emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: fix 'echo aaa | grep -o a' + ENABLE_EXTRA_COMPAT case

Browse Source 
by Natanael Copa
This commit is contained in:
Denis Vlasenko 2008-09-30 22:37:29 +00:00
parent df6b3ad6ba
commit f60719cd49
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
findutils/grep.c
View File

@ -363,11 +363,21 @@ static int grep_file(FILE *file)
* (unless -v: -Fov doesnt print anything at all) */ * (unless -v: -Fov doesnt print anything at all) */
if (found) if (found)
print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); 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'; line[gl->matched_range.rm_eo] = '\0';
print_line(line + gl->matched_range.rm_so, print_line(line + gl->matched_range.rm_so,
gl->matched_range.rm_eo - gl->matched_range.rm_so, gl->matched_range.rm_eo - gl->matched_range.rm_so,
linenum, ':'); 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 { } else {
print_line(line, line_len, linenum, ':'); print_line(line, line_len, linenum, ':');