diff.c: fix emit_line() again not to add extra line
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 16, 2008 at 17:37 UTC
4afbcab9898ce63ad641dd0de6e9b69deda44330
1 file changed
+4
-2
diff.c
+4
-2
@@ -514,13 +514,15 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix)
514
515
static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
516
{
517
- if (len > 0 && line[len-1] == '\n')
517
+ int has_trailing_newline = (len > 0 && line[len-1] == '\n');
518
+ if (has_trailing_newline)
519
len--;
520
521
fputs(set, file);
522
fwrite(line, len, 1, file);
523
fputs(reset, file);
523
- fputc('\n', file);
524
+ if (has_trailing_newline)
525
+ fputc('\n', file);
526
}
527
528
static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)