|
diff --git a/shared.c b/shared.c index 76d26dd..9f7d6a5 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -10,7 +10,6 @@ |
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; |
| |
14 | |
13 | |
15 | int chk_zero(int result, char *msg) |
14 | int chk_zero(int result, char *msg) |
16 | { |
15 | { |
@@ -60,6 +59,7 @@ struct cgit_repo *cgit_add_repo(const char *url) |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
| |
62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
63 | ret->max_stats = ctx.cfg.max_stats; |
63 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->module_link = ctx.cfg.module_link; |
64 | ret->module_link = ctx.cfg.module_link; |
65 | ret->readme = NULL; |
65 | ret->readme = NULL; |
@@ -263,7 +263,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
263 | |
263 | |
264 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | int cgit_diff_files(const unsigned char *old_sha1, |
265 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | const unsigned char *new_sha1, unsigned long *old_size, |
266 | unsigned long *new_size, int *binary, linediff_fn fn) |
266 | unsigned long *new_size, int *binary, int context, |
| |
267 | linediff_fn fn) |
267 | { |
268 | { |
268 | mmfile_t file1, file2; |
269 | mmfile_t file1, file2; |
269 | xpparam_t diff_params; |
270 | xpparam_t diff_params; |
@@ -279,6 +280,10 @@ int cgit_diff_files(const unsigned char *old_sha1, |
279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
280 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
281 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
281 | *binary = 1; |
282 | *binary = 1; |
| |
283 | if (file1.size) |
| |
284 | free(file1.ptr); |
| |
285 | if (file2.size) |
| |
286 | free(file2.ptr); |
282 | return 0; |
287 | return 0; |
283 | } |
288 | } |
284 | |
289 | |
@@ -286,11 +291,15 @@ int cgit_diff_files(const unsigned char *old_sha1, |
286 | memset(&emit_params, 0, sizeof(emit_params)); |
291 | memset(&emit_params, 0, sizeof(emit_params)); |
287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
292 | memset(&emit_cb, 0, sizeof(emit_cb)); |
288 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
289 | emit_params.ctxlen = 3; |
294 | emit_params.ctxlen = context > 0 ? context : 3; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
295 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
291 | emit_cb.outf = filediff_cb; |
296 | emit_cb.outf = filediff_cb; |
292 | emit_cb.priv = fn; |
297 | emit_cb.priv = fn; |
293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
298 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
| |
299 | if (file1.size) |
| |
300 | free(file1.ptr); |
| |
301 | if (file2.size) |
| |
302 | free(file2.ptr); |
294 | return 0; |
303 | return 0; |
295 | } |
304 | } |
296 | |
305 | |
|