1 files changed, 19 insertions, 14 deletions

diff --git a/findutils/grep.c b/findutils/grep.c
index f5f95cb95..615cacac4 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -383,6 +383,8 @@ static int grep_file(FILE *file)
                         } else {
 #if ENABLE_EXTRA_COMPAT
                                 unsigned start_pos;
+#else
+                                int match_flg;
 #endif
                                 char *match_at;
 
@@ -400,6 +402,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
@@ -408,7 +411,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,
@@ -423,13 +426,15 @@ 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];
-                                                        if (!c || (!isalnum(c) && c != '_')) {
-                                                                found = 1;
-                                                        } else {
+                                                }
+                                                if (!isalnum(c) && c != '_') {
+                                                        found = 1;
+                                                } else {
                         /*
                          * Why check gl->matched_range.rm_eo?
                          * Zero-length match makes -w skip the line:
@@ -438,17 +443,17 @@ static int grep_file(FILE *file)
                          * Without such check, we can loop forever.
                          */
 #if !ENABLE_EXTRA_COMPAT
-                                                                if (gl->matched_range.rm_eo != 0) {
-                                                                        match_at += gl->matched_range.rm_eo;
-                                                                        goto opt_w_again;
-                                                                }
+                                                        if (gl->matched_range.rm_eo != 0) {
+                                                                match_at += gl->matched_range.rm_eo;
+                                                                match_flg |= REG_NOTBOL;
+                                                                goto opt_w_again;
+                                                        }
 #else
-                                                                if (gl->matched_range.rm_eo > start_pos) {
-                                                                        start_pos = gl->matched_range.rm_eo;
-                                                                        goto opt_w_again;
-                                                                }
-#endif
+                                                        if (gl->matched_range.rm_eo > start_pos) {
+                                                                start_pos = gl->matched_range.rm_eo;
+                                                                goto opt_w_again;
                                                         }
+#endif
                                                 }
                                         }
                                 }