wok annotate busybox/stuff/busybox-1.21-diff.u @ rev 14463

Up: ndoutils (1.5.2)
author Eric Joseph-Alexandre <erjo@slitaz.org>
date Sat Apr 27 03:10:35 2013 +0200 (2013-04-27)
parents
children
rev   line source
pascal@13905 1 --- busybox-1.20.0/editors/diff.c
pascal@13905 2 +++ busybox-1.20.0/editors/diff.c
pascal@13905 3 @@ -729,6 +729,14 @@
pascal@13905 4 j = fread(buf1, 1, sz, fp[1]);
pascal@13905 5 if (i != j) {
pascal@13905 6 differ = true;
pascal@13905 7 + /* Ensure we detect binary file even if a file is empty or very
pascal@13905 8 + short. */
pascal@13905 9 + for (k = 0; k < i; k++)
pascal@13905 10 + if (!buf0[k])
pascal@13905 11 + binary = true;
pascal@13905 12 + for (k = 0; k < j; k++)
pascal@13905 13 + if (!buf1[k])
pascal@13905 14 + binary = true;
pascal@13905 15 i = MIN(i, j);
pascal@13905 16 }
pascal@13905 17 if (i == 0)