git: update to v2.37.0

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index c7611e88947edfed93b497bd654703e3c8987efe..18361a65538485c7543cc0cb9e123fd84cf8dae0 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -13,32 +13,32 @@
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {

-       struct argv_array argv = ARGV_ARRAY_INIT;
+       struct strvec argv = STRVEC_INIT;

        const char **nargv;
        int result;
        const char **nargv;
        int result;

-       argv_array_push(&argv, "snapshot");
-       argv_array_push(&argv, format);
+       strvec_push(&argv, "snapshot");
+       strvec_push(&argv, format);

        if (prefix) {
                struct strbuf buf = STRBUF_INIT;
                strbuf_addstr(&buf, prefix);
                strbuf_addch(&buf, '/');
        if (prefix) {
                struct strbuf buf = STRBUF_INIT;
                strbuf_addstr(&buf, prefix);
                strbuf_addch(&buf, '/');

-               argv_array_push(&argv, "--prefix");
-               argv_array_push(&argv, buf.buf);
+               strvec_push(&argv, "--prefix");
+               strvec_push(&argv, buf.buf);

                strbuf_release(&buf);
        }
                strbuf_release(&buf);
        }

-       argv_array_push(&argv, hex);
+       strvec_push(&argv, hex);

        /*
         * Now we need to copy the pointers to arguments into a new
         * structure because write_archive will rearrange its arguments
         * which may result in duplicated/missing entries causing leaks
        /*
         * Now we need to copy the pointers to arguments into a new
         * structure because write_archive will rearrange its arguments
         * which may result in duplicated/missing entries causing leaks

-        * or double-frees in argv_array_clear.
+        * or double-frees in strvec_clear.

         */
         */

-       nargv = xmalloc(sizeof(char *) * (argv.argc + 1));
-       /* argv_array guarantees a trailing NULL entry. */
-       memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
+       nargv = xmalloc(sizeof(char *) * (argv.nr + 1));
+       /* strvec guarantees a trailing NULL entry. */
+       memcpy(nargv, argv.v, sizeof(char *) * (argv.nr + 1));

 
 

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

        free(nargv);
        return result;
 }
        free(nargv);
        return result;
 }


@@ -79,18 +79,33 @@ 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[] = {

-       { ".zip", "application/x-zip", write_zip_archive, 0x01 },
-       { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 },
-       { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
-       { ".tar", "application/x-tar", write_tar_archive, 0x08 },
-       { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },
+       /* .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.lz",    "application/x-lzip",   write_tar_lzip_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 }
 };
 
        { NULL }
 };
 


@@ -130,6 +145,11 @@ static const struct cgit_snapshot_format *get_format(const char *filename)
        return NULL;
 }
 
        return NULL;
 }
 

+const unsigned cgit_snapshot_format_bit(const struct cgit_snapshot_format *f)
+{
+       return BIT(f - &cgit_snapshot_formats[0]);
+}
+

 static int make_snapshot(const struct cgit_snapshot_format *format,
                         const char *hex, const char *prefix,
                         const char *filename)
 static int make_snapshot(const struct cgit_snapshot_format *format,
                         const char *hex, const char *prefix,
                         const char *filename)


@@ -141,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;


@@ -150,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;
 }


@@ -169,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;


@@ -263,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 & f->bit)) {
+       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;