diff options
author | Ron Yorston <rmy@pobox.com> | 2015-10-13 14:45:51 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-10-13 14:45:51 +0100 |
commit | 8e509f11bceeec419abc718300bef7422d1fee4c (patch) | |
tree | fdfbc752ad94102e3613a5d7254f14a93eaf7f56 /editors/diff.c | |
parent | 420f5edfe7676fe6e7cddbbf15c04649d096e422 (diff) | |
parent | 4d0c1ea4784c9844f8468d97ca5c26d3c70f9921 (diff) | |
download | busybox-w32-8e509f11bceeec419abc718300bef7422d1fee4c.tar.gz busybox-w32-8e509f11bceeec419abc718300bef7422d1fee4c.tar.bz2 busybox-w32-8e509f11bceeec419abc718300bef7422d1fee4c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/diff.c')
-rw-r--r-- | editors/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/diff.c b/editors/diff.c index e0adcee59..a892cfdf2 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
@@ -433,7 +433,7 @@ static void fetch(FILE_and_pos_t *ft, const off_t *ix, int a, int b, int ch) | |||
433 | for (j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) { | 433 | for (j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) { |
434 | int c = fgetc(ft->ft_fp); | 434 | int c = fgetc(ft->ft_fp); |
435 | if (c == EOF) { | 435 | if (c == EOF) { |
436 | printf("\n\\ No newline at end of file\n"); | 436 | puts("\n\\ No newline at end of file"); |
437 | return; | 437 | return; |
438 | } | 438 | } |
439 | ft->ft_pos++; | 439 | ft->ft_pos++; |
@@ -692,7 +692,7 @@ static bool diff(FILE* fp[2], char *file[2]) | |||
692 | continue; | 692 | continue; |
693 | printf(",%d", (a < b) ? b - a + 1 : 0); | 693 | printf(",%d", (a < b) ? b - a + 1 : 0); |
694 | } | 694 | } |
695 | printf(" @@\n"); | 695 | puts(" @@"); |
696 | /* | 696 | /* |
697 | * Output changes in "unified" diff format--the old and new lines | 697 | * Output changes in "unified" diff format--the old and new lines |
698 | * are printed together. | 698 | * are printed together. |