X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/1b09cbd303d889ec2636127584d57b7f1b70c25e..c0a92e82da3063efc230538ba109ff95aa59589a:/ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6e3412c..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 <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -10,15 +11,13 @@
 #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;
+	f.cmd = filter_argv[0];
+	f.argv = filter_argv;
 	cgit_open_filter(&f);
 	rv = write_tar_archive(args);
 	cgit_close_filter(&f);
@@ -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[] = {
@@ -119,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 == '_'))