ui-ssdiff: ban strncpy()

[cgit.git] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 3fbaad07302d90e1cb127666c51deceb67f5c02d..2ec385854ef9a2396fc10881de5f46599464685e 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -1,6 +1,6 @@
 /* ui-refs.c: browse symbolic refs
  *
- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -11,18 +11,10 @@
 #include "html.h"
 #include "ui-shared.h"
 
-static int cmp_age(int age1, int age2)
+static inline int cmp_age(int age1, int age2)
 {
-       if (age1 != 0 && age2 != 0)
-               return age2 - age1;
-
-       if (age1 == 0 && age2 == 0)
-               return 0;
-
-       if (age1 == 0)
-               return +1;
-
-       return -1;
+       /* age1 and age2 are assumed to be non-negative */
+       return age2 - age1;
 }
 
 static int cmp_ref_name(const void *a, const void *b)
@@ -71,15 +63,17 @@ static int print_branch(struct refinfo *ref)
                return 1;
        html("<tr><td>");
        cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
-                     ctx.qry.showmsg);
+                     ctx.qry.showmsg, 0);
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
-               cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
+               cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL);
                html("</td><td>");
+               cgit_open_filter(ctx.repo->email_filter, info->author_email, "refs");
                html_txt(info->author);
+               cgit_close_filter(ctx.repo->email_filter);
                html("</td><td colspan='2'>");
-               cgit_print_age(info->commit->date, -1, NULL);
+               cgit_print_age(info->committer_date, info->committer_tz, -1);
        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);
@@ -88,7 +82,7 @@ static int print_branch(struct refinfo *ref)
        return 0;
 }
 
-static void print_tag_header()
+static void print_tag_header(void)
 {
        html("<tr class='nohover'><th class='left'>Tag</th>"
             "<th class='left'>Download</th>"
@@ -96,40 +90,6 @@ static void print_tag_header()
             "<th class='left' colspan='2'>Age</th></tr>\n");
 }
 
-static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
-{
-       const struct cgit_snapshot_format* f;
-       struct strbuf filename = STRBUF_INIT;
-       const char *basename;
-       int free_ref = 0;
-
-       if (!ref || strlen(ref) < 2)
-               return;
-
-       basename = cgit_repobasename(repo->url);
-       if (prefixcmp(ref, basename) != 0) {
-               if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
-                       ref++;
-               if (isdigit(ref[0])) {
-                       ref = fmtalloc("%s-%s", basename, ref);
-                       free_ref = 1;
-               }
-       }
-
-       for (f = cgit_snapshot_formats; f->suffix; f++) {
-               if (!(repo->snapshots & f->bit))
-                       continue;
-               strbuf_reset(&filename);
-               strbuf_addf(&filename, "%s%s", ref, f->suffix);
-               cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf);
-               html("&nbsp;&nbsp;");
-       }
-
-       if (free_ref)
-               free((char *)ref);
-       strbuf_release(&filename);
-}
-
 static int print_tag(struct refinfo *ref)
 {
        struct tag *tag = NULL;
@@ -141,30 +101,35 @@ static int print_tag(struct refinfo *ref)
                tag = (struct tag *)obj;
                obj = tag->tagged;
                info = ref->tag;
-               if (!tag || !info)
+               if (!info)
                        return 1;
        }
 
        html("<tr><td>");
-       cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+       cgit_tag_link(name, NULL, NULL, name);
        html("</td><td>");
        if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
-               print_tag_downloads(ctx.repo, name);
+               cgit_print_snapshot_links(ctx.repo, name, "&nbsp;&nbsp;");
        else
                cgit_object_link(obj);
        html("</td><td>");
        if (info) {
-               if (info->tagger)
-                       html(info->tagger);
+               if (info->tagger) {
+                       cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "refs");
+                       html_txt(info->tagger);
+                       cgit_close_filter(ctx.repo->email_filter);
+               }
        } else if (ref->object->type == OBJ_COMMIT) {
-               html(ref->commit->author);
+               cgit_open_filter(ctx.repo->email_filter, ref->commit->author_email, "refs");
+               html_txt(ref->commit->author);
+               cgit_close_filter(ctx.repo->email_filter);
        }
        html("</td><td colspan='2'>");
        if (info) {
                if (info->tagger_date > 0)
-                       cgit_print_age(info->tagger_date, -1, NULL);
+                       cgit_print_age(info->tagger_date, info->tagger_tz, -1);
        } else if (ref->object->type == OBJ_COMMIT) {
-               cgit_print_age(ref->commit->commit->date, -1, NULL);
+               cgit_print_age(ref->commit->commit->date, 0, -1);
        }
        html("</td></tr>\n");
 
@@ -197,10 +162,9 @@ void cgit_print_branches(int maxcount)
        if (maxcount == 0 || maxcount > list.count)
                maxcount = list.count;
 
-       if (maxcount < list.count) {
-               qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
+       qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
+       if (ctx.repo->branch_sort == 0)
                qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
-       }
 
        for (i = 0; i < maxcount; i++)
                print_branch(list.refs[i]);
@@ -236,14 +200,14 @@ void cgit_print_tags(int maxcount)
        cgit_free_reflist_inner(&list);
 }
 
-void cgit_print_refs()
+void cgit_print_refs(void)
 {
-
+       cgit_print_layout_start();
        html("<table class='list nowrap'>");
 
-       if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5))
+       if (ctx.qry.path && starts_with(ctx.qry.path, "heads"))
                cgit_print_branches(0);
-       else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4))
+       else if (ctx.qry.path && starts_with(ctx.qry.path, "tags"))
                cgit_print_tags(0);
        else {
                cgit_print_branches(0);
@@ -251,4 +215,5 @@ void cgit_print_refs()
                cgit_print_tags(0);
        }
        html("</table>");
+       cgit_print_layout_end();
 }