Merge branch 'snapshot-fixes'

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6f09151d8b68e9d1ebee1d2708c73cc7e28fc206..f25613e9d6c98530e48c1814305000d22ebbb44f 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 },
 
 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 },
        {}
 };
        { ".tar", "application/x-tar", write_tar_archive, 0x8 },
        {}
 };


@@ -175,10 +175,12 @@ void cgit_print_snapshot(const char *head, const char *hex,
 
        if (!hex && dwim) {
                hex = get_ref_from_filename(ctx.repo->url, filename, f);
 
        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 == NULL) {
+                       html_status(404, "Not found", 0);
+                       return;

                }
                }

+               prefix = xstrdup(filename);
+               prefix[strlen(filename) - strlen(f->suffix)] = '\0';

        }
 
        if (!hex)
        }
 
        if (!hex)