Diffstat (limited to 'ui-ssdiff.c')
| -rw-r--r-- | ui-ssdiff.c | 73 |
1 files changed, 31 insertions, 42 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index af8bc9e..3d3dad6 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,7 +18,7 @@ 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) +static void create_or_reset_lcs_table() { int i; @@ -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, res; + int len; buf1 = strchr(line, type); if (buf1 == NULL) @@ -103,8 +103,9 @@ static int line_from_hunk(char *line, char type) return 0; len = buf2 - buf1; buf2 = xmalloc(len + 1); - strlcpy(buf2, buf1, len + 1); - res = atoi(buf2); + strncpy(buf2, buf1, len); + buf2[len] = '\0'; + int res = atoi(buf2); free(buf2); return res; } @@ -113,11 +114,11 @@ static char *replace_tabs(char *line) { char *prev_buf = line; char *cur_buf; - size_t linelen = strlen(line); + int linelen = strlen(line); int n_tabs = 0; int i; char *result; - size_t result_len; + char *spaces = " "; if (linelen == 0) { result = xmalloc(1); @@ -125,26 +126,20 @@ 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_len = linelen + n_tabs * 8; - result = xmalloc(result_len + 1); + result = xmalloc(linelen + n_tabs * 8 + 1); result[0] = '\0'; - for (;;) { + while (1) { cur_buf = strchr(prev_buf, '\t'); if (!cur_buf) { - linelen = strlen(result); - strlcpy(&result[linelen], prev_buf, result_len - linelen + 1); + strcat(result, prev_buf); break; } else { - 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'; + strncat(result, prev_buf, cur_buf - prev_buf); + strncat(result, spaces, 8 - (strlen(result) % 8)); } prev_buf = cur_buf + 1; } @@ -209,13 +204,11 @@ static void print_part_with_lcs(char *class, char *line, char *lcs) } } else if (line[i] == lcs[j]) { same = 1; - html("</span>"); + htmlf("</span>"); j += 1; } html_txt(c); } - if (!same) - html("</span>"); } static void print_ssdiff_line(char *class, @@ -236,14 +229,12 @@ 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("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); + 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 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); html("</td>"); htmlf("<td class='%s'>", class); - free(fileurl); } else if (old_line) htmlf("<td class='lineno'></td><td class='%s'>", class); else @@ -259,14 +250,12 @@ 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("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); + 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 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); html("</td>"); htmlf("<td class='%s'>", class); - free(fileurl); } else if (new_line) htmlf("<td class='lineno'></td><td class='%s'>", class); else @@ -287,7 +276,7 @@ static void print_ssdiff_line(char *class, free(old_line); } -static void print_deferred_old_lines(void) +static void print_deferred_old_lines() { struct deferred_lines *iter_old, *tmp; iter_old = deferred_old; @@ -300,7 +289,7 @@ static void print_deferred_old_lines(void) } } -static void print_deferred_new_lines(void) +static void print_deferred_new_lines() { struct deferred_lines *iter_new, *tmp; iter_new = deferred_new; @@ -313,7 +302,7 @@ static void print_deferred_new_lines(void) } } -static void print_deferred_changed_lines(void) +static void print_deferred_changed_lines() { struct deferred_lines *iter_old, *iter_new, *tmp; int n_old_lines = calc_deferred_lines(deferred_old); @@ -348,7 +337,7 @@ static void print_deferred_changed_lines(void) } } -void cgit_ssdiff_print_deferred_lines(void) +void cgit_ssdiff_print_deferred_lines() { if (!deferred_old && !deferred_new) return; @@ -399,7 +388,7 @@ void cgit_ssdiff_line_cb(char *line, int len) line[len - 1] = c; } -void cgit_ssdiff_header_begin(void) +void cgit_ssdiff_header_begin() { current_old_line = -1; current_new_line = -1; @@ -407,12 +396,12 @@ void cgit_ssdiff_header_begin(void) html("<tr><td class='head' colspan='4'>"); } -void cgit_ssdiff_header_end(void) +void cgit_ssdiff_header_end() { - html("</td></tr>"); + html("</td><tr>"); } -void cgit_ssdiff_footer(void) +void cgit_ssdiff_footer() { if (deferred_old || deferred_new) cgit_ssdiff_print_deferred_lines(); |