t0107: Skip ZIP tests if unzip(1) isn't available

[ps-cgit] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 74064789ecdd281bd411472b20730501d1c52182..0ae0612665e95c3254aa6a3ed769f5f355cf5b12 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -99,7 +99,7 @@ static void print_tag_header()
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
 {
        const struct cgit_snapshot_format* f;
-       char *filename;
+       struct strbuf filename = STRBUF_INIT;
        const char *basename;
        int free_ref = 0;
 
@@ -111,7 +111,7 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
                if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                        ref++;
                if (isdigit(ref[0])) {
-                       ref = xstrdup(fmt("%s-%s", basename, ref));
+                       ref = fmtalloc("%s-%s", basename, ref);
                        free_ref = 1;
                }
        }
@@ -119,13 +119,15 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(repo->snapshots & f->bit))
                        continue;
-               filename = fmt("%s%s", ref, f->suffix);
-               cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
+               strbuf_reset(&filename);
+               strbuf_addf(&filename, "%s%s", ref, f->suffix);
+               cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf);
                html("  ");
        }
 
        if (free_ref)
                free((char *)ref);
+       strbuf_release(&filename);
 }
 
 static int print_tag(struct refinfo *ref)
@@ -195,10 +197,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]);