Avoid ambiguities when prettifying snapshot names

When composing snapshot file names for a tag with a prefix of the form
v[0-9] (resp. V[0-9]), the leading "v" (resp. "V") is stripped. This
leads to conflicts if a tag with the stripped name already exists or if
there are tags only differing in the capitalization of the leading "v".
Make sure we do not strip the "v" in these cases.

Reported-by: Juuso Lapinlampi <wub@partyvan.eu>
Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>

1 files changed, 9 insertions, 15 deletions

@@ -93,34 +93,28 @@ static void print_tag_header(void)
 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;
+        struct strbuf filename = STRBUF_INIT;
+        size_t prefixlen;
 
         if (!ref || strlen(ref) < 1)
                 return;
 
         basename = cgit_repobasename(repo->url);
-        if (!starts_with(ref, basename)) {
-                if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
-                        ref++;
-                if (isdigit(ref[0])) {
-                        ref = fmtalloc("%s-%s", basename, ref);
-                        free_ref = 1;
-                }
-        }
-
+        if (starts_with(ref, basename))
+                strbuf_addstr(&filename, ref);
+        else
+                cgit_compose_snapshot_prefix(&filename, basename, ref);
+        prefixlen = filename.len;
         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);
+                strbuf_setlen(&filename, prefixlen);
+                strbuf_addstr(&filename, 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);
 }