global: use proper accessors for maybe_tree

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 83ce6e86243fd3105f24bef20a71924a0e8173e0..556d3ed4125aac62a6d307d10b8869cc544d6118 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
        /* argv_array guarantees a trailing NULL entry. */
        memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
        /* argv_array guarantees a trailing NULL entry. */
        memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 

-       result = write_archive(argv.argc, nargv, NULL, NULL, 0);
+       result = write_archive(argv.argc, nargv, NULL, the_repository, NULL, 0);

        argv_array_clear(&argv);
        free(nargv);
        return result;
        argv_array_clear(&argv);
        free(nargv);
        return result;


@@ -79,17 +79,32 @@ static int write_tar_bzip2_archive(const char *hex, const char *prefix)
        return write_compressed_tar_archive(hex, prefix, argv);
 }
 
        return write_compressed_tar_archive(hex, prefix, argv);
 }
 

+static int write_tar_lzip_archive(const char *hex, const char *prefix)
+{
+       char *argv[] = { "lzip", NULL };
+       return write_compressed_tar_archive(hex, prefix, argv);
+}
+

 static int write_tar_xz_archive(const char *hex, const char *prefix)
 {
        char *argv[] = { "xz", NULL };
        return write_compressed_tar_archive(hex, prefix, argv);
 }
 
 static int write_tar_xz_archive(const char *hex, const char *prefix)
 {
        char *argv[] = { "xz", NULL };
        return write_compressed_tar_archive(hex, prefix, argv);
 }
 

+static int write_tar_zstd_archive(const char *hex, const char *prefix)
+{
+       char *argv[] = { "zstd", "-T0", NULL };
+       return write_compressed_tar_archive(hex, prefix, argv);
+}
+

 const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 const struct cgit_snapshot_format cgit_snapshot_formats[] = {

+       /* .tar must remain the 0 index */

        { ".tar",       "application/x-tar",    write_tar_archive       },
        { ".tar.gz",    "application/x-gzip",   write_tar_gzip_archive  },
        { ".tar.bz2",   "application/x-bzip2",  write_tar_bzip2_archive },
        { ".tar",       "application/x-tar",    write_tar_archive       },
        { ".tar.gz",    "application/x-gzip",   write_tar_gzip_archive  },
        { ".tar.bz2",   "application/x-bzip2",  write_tar_bzip2_archive },

+       { ".tar.lz",    "application/x-lzip",   write_tar_lzip_archive  },

        { ".tar.xz",    "application/x-xz",     write_tar_xz_archive    },
        { ".tar.xz",    "application/x-xz",     write_tar_xz_archive    },

+       { ".tar.zst",   "application/x-zstd",   write_tar_zstd_archive  },

        { ".zip",       "application/x-zip",    write_zip_archive       },
        { NULL }
 };
        { ".zip",       "application/x-zip",    write_zip_archive       },
        { NULL }
 };


@@ -146,7 +161,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
                                "Bad object id: %s", hex);
                return 1;
        }
                                "Bad object id: %s", hex);
                return 1;
        }

-       if (!lookup_commit_reference(&oid)) {
+       if (!lookup_commit_reference(the_repository, &oid)) {

                cgit_print_error_page(400, "Bad request",
                                "Not a commit reference: %s", hex);
                return 1;
                cgit_print_error_page(400, "Bad request",
                                "Not a commit reference: %s", hex);
                return 1;


@@ -155,6 +170,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
        ctx.page.mimetype = xstrdup(format->mimetype);
        ctx.page.filename = xstrdup(filename);
        cgit_print_http_headers();
        ctx.page.mimetype = xstrdup(format->mimetype);
        ctx.page.filename = xstrdup(filename);
        cgit_print_http_headers();

+       init_archivers();

        format->write_func(hex, prefix);
        return 0;
 }
        format->write_func(hex, prefix);
        return 0;
 }


@@ -174,7 +190,7 @@ static int write_sig(const struct cgit_snapshot_format *format,
                return 0;
        }
 
                return 0;
        }
 

-       buf = read_sha1_file(note->hash, &type, &size);
+       buf = read_object_file(note, &type, &size);

        if (!buf) {
                cgit_print_error_page(404, "Not found", "Not found");
                return 0;
        if (!buf) {
                cgit_print_error_page(404, "Not found", "Not found");
                return 0;


@@ -268,7 +284,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
        }
 
        f = get_format(filename);
        }
 
        f = get_format(filename);

-       if (!f || !(ctx.repo->snapshots & cgit_snapshot_format_bit(f))) {
+       if (!f || (!sig_filename && !(ctx.repo->snapshots & cgit_snapshot_format_bit(f)))) {

                cgit_print_error_page(400, "Bad request",
                                "Unsupported snapshot format: %s", filename);
                return;
                cgit_print_error_page(400, "Bad request",
                                "Unsupported snapshot format: %s", filename);
                return;