Unidiff1 files changed, 11 insertions, 2 deletions
|
diff --git a/shared.c b/shared.c index 578a544..cce0af4 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -258,6 +258,6 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
258 | |
258 | |
259 | int cgit_diff_files(const unsigned char *old_sha1, |
259 | int cgit_diff_files(const unsigned char *old_sha1, |
260 | const unsigned char *new_sha1, |
260 | const unsigned char *new_sha1, unsigned long *old_size, |
261 | linediff_fn fn) |
261 | unsigned long *new_size, int *binary, linediff_fn fn) |
262 | { |
262 | { |
263 | mmfile_t file1, file2; |
263 | mmfile_t file1, file2; |
@@ -269,4 +269,13 @@ int cgit_diff_files(const unsigned char *old_sha1, |
269 | return 1; |
269 | return 1; |
270 | |
270 | |
| |
271 | *old_size = file1.size; |
| |
272 | *new_size = file2.size; |
| |
273 | |
| |
274 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
| |
275 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
| |
276 | *binary = 1; |
| |
277 | return 0; |
| |
278 | } |
| |
279 | |
271 | memset(&diff_params, 0, sizeof(diff_params)); |
280 | memset(&diff_params, 0, sizeof(diff_params)); |
272 | memset(&emit_params, 0, sizeof(emit_params)); |
281 | memset(&emit_params, 0, sizeof(emit_params)); |
|