|
diff --git a/shared.c b/shared.c index 72ac140..765cd27 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -293,103 +293,103 @@ int cgit_diff_files(const unsigned char *old_sha1, |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
294 | if (ignorews) |
294 | if (ignorews) |
295 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
295 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
296 | emit_params.ctxlen = context > 0 ? context : 3; |
296 | emit_params.ctxlen = context > 0 ? context : 3; |
297 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
297 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
298 | emit_cb.outf = filediff_cb; |
298 | emit_cb.outf = filediff_cb; |
299 | emit_cb.priv = fn; |
299 | emit_cb.priv = fn; |
300 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
300 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
301 | if (file1.size) |
301 | if (file1.size) |
302 | free(file1.ptr); |
302 | free(file1.ptr); |
303 | if (file2.size) |
303 | if (file2.size) |
304 | free(file2.ptr); |
304 | free(file2.ptr); |
305 | return 0; |
305 | return 0; |
306 | } |
306 | } |
307 | |
307 | |
308 | void cgit_diff_tree(const unsigned char *old_sha1, |
308 | void cgit_diff_tree(const unsigned char *old_sha1, |
309 | const unsigned char *new_sha1, |
309 | const unsigned char *new_sha1, |
310 | filepair_fn fn, const char *prefix, int ignorews) |
310 | filepair_fn fn, const char *prefix, int ignorews) |
311 | { |
311 | { |
312 | struct diff_options opt; |
312 | struct diff_options opt; |
313 | int ret; |
313 | int ret; |
314 | int prefixlen; |
314 | int prefixlen; |
315 | |
315 | |
316 | diff_setup(&opt); |
316 | diff_setup(&opt); |
317 | opt.output_format = DIFF_FORMAT_CALLBACK; |
317 | opt.output_format = DIFF_FORMAT_CALLBACK; |
318 | opt.detect_rename = 1; |
318 | opt.detect_rename = 1; |
319 | opt.rename_limit = ctx.cfg.renamelimit; |
319 | opt.rename_limit = ctx.cfg.renamelimit; |
320 | DIFF_OPT_SET(&opt, RECURSIVE); |
320 | DIFF_OPT_SET(&opt, RECURSIVE); |
321 | if (ignorews) |
321 | if (ignorews) |
322 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
322 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
323 | opt.format_callback = cgit_diff_tree_cb; |
323 | opt.format_callback = cgit_diff_tree_cb; |
324 | opt.format_callback_data = fn; |
324 | opt.format_callback_data = fn; |
325 | if (prefix) { |
325 | if (prefix) { |
326 | opt.nr_paths = 1; |
326 | opt.nr_paths = 1; |
327 | opt.paths = &prefix; |
327 | opt.paths = &prefix; |
328 | prefixlen = strlen(prefix); |
328 | prefixlen = strlen(prefix); |
329 | opt.pathlens = &prefixlen; |
329 | opt.pathlens = &prefixlen; |
330 | } |
330 | } |
331 | diff_setup_done(&opt); |
331 | diff_setup_done(&opt); |
332 | |
332 | |
333 | if (old_sha1 && !is_null_sha1(old_sha1)) |
333 | if (old_sha1 && !is_null_sha1(old_sha1)) |
334 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
334 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
335 | else |
335 | else |
336 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
336 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
337 | diffcore_std(&opt); |
337 | diffcore_std(&opt); |
338 | diff_flush(&opt); |
338 | diff_flush(&opt); |
339 | } |
339 | } |
340 | |
340 | |
341 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
341 | void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) |
342 | { |
342 | { |
343 | unsigned char *old_sha1 = NULL; |
343 | unsigned char *old_sha1 = NULL; |
344 | |
344 | |
345 | if (commit->parents) |
345 | if (commit->parents) |
346 | old_sha1 = commit->parents->item->object.sha1; |
346 | old_sha1 = commit->parents->item->object.sha1; |
347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL, |
347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix, |
348 | ctx.qry.ignorews); |
348 | ctx.qry.ignorews); |
349 | } |
349 | } |
350 | |
350 | |
351 | int cgit_parse_snapshots_mask(const char *str) |
351 | int cgit_parse_snapshots_mask(const char *str) |
352 | { |
352 | { |
353 | const struct cgit_snapshot_format *f; |
353 | const struct cgit_snapshot_format *f; |
354 | static const char *delim = " \t,:/|;"; |
354 | static const char *delim = " \t,:/|;"; |
355 | int tl, sl, rv = 0; |
355 | int tl, sl, rv = 0; |
356 | |
356 | |
357 | /* favor legacy setting */ |
357 | /* favor legacy setting */ |
358 | if(atoi(str)) |
358 | if(atoi(str)) |
359 | return 1; |
359 | return 1; |
360 | for(;;) { |
360 | for(;;) { |
361 | str += strspn(str,delim); |
361 | str += strspn(str,delim); |
362 | tl = strcspn(str,delim); |
362 | tl = strcspn(str,delim); |
363 | if (!tl) |
363 | if (!tl) |
364 | break; |
364 | break; |
365 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
365 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
366 | sl = strlen(f->suffix); |
366 | sl = strlen(f->suffix); |
367 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
367 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
368 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
368 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
369 | rv |= f->bit; |
369 | rv |= f->bit; |
370 | break; |
370 | break; |
371 | } |
371 | } |
372 | } |
372 | } |
373 | str += tl; |
373 | str += tl; |
374 | } |
374 | } |
375 | return rv; |
375 | return rv; |
376 | } |
376 | } |
377 | |
377 | |
378 | int cgit_open_filter(struct cgit_filter *filter) |
378 | int cgit_open_filter(struct cgit_filter *filter) |
379 | { |
379 | { |
380 | |
380 | |
381 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
381 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
382 | "Unable to duplicate STDOUT"); |
382 | "Unable to duplicate STDOUT"); |
383 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
383 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
384 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
384 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
385 | if (filter->pid == 0) { |
385 | if (filter->pid == 0) { |
386 | close(filter->pipe_fh[1]); |
386 | close(filter->pipe_fh[1]); |
387 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
387 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
388 | "Unable to use pipe as STDIN"); |
388 | "Unable to use pipe as STDIN"); |
389 | execvp(filter->cmd, filter->argv); |
389 | execvp(filter->cmd, filter->argv); |
390 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
390 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
391 | strerror(errno), errno); |
391 | strerror(errno), errno); |
392 | } |
392 | } |
393 | close(filter->pipe_fh[0]); |
393 | close(filter->pipe_fh[0]); |
394 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
394 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
395 | "Unable to use pipe as STDOUT"); |
395 | "Unable to use pipe as STDOUT"); |
|