filter: make exit status local

[cgit.git] / ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 408e620533ac0dd3f61d1f868ec3aeede246f9d7..08cf513b477097b85315e448f80401900f50e5d8 100644 (file)
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,10 +1,13 @@
 #include "cgit.h"
+#include "ui-ssdiff.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-diff.h"
 
 extern int use_ssdiff;
 
 static int current_old_line, current_new_line;
+static int **L = NULL;
 
 struct deferred_lines {
        int line_no;
@@ -15,16 +18,40 @@ struct deferred_lines {
 static struct deferred_lines *deferred_old, *deferred_old_last;
 static struct deferred_lines *deferred_new, *deferred_new_last;
 
+static void create_or_reset_lcs_table()
+{
+       int i;
+
+       if (L != NULL) {
+               memset(*L, 0, sizeof(int) * MAX_SSDIFF_SIZE);
+               return;
+       }
+
+       // xcalloc will die if we ran out of memory;
+       // not very helpful for debugging
+       L = (int**)xcalloc(MAX_SSDIFF_M, sizeof(int *));
+       *L = (int*)xcalloc(MAX_SSDIFF_SIZE, sizeof(int));
+
+       for (i = 1; i < MAX_SSDIFF_M; i++) {
+               L[i] = *L + i * MAX_SSDIFF_N;
+       }
+}
+
 static char *longest_common_subsequence(char *A, char *B)
 {
        int i, j, ri;
        int m = strlen(A);
        int n = strlen(B);
-       int L[m + 1][n + 1];
        int tmp1, tmp2;
        int lcs_length;
        char *result;
 
+       // We bail if the lines are too long
+       if (m >= MAX_SSDIFF_M || n >= MAX_SSDIFF_N)
+               return NULL;
+
+       create_or_reset_lcs_table();
+
        for (i = m; i >= 0; i--) {
                for (j = n; j >= 0; j--) {
                        if (A[i] == '\0' || B[j] == '\0') {
@@ -58,6 +85,7 @@ static char *longest_common_subsequence(char *A, char *B)
                        j += 1;
                }
        }
+
        return result;
 }
 
@@ -110,9 +138,8 @@ static char *replace_tabs(char *line)
                        strcat(result, prev_buf);
                        break;
                } else {
-                       strcat(result, " ");
-                       strncat(result, spaces, 8 - (strlen(result) % 8));
                        strncat(result, prev_buf, cur_buf - prev_buf);
+                       strncat(result, spaces, 8 - (strlen(result) % 8));
                }
                prev_buf = cur_buf + 1;
        }
@@ -191,17 +218,24 @@ static void print_ssdiff_line(char *class,
                              char *new_line, int individual_chars)
 {
        char *lcs = NULL;
+
        if (old_line)
                old_line = replace_tabs(old_line + 1);
        if (new_line)
                new_line = replace_tabs(new_line + 1);
        if (individual_chars && old_line && new_line)
                lcs = longest_common_subsequence(old_line, new_line);
-       html("<tr>");
-       if (old_line_no > 0)
-               htmlf("<td class='lineno'>%d</td><td class='%s'>",
-                     old_line_no, class);
-       else if (old_line)
+       html("<tr>\n");
+       if (old_line_no > 0) {
+               struct diff_filespec *old_file = cgit_get_current_old_file();
+               char *lineno_str = fmt("n%d", old_line_no);
+               char *id_str = fmt("id=%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
+               html("<td class='lineno'><a href='");
+               html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
+               htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);
+               html("</td>");
+               htmlf("<td class='%s'>", class);
+       } else if (old_line)
                htmlf("<td class='lineno'></td><td class='%s'>", class);
        else
                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
@@ -212,11 +246,17 @@ static void print_ssdiff_line(char *class,
                        html_txt(old_line);
        }
 
-       html("</td>");
-       if (new_line_no > 0)
-               htmlf("<td class='lineno'>%d</td><td class='%s'>",
-                     new_line_no, class);
-       else if (new_line)
+       html("</td>\n");
+       if (new_line_no > 0) {
+               struct diff_filespec *new_file = cgit_get_current_new_file();
+               char *lineno_str = fmt("n%d", new_line_no);
+               char *id_str = fmt("id=%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
+               html("<td class='lineno'><a href='");
+               html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
+               htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);
+               html("</td>");
+               htmlf("<td class='%s'>", class);
+       } else if (new_line)
                htmlf("<td class='lineno'></td><td class='%s'>", class);
        else
                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);