|
diff --git a/shared.c b/shared.c index a27ab30..9362d21 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -19,404 +19,406 @@ int chk_zero(int result, char *msg) |
19 | return result; |
19 | return result; |
20 | } |
20 | } |
21 | |
21 | |
22 | int chk_positive(int result, char *msg) |
22 | int chk_positive(int result, char *msg) |
23 | { |
23 | { |
24 | if (result <= 0) |
24 | if (result <= 0) |
25 | die("%s: %s", msg, strerror(errno)); |
25 | die("%s: %s", msg, strerror(errno)); |
26 | return result; |
26 | return result; |
27 | } |
27 | } |
28 | |
28 | |
29 | int chk_non_negative(int result, char *msg) |
29 | int chk_non_negative(int result, char *msg) |
30 | { |
30 | { |
31 | if (result < 0) |
31 | if (result < 0) |
32 | die("%s: %s",msg, strerror(errno)); |
32 | die("%s: %s",msg, strerror(errno)); |
33 | return result; |
33 | return result; |
34 | } |
34 | } |
35 | |
35 | |
36 | struct cgit_repo *cgit_add_repo(const char *url) |
36 | struct cgit_repo *cgit_add_repo(const char *url) |
37 | { |
37 | { |
38 | struct cgit_repo *ret; |
38 | struct cgit_repo *ret; |
39 | |
39 | |
40 | if (++cgit_repolist.count > cgit_repolist.length) { |
40 | if (++cgit_repolist.count > cgit_repolist.length) { |
41 | if (cgit_repolist.length == 0) |
41 | if (cgit_repolist.length == 0) |
42 | cgit_repolist.length = 8; |
42 | cgit_repolist.length = 8; |
43 | else |
43 | else |
44 | cgit_repolist.length *= 2; |
44 | cgit_repolist.length *= 2; |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
46 | cgit_repolist.length * |
46 | cgit_repolist.length * |
47 | sizeof(struct cgit_repo)); |
47 | sizeof(struct cgit_repo)); |
48 | } |
48 | } |
49 | |
49 | |
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | memset(ret, 0, sizeof(struct cgit_repo)); |
51 | memset(ret, 0, sizeof(struct cgit_repo)); |
52 | ret->url = trim_end(url, '/'); |
52 | ret->url = trim_end(url, '/'); |
53 | ret->name = ret->url; |
53 | ret->name = ret->url; |
54 | ret->path = NULL; |
54 | ret->path = NULL; |
55 | ret->desc = "[no description]"; |
55 | ret->desc = "[no description]"; |
56 | ret->owner = NULL; |
56 | ret->owner = NULL; |
57 | ret->section = ctx.cfg.section; |
57 | ret->section = ctx.cfg.section; |
58 | ret->defbranch = "master"; |
58 | ret->defbranch = "master"; |
59 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->snapshots = ctx.cfg.snapshots; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->max_stats = ctx.cfg.max_stats; |
62 | ret->max_stats = ctx.cfg.max_stats; |
63 | ret->module_link = ctx.cfg.module_link; |
63 | ret->module_link = ctx.cfg.module_link; |
64 | ret->readme = NULL; |
64 | ret->readme = NULL; |
65 | ret->mtime = -1; |
65 | ret->mtime = -1; |
66 | ret->about_filter = ctx.cfg.about_filter; |
66 | ret->about_filter = ctx.cfg.about_filter; |
67 | ret->commit_filter = ctx.cfg.commit_filter; |
67 | ret->commit_filter = ctx.cfg.commit_filter; |
68 | ret->source_filter = ctx.cfg.source_filter; |
68 | ret->source_filter = ctx.cfg.source_filter; |
69 | return ret; |
69 | return ret; |
70 | } |
70 | } |
71 | |
71 | |
72 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
72 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
73 | { |
73 | { |
74 | int i; |
74 | int i; |
75 | struct cgit_repo *repo; |
75 | struct cgit_repo *repo; |
76 | |
76 | |
77 | for (i=0; i<cgit_repolist.count; i++) { |
77 | for (i=0; i<cgit_repolist.count; i++) { |
78 | repo = &cgit_repolist.repos[i]; |
78 | repo = &cgit_repolist.repos[i]; |
79 | if (!strcmp(repo->url, url)) |
79 | if (!strcmp(repo->url, url)) |
80 | return repo; |
80 | return repo; |
81 | } |
81 | } |
82 | return NULL; |
82 | return NULL; |
83 | } |
83 | } |
84 | |
84 | |
85 | void *cgit_free_commitinfo(struct commitinfo *info) |
85 | void *cgit_free_commitinfo(struct commitinfo *info) |
86 | { |
86 | { |
87 | free(info->author); |
87 | free(info->author); |
88 | free(info->author_email); |
88 | free(info->author_email); |
89 | free(info->committer); |
89 | free(info->committer); |
90 | free(info->committer_email); |
90 | free(info->committer_email); |
91 | free(info->subject); |
91 | free(info->subject); |
92 | free(info->msg); |
92 | free(info->msg); |
93 | free(info->msg_encoding); |
93 | free(info->msg_encoding); |
94 | free(info); |
94 | free(info); |
95 | return NULL; |
95 | return NULL; |
96 | } |
96 | } |
97 | |
97 | |
98 | char *trim_end(const char *str, char c) |
98 | char *trim_end(const char *str, char c) |
99 | { |
99 | { |
100 | int len; |
100 | int len; |
101 | char *s, *t; |
101 | char *s, *t; |
102 | |
102 | |
103 | if (str == NULL) |
103 | if (str == NULL) |
104 | return NULL; |
104 | return NULL; |
105 | t = (char *)str; |
105 | t = (char *)str; |
106 | len = strlen(t); |
106 | len = strlen(t); |
107 | while(len > 0 && t[len - 1] == c) |
107 | while(len > 0 && t[len - 1] == c) |
108 | len--; |
108 | len--; |
109 | |
109 | |
110 | if (len == 0) |
110 | if (len == 0) |
111 | return NULL; |
111 | return NULL; |
112 | |
112 | |
113 | c = t[len]; |
113 | c = t[len]; |
114 | t[len] = '\0'; |
114 | t[len] = '\0'; |
115 | s = xstrdup(t); |
115 | s = xstrdup(t); |
116 | t[len] = c; |
116 | t[len] = c; |
117 | return s; |
117 | return s; |
118 | } |
118 | } |
119 | |
119 | |
120 | char *strlpart(char *txt, int maxlen) |
120 | char *strlpart(char *txt, int maxlen) |
121 | { |
121 | { |
122 | char *result; |
122 | char *result; |
123 | |
123 | |
124 | if (!txt) |
124 | if (!txt) |
125 | return txt; |
125 | return txt; |
126 | |
126 | |
127 | if (strlen(txt) <= maxlen) |
127 | if (strlen(txt) <= maxlen) |
128 | return txt; |
128 | return txt; |
129 | result = xmalloc(maxlen + 1); |
129 | result = xmalloc(maxlen + 1); |
130 | memcpy(result, txt, maxlen - 3); |
130 | memcpy(result, txt, maxlen - 3); |
131 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
131 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
132 | result[maxlen] = '\0'; |
132 | result[maxlen] = '\0'; |
133 | return result; |
133 | return result; |
134 | } |
134 | } |
135 | |
135 | |
136 | char *strrpart(char *txt, int maxlen) |
136 | char *strrpart(char *txt, int maxlen) |
137 | { |
137 | { |
138 | char *result; |
138 | char *result; |
139 | |
139 | |
140 | if (!txt) |
140 | if (!txt) |
141 | return txt; |
141 | return txt; |
142 | |
142 | |
143 | if (strlen(txt) <= maxlen) |
143 | if (strlen(txt) <= maxlen) |
144 | return txt; |
144 | return txt; |
145 | result = xmalloc(maxlen + 1); |
145 | result = xmalloc(maxlen + 1); |
146 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
146 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
147 | result[0] = result[1] = result[2] = '.'; |
147 | result[0] = result[1] = result[2] = '.'; |
148 | return result; |
148 | return result; |
149 | } |
149 | } |
150 | |
150 | |
151 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
151 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
152 | { |
152 | { |
153 | size_t size; |
153 | size_t size; |
154 | |
154 | |
155 | if (list->count >= list->alloc) { |
155 | if (list->count >= list->alloc) { |
156 | list->alloc += (list->alloc ? list->alloc : 4); |
156 | list->alloc += (list->alloc ? list->alloc : 4); |
157 | size = list->alloc * sizeof(struct refinfo *); |
157 | size = list->alloc * sizeof(struct refinfo *); |
158 | list->refs = xrealloc(list->refs, size); |
158 | list->refs = xrealloc(list->refs, size); |
159 | } |
159 | } |
160 | list->refs[list->count++] = ref; |
160 | list->refs[list->count++] = ref; |
161 | } |
161 | } |
162 | |
162 | |
163 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
163 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
164 | { |
164 | { |
165 | struct refinfo *ref; |
165 | struct refinfo *ref; |
166 | |
166 | |
167 | ref = xmalloc(sizeof (struct refinfo)); |
167 | ref = xmalloc(sizeof (struct refinfo)); |
168 | ref->refname = xstrdup(refname); |
168 | ref->refname = xstrdup(refname); |
169 | ref->object = parse_object(sha1); |
169 | ref->object = parse_object(sha1); |
170 | switch (ref->object->type) { |
170 | switch (ref->object->type) { |
171 | case OBJ_TAG: |
171 | case OBJ_TAG: |
172 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
172 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
173 | break; |
173 | break; |
174 | case OBJ_COMMIT: |
174 | case OBJ_COMMIT: |
175 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
175 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
176 | break; |
176 | break; |
177 | } |
177 | } |
178 | return ref; |
178 | return ref; |
179 | } |
179 | } |
180 | |
180 | |
181 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
181 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
182 | void *cb_data) |
182 | void *cb_data) |
183 | { |
183 | { |
184 | struct reflist *list = (struct reflist *)cb_data; |
184 | struct reflist *list = (struct reflist *)cb_data; |
185 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
185 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
186 | |
186 | |
187 | if (info) |
187 | if (info) |
188 | cgit_add_ref(list, info); |
188 | cgit_add_ref(list, info); |
189 | return 0; |
189 | return 0; |
190 | } |
190 | } |
191 | |
191 | |
192 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
192 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
193 | struct diff_options *options, void *data) |
193 | struct diff_options *options, void *data) |
194 | { |
194 | { |
195 | int i; |
195 | int i; |
196 | |
196 | |
197 | for (i = 0; i < q->nr; i++) { |
197 | for (i = 0; i < q->nr; i++) { |
198 | if (q->queue[i]->status == 'U') |
198 | if (q->queue[i]->status == 'U') |
199 | continue; |
199 | continue; |
200 | ((filepair_fn)data)(q->queue[i]); |
200 | ((filepair_fn)data)(q->queue[i]); |
201 | } |
201 | } |
202 | } |
202 | } |
203 | |
203 | |
204 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
204 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
205 | { |
205 | { |
206 | enum object_type type; |
206 | enum object_type type; |
207 | |
207 | |
208 | if (is_null_sha1(sha1)) { |
208 | if (is_null_sha1(sha1)) { |
209 | file->ptr = (char *)""; |
209 | file->ptr = (char *)""; |
210 | file->size = 0; |
210 | file->size = 0; |
211 | } else { |
211 | } else { |
212 | file->ptr = read_sha1_file(sha1, &type, |
212 | file->ptr = read_sha1_file(sha1, &type, |
213 | (unsigned long *)&file->size); |
213 | (unsigned long *)&file->size); |
214 | } |
214 | } |
215 | return 1; |
215 | return 1; |
216 | } |
216 | } |
217 | |
217 | |
218 | /* |
218 | /* |
219 | * Receive diff-buffers from xdiff and concatenate them as |
219 | * Receive diff-buffers from xdiff and concatenate them as |
220 | * needed across multiple callbacks. |
220 | * needed across multiple callbacks. |
221 | * |
221 | * |
222 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
222 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
223 | * ripped from git and modified to use globals instead of |
223 | * ripped from git and modified to use globals instead of |
224 | * a special callback-struct. |
224 | * a special callback-struct. |
225 | */ |
225 | */ |
226 | char *diffbuf = NULL; |
226 | char *diffbuf = NULL; |
227 | int buflen = 0; |
227 | int buflen = 0; |
228 | |
228 | |
229 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
229 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
230 | { |
230 | { |
231 | int i; |
231 | int i; |
232 | |
232 | |
233 | for (i = 0; i < nbuf; i++) { |
233 | for (i = 0; i < nbuf; i++) { |
234 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
234 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
235 | /* Incomplete line */ |
235 | /* Incomplete line */ |
236 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
236 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
237 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
237 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
238 | buflen += mb[i].size; |
238 | buflen += mb[i].size; |
239 | continue; |
239 | continue; |
240 | } |
240 | } |
241 | |
241 | |
242 | /* we have a complete line */ |
242 | /* we have a complete line */ |
243 | if (!diffbuf) { |
243 | if (!diffbuf) { |
244 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
244 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
245 | continue; |
245 | continue; |
246 | } |
246 | } |
247 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
247 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
248 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
248 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
249 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
249 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
250 | free(diffbuf); |
250 | free(diffbuf); |
251 | diffbuf = NULL; |
251 | diffbuf = NULL; |
252 | buflen = 0; |
252 | buflen = 0; |
253 | } |
253 | } |
254 | if (diffbuf) { |
254 | if (diffbuf) { |
255 | ((linediff_fn)priv)(diffbuf, buflen); |
255 | ((linediff_fn)priv)(diffbuf, buflen); |
256 | free(diffbuf); |
256 | free(diffbuf); |
257 | diffbuf = NULL; |
257 | diffbuf = NULL; |
258 | buflen = 0; |
258 | buflen = 0; |
259 | } |
259 | } |
260 | return 0; |
260 | return 0; |
261 | } |
261 | } |
262 | |
262 | |
263 | int cgit_diff_files(const unsigned char *old_sha1, |
263 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | const unsigned char *new_sha1, unsigned long *old_size, |
264 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | unsigned long *new_size, int *binary, linediff_fn fn) |
265 | unsigned long *new_size, int *binary, linediff_fn fn) |
266 | { |
266 | { |
267 | mmfile_t file1, file2; |
267 | mmfile_t file1, file2; |
268 | xpparam_t diff_params; |
268 | xpparam_t diff_params; |
269 | xdemitconf_t emit_params; |
269 | xdemitconf_t emit_params; |
270 | xdemitcb_t emit_cb; |
270 | xdemitcb_t emit_cb; |
271 | |
271 | |
272 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
272 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
273 | return 1; |
273 | return 1; |
274 | |
274 | |
275 | *old_size = file1.size; |
275 | *old_size = file1.size; |
276 | *new_size = file2.size; |
276 | *new_size = file2.size; |
277 | |
277 | |
278 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
278 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
279 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
279 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
280 | *binary = 1; |
280 | *binary = 1; |
281 | return 0; |
281 | return 0; |
282 | } |
282 | } |
283 | |
283 | |
284 | memset(&diff_params, 0, sizeof(diff_params)); |
284 | memset(&diff_params, 0, sizeof(diff_params)); |
285 | memset(&emit_params, 0, sizeof(emit_params)); |
285 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_cb, 0, sizeof(emit_cb)); |
286 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | diff_params.flags = XDF_NEED_MINIMAL; |
287 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | emit_params.ctxlen = 3; |
288 | emit_params.ctxlen = 3; |
289 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
289 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
290 | emit_cb.outf = filediff_cb; |
290 | emit_cb.outf = filediff_cb; |
291 | emit_cb.priv = fn; |
291 | emit_cb.priv = fn; |
292 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
292 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
293 | return 0; |
293 | return 0; |
294 | } |
294 | } |
295 | |
295 | |
296 | void cgit_diff_tree(const unsigned char *old_sha1, |
296 | void cgit_diff_tree(const unsigned char *old_sha1, |
297 | const unsigned char *new_sha1, |
297 | const unsigned char *new_sha1, |
298 | filepair_fn fn, const char *prefix) |
298 | filepair_fn fn, const char *prefix) |
299 | { |
299 | { |
300 | struct diff_options opt; |
300 | struct diff_options opt; |
301 | int ret; |
301 | int ret; |
302 | int prefixlen; |
302 | int prefixlen; |
303 | |
303 | |
304 | diff_setup(&opt); |
304 | diff_setup(&opt); |
305 | opt.output_format = DIFF_FORMAT_CALLBACK; |
305 | opt.output_format = DIFF_FORMAT_CALLBACK; |
306 | opt.detect_rename = 1; |
306 | opt.detect_rename = 1; |
307 | opt.rename_limit = ctx.cfg.renamelimit; |
307 | opt.rename_limit = ctx.cfg.renamelimit; |
308 | DIFF_OPT_SET(&opt, RECURSIVE); |
308 | DIFF_OPT_SET(&opt, RECURSIVE); |
309 | opt.format_callback = cgit_diff_tree_cb; |
309 | opt.format_callback = cgit_diff_tree_cb; |
310 | opt.format_callback_data = fn; |
310 | opt.format_callback_data = fn; |
311 | if (prefix) { |
311 | if (prefix) { |
312 | opt.nr_paths = 1; |
312 | opt.nr_paths = 1; |
313 | opt.paths = &prefix; |
313 | opt.paths = &prefix; |
314 | prefixlen = strlen(prefix); |
314 | prefixlen = strlen(prefix); |
315 | opt.pathlens = &prefixlen; |
315 | opt.pathlens = &prefixlen; |
316 | } |
316 | } |
317 | diff_setup_done(&opt); |
317 | diff_setup_done(&opt); |
318 | |
318 | |
319 | if (old_sha1 && !is_null_sha1(old_sha1)) |
319 | if (old_sha1 && !is_null_sha1(old_sha1)) |
320 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
320 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
321 | else |
321 | else |
322 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
322 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
323 | diffcore_std(&opt); |
323 | diffcore_std(&opt); |
324 | diff_flush(&opt); |
324 | diff_flush(&opt); |
325 | } |
325 | } |
326 | |
326 | |
327 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
327 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
328 | { |
328 | { |
329 | unsigned char *old_sha1 = NULL; |
329 | unsigned char *old_sha1 = NULL; |
330 | |
330 | |
331 | if (commit->parents) |
331 | if (commit->parents) |
332 | old_sha1 = commit->parents->item->object.sha1; |
332 | old_sha1 = commit->parents->item->object.sha1; |
333 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
333 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
334 | } |
334 | } |
335 | |
335 | |
336 | int cgit_parse_snapshots_mask(const char *str) |
336 | int cgit_parse_snapshots_mask(const char *str) |
337 | { |
337 | { |
338 | const struct cgit_snapshot_format *f; |
338 | const struct cgit_snapshot_format *f; |
339 | static const char *delim = " \t,:/|;"; |
339 | static const char *delim = " \t,:/|;"; |
340 | int tl, sl, rv = 0; |
340 | int tl, sl, rv = 0; |
341 | |
341 | |
342 | /* favor legacy setting */ |
342 | /* favor legacy setting */ |
343 | if(atoi(str)) |
343 | if(atoi(str)) |
344 | return 1; |
344 | return 1; |
345 | for(;;) { |
345 | for(;;) { |
346 | str += strspn(str,delim); |
346 | str += strspn(str,delim); |
347 | tl = strcspn(str,delim); |
347 | tl = strcspn(str,delim); |
348 | if (!tl) |
348 | if (!tl) |
349 | break; |
349 | break; |
350 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
350 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
351 | sl = strlen(f->suffix); |
351 | sl = strlen(f->suffix); |
352 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
352 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
353 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
353 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
354 | rv |= f->bit; |
354 | rv |= f->bit; |
355 | break; |
355 | break; |
356 | } |
356 | } |
357 | } |
357 | } |
358 | str += tl; |
358 | str += tl; |
359 | } |
359 | } |
360 | return rv; |
360 | return rv; |
361 | } |
361 | } |
362 | |
362 | |
363 | int cgit_open_filter(struct cgit_filter *filter) |
363 | int cgit_open_filter(struct cgit_filter *filter) |
364 | { |
364 | { |
365 | |
365 | |
366 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
366 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
367 | "Unable to duplicate STDOUT"); |
367 | "Unable to duplicate STDOUT"); |
368 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
368 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
369 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
369 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
370 | if (filter->pid == 0) { |
370 | if (filter->pid == 0) { |
371 | close(filter->pipe_fh[1]); |
371 | close(filter->pipe_fh[1]); |
372 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
372 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
373 | "Unable to use pipe as STDIN"); |
373 | "Unable to use pipe as STDIN"); |
374 | execvp(filter->cmd, filter->argv); |
374 | execvp(filter->cmd, filter->argv); |
375 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
375 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
376 | strerror(errno), errno); |
376 | strerror(errno), errno); |
377 | } |
377 | } |
378 | close(filter->pipe_fh[0]); |
378 | close(filter->pipe_fh[0]); |
379 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
379 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
380 | "Unable to use pipe as STDOUT"); |
380 | "Unable to use pipe as STDOUT"); |
381 | close(filter->pipe_fh[1]); |
381 | close(filter->pipe_fh[1]); |
382 | return 0; |
382 | return 0; |
383 | } |
383 | } |
384 | |
384 | |
385 | int cgit_close_filter(struct cgit_filter *filter) |
385 | int cgit_close_filter(struct cgit_filter *filter) |
386 | { |
386 | { |
387 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
387 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
388 | "Unable to restore STDOUT"); |
388 | "Unable to restore STDOUT"); |
389 | close(filter->old_stdout); |
389 | close(filter->old_stdout); |
390 | if (filter->pid < 0) |
390 | if (filter->pid < 0) |
391 | return 0; |
391 | return 0; |
392 | waitpid(filter->pid, &filter->exitstatus, 0); |
392 | waitpid(filter->pid, &filter->exitstatus, 0); |
393 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
393 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
394 | return 0; |
394 | return 0; |
395 | die("Subprocess %s exited abnormally", filter->cmd); |
395 | die("Subprocess %s exited abnormally", filter->cmd); |
396 | } |
396 | } |
397 | |
397 | |
398 | /* Read the content of the specified file into a newly allocated buffer, |
398 | /* Read the content of the specified file into a newly allocated buffer, |
399 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
399 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
400 | */ |
400 | */ |
401 | int readfile(const char *path, char **buf, size_t *size) |
401 | int readfile(const char *path, char **buf, size_t *size) |
402 | { |
402 | { |
403 | int fd; |
403 | int fd, e; |
404 | struct stat st; |
404 | struct stat st; |
405 | |
405 | |
406 | fd = open(path, O_RDONLY); |
406 | fd = open(path, O_RDONLY); |
407 | if (fd == -1) |
407 | if (fd == -1) |
408 | return errno; |
408 | return errno; |
409 | if (fstat(fd, &st)) { |
409 | if (fstat(fd, &st)) { |
| |
410 | e = errno; |
410 | close(fd); |
411 | close(fd); |
411 | return errno; |
412 | return e; |
412 | } |
413 | } |
413 | if (!S_ISREG(st.st_mode)) { |
414 | if (!S_ISREG(st.st_mode)) { |
414 | close(fd); |
415 | close(fd); |
415 | return EISDIR; |
416 | return EISDIR; |
416 | } |
417 | } |
417 | *buf = xmalloc(st.st_size + 1); |
418 | *buf = xmalloc(st.st_size + 1); |
418 | *size = read_in_full(fd, *buf, st.st_size); |
419 | *size = read_in_full(fd, *buf, st.st_size); |
| |
420 | e = errno; |
419 | (*buf)[*size] = '\0'; |
421 | (*buf)[*size] = '\0'; |
420 | close(fd); |
422 | close(fd); |
421 | return (*size == st.st_size ? 0 : errno); |
423 | return (*size == st.st_size ? 0 : e); |
422 | } |
424 | } |
|