X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12..8f208794318f83826e98168b8b430f2d9a68bcce:/ui-snapshot.c diff --git a/ui-snapshot.c b/ui-snapshot.c index 5f813fc..9be5dbe 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -1,67 +1,80 @@ /* ui-snapshot.c: generate snapshot of a commit * * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2012 Jason A. Donenfeld * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" +#include "ui-snapshot.h" #include "html.h" #include "ui-shared.h" -static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) +static int write_archive_type(const char *format, const char *hex, const char *prefix) { - int rw[2]; - pid_t gzpid; - int stdout2; - int status; - int rv; - - stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); - chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); - gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); - if(gzpid==0) { - /* child */ - chk_zero(close(rw[1]), "Closing write end of pipe in child"); - chk_zero(close(STDIN_FILENO), "Closing STDIN"); - chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); - execlp(filter,filter,NULL); - _exit(-1); + struct argv_array argv = ARGV_ARRAY_INIT; + argv_array_push(&argv, "snapshot"); + argv_array_push(&argv, format); + if (prefix) { + argv_array_push(&argv, "--prefix"); + argv_array_push(&argv, fmt("%s/", prefix)); } - /* parent */ - chk_zero(close(rw[0]), "Closing read end of pipe"); - chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); + argv_array_push(&argv, hex); + return write_archive(argv.argc, argv.argv, NULL, 1, NULL, 0); +} + +static int write_tar_archive(const char *hex, const char *prefix) +{ + return write_archive_type("--format=tar", hex, prefix); +} - rv = write_tar_archive(args); +static int write_zip_archive(const char *hex, const char *prefix) +{ + return write_archive_type("--format=zip", hex, prefix); +} - chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); - chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); - chk_zero(close(stdout2), "Closing uncompressed STDOUT"); - chk_zero(close(rw[1]), "Closing write end of pipe in parent"); - chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); - if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) - cgit_print_error("Failed to compress archive"); +static int write_compressed_tar_archive(const char *hex, + const char *prefix, + char *filter_argv[]) +{ + int rv; + struct cgit_filter f; + f.cmd = filter_argv[0]; + f.argv = filter_argv; + cgit_open_filter(&f); + rv = write_tar_archive(hex, prefix); + cgit_close_filter(&f); return rv; } -static int write_tar_gzip_archive(struct archiver_args *args) +static int write_tar_gzip_archive(const char *hex, const char *prefix) { - return write_compressed_tar_archive(args,"gzip"); + char *argv[] = { "gzip", "-n", NULL }; + return write_compressed_tar_archive(hex, prefix, argv); } -static int write_tar_bzip2_archive(struct archiver_args *args) +static int write_tar_bzip2_archive(const char *hex, const char *prefix) { - return write_compressed_tar_archive(args,"bzip2"); + char *argv[] = { "bzip2", 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); } const struct cgit_snapshot_format cgit_snapshot_formats[] = { - { ".zip", "application/x-zip", write_zip_archive, 0x1 }, - { ".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 }, - {} + { ".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 }, + { NULL } }; static const struct cgit_snapshot_format *get_format(const char *filename) @@ -70,7 +83,7 @@ static const struct cgit_snapshot_format *get_format(const char *filename) int fl, sl; fl = strlen(filename); - for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { + for (fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { sl = strlen(fmt->suffix); if (sl >= fl) continue; @@ -84,33 +97,20 @@ static int make_snapshot(const struct cgit_snapshot_format *format, const char *hex, const char *prefix, const char *filename) { - struct archiver_args args; - struct commit *commit; unsigned char sha1[20]; - if(get_sha1(hex, sha1)) { + if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); return 1; } - commit = lookup_commit_reference(sha1); - if(!commit) { + if (!lookup_commit_reference(sha1)) { cgit_print_error(fmt("Not a commit reference: %s", hex)); return 1; } - memset(&args, 0, sizeof(args)); - if (prefix) { - args.base = fmt("%s/", prefix); - args.baselen = strlen(prefix) + 1; - } else { - args.base = ""; - args.baselen = 0; - } - args.tree = commit->tree; - args.time = commit->date; ctx.page.mimetype = xstrdup(format->mimetype); ctx.page.filename = xstrdup(filename); cgit_print_http_headers(&ctx); - format->write_func(&args); + format->write_func(hex, prefix); return 0; } @@ -133,13 +133,11 @@ static const char *get_ref_from_filename(const char *url, const char *filename, snapshot = xstrdup(filename); snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; - fprintf(stderr, "snapshot=%s\n", snapshot); if (get_sha1(snapshot, sha1) == 0) return snapshot; reponame = cgit_repobasename(url); - fprintf(stderr, "reponame=%s\n", reponame); if (prefixcmp(snapshot, reponame) == 0) { snapshot += strlen(reponame); while (snapshot && (*snapshot == '-' || *snapshot == '_')) @@ -156,29 +154,42 @@ static const char *get_ref_from_filename(const char *url, const char *filename, return NULL; } +static 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; } 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)