|
diff --git a/shared.c b/shared.c index 3926b4a..3778a5b 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -258,120 +258,119 @@ int cgit_diff_files(const unsigned char *old_sha1, |
258 | const unsigned char *new_sha1, unsigned long *old_size, |
258 | const unsigned char *new_sha1, unsigned long *old_size, |
259 | unsigned long *new_size, int *binary, int context, |
259 | unsigned long *new_size, int *binary, int context, |
260 | int ignorews, linediff_fn fn) |
260 | int ignorews, linediff_fn fn) |
261 | { |
261 | { |
262 | mmfile_t file1, file2; |
262 | mmfile_t file1, file2; |
263 | xpparam_t diff_params; |
263 | xpparam_t diff_params; |
264 | xdemitconf_t emit_params; |
264 | xdemitconf_t emit_params; |
265 | xdemitcb_t emit_cb; |
265 | xdemitcb_t emit_cb; |
266 | |
266 | |
267 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
267 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
268 | return 1; |
268 | return 1; |
269 | |
269 | |
270 | *old_size = file1.size; |
270 | *old_size = file1.size; |
271 | *new_size = file2.size; |
271 | *new_size = file2.size; |
272 | |
272 | |
273 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
273 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
274 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
274 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
275 | *binary = 1; |
275 | *binary = 1; |
276 | if (file1.size) |
276 | if (file1.size) |
277 | free(file1.ptr); |
277 | free(file1.ptr); |
278 | if (file2.size) |
278 | if (file2.size) |
279 | free(file2.ptr); |
279 | free(file2.ptr); |
280 | return 0; |
280 | return 0; |
281 | } |
281 | } |
282 | |
282 | |
283 | memset(&diff_params, 0, sizeof(diff_params)); |
283 | memset(&diff_params, 0, sizeof(diff_params)); |
284 | memset(&emit_params, 0, sizeof(emit_params)); |
284 | memset(&emit_params, 0, sizeof(emit_params)); |
285 | memset(&emit_cb, 0, sizeof(emit_cb)); |
285 | memset(&emit_cb, 0, sizeof(emit_cb)); |
286 | diff_params.flags = XDF_NEED_MINIMAL; |
286 | diff_params.flags = XDF_NEED_MINIMAL; |
287 | if (ignorews) |
287 | if (ignorews) |
288 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
288 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
289 | emit_params.ctxlen = context > 0 ? context : 3; |
289 | emit_params.ctxlen = context > 0 ? context : 3; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
291 | emit_cb.outf = filediff_cb; |
291 | emit_cb.outf = filediff_cb; |
292 | emit_cb.priv = fn; |
292 | emit_cb.priv = fn; |
293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
294 | if (file1.size) |
294 | if (file1.size) |
295 | free(file1.ptr); |
295 | free(file1.ptr); |
296 | if (file2.size) |
296 | if (file2.size) |
297 | free(file2.ptr); |
297 | free(file2.ptr); |
298 | return 0; |
298 | return 0; |
299 | } |
299 | } |
300 | |
300 | |
301 | void cgit_diff_tree(const unsigned char *old_sha1, |
301 | void cgit_diff_tree(const unsigned char *old_sha1, |
302 | const unsigned char *new_sha1, |
302 | const unsigned char *new_sha1, |
303 | filepair_fn fn, const char *prefix, int ignorews) |
303 | filepair_fn fn, const char *prefix, int ignorews) |
304 | { |
304 | { |
305 | struct diff_options opt; |
305 | struct diff_options opt; |
306 | int ret; |
| |
307 | int prefixlen; |
306 | int prefixlen; |
308 | |
307 | |
309 | diff_setup(&opt); |
308 | diff_setup(&opt); |
310 | opt.output_format = DIFF_FORMAT_CALLBACK; |
309 | opt.output_format = DIFF_FORMAT_CALLBACK; |
311 | opt.detect_rename = 1; |
310 | opt.detect_rename = 1; |
312 | opt.rename_limit = ctx.cfg.renamelimit; |
311 | opt.rename_limit = ctx.cfg.renamelimit; |
313 | DIFF_OPT_SET(&opt, RECURSIVE); |
312 | DIFF_OPT_SET(&opt, RECURSIVE); |
314 | if (ignorews) |
313 | if (ignorews) |
315 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
314 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
316 | opt.format_callback = cgit_diff_tree_cb; |
315 | opt.format_callback = cgit_diff_tree_cb; |
317 | opt.format_callback_data = fn; |
316 | opt.format_callback_data = fn; |
318 | if (prefix) { |
317 | if (prefix) { |
319 | opt.nr_paths = 1; |
318 | opt.nr_paths = 1; |
320 | opt.paths = &prefix; |
319 | opt.paths = &prefix; |
321 | prefixlen = strlen(prefix); |
320 | prefixlen = strlen(prefix); |
322 | opt.pathlens = &prefixlen; |
321 | opt.pathlens = &prefixlen; |
323 | } |
322 | } |
324 | diff_setup_done(&opt); |
323 | diff_setup_done(&opt); |
325 | |
324 | |
326 | if (old_sha1 && !is_null_sha1(old_sha1)) |
325 | if (old_sha1 && !is_null_sha1(old_sha1)) |
327 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
326 | diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
328 | else |
327 | else |
329 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
328 | diff_root_tree_sha1(new_sha1, "", &opt); |
330 | diffcore_std(&opt); |
329 | diffcore_std(&opt); |
331 | diff_flush(&opt); |
330 | diff_flush(&opt); |
332 | } |
331 | } |
333 | |
332 | |
334 | void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) |
333 | void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) |
335 | { |
334 | { |
336 | unsigned char *old_sha1 = NULL; |
335 | unsigned char *old_sha1 = NULL; |
337 | |
336 | |
338 | if (commit->parents) |
337 | if (commit->parents) |
339 | old_sha1 = commit->parents->item->object.sha1; |
338 | old_sha1 = commit->parents->item->object.sha1; |
340 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix, |
339 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix, |
341 | ctx.qry.ignorews); |
340 | ctx.qry.ignorews); |
342 | } |
341 | } |
343 | |
342 | |
344 | int cgit_parse_snapshots_mask(const char *str) |
343 | int cgit_parse_snapshots_mask(const char *str) |
345 | { |
344 | { |
346 | const struct cgit_snapshot_format *f; |
345 | const struct cgit_snapshot_format *f; |
347 | static const char *delim = " \t,:/|;"; |
346 | static const char *delim = " \t,:/|;"; |
348 | int tl, sl, rv = 0; |
347 | int tl, sl, rv = 0; |
349 | |
348 | |
350 | /* favor legacy setting */ |
349 | /* favor legacy setting */ |
351 | if(atoi(str)) |
350 | if(atoi(str)) |
352 | return 1; |
351 | return 1; |
353 | for(;;) { |
352 | for(;;) { |
354 | str += strspn(str,delim); |
353 | str += strspn(str,delim); |
355 | tl = strcspn(str,delim); |
354 | tl = strcspn(str,delim); |
356 | if (!tl) |
355 | if (!tl) |
357 | break; |
356 | break; |
358 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
357 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
359 | sl = strlen(f->suffix); |
358 | sl = strlen(f->suffix); |
360 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
359 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
361 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
360 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
362 | rv |= f->bit; |
361 | rv |= f->bit; |
363 | break; |
362 | break; |
364 | } |
363 | } |
365 | } |
364 | } |
366 | str += tl; |
365 | str += tl; |
367 | } |
366 | } |
368 | return rv; |
367 | return rv; |
369 | } |
368 | } |
370 | |
369 | |
371 | int cgit_open_filter(struct cgit_filter *filter) |
370 | int cgit_open_filter(struct cgit_filter *filter) |
372 | { |
371 | { |
373 | |
372 | |
374 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
373 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
375 | "Unable to duplicate STDOUT"); |
374 | "Unable to duplicate STDOUT"); |
376 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
375 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
377 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
376 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
|