X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/f8f6e1fe789e9dbcea40a0f8d5ebfb019c2a1a19..61d4147ea2d58c9d129a084be13ccec6ae18b4d5:/ui-snapshot.c diff --git a/ui-snapshot.c b/ui-snapshot.c index 126779d..47432bd 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -1,6 +1,7 @@ /* 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) @@ -10,16 +11,14 @@ #include "html.h" #include "ui-shared.h" -static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) +static int write_compressed_tar_archive(struct archiver_args *args, char *filter_argv[]) { int rv; struct cgit_filter f; - f.cmd = xstrdup(filter); - f.argv = malloc(2 * sizeof(char *)); - f.argv[0] = f.cmd; - f.argv[1] = NULL; - cgit_open_filter(&f, NULL); + f.cmd = filter_argv[0]; + f.argv = filter_argv; + cgit_open_filter(&f); rv = write_tar_archive(args); cgit_close_filter(&f); return rv; @@ -27,17 +26,20 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f static int write_tar_gzip_archive(struct archiver_args *args) { - return write_compressed_tar_archive(args,"gzip"); + char *argv[] = { "gzip", "-n", NULL }; + return write_compressed_tar_archive(args, argv); } static int write_tar_bzip2_archive(struct archiver_args *args) { - return write_compressed_tar_archive(args,"bzip2"); + char *argv[] = { "bzip2", NULL }; + return write_compressed_tar_archive(args, argv); } static int write_tar_xz_archive(struct archiver_args *args) { - return write_compressed_tar_archive(args,"xz"); + char *argv[] = { "xz", NULL }; + return write_compressed_tar_archive(args, argv); } const struct cgit_snapshot_format cgit_snapshot_formats[] = {