X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/547a64fbd65de293c290f4e18bbeae958d54aaa7..c712d5ac434b9ee8cb4e63a173a2538e1878637f:/ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 408e620..7f261ed 100644
--- 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(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);
-	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,13 +85,14 @@ static char *longest_common_subsequence(char *A, char *B)
 			j += 1;
 		}
 	}
+
 	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)
@@ -77,7 +105,7 @@ static int line_from_hunk(char *line, char type)
 	buf2 = xmalloc(len + 1);
 	strncpy(buf2, buf1, len);
 	buf2[len] = '\0';
-	int res = atoi(buf2);
+	res = atoi(buf2);
 	free(buf2);
 	return res;
 }
@@ -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,26 @@ 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_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("' id='%s'>%s</a>", lineno_str, 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);
@@ -212,11 +248,19 @@ 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_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("' id='%s'>%s</a>", lineno_str, 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);
@@ -236,7 +280,7 @@ static void print_ssdiff_line(char *class,
 		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;
@@ -249,7 +293,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;
@@ -262,7 +306,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);
@@ -297,7 +341,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;
@@ -348,7 +392,7 @@ void cgit_ssdiff_line_cb(char *line, int len)
 	line[len - 1] = c;
 }
 
-void cgit_ssdiff_header_begin()
+void cgit_ssdiff_header_begin(void)
 {
 	current_old_line = -1;
 	current_new_line = -1;
@@ -356,12 +400,12 @@ void cgit_ssdiff_header_begin()
 	html("<tr><td class='head' colspan='4'>");
 }
 
-void cgit_ssdiff_header_end()
+void cgit_ssdiff_header_end(void)
 {
 	html("</td><tr>");
 }
 
-void cgit_ssdiff_footer()
+void cgit_ssdiff_footer(void)
 {
 	if (deferred_old || deferred_new)
 		cgit_ssdiff_print_deferred_lines();