summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-snapshot.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 4136b3e..1b25dca 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -14,53 +14,59 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f
14{ 14{
15 int rv; 15 int rv;
16 struct cgit_filter f; 16 struct cgit_filter f;
17 17
18 f.cmd = xstrdup(filter); 18 f.cmd = xstrdup(filter);
19 f.argv = malloc(2 * sizeof(char *)); 19 f.argv = malloc(2 * sizeof(char *));
20 f.argv[0] = f.cmd; 20 f.argv[0] = f.cmd;
21 f.argv[1] = NULL; 21 f.argv[1] = NULL;
22 cgit_open_filter(&f); 22 cgit_open_filter(&f);
23 rv = write_tar_archive(args); 23 rv = write_tar_archive(args);
24 cgit_close_filter(&f); 24 cgit_close_filter(&f);
25 return rv; 25 return rv;
26} 26}
27 27
28static int write_tar_gzip_archive(struct archiver_args *args) 28static int write_tar_gzip_archive(struct archiver_args *args)
29{ 29{
30 return write_compressed_tar_archive(args,"gzip"); 30 return write_compressed_tar_archive(args,"gzip");
31} 31}
32 32
33static int write_tar_bzip2_archive(struct archiver_args *args) 33static int write_tar_bzip2_archive(struct archiver_args *args)
34{ 34{
35 return write_compressed_tar_archive(args,"bzip2"); 35 return write_compressed_tar_archive(args,"bzip2");
36} 36}
37 37
38static int write_tar_xz_archive(struct archiver_args *args)
39{
40 return write_compressed_tar_archive(args,"xz");
41}
42
38const struct cgit_snapshot_format cgit_snapshot_formats[] = { 43const struct cgit_snapshot_format cgit_snapshot_formats[] = {
39 { ".zip", "application/x-zip", write_zip_archive, 0x1 }, 44 { ".zip", "application/x-zip", write_zip_archive, 0x01 },
40 { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, 45 { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 },
41 { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, 46 { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
42 { ".tar", "application/x-tar", write_tar_archive, 0x8 }, 47 { ".tar", "application/x-tar", write_tar_archive, 0x08 },
48 { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },
43 {} 49 {}
44}; 50};
45 51
46static const struct cgit_snapshot_format *get_format(const char *filename) 52static const struct cgit_snapshot_format *get_format(const char *filename)
47{ 53{
48 const struct cgit_snapshot_format *fmt; 54 const struct cgit_snapshot_format *fmt;
49 int fl, sl; 55 int fl, sl;
50 56
51 fl = strlen(filename); 57 fl = strlen(filename);
52 for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { 58 for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
53 sl = strlen(fmt->suffix); 59 sl = strlen(fmt->suffix);
54 if (sl >= fl) 60 if (sl >= fl)
55 continue; 61 continue;
56 if (!strcmp(fmt->suffix, filename + fl - sl)) 62 if (!strcmp(fmt->suffix, filename + fl - sl))
57 return fmt; 63 return fmt;
58 } 64 }
59 return NULL; 65 return NULL;
60} 66}
61 67
62static int make_snapshot(const struct cgit_snapshot_format *format, 68static int make_snapshot(const struct cgit_snapshot_format *format,
63 const char *hex, const char *prefix, 69 const char *hex, const char *prefix,
64 const char *filename) 70 const char *filename)
65{ 71{
66 struct archiver_args args; 72 struct archiver_args args;