about summary refs log tree commit diff
path: root/ui-refs.c
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@lfos.de>2016-05-24 18:15:18 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2016-07-05 16:14:40 +0200
commit9984e7ab49c59e49a0d7e62c3435e7133f7a53ec (patch)
tree1f3a53622746e5fe43e9d5c7c9bc27ab2da22761 /ui-refs.c
parentgit: update to v2.9.0 (diff)
downloadcgit-pink-9984e7ab49c59e49a0d7e62c3435e7133f7a53ec.tar.gz
cgit-pink-9984e7ab49c59e49a0d7e62c3435e7133f7a53ec.zip
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>
Diffstat (limited to '')
-rw-r--r--ui-refs.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/ui-refs.c b/ui-refs.c
index 5b4530e..75f2789 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -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);
 }