-rw-r--r-- | ui-snapshot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 67dbbdd..4449803 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -40,119 +40,121 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f | |||
40 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); | 40 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); |
41 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); | 41 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); |
42 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) | 42 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) |
43 | cgit_print_error("Failed to compress archive"); | 43 | cgit_print_error("Failed to compress archive"); |
44 | 44 | ||
45 | return rv; | 45 | return rv; |
46 | } | 46 | } |
47 | 47 | ||
48 | static int write_tar_gzip_archive(struct archiver_args *args) | 48 | static int write_tar_gzip_archive(struct archiver_args *args) |
49 | { | 49 | { |
50 | return write_compressed_tar_archive(args,"gzip"); | 50 | return write_compressed_tar_archive(args,"gzip"); |
51 | } | 51 | } |
52 | 52 | ||
53 | static int write_tar_bzip2_archive(struct archiver_args *args) | 53 | static int write_tar_bzip2_archive(struct archiver_args *args) |
54 | { | 54 | { |
55 | return write_compressed_tar_archive(args,"bzip2"); | 55 | return write_compressed_tar_archive(args,"bzip2"); |
56 | } | 56 | } |
57 | 57 | ||
58 | static const struct snapshot_archive_t { | 58 | static const struct snapshot_archive_t { |
59 | const char *suffix; | 59 | const char *suffix; |
60 | const char *mimetype; | 60 | const char *mimetype; |
61 | write_archive_fn_t write_func; | 61 | write_archive_fn_t write_func; |
62 | int bit; | 62 | int bit; |
63 | }snapshot_archives[] = { | 63 | }snapshot_archives[] = { |
64 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 64 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
65 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, | 65 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, |
66 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 66 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, |
67 | { ".tar", "application/x-tar", write_tar_archive, 0x8 } | 67 | { ".tar", "application/x-tar", write_tar_archive, 0x8 } |
68 | }; | 68 | }; |
69 | 69 | ||
70 | #define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) | 70 | #define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) |
71 | 71 | ||
72 | void cgit_print_snapshot(struct cacheitem *item, const char *head, | 72 | void cgit_print_snapshot(struct cacheitem *item, const char *head, |
73 | const char *hex, const char *prefix, | 73 | const char *hex, const char *prefix, |
74 | const char *filename, int snapshots) | 74 | const char *filename, int snapshots) |
75 | { | 75 | { |
76 | const struct snapshot_archive_t* sat; | 76 | const struct snapshot_archive_t* sat; |
77 | struct archiver_args args; | 77 | struct archiver_args args; |
78 | struct commit *commit; | 78 | struct commit *commit; |
79 | unsigned char sha1[20]; | 79 | unsigned char sha1[20]; |
80 | int f, sl, fnl = strlen(filename); | 80 | int f, sl, fnl = strlen(filename); |
81 | 81 | ||
82 | for(f=0; f<snapshot_archives_len; f++) { | 82 | for(f=0; f<snapshot_archives_len; f++) { |
83 | sat = &snapshot_archives[f]; | 83 | sat = &snapshot_archives[f]; |
84 | if(!(snapshots & sat->bit)) | 84 | if(!(snapshots & sat->bit)) |
85 | continue; | 85 | continue; |
86 | sl = strlen(sat->suffix); | 86 | sl = strlen(sat->suffix); |
87 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) | 87 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) |
88 | continue; | 88 | continue; |
89 | if (!hex) | 89 | if (!hex) |
90 | hex = head; | 90 | hex = head; |
91 | if(get_sha1(hex, sha1)) { | 91 | if(get_sha1(hex, sha1)) { |
92 | cgit_print_error(fmt("Bad object id: %s", hex)); | 92 | cgit_print_error(fmt("Bad object id: %s", hex)); |
93 | return; | 93 | return; |
94 | } | 94 | } |
95 | commit = lookup_commit_reference(sha1); | 95 | commit = lookup_commit_reference(sha1); |
96 | if(!commit) { | 96 | if(!commit) { |
97 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 97 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
98 | return;; | 98 | return;; |
99 | } | 99 | } |
100 | memset(&args,0,sizeof(args)); | 100 | memset(&args,0,sizeof(args)); |
101 | args.base = fmt("%s/", prefix); | 101 | args.base = fmt("%s/", prefix); |
102 | args.tree = commit->tree; | 102 | args.tree = commit->tree; |
103 | args.time = commit->date; | 103 | args.time = commit->date; |
104 | cgit_print_snapshot_start(sat->mimetype, filename, item); | 104 | ctx.page.mimetype = xstrdup(sat->mimetype); |
105 | ctx.page.filename = xstrdup(filename); | ||
106 | cgit_print_http_headers(&ctx); | ||
105 | (*sat->write_func)(&args); | 107 | (*sat->write_func)(&args); |
106 | return; | 108 | return; |
107 | } | 109 | } |
108 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); | 110 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); |
109 | } | 111 | } |
110 | 112 | ||
111 | void cgit_print_snapshot_links(const char *repo, const char *head, | 113 | void cgit_print_snapshot_links(const char *repo, const char *head, |
112 | const char *hex, int snapshots) | 114 | const char *hex, int snapshots) |
113 | { | 115 | { |
114 | const struct snapshot_archive_t* sat; | 116 | const struct snapshot_archive_t* sat; |
115 | char *filename; | 117 | char *filename; |
116 | int f; | 118 | int f; |
117 | 119 | ||
118 | for(f=0; f<snapshot_archives_len; f++) { | 120 | for(f=0; f<snapshot_archives_len; f++) { |
119 | sat = &snapshot_archives[f]; | 121 | sat = &snapshot_archives[f]; |
120 | if(!(snapshots & sat->bit)) | 122 | if(!(snapshots & sat->bit)) |
121 | continue; | 123 | continue; |
122 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 124 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
123 | sat->suffix); | 125 | sat->suffix); |
124 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 126 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, |
125 | (char *)hex, filename); | 127 | (char *)hex, filename); |
126 | html("<br/>"); | 128 | html("<br/>"); |
127 | } | 129 | } |
128 | } | 130 | } |
129 | 131 | ||
130 | int cgit_parse_snapshots_mask(const char *str) | 132 | int cgit_parse_snapshots_mask(const char *str) |
131 | { | 133 | { |
132 | const struct snapshot_archive_t* sat; | 134 | const struct snapshot_archive_t* sat; |
133 | static const char *delim = " \t,:/|;"; | 135 | static const char *delim = " \t,:/|;"; |
134 | int f, tl, sl, rv = 0; | 136 | int f, tl, sl, rv = 0; |
135 | 137 | ||
136 | /* favor legacy setting */ | 138 | /* favor legacy setting */ |
137 | if(atoi(str)) | 139 | if(atoi(str)) |
138 | return 1; | 140 | return 1; |
139 | for(;;) { | 141 | for(;;) { |
140 | str += strspn(str,delim); | 142 | str += strspn(str,delim); |
141 | tl = strcspn(str,delim); | 143 | tl = strcspn(str,delim); |
142 | if(!tl) | 144 | if(!tl) |
143 | break; | 145 | break; |
144 | for(f=0; f<snapshot_archives_len; f++) { | 146 | for(f=0; f<snapshot_archives_len; f++) { |
145 | sat = &snapshot_archives[f]; | 147 | sat = &snapshot_archives[f]; |
146 | sl = strlen(sat->suffix); | 148 | sl = strlen(sat->suffix); |
147 | if((tl == sl && !strncmp(sat->suffix, str, tl)) || | 149 | if((tl == sl && !strncmp(sat->suffix, str, tl)) || |
148 | (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) { | 150 | (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) { |
149 | rv |= sat->bit; | 151 | rv |= sat->bit; |
150 | break; | 152 | break; |
151 | } | 153 | } |
152 | } | 154 | } |
153 | str += tl; | 155 | str += tl; |
154 | } | 156 | } |
155 | return rv; | 157 | return rv; |
156 | } | 158 | } |
157 | 159 | ||
158 | /* vim:set sw=8: */ | 160 | /* vim:set sw=8: */ |