ui-log: ban strncpy()

[ps-cgit] / ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index d183d40501a2393a1db0c1a565c759bfdbc3ba06..68c2044dcc75c8ab58df847c36e0debe3665acba 100644 (file)
--- 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;
+       int len, res;
 
        buf1 = strchr(line, type);
        if (buf1 == NULL)
@@ -105,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;
 }
@@ -114,11 +114,10 @@ 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 = "        ";
 
        if (linelen == 0) {
                result = xmalloc(1);
@@ -126,20 +125,23 @@ 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[0] = '\0';
 
-       while (1) {
+       for (;;) {
                cur_buf = strchr(prev_buf, '\t');
                if (!cur_buf) {
                        strcat(result, prev_buf);
                        break;
                } else {
                        strncat(result, prev_buf, cur_buf - prev_buf);
-                       strncat(result, spaces, 8 - (strlen(result) % 8));
+                       linelen = strlen(result);
+                       memset(&result[linelen], ' ', 8 - (linelen % 8));
+                       result[linelen + 8 - (linelen % 8)] = '\0';
                }
                prev_buf = cur_buf + 1;
        }
@@ -229,7 +231,7 @@ 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_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
+               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);
@@ -252,7 +254,7 @@ 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_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
+               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);