ui-snapshot: pass -n to gzip, to suppress timestamp

[cgit.git] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 5372f5d3d8b42a474713fe0867f4b50d96f5acf1..47432bd325759178aa0a30389ae04c11adf340b1 100644 (file)
--- 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 <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -10,57 +11,43 @@
 #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 rw[2];
-       pid_t gzpid;
-       int stdout2;
-       int status;
        int rv;
+       struct cgit_filter f;
 
-       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);
-       }
-       /* parent */
-       chk_zero(close(rw[0]), "Closing read end of pipe");
-       chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
-
+       f.cmd = filter_argv[0];
+       f.argv = filter_argv;
+       cgit_open_filter(&f);
        rv = write_tar_archive(args);
-
-       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");
-
+       cgit_close_filter(&f);
        return rv;
 }
 
 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)
+{
+       char *argv[] = { "xz", NULL };
+       return write_compressed_tar_archive(args, 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 },
        {}
 };
 
@@ -107,6 +94,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
        }
        args.tree = commit->tree;
        args.time = commit->date;
+       args.compression_level = Z_DEFAULT_COMPRESSION;
        ctx.page.mimetype = xstrdup(format->mimetype);
        ctx.page.filename = xstrdup(filename);
        cgit_print_http_headers(&ctx);
@@ -133,13 +121,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 == '_'))