From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Tue, 30 Sep 2008 22:37:29 +0000 (-0000)
Subject: grep: fix 'echo aaa | grep -o a' + ENABLE_EXTRA_COMPAT case
X-Git-Tag: 1_13_0~138
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f60719cd4967c6abf92c47737641ba4a33cd7d61;p=oweals%2Fbusybox.git

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

diff --git a/findutils/grep.c b/findutils/grep.c
index 9d38ef912..73e74f4b3 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -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, ':');
 				}