git: update to v2.25.0

[cgit.git] / ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 408e620533ac0dd3f61d1f868ec3aeede246f9d7..af8bc9e0659bff07c1cf51733ef15b4cd37ea990 100644 (file)
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,10 +1,13 @@
 #include "cgit.h"
 #include "cgit.h"

+#include "ui-ssdiff.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "html.h"
 #include "ui-shared.h"

+#include "ui-diff.h"

 
 extern int use_ssdiff;
 
 static int current_old_line, current_new_line;
 
 extern int use_ssdiff;
 
 static int current_old_line, current_new_line;

+static int **L = NULL;

 
 struct deferred_lines {
        int line_no;
 
 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 struct deferred_lines *deferred_old, *deferred_old_last;
 static struct deferred_lines *deferred_new, *deferred_new_last;
 

+static void create_or_reset_lcs_table(void)
+{
+       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);
 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;
 
        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') {
        for (i = m; i >= 0; i--) {
                for (j = n; j >= 0; j--) {
                        if (A[i] == '\0' || B[j] == '\0') {


@@ -58,13 +85,14 @@ static char *longest_common_subsequence(char *A, char *B)
                        j += 1;
                }
        }
                        j += 1;
                }
        }

+

        return result;
 }
 
 static int line_from_hunk(char *line, char type)
 {
        char *buf1, *buf2;
        return result;
 }
 
 static int line_from_hunk(char *line, char type)
 {
        char *buf1, *buf2;

-       int len;
+       int len, res;

 
        buf1 = strchr(line, type);
        if (buf1 == NULL)
 
        buf1 = strchr(line, type);
        if (buf1 == NULL)


@@ -75,9 +103,8 @@ static int line_from_hunk(char *line, char type)
                return 0;
        len = buf2 - buf1;
        buf2 = xmalloc(len + 1);
                return 0;
        len = buf2 - buf1;
        buf2 = xmalloc(len + 1);

-       strncpy(buf2, buf1, len);
-       buf2[len] = '\0';
-       int res = atoi(buf2);
+       strlcpy(buf2, buf1, len + 1);
+       res = atoi(buf2);

        free(buf2);
        return res;
 }
        free(buf2);
        return res;
 }


@@ -86,11 +113,11 @@ static char *replace_tabs(char *line)
 {
        char *prev_buf = line;
        char *cur_buf;
 {
        char *prev_buf = line;
        char *cur_buf;

-       int linelen = strlen(line);
+       size_t linelen = strlen(line);

        int n_tabs = 0;
        int i;
        char *result;
        int n_tabs = 0;
        int i;
        char *result;

-       char *spaces = "        ";
+       size_t result_len;

 
        if (linelen == 0) {
                result = xmalloc(1);
 
        if (linelen == 0) {
                result = xmalloc(1);


@@ -98,21 +125,26 @@ static char *replace_tabs(char *line)
                return result;
        }
 
                return result;
        }
 

-       for (i = 0; i < linelen; i++)
+       for (i = 0; i < linelen; i++) {

                if (line[i] == '\t')
                        n_tabs += 1;
                if (line[i] == '\t')
                        n_tabs += 1;

-       result = xmalloc(linelen + n_tabs * 8 + 1);
+       }
+       result_len = linelen + n_tabs * 8;
+       result = xmalloc(result_len + 1);

        result[0] = '\0';
 
        result[0] = '\0';
 

-       while (1) {
+       for (;;) {

                cur_buf = strchr(prev_buf, '\t');
                if (!cur_buf) {
                cur_buf = strchr(prev_buf, '\t');
                if (!cur_buf) {

-                       strcat(result, prev_buf);
+                       linelen = strlen(result);
+                       strlcpy(&result[linelen], prev_buf, result_len - linelen + 1);

                        break;
                } else {
                        break;
                } else {

-                       strcat(result, " ");
-                       strncat(result, spaces, 8 - (strlen(result) % 8));
-                       strncat(result, prev_buf, cur_buf - prev_buf);
+                       linelen = strlen(result);
+                       strlcpy(&result[linelen], prev_buf, cur_buf - prev_buf + 1);
+                       linelen = strlen(result);
+                       memset(&result[linelen], ' ', 8 - (linelen % 8));
+                       result[linelen + 8 - (linelen % 8)] = '\0';

                }
                prev_buf = cur_buf + 1;
        }
                }
                prev_buf = cur_buf + 1;
        }


@@ -177,11 +209,13 @@ static void print_part_with_lcs(char *class, char *line, char *lcs)
                        }
                } else if (line[i] == lcs[j]) {
                        same = 1;
                        }
                } else if (line[i] == lcs[j]) {
                        same = 1;

-                       htmlf("</span>");
+                       html("</span>");

                        j += 1;
                }
                html_txt(c);
        }
                        j += 1;
                }
                html_txt(c);
        }

+       if (!same)
+               html("</span>");

 }
 
 static void print_ssdiff_line(char *class,
 }
 
 static void print_ssdiff_line(char *class,


@@ -191,17 +225,26 @@ static void print_ssdiff_line(char *class,
                              char *new_line, int individual_chars)
 {
        char *lcs = NULL;
                              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);
        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_oid(&old_file->oid)?"HEAD":oid_to_hex(old_rev_oid), lineno_str);
+               char *fileurl = cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str);
+               html("<td class='lineno'><a href='");
+               html(fileurl);
+               htmlf("'>%s</a>", lineno_str + 1);
+               html("</td>");
+               htmlf("<td class='%s'>", class);
+               free(fileurl);
+       } else if (old_line)

                htmlf("<td class='lineno'></td><td class='%s'>", class);
        else
                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
                htmlf("<td class='lineno'></td><td class='%s'>", class);
        else
                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);


@@ -212,11 +255,19 @@ static void print_ssdiff_line(char *class,
                        html_txt(old_line);
        }
 
                        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_oid(&new_file->oid)?"HEAD":oid_to_hex(new_rev_oid), lineno_str);
+               char *fileurl = cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str);
+               html("<td class='lineno'><a href='");
+               html(fileurl);
+               htmlf("'>%s</a>", lineno_str + 1);
+               html("</td>");
+               htmlf("<td class='%s'>", class);
+               free(fileurl);
+       } else if (new_line)

                htmlf("<td class='lineno'></td><td class='%s'>", class);
        else
                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
                htmlf("<td class='lineno'></td><td class='%s'>", class);
        else
                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);


@@ -236,7 +287,7 @@ static void print_ssdiff_line(char *class,
                free(old_line);
 }
 
                free(old_line);
 }
 

-static void print_deferred_old_lines()
+static void print_deferred_old_lines(void)

 {
        struct deferred_lines *iter_old, *tmp;
        iter_old = deferred_old;
 {
        struct deferred_lines *iter_old, *tmp;
        iter_old = deferred_old;


@@ -249,7 +300,7 @@ static void print_deferred_old_lines()
        }
 }
 
        }
 }
 

-static void print_deferred_new_lines()
+static void print_deferred_new_lines(void)

 {
        struct deferred_lines *iter_new, *tmp;
        iter_new = deferred_new;
 {
        struct deferred_lines *iter_new, *tmp;
        iter_new = deferred_new;


@@ -262,7 +313,7 @@ static void print_deferred_new_lines()
        }
 }
 
        }
 }
 

-static void print_deferred_changed_lines()
+static void print_deferred_changed_lines(void)

 {
        struct deferred_lines *iter_old, *iter_new, *tmp;
        int n_old_lines = calc_deferred_lines(deferred_old);
 {
        struct deferred_lines *iter_old, *iter_new, *tmp;
        int n_old_lines = calc_deferred_lines(deferred_old);


@@ -297,7 +348,7 @@ static void print_deferred_changed_lines()
        }
 }
 
        }
 }
 

-void cgit_ssdiff_print_deferred_lines()
+void cgit_ssdiff_print_deferred_lines(void)

 {
        if (!deferred_old && !deferred_new)
                return;
 {
        if (!deferred_old && !deferred_new)
                return;


@@ -348,7 +399,7 @@ void cgit_ssdiff_line_cb(char *line, int len)
        line[len - 1] = c;
 }
 
        line[len - 1] = c;
 }
 

-void cgit_ssdiff_header_begin()
+void cgit_ssdiff_header_begin(void)

 {
        current_old_line = -1;
        current_new_line = -1;
 {
        current_old_line = -1;
        current_new_line = -1;


@@ -356,12 +407,12 @@ void cgit_ssdiff_header_begin()
        html("<tr><td class='head' colspan='4'>");
 }
 
        html("<tr><td class='head' colspan='4'>");
 }
 

-void cgit_ssdiff_header_end()
+void cgit_ssdiff_header_end(void)

 {
 {

-       html("</td><tr>");
+       html("</td></tr>");

 }
 
 }
 

-void cgit_ssdiff_footer()
+void cgit_ssdiff_footer(void)

 {
        if (deferred_old || deferred_new)
                cgit_ssdiff_print_deferred_lines();
 {
        if (deferred_old || deferred_new)
                cgit_ssdiff_print_deferred_lines();