mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff.c: rewrite emit_line_0 more understandably

Browse Source 
Rewrite emit_line_0 to have fewer (nested) conditions.

The change in 'emit_line' makes sure that 'first' is never user data,
but always under our control, a sign or special character in the
beginning of the line (or 0, in which case we ignore it).
So from now on, let's pass only a diff marker or 0 as the 'first'
character of the line.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2018-08-13 18:41:22 -07:00
committed by Junio C Hamano
parent f103a6faef
commit 444106791e
1 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
diff.c
View File

@ -626,43 +626,50 @@ static void emit_line_0(struct diff_options *o,
int first, const char *line, int len) int first, const char *line, int len)
{ {
int has_trailing_newline, has_trailing_carriage_return; int has_trailing_newline, has_trailing_carriage_return;
int nofirst; int needs_reset = 0; /* at the end of the line */
FILE *file = o->file; FILE *file = o->file;
fputs(diff_line_prefix(o), file); fputs(diff_line_prefix(o), file);
if (len == 0) { has_trailing_newline = (len > 0 && line[len-1] == '\n');
has_trailing_newline = (first == '\n'); if (has_trailing_newline)
has_trailing_carriage_return = (!has_trailing_newline && len--;
(first == '\r'));
nofirst = has_trailing_newline || has_trailing_carriage_return; has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
} else { if (has_trailing_carriage_return)
has_trailing_newline = (len > 0 && line[len-1] == '\n'); len--;
if (has_trailing_newline)
len--; if (!len && !first)
has_trailing_carriage_return = (len > 0 && line[len-1] == '\r'); goto end_of_line;
if (has_trailing_carriage_return)
len--; if (reverse && want_color(o->use_color)) {
nofirst = 0; fputs(GIT_COLOR_REVERSE, file);
needs_reset = 1;
} }
if (len || !nofirst) { if (set_sign) {
if (reverse && want_color(o->use_color)) fputs(set_sign, file);
fputs(GIT_COLOR_REVERSE, file); needs_reset = 1;
if (set_sign)
fputs(set_sign, file);
if (first && !nofirst)
fputc(first, file);
if (len) {
if (set && set != set_sign) {
if (set_sign)
fputs(reset, file);
fputs(set, file);
}
fwrite(line, len, 1, file);
}
fputs(reset, file);
} }
if (first)
fputc(first, file);
if (!len)
goto end_of_line;
if (set) {
if (set_sign && set != set_sign)
fputs(reset, file);
fputs(set, file);
needs_reset = 1;
}
fwrite(line, len, 1, file);
needs_reset = 1; /* 'line' may contain color codes. */
end_of_line:
if (needs_reset)
fputs(reset, file);
if (has_trailing_carriage_return) if (has_trailing_carriage_return)
fputc('\r', file); fputc('\r', file);
if (has_trailing_newline) if (has_trailing_newline)
@ -672,7 +679,7 @@ static void emit_line_0(struct diff_options *o,
static void emit_line(struct diff_options *o, const char *set, const char *reset, static void emit_line(struct diff_options *o, const char *set, const char *reset,
const char *line, int len) const char *line, int len)
{ {
emit_line_0(o, set, NULL, 0, reset, line[0], line+1, len-1); emit_line_0(o, set, NULL, 0, reset, 0, line, len);
} }
enum diff_symbol { enum diff_symbol {