author | Junio C Hamano <gitster@pobox.com> | |
Tue, 17 Jun 2008 00:39:50 +0000 (17:39 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 17 Jun 2008 00:39:50 +0000 (17:39 -0700) |
* maint:
diff.c: fix emit_line() again not to add extra line
diff.c: fix emit_line() again not to add extra line
diff.c | patch | blob | history |
index f23657bd347a62729d2211e8c64536279a5ea910..526249008662d4041e5623914c1a420f3443c4d4 100644 (file)
--- a/diff.c
+++ b/diff.c
static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
{
- if (len > 0 && line[len-1] == '\n')
+ int has_trailing_newline = (len > 0 && line[len-1] == '\n');
+ if (has_trailing_newline)
len--;
fputs(set, file);
fwrite(line, len, 1, file);
fputs(reset, file);
- fputc('\n', file);
+ if (has_trailing_newline)
+ fputc('\n', file);
}
static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)