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>

diff --git a/findutils/grep.c b/findutils/grep.c
index a7bc4ca9ea29f5c5f6b382e8200f5dfe06c5c127..76859464fbaf7e47ae44cb887d26403467c2faf5 100644 (file)
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -375,6 +375,8 @@ static int grep_file(FILE *file)
                        } else {
 #if ENABLE_EXTRA_COMPAT
                                unsigned start_pos;
+#else
+                               int match_flg;
 #endif
                                char *match_at;
 
@@ -392,6 +394,7 @@ static int grep_file(FILE *file)
 #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 @@ static int grep_file(FILE *file)
 //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 @@ static int grep_file(FILE *file)
                                                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 @@ static int grep_file(FILE *file)
 #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

diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index 412efffbbacecd371782b3825b9db63fdeccb60f..74b0eb63f39317796dddc9419cf40af880f7a49c 100755 (executable)
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -159,6 +159,12 @@ testing "grep -w ^ doesn't hang" \
        "anything\n" \
        ""
 
+testing "grep -w word doesn't match wordword" \
+       "grep -w word input" \
+       "" \
+       "wordword\n" \
+       ""
+
 # testing "test name" "commands" "expected result" "file input" "stdin"
 #   file input will be file called "input"
 #   test can create a file "actual" instead of writing to stdout