summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 9362d21..6adf2b6 100644
--- a/shared.c
+++ b/shared.c
@@ -265,44 +265,52 @@ int cgit_diff_files(const unsigned char *old_sha1,
265 unsigned long *new_size, int *binary, linediff_fn fn) 265 unsigned long *new_size, int *binary, linediff_fn fn)
266{ 266{
267 mmfile_t file1, file2; 267 mmfile_t file1, file2;
268 xpparam_t diff_params; 268 xpparam_t diff_params;
269 xdemitconf_t emit_params; 269 xdemitconf_t emit_params;
270 xdemitcb_t emit_cb; 270 xdemitcb_t emit_cb;
271 271
272 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 272 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
273 return 1; 273 return 1;
274 274
275 *old_size = file1.size; 275 *old_size = file1.size;
276 *new_size = file2.size; 276 *new_size = file2.size;
277 277
278 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || 278 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
279 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { 279 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
280 *binary = 1; 280 *binary = 1;
281 if (file1.size)
282 free(file1.ptr);
283 if (file2.size)
284 free(file2.ptr);
281 return 0; 285 return 0;
282 } 286 }
283 287
284 memset(&diff_params, 0, sizeof(diff_params)); 288 memset(&diff_params, 0, sizeof(diff_params));
285 memset(&emit_params, 0, sizeof(emit_params)); 289 memset(&emit_params, 0, sizeof(emit_params));
286 memset(&emit_cb, 0, sizeof(emit_cb)); 290 memset(&emit_cb, 0, sizeof(emit_cb));
287 diff_params.flags = XDF_NEED_MINIMAL; 291 diff_params.flags = XDF_NEED_MINIMAL;
288 emit_params.ctxlen = 3; 292 emit_params.ctxlen = 3;
289 emit_params.flags = XDL_EMIT_FUNCNAMES; 293 emit_params.flags = XDL_EMIT_FUNCNAMES;
290 emit_cb.outf = filediff_cb; 294 emit_cb.outf = filediff_cb;
291 emit_cb.priv = fn; 295 emit_cb.priv = fn;
292 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 296 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
297 if (file1.size)
298 free(file1.ptr);
299 if (file2.size)
300 free(file2.ptr);
293 return 0; 301 return 0;
294} 302}
295 303
296void cgit_diff_tree(const unsigned char *old_sha1, 304void cgit_diff_tree(const unsigned char *old_sha1,
297 const unsigned char *new_sha1, 305 const unsigned char *new_sha1,
298 filepair_fn fn, const char *prefix) 306 filepair_fn fn, const char *prefix)
299{ 307{
300 struct diff_options opt; 308 struct diff_options opt;
301 int ret; 309 int ret;
302 int prefixlen; 310 int prefixlen;
303 311
304 diff_setup(&opt); 312 diff_setup(&opt);
305 opt.output_format = DIFF_FORMAT_CALLBACK; 313 opt.output_format = DIFF_FORMAT_CALLBACK;
306 opt.detect_rename = 1; 314 opt.detect_rename = 1;
307 opt.rename_limit = ctx.cfg.renamelimit; 315 opt.rename_limit = ctx.cfg.renamelimit;
308 DIFF_OPT_SET(&opt, RECURSIVE); 316 DIFF_OPT_SET(&opt, RECURSIVE);