wok diff busybox/stuff/busybox-1.18-diff.u @ rev 12244
Up: slitaz-configs (4.9)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Apr 09 18:09:48 2012 +0200 (2012-04-09) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/busybox/stuff/busybox-1.18-diff.u Mon Apr 09 18:09:48 2012 +0200 1.3 @@ -0,0 +1,17 @@ 1.4 +--- busybox-1.18.4/editors/diff.c 1.5 ++++ busybox-1.18.4/editors/diff.c 1.6 +@@ -706,6 +706,14 @@ 1.7 + j = fread(buf1, 1, sz, fp[1]); 1.8 + if (i != j) { 1.9 + differ = true; 1.10 ++ /* Ensure we detect binary file even if a file is empty or very 1.11 ++ short. */ 1.12 ++ for (k = 0; k < i; k++) 1.13 ++ if (!buf0[k]) 1.14 ++ binary = true; 1.15 ++ for (k = 0; k < j; k++) 1.16 ++ if (!buf1[k]) 1.17 ++ binary = true; 1.18 + i = MIN(i, j); 1.19 + } 1.20 + if (i == 0)