ui-log: ban strncpy()

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 2bca7a019ea67a9e0c63f2578ed9ff076dd6d5bd..995cb9345addb03fc4eef95c1004a671d4f00d09 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -19,19 +19,19 @@ void cgit_print_commit(char *hex, const char *prefix)
        struct commitinfo *info, *parent_info;
        struct commit_list *p;
        struct strbuf notes = STRBUF_INIT;
-       unsigned char sha1[20];
+       struct object_id oid;
        char *tmp, *tmp2;
        int parents = 0;
 
        if (!hex)
                hex = ctx.qry.head;
 
-       if (get_sha1(hex, sha1)) {
+       if (get_oid(hex, &oid)) {
                cgit_print_error_page(400, "Bad request",
                                "Bad object id: %s", hex);
                return;
        }
-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(&oid);
        if (!commit) {
                cgit_print_error_page(404, "Not found",
                                "Bad commit reference: %s", hex);
@@ -39,9 +39,9 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        info = cgit_parse_commit(commit);
 
-       format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
+       format_display_notes(&oid, &notes, PAGE_ENCODING, 0);
 
-       load_ref_decorations(DECORATE_FULL_REFS);
+       load_ref_decorations(NULL, DECORATE_FULL_REFS);
 
        cgit_print_layout_start();
        cgit_print_diff_ctrls();
@@ -55,7 +55,8 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
-       cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
+       html_txt(show_date(info->author_date, info->author_tz,
+                               cgit_date_mode(DATE_ISO8601)));
        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");
@@ -66,17 +67,18 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
-       cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
+       html_txt(show_date(info->committer_date, info->committer_tz,
+                               cgit_date_mode(DATE_ISO8601)));
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
-       tmp = sha1_to_hex(commit->object.sha1);
+       tmp = oid_to_hex(&commit->object.oid);
        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
        html(" (");
        cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
        html(")</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);
-       cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
+       cgit_tree_link(oid_to_hex(&commit->maybe_tree->object.oid), NULL, NULL,
                       ctx.qry.head, tmp, NULL);
        if (prefix) {
                html(" /");
@@ -85,7 +87,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        free(tmp);
        html("</td></tr>\n");
        for (p = commit->parents; p; p = p->next) {
-               parent = lookup_commit_reference(p->item->object.sha1);
+               parent = lookup_commit_reference(&p->item->object.oid);
                if (!parent) {
                        html("<tr><td colspan='3'>");
                        cgit_print_error("Error reading parent commit");
@@ -94,7 +96,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                }
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
-               tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
+               tmp = tmp2 = oid_to_hex(&p->item->object.oid);
                if (ctx.repo->enable_subject_links) {
                        parent_info = cgit_parse_commit(parent);
                        tmp2 = parent_info->subject;
@@ -102,14 +104,13 @@ void cgit_print_commit(char *hex, const char *prefix)
                cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix);
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
-                              sha1_to_hex(p->item->object.sha1), prefix);
+                              oid_to_hex(&p->item->object.oid), prefix);
                html(")</td></tr>");
                parents++;
        }
        if (ctx.repo->snapshots) {
                html("<tr><th>download</th><td colspan='2' class='sha1'>");
-               cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
-                                         hex, ctx.repo->snapshots);
+               cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
                html("</td></tr>");
        }
        html("</table>\n");
@@ -135,7 +136,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        if (parents < 3) {
                if (parents)
-                       tmp = sha1_to_hex(commit->parents->item->object.sha1);
+                       tmp = oid_to_hex(&commit->parents->item->object.oid);
                else
                        tmp = NULL;
                cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);