f60719cd4
Denis Vlasenko
2008-09-30
Subject
grep: fix 'echo aaa | grep -o a' + ENABLE_EXTRA_COMPAT case by Natanael Copa
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
findutils/grep.c+12 -2
| @@ -363,12 +363,22 @@ static int grep_file(FILE *file) | |
| * (unless -v: -Fov doesnt print anything at all) */ | |
| if (found) | |
| print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); | |
| - | } else { |
| + | } else while (1) { |
| + | char old = line[gl->matched_range.rm_eo]; |
| line[gl->matched_range.rm_eo] = '\0'; | |
| print_line(line + gl->matched_range.rm_so, | |
| gl->matched_range.rm_eo - gl->matched_range.rm_so, | |
| linenum, ':'); | |
| - | } |
| + | line[gl->matched_range.rm_eo] = old; |
| + | #if !ENABLE_EXTRA_COMPAT |
| + | break; |
| + | #else |
| + | if (re_search(&gl->compiled_regex, line, line_len, |
| + | gl->matched_range.rm_eo, line_len - gl->matched_range.rm_eo, |
| + | &gl->matched_range) < 0) |
| + | break; |
| + | #endif |
| + | } |
| } else { | |
| print_line(line, line_len, linenum, ':'); | |
| } | |