3 files changed, 14 insertions, 6 deletions

diff --git a/cmd.c b/cmd.c
index 5b3c14c..8914fa5 100644
--- a/cmd.c
+++ b/cmd.c
@@ -101,14 +101,13 @@ static void refs_fn(struct cgit_context *ctx)
 {
 	cgit_print_refs();
 }
 
 static void snapshot_fn(struct cgit_context *ctx)
 {
-	cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1,
-			    cgit_repobasename(ctx->repo->url), ctx->qry.path,
+	cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path,
 			    ctx->repo->snapshots, ctx->qry.nohead);
 }
 
 static void summary_fn(struct cgit_context *ctx)
 {
 	cgit_print_summary();
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 9c4d086..76457d6 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -159,30 +159,40 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
 	dwim_filename = xstrdup(filename);
 	dwim_filename[strlen(filename) - strlen(fmt->suffix)] = '\0';
 	for_each_tag_ref(ref_cb, NULL);
 	return dwim_refname;
 }
 
-void cgit_print_snapshot(const char *head, const char *hex, const char *prefix,
+void cgit_print_snapshot(const char *head, const char *hex,
 			 const char *filename, int snapshots, int dwim)
 {
 	const struct cgit_snapshot_format* f;
+	char *prefix = NULL;
 
 	f = get_format(filename);
 	if (!f) {
 		ctx.page.mimetype = "text/html";
 		cgit_print_http_headers(&ctx);
 		cgit_print_docstart(&ctx);
 		cgit_print_pageheader(&ctx);
 		cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 		cgit_print_docend();
 		return;
 	}
 
-	if (!hex && dwim)
+	if (!hex && dwim) {
 		hex = get_ref_from_filename(ctx.repo->url, filename, f);
+		if (hex != NULL) {
+			prefix = xstrdup(filename);
+			prefix[strlen(filename) - strlen(f->suffix)] = '\0';
+		}
+	}
 
 	if (!hex)
 		hex = head;
 
+	if (!prefix)
+		prefix = xstrdup(cgit_repobasename(ctx.repo->url));
+
 	make_snapshot(f, hex, prefix, filename);
+	free(prefix);
 }
diff --git a/ui-snapshot.h b/ui-snapshot.h
index 3540303..b6ede52 100644
--- a/ui-snapshot.h
+++ b/ui-snapshot.h
@@ -1,8 +1,7 @@
 #ifndef UI_SNAPSHOT_H
 #define UI_SNAPSHOT_H
 
 extern void cgit_print_snapshot(const char *head, const char *hex,
-				const char *prefix, const char *filename,
-				int snapshot, int dwim);
+				const char *filename, int snapshot, int dwim);
 
 #endif /* UI_SNAPSHOT_H */