X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/3e9578e9a3393eaebc658ad650a3241bf1930176..fd00e71ab7cf1eabd8d1fc2e5980055350849034:/ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 3107b05..f68e877 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -99,7 +99,7 @@ static const struct cgit_snapshot_format *get_format(const char *filename)
 	const struct cgit_snapshot_format *fmt;
 
 	for (fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
-		if (!suffixcmp(filename, fmt->suffix))
+		if (ends_with(filename, fmt->suffix))
 			return fmt;
 	}
 	return NULL;
@@ -112,13 +112,16 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
 	unsigned char sha1[20];
 
 	if (get_sha1(hex, sha1)) {
-		cgit_print_error("Bad object id: %s", hex);
+		cgit_print_error_page(404, "Not found",
+				"Bad object id: %s", hex);
 		return 1;
 	}
 	if (!lookup_commit_reference(sha1)) {
-		cgit_print_error("Not a commit reference: %s", hex);
+		cgit_print_error_page(400, "Bad request",
+				"Not a commit reference: %s", hex);
 		return 1;
 	}
+	ctx.page.etag = sha1_to_hex(sha1);
 	ctx.page.mimetype = xstrdup(format->mimetype);
 	ctx.page.filename = xstrdup(filename);
 	cgit_print_http_headers();
@@ -151,7 +154,7 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
 		goto out;
 
 	reponame = cgit_repobasename(url);
-	if (prefixcmp(snapshot.buf, reponame) == 0) {
+	if (starts_with(snapshot.buf, reponame)) {
 		const char *new_start = snapshot.buf;
 		new_start += strlen(reponame);
 		while (new_start && (*new_start == '-' || *new_start == '_'))
@@ -177,21 +180,6 @@ out:
 	return result ? strbuf_detach(&snapshot, NULL) : NULL;
 }
 
-__attribute__((format (printf, 1, 2)))
-static void show_error(char *fmt, ...)
-{
-	va_list ap;
-
-	ctx.page.mimetype = "text/html";
-	cgit_print_http_headers();
-	cgit_print_docstart();
-	cgit_print_pageheader();
-	va_start(ap, fmt);
-	cgit_vprint_error(fmt, ap);
-	va_end(ap);
-	cgit_print_docend();
-}
-
 void cgit_print_snapshot(const char *head, const char *hex,
 			 const char *filename, int dwim)
 {
@@ -199,20 +187,22 @@ void cgit_print_snapshot(const char *head, const char *hex,
 	char *prefix = NULL;
 
 	if (!filename) {
-		show_error("No snapshot name specified");
+		cgit_print_error_page(400, "Bad request",
+				"No snapshot name specified");
 		return;
 	}
 
 	f = get_format(filename);
 	if (!f) {
-		show_error("Unsupported snapshot format: %s", filename);
+		cgit_print_error_page(400, "Bad request",
+				"Unsupported snapshot format: %s", filename);
 		return;
 	}
 
 	if (!hex && dwim) {
 		hex = get_ref_from_filename(ctx.repo->url, filename, f);
 		if (hex == NULL) {
-			html_status(404, "Not found", 0);
+			cgit_print_error_page(404, "Not found", "Not found");
 			return;
 		}
 		prefix = xstrdup(filename);