Skip to content

Fix interdiff context trimming when output is colorized #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix interdiff context trimming when output is colorized #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/interdiff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,18 +988,28 @@ trim_context (FILE *f /* positioned at start of @@ line */,

if (read_atatline (line, &orig_offset, &orig_count,
&new_offset, &new_count))
error (EXIT_FAILURE, 0, "Line not understood: %s",
line);
goto line_not_understood;

orig_orig_count = new_orig_count = orig_count;
orig_new_count = new_new_count = new_count;
fgetpos (f, &pos);
while (orig_count || new_count) {
char *first_char;

if (getline (&line, &linelen, f) < 0)
break;

/* Skip past any color escape code for a +/- line */
if (line[0] == 0x1b) {
first_char = strpbrk(line, "+-");
if (!first_char)
goto line_not_understood;
} else {
first_char = line;
}

total_count++;
switch (line[0]) {
switch (*first_char) {
case '\n':
whitespace_damage("input");
case ' ' :
Expand Down Expand Up @@ -1081,6 +1091,10 @@ trim_context (FILE *f /* positioned at start of @@ line */,
error (0, 0, "hunk-splitting is required in this case, but is not yet implemented");
error (1, 0, "use the -U option to work around this");
return 0;

line_not_understood:
error (EXIT_FAILURE, 0, "Line not understood: %s", line);
return 0;
}

static int
Expand Down