# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1331670272 -3600
# Node ID fa31026b97ce540e8fb65ea8e3c1197d7190ba2e
# Parent  cba3722453f57076e1a77429fb6c74bfa2e49624
Fix busybox diff: don't output binary content

diff -r cba3722453f5 -r fa31026b97ce busybox/receipt
--- a/busybox/receipt	Tue Mar 13 21:06:51 2012 +0100
+++ b/busybox/receipt	Tue Mar 13 21:24:32 2012 +0100
@@ -32,6 +32,7 @@
 httpd.u
 su-nochdir.u
 tftp-chroot.u
+diff.u
 EOT
     cp $stuff/$PACKAGE-${VERSION%.*}.config .config
 }
diff -r cba3722453f5 -r fa31026b97ce busybox/stuff/busybox-1.18-diff.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox/stuff/busybox-1.18-diff.u	Tue Mar 13 21:24:32 2012 +0100
@@ -0,0 +1,17 @@
+--- busybox-1.18.4/editors/diff.c
++++ busybox-1.18.4/editors/diff.c
+@@ -706,6 +706,14 @@
+ 		j = fread(buf1, 1, sz, fp[1]);
+ 		if (i != j) {
+ 			differ = true;
++			/* Ensure we detect binary file even if a file is empty or very
++			   short. */
++			for (k = 0; k < i; k++)
++				if (!buf0[k])
++					binary = true;
++			for (k = 0; k < j; k++)
++				if (!buf1[k])
++					binary = true;
+ 			i = MIN(i, j);
+ 		}
+ 		if (i == 0)