|
diff --git a/shared.c b/shared.c index f5875e4..a764c4d 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -15,96 +15,97 @@ int cgit_cmd; |
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->module_link = ctx.cfg.module_link; |
61 | ret->module_link = ctx.cfg.module_link; |
62 | ret->readme = NULL; |
62 | ret->readme = NULL; |
| |
63 | ret->mtime = -1; |
63 | return ret; |
64 | return ret; |
64 | } |
65 | } |
65 | |
66 | |
66 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
67 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
67 | { |
68 | { |
68 | int i; |
69 | int i; |
69 | struct cgit_repo *repo; |
70 | struct cgit_repo *repo; |
70 | |
71 | |
71 | for (i=0; i<cgit_repolist.count; i++) { |
72 | for (i=0; i<cgit_repolist.count; i++) { |
72 | repo = &cgit_repolist.repos[i]; |
73 | repo = &cgit_repolist.repos[i]; |
73 | if (!strcmp(repo->url, url)) |
74 | if (!strcmp(repo->url, url)) |
74 | return repo; |
75 | return repo; |
75 | } |
76 | } |
76 | return NULL; |
77 | return NULL; |
77 | } |
78 | } |
78 | |
79 | |
79 | void *cgit_free_commitinfo(struct commitinfo *info) |
80 | void *cgit_free_commitinfo(struct commitinfo *info) |
80 | { |
81 | { |
81 | free(info->author); |
82 | free(info->author); |
82 | free(info->author_email); |
83 | free(info->author_email); |
83 | free(info->committer); |
84 | free(info->committer); |
84 | free(info->committer_email); |
85 | free(info->committer_email); |
85 | free(info->subject); |
86 | free(info->subject); |
86 | free(info->msg); |
87 | free(info->msg); |
87 | free(info->msg_encoding); |
88 | free(info->msg_encoding); |
88 | free(info); |
89 | free(info); |
89 | return NULL; |
90 | return NULL; |
90 | } |
91 | } |
91 | |
92 | |
92 | char *trim_end(const char *str, char c) |
93 | char *trim_end(const char *str, char c) |
93 | { |
94 | { |
94 | int len; |
95 | int len; |
95 | char *s, *t; |
96 | char *s, *t; |
96 | |
97 | |
97 | if (str == NULL) |
98 | if (str == NULL) |
98 | return NULL; |
99 | return NULL; |
99 | t = (char *)str; |
100 | t = (char *)str; |
100 | len = strlen(t); |
101 | len = strlen(t); |
101 | while(len > 0 && t[len - 1] == c) |
102 | while(len > 0 && t[len - 1] == c) |
102 | len--; |
103 | len--; |
103 | |
104 | |
104 | if (len == 0) |
105 | if (len == 0) |
105 | return NULL; |
106 | return NULL; |
106 | |
107 | |
107 | c = t[len]; |
108 | c = t[len]; |
108 | t[len] = '\0'; |
109 | t[len] = '\0'; |
109 | s = xstrdup(t); |
110 | s = xstrdup(t); |
110 | t[len] = c; |
111 | t[len] = c; |
@@ -221,100 +222,102 @@ char *diffbuf = NULL; |
221 | int buflen = 0; |
222 | int buflen = 0; |
222 | |
223 | |
223 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
224 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
224 | { |
225 | { |
225 | int i; |
226 | int i; |
226 | |
227 | |
227 | for (i = 0; i < nbuf; i++) { |
228 | for (i = 0; i < nbuf; i++) { |
228 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
229 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
229 | /* Incomplete line */ |
230 | /* Incomplete line */ |
230 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
231 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
231 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
232 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
232 | buflen += mb[i].size; |
233 | buflen += mb[i].size; |
233 | continue; |
234 | continue; |
234 | } |
235 | } |
235 | |
236 | |
236 | /* we have a complete line */ |
237 | /* we have a complete line */ |
237 | if (!diffbuf) { |
238 | if (!diffbuf) { |
238 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
239 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
239 | continue; |
240 | continue; |
240 | } |
241 | } |
241 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
242 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
242 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
243 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
243 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
244 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
244 | free(diffbuf); |
245 | free(diffbuf); |
245 | diffbuf = NULL; |
246 | diffbuf = NULL; |
246 | buflen = 0; |
247 | buflen = 0; |
247 | } |
248 | } |
248 | if (diffbuf) { |
249 | if (diffbuf) { |
249 | ((linediff_fn)priv)(diffbuf, buflen); |
250 | ((linediff_fn)priv)(diffbuf, buflen); |
250 | free(diffbuf); |
251 | free(diffbuf); |
251 | diffbuf = NULL; |
252 | diffbuf = NULL; |
252 | buflen = 0; |
253 | buflen = 0; |
253 | } |
254 | } |
254 | return 0; |
255 | return 0; |
255 | } |
256 | } |
256 | |
257 | |
257 | int cgit_diff_files(const unsigned char *old_sha1, |
258 | int cgit_diff_files(const unsigned char *old_sha1, |
258 | const unsigned char *new_sha1, |
259 | const unsigned char *new_sha1, |
259 | linediff_fn fn) |
260 | linediff_fn fn) |
260 | { |
261 | { |
261 | mmfile_t file1, file2; |
262 | mmfile_t file1, file2; |
262 | xpparam_t diff_params; |
263 | xpparam_t diff_params; |
263 | xdemitconf_t emit_params; |
264 | xdemitconf_t emit_params; |
264 | xdemitcb_t emit_cb; |
265 | xdemitcb_t emit_cb; |
265 | |
266 | |
266 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
267 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
267 | return 1; |
268 | return 1; |
268 | |
269 | |
| |
270 | memset(&diff_params, 0, sizeof(diff_params)); |
| |
271 | memset(&emit_params, 0, sizeof(emit_params)); |
| |
272 | memset(&emit_cb, 0, sizeof(emit_cb)); |
269 | diff_params.flags = XDF_NEED_MINIMAL; |
273 | diff_params.flags = XDF_NEED_MINIMAL; |
270 | emit_params.ctxlen = 3; |
274 | emit_params.ctxlen = 3; |
271 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
275 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
272 | emit_params.find_func = NULL; |
| |
273 | emit_cb.outf = filediff_cb; |
276 | emit_cb.outf = filediff_cb; |
274 | emit_cb.priv = fn; |
277 | emit_cb.priv = fn; |
275 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
278 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
276 | return 0; |
279 | return 0; |
277 | } |
280 | } |
278 | |
281 | |
279 | void cgit_diff_tree(const unsigned char *old_sha1, |
282 | void cgit_diff_tree(const unsigned char *old_sha1, |
280 | const unsigned char *new_sha1, |
283 | const unsigned char *new_sha1, |
281 | filepair_fn fn, const char *prefix) |
284 | filepair_fn fn, const char *prefix) |
282 | { |
285 | { |
283 | struct diff_options opt; |
286 | struct diff_options opt; |
284 | int ret; |
287 | int ret; |
285 | int prefixlen; |
288 | int prefixlen; |
286 | |
289 | |
287 | diff_setup(&opt); |
290 | diff_setup(&opt); |
288 | opt.output_format = DIFF_FORMAT_CALLBACK; |
291 | opt.output_format = DIFF_FORMAT_CALLBACK; |
289 | opt.detect_rename = 1; |
292 | opt.detect_rename = 1; |
290 | opt.rename_limit = ctx.cfg.renamelimit; |
293 | opt.rename_limit = ctx.cfg.renamelimit; |
291 | DIFF_OPT_SET(&opt, RECURSIVE); |
294 | DIFF_OPT_SET(&opt, RECURSIVE); |
292 | opt.format_callback = cgit_diff_tree_cb; |
295 | opt.format_callback = cgit_diff_tree_cb; |
293 | opt.format_callback_data = fn; |
296 | opt.format_callback_data = fn; |
294 | if (prefix) { |
297 | if (prefix) { |
295 | opt.nr_paths = 1; |
298 | opt.nr_paths = 1; |
296 | opt.paths = &prefix; |
299 | opt.paths = &prefix; |
297 | prefixlen = strlen(prefix); |
300 | prefixlen = strlen(prefix); |
298 | opt.pathlens = &prefixlen; |
301 | opt.pathlens = &prefixlen; |
299 | } |
302 | } |
300 | diff_setup_done(&opt); |
303 | diff_setup_done(&opt); |
301 | |
304 | |
302 | if (old_sha1 && !is_null_sha1(old_sha1)) |
305 | if (old_sha1 && !is_null_sha1(old_sha1)) |
303 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
306 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
304 | else |
307 | else |
305 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
308 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
306 | diffcore_std(&opt); |
309 | diffcore_std(&opt); |
307 | diff_flush(&opt); |
310 | diff_flush(&opt); |
308 | } |
311 | } |
309 | |
312 | |
310 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
313 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
311 | { |
314 | { |
312 | unsigned char *old_sha1 = NULL; |
315 | unsigned char *old_sha1 = NULL; |
313 | |
316 | |
314 | if (commit->parents) |
317 | if (commit->parents) |
315 | old_sha1 = commit->parents->item->object.sha1; |
318 | old_sha1 = commit->parents->item->object.sha1; |
316 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
319 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
317 | } |
320 | } |
318 | |
321 | |
319 | int cgit_parse_snapshots_mask(const char *str) |
322 | int cgit_parse_snapshots_mask(const char *str) |
320 | { |
323 | { |
|