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