X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/19c31231fac828bb336db67b8cccc871bea1500e..bd68c98879ecc8ce9f7f6d3e01bc4ffeb9182b04:/ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 45770b1..af8bc9e 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,8 +1,8 @@
 #include "cgit.h"
+#include "ui-ssdiff.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
-#include "ui-ssdiff.h"
 
 extern int use_ssdiff;
 
@@ -18,12 +18,12 @@ 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()
+static void create_or_reset_lcs_table(void)
 {
 	int i;
 
 	if (L != NULL) {
-		memset(*L, 0, sizeof(*L) * MAX_SSDIFF_SIZE);
+		memset(*L, 0, sizeof(int) * MAX_SSDIFF_SIZE);
 		return;
 	}
 
@@ -92,7 +92,7 @@ static char *longest_common_subsequence(char *A, char *B)
 static int line_from_hunk(char *line, char type)
 {
 	char *buf1, *buf2;
-	int len;
+	int len, res;
 
 	buf1 = strchr(line, type);
 	if (buf1 == NULL)
@@ -103,9 +103,8 @@ static int line_from_hunk(char *line, char type)
 		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;
 }
@@ -114,11 +113,11 @@ static char *replace_tabs(char *line)
 {
 	char *prev_buf = line;
 	char *cur_buf;
-	int linelen = strlen(line);
+	size_t linelen = strlen(line);
 	int n_tabs = 0;
 	int i;
 	char *result;
-	char *spaces = "        ";
+	size_t result_len;
 
 	if (linelen == 0) {
 		result = xmalloc(1);
@@ -126,21 +125,26 @@ static char *replace_tabs(char *line)
 		return result;
 	}
 
-	for (i = 0; i < linelen; i++)
+	for (i = 0; i < linelen; i++) {
 		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';
 
-	while (1) {
+	for (;;) {
 		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 {
-			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;
 	}
@@ -205,11 +209,13 @@ static void print_part_with_lcs(char *class, char *line, char *lcs)
 			}
 		} else if (line[i] == lcs[j]) {
 			same = 1;
-			htmlf("</span>");
+			html("</span>");
 			j += 1;
 		}
 		html_txt(c);
 	}
+	if (!same)
+		html("</span>");
 }
 
 static void print_ssdiff_line(char *class,
@@ -230,12 +236,14 @@ static void print_ssdiff_line(char *class,
 	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("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
-		html("<td class='lineno'><a class='no' href='");
-		html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
-		htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+		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
@@ -251,12 +259,14 @@ static void print_ssdiff_line(char *class,
 	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("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
-		html("<td class='lineno'><a class='no' href='");
-		html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
-		htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+		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
@@ -277,7 +287,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;
@@ -290,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;
@@ -303,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);
@@ -338,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;
@@ -389,7 +399,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;
@@ -397,12 +407,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>");
+	html("</td></tr>");
 }
 
-void cgit_ssdiff_footer()
+void cgit_ssdiff_footer(void)
 {
 	if (deferred_old || deferred_new)
 		cgit_ssdiff_print_deferred_lines();