From c495cf02bac16e459f7c9e1740798646f12c00c5 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Sat, 31 Jan 2009 10:40:40 +0100
Subject: Handle binary files in diffs
This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch)
how to handle binary files.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
shared.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
(limited to 'shared.c')
diff --git a/shared.c b/shared.c
index 578a544..dbb84d8 100644
--- a/shared.c
+++ b/shared.c
@@ -257,8 +257,8 @@ 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)
{
mmfile_t file1, file2;
xpparam_t diff_params;
@@ -268,6 +268,15 @@ int cgit_diff_files(const unsigned char *old_sha1,
if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
return 1;
+ *old_size = file1.size;
+ *new_size = file2.size;
+
+ if (buffer_is_binary(file1.ptr, file1.size) ||
+ buffer_is_binary(file2.ptr, file2.size)) {
+ *binary = 1;
+ return 0;
+ }
+
memset(&diff_params, 0, sizeof(diff_params));
memset(&emit_params, 0, sizeof(emit_params));
memset(&emit_cb, 0, sizeof(emit_cb));
--
cgit v1.2.3-54-g00ecf
From 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Sun, 1 Feb 2009 19:29:24 +0100
Subject: shared.c: avoid SEGFAULT when checking for binary buffers
Before calling buffer_is_binary() we need to verify that the buffer
is valid.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
shared.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'shared.c')
diff --git a/shared.c b/shared.c
index dbb84d8..cce0af4 100644
--- a/shared.c
+++ b/shared.c
@@ -271,8 +271,8 @@ int cgit_diff_files(const unsigned char *old_sha1,
*old_size = file1.size;
*new_size = file2.size;
- if (buffer_is_binary(file1.ptr, file1.size) ||
- buffer_is_binary(file2.ptr, 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;
}
--
cgit v1.2.3-54-g00ecf