commit 3ba2df874ca27f075a0897210d8dce6c56646e60
author Bartosz Golaszewski <bartekgola@gmail.com> Fri Feb 07 17:14:37 2014 +0100
committer Denys Vlasenko <vda.linux@googlemail.com> Fri Feb 07 17:15:56 2014 +0100
tree 8d8b56ec8092ab4da85abd275998b2da457dbef7
parent 07f417b6ab92e0429f302ff6783bb9681b60120e

grep: properly handle grep -w "^str" in !EXTRA_COMPAT case too

function                                             old     new   delta
grep_file                                           1267    1288     +21

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

findutils/grep.c

diff --git a/findutils/grep.c b/findutils/grep.c
index a7bc4ca..7685946 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -375,6 +375,8 @@
 			} else {
 #if ENABLE_EXTRA_COMPAT
 				unsigned start_pos;
+#else
+				int match_flg;
 #endif
 				char *match_at;
 
@@ -392,6 +394,7 @@
 #if !ENABLE_EXTRA_COMPAT
 				gl->matched_range.rm_so = 0;
 				gl->matched_range.rm_eo = 0;
+				match_flg = 0;
 #else
 				start_pos = 0;
 #endif
@@ -400,7 +403,7 @@
 //bb_error_msg("'%s' start_pos:%d line_len:%d", match_at, start_pos, line_len);
 				if (
 #if !ENABLE_EXTRA_COMPAT
-					regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, 0) == 0
+					regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, match_flg) == 0
 #else
 					re_search(&gl->compiled_regex, match_at, line_len,
 							start_pos, /*range:*/ line_len,
@@ -415,7 +418,7 @@
 						found = 1;
 					} else {
 						char c = ' ';
-						if (gl->matched_range.rm_so)
+						if (match_at > line || gl->matched_range.rm_so != 0)
 							c = match_at[gl->matched_range.rm_so - 1];
 						if (!isalnum(c) && c != '_') {
 							c = match_at[gl->matched_range.rm_eo];
@@ -432,6 +435,7 @@
 #if !ENABLE_EXTRA_COMPAT
 								if (gl->matched_range.rm_eo != 0) {
 									match_at += gl->matched_range.rm_eo;
+									match_flg |= REG_NOTBOL;
 									goto opt_w_again;
 								}
 #else