-rw-r--r-- | shared.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -259,4 +259,4 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) int cgit_diff_files(const unsigned char *old_sha1, - const unsigned char *new_sha1, - linediff_fn fn) + const unsigned char *new_sha1, unsigned long *old_size, + unsigned long *new_size, int *binary, linediff_fn fn) { @@ -270,2 +270,11 @@ int cgit_diff_files(const unsigned char *old_sha1, + *old_size = file1.size; + *new_size = file2.size; + + if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || + (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { + *binary = 1; + return 0; + } + memset(&diff_params, 0, sizeof(diff_params)); |