use cgit_httpscheme() for atom feed

[cgit.git] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index f98f5d74bf46ead3077bd79a975703d9bb016c83..5372f5d3d8b42a474713fe0867f4b50d96f5acf1 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -58,8 +58,8 @@ static int write_tar_bzip2_archive(struct archiver_args *args)
 
 const struct cgit_snapshot_format cgit_snapshot_formats[] = {
        { ".zip", "application/x-zip", write_zip_archive, 0x1 },
-       { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 },
-       { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 },
+       { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 },
+       { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 },
        { ".tar", "application/x-tar", write_tar_archive, 0x8 },
        {}
 };
@@ -156,20 +156,31 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
        return NULL;
 }
 
+void show_error(char *msg)
+{
+       ctx.page.mimetype = "text/html";
+       cgit_print_http_headers(&ctx);
+       cgit_print_docstart(&ctx);
+       cgit_print_pageheader(&ctx);
+       cgit_print_error(msg);
+       cgit_print_docend();
+}
+
 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;
 
+       if (!filename) {
+               show_error("No snapshot name specified");
+               return;
+       }
+
        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();
+               show_error(xstrdup(fmt("Unsupported snapshot format: %s",
+                                      filename)));
                return;
        }