summaryrefslogtreecommitdiffabout
authorAndreas Wiese <aw-devel@instandbesetzt.net>2009-12-08 21:18:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-12-08 21:18:11 (UTC)
commit0642435fed6793a0d038e1e5097a91293ee89a05 (patch) (unidiff)
treed867ba37394042152c985a86765f3941aa97f685
parent4e75d7c9b93010663963d362099777b77a67c446 (diff)
downloadcgit-0642435fed6793a0d038e1e5097a91293ee89a05.zip
cgit-0642435fed6793a0d038e1e5097a91293ee89a05.tar.gz
cgit-0642435fed6793a0d038e1e5097a91293ee89a05.tar.bz2
Add .tar.xz-snapshot support
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
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
@@ -1,90 +1,96 @@
1/* ui-snapshot.c: generate snapshot of a commit 1/* ui-snapshot.c: generate snapshot of a commit
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) 13static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
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;
67 struct commit *commit; 73 struct commit *commit;
68 unsigned char sha1[20]; 74 unsigned char sha1[20];
69 75
70 if(get_sha1(hex, sha1)) { 76 if(get_sha1(hex, sha1)) {
71 cgit_print_error(fmt("Bad object id: %s", hex)); 77 cgit_print_error(fmt("Bad object id: %s", hex));
72 return 1; 78 return 1;
73 } 79 }
74 commit = lookup_commit_reference(sha1); 80 commit = lookup_commit_reference(sha1);
75 if(!commit) { 81 if(!commit) {
76 cgit_print_error(fmt("Not a commit reference: %s", hex)); 82 cgit_print_error(fmt("Not a commit reference: %s", hex));
77 return 1; 83 return 1;
78 } 84 }
79 memset(&args, 0, sizeof(args)); 85 memset(&args, 0, sizeof(args));
80 if (prefix) { 86 if (prefix) {
81 args.base = fmt("%s/", prefix); 87 args.base = fmt("%s/", prefix);
82 args.baselen = strlen(prefix) + 1; 88 args.baselen = strlen(prefix) + 1;
83 } else { 89 } else {
84 args.base = ""; 90 args.base = "";
85 args.baselen = 0; 91 args.baselen = 0;
86 } 92 }
87 args.tree = commit->tree; 93 args.tree = commit->tree;
88 args.time = commit->date; 94 args.time = commit->date;
89 ctx.page.mimetype = xstrdup(format->mimetype); 95 ctx.page.mimetype = xstrdup(format->mimetype);
90 ctx.page.filename = xstrdup(filename); 96 ctx.page.filename = xstrdup(filename);