Diffstat (limited to 'ui-ssdiff.c')
| -rw-r--r-- | ui-ssdiff.c | 51 |
1 files changed, 20 insertions, 31 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index af8bc9e..2146c71 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -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); + 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(fileurl); - htmlf("'>%s</a>", lineno_str + 1); + 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); - 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); + 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(fileurl); - htmlf("'>%s</a>", lineno_str + 1); + 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); - free(fileurl); } else if (new_line) htmlf("<td class='lineno'></td><td class='%s'>", class); else @@ -409,7 +398,7 @@ void cgit_ssdiff_header_begin(void) void cgit_ssdiff_header_end(void) { - html("</td></tr>"); + html("</td><tr>"); } void cgit_ssdiff_footer(void) |