|
diff --git a/shared.c b/shared.c index 58837dc..06f70bb 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -234,92 +234,93 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
234 | for (i = 0; i < nbuf; i++) { |
234 | for (i = 0; i < nbuf; i++) { |
235 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
235 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
236 | /* Incomplete line */ |
236 | /* Incomplete line */ |
237 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
237 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
238 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
238 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
239 | buflen += mb[i].size; |
239 | buflen += mb[i].size; |
240 | continue; |
240 | continue; |
241 | } |
241 | } |
242 | |
242 | |
243 | /* we have a complete line */ |
243 | /* we have a complete line */ |
244 | if (!diffbuf) { |
244 | if (!diffbuf) { |
245 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
245 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
246 | continue; |
246 | continue; |
247 | } |
247 | } |
248 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
248 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
249 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
249 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
250 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
250 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
251 | free(diffbuf); |
251 | free(diffbuf); |
252 | diffbuf = NULL; |
252 | diffbuf = NULL; |
253 | buflen = 0; |
253 | buflen = 0; |
254 | } |
254 | } |
255 | if (diffbuf) { |
255 | if (diffbuf) { |
256 | ((linediff_fn)priv)(diffbuf, buflen); |
256 | ((linediff_fn)priv)(diffbuf, buflen); |
257 | free(diffbuf); |
257 | free(diffbuf); |
258 | diffbuf = NULL; |
258 | diffbuf = NULL; |
259 | buflen = 0; |
259 | buflen = 0; |
260 | } |
260 | } |
261 | return 0; |
261 | return 0; |
262 | } |
262 | } |
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; |
270 | xdemitconf_t emit_params; |
271 | xdemitconf_t emit_params; |
271 | xdemitcb_t emit_cb; |
272 | xdemitcb_t emit_cb; |
272 | |
273 | |
273 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
274 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
274 | return 1; |
275 | return 1; |
275 | |
276 | |
276 | *old_size = file1.size; |
277 | *old_size = file1.size; |
277 | *new_size = file2.size; |
278 | *new_size = file2.size; |
278 | |
279 | |
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; |
282 | if (file1.size) |
283 | if (file1.size) |
283 | free(file1.ptr); |
284 | free(file1.ptr); |
284 | if (file2.size) |
285 | if (file2.size) |
285 | free(file2.ptr); |
286 | free(file2.ptr); |
286 | return 0; |
287 | return 0; |
287 | } |
288 | } |
288 | |
289 | |
289 | memset(&diff_params, 0, sizeof(diff_params)); |
290 | memset(&diff_params, 0, sizeof(diff_params)); |
290 | memset(&emit_params, 0, sizeof(emit_params)); |
291 | memset(&emit_params, 0, sizeof(emit_params)); |
291 | memset(&emit_cb, 0, sizeof(emit_cb)); |
292 | memset(&emit_cb, 0, sizeof(emit_cb)); |
292 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | emit_params.ctxlen = 3; |
294 | emit_params.ctxlen = context > 0 ? context : 3; |
294 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
295 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
295 | emit_cb.outf = filediff_cb; |
296 | emit_cb.outf = filediff_cb; |
296 | emit_cb.priv = fn; |
297 | emit_cb.priv = fn; |
297 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
298 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
298 | if (file1.size) |
299 | if (file1.size) |
299 | free(file1.ptr); |
300 | free(file1.ptr); |
300 | if (file2.size) |
301 | if (file2.size) |
301 | free(file2.ptr); |
302 | free(file2.ptr); |
302 | return 0; |
303 | return 0; |
303 | } |
304 | } |
304 | |
305 | |
305 | void cgit_diff_tree(const unsigned char *old_sha1, |
306 | void cgit_diff_tree(const unsigned char *old_sha1, |
306 | const unsigned char *new_sha1, |
307 | const unsigned char *new_sha1, |
307 | filepair_fn fn, const char *prefix) |
308 | filepair_fn fn, const char *prefix) |
308 | { |
309 | { |
309 | struct diff_options opt; |
310 | struct diff_options opt; |
310 | int ret; |
311 | int ret; |
311 | int prefixlen; |
312 | int prefixlen; |
312 | |
313 | |
313 | diff_setup(&opt); |
314 | diff_setup(&opt); |
314 | opt.output_format = DIFF_FORMAT_CALLBACK; |
315 | opt.output_format = DIFF_FORMAT_CALLBACK; |
315 | opt.detect_rename = 1; |
316 | opt.detect_rename = 1; |
316 | opt.rename_limit = ctx.cfg.renamelimit; |
317 | opt.rename_limit = ctx.cfg.renamelimit; |
317 | DIFF_OPT_SET(&opt, RECURSIVE); |
318 | DIFF_OPT_SET(&opt, RECURSIVE); |
318 | opt.format_callback = cgit_diff_tree_cb; |
319 | opt.format_callback = cgit_diff_tree_cb; |
319 | opt.format_callback_data = fn; |
320 | opt.format_callback_data = fn; |
320 | if (prefix) { |
321 | if (prefix) { |
321 | opt.nr_paths = 1; |
322 | opt.nr_paths = 1; |
322 | opt.paths = &prefix; |
323 | opt.paths = &prefix; |
323 | prefixlen = strlen(prefix); |
324 | prefixlen = strlen(prefix); |
324 | opt.pathlens = &prefixlen; |
325 | opt.pathlens = &prefixlen; |
325 | } |
326 | } |
|