wok-current annotate busybox/stuff/busybox-1.22-diff.u @ rev 16030
busybox: enable FEATURE_SUID_CONFIG_QUIET
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Mar 08 10:43:44 2014 +0000 (2014-03-08) |
| parents | e30c03f14110 |
| children |
| rev | line source |
|---|---|
| pascal@15734 | 1 --- busybox-1.20.0/editors/diff.c |
| pascal@15734 | 2 +++ busybox-1.20.0/editors/diff.c |
| pascal@15743 | 3 @@ -756,6 +756,14 @@ |
| pascal@15734 | 4 j = fread(buf1, 1, sz, fp[1]); |
| pascal@15734 | 5 if (i != j) { |
| pascal@15734 | 6 differ = true; |
| pascal@15734 | 7 + /* Ensure we detect binary file even if a file is empty or very |
| pascal@15734 | 8 + short. */ |
| pascal@15734 | 9 + for (k = 0; k < i; k++) |
| pascal@15734 | 10 + if (!buf0[k]) |
| pascal@15734 | 11 + binary = true; |
| pascal@15734 | 12 + for (k = 0; k < j; k++) |
| pascal@15734 | 13 + if (!buf1[k]) |
| pascal@15734 | 14 + binary = true; |
| pascal@15734 | 15 i = MIN(i, j); |
| pascal@15734 | 16 } |
| pascal@15734 | 17 if (i == 0) |