Merge branch 'busybox' into merge

2 files changed, 35 insertions, 8 deletions

diff --git a/findutils/find.c b/findutils/find.c
index b521e5b08..2235b5049 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -878,8 +878,8 @@ static action*** parse_params(char **argv)
         IF_FEATURE_FIND_EXEC(   "-exec\0"   )
         IF_FEATURE_FIND_PAREN(  "(\0"       )
         /* All options/actions starting from here require argument */
-                                 "-name\0"
-                                 "-iname\0"
+                                "-name\0"
+                                "-iname\0"
         IF_FEATURE_FIND_PATH(   "-path\0"   )
 #if ENABLE_DESKTOP
         IF_FEATURE_FIND_PATH(   "-wholename\0")
diff --git a/findutils/grep.c b/findutils/grep.c
index 5b8ae3bff..6b47f4327 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -352,10 +352,34 @@ static int grep_file(FILE *file)
                 while (pattern_ptr) {
                         gl = (grep_list_data_t *)pattern_ptr->data;
                         if (FGREP_FLAG) {
-                                found |= (((option_mask32 & OPT_i)
-                                        ? strcasestr(line, gl->pattern)
-                                        : strstr(line, gl->pattern)
-                                        ) != NULL);
+                                char *match;
+                                char *str = line;
+ opt_f_again:
+                                match = ((option_mask32 & OPT_i)
+                                        ? strcasestr(str, gl->pattern)
+                                        : strstr(str, gl->pattern)
+                                        );
+                                if (match) {
+                                        if (option_mask32 & OPT_x) {
+                                                if (match != str)
+                                                        goto opt_f_not_found;
+                                                if (str[strlen(gl->pattern)] != '\0')
+                                                        goto opt_f_not_found;
+                                        } else
+                                        if (option_mask32 & OPT_w) {
+                                                char c = (match != str) ? match[-1] : ' ';
+                                                if (!isalnum(c) && c != '_') {
+                                                        c = match[strlen(gl->pattern)];
+                                                        if (!c || (!isalnum(c) && c != '_'))
+                                                                goto opt_f_found;
+                                                }
+                                                str = match + 1;
+                                                goto opt_f_again;
+                                        }
+ opt_f_found:
+                                        found = 1;
+ opt_f_not_found: ;
+                                }
                         } else {
                                 if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
                                         gl->flg_mem_alocated_compiled |= COMPILED;
@@ -384,7 +408,8 @@ static int grep_file(FILE *file)
                                         if (option_mask32 & OPT_x) {
                                                 found = (gl->matched_range.rm_so == 0
                                                          && line[gl->matched_range.rm_eo] == '\0');
-                                        } else if (!(option_mask32 & OPT_w)) {
+                                        } else
+                                        if (!(option_mask32 & OPT_w)) {
                                                 found = 1;
                                         } else {
                                                 char c = ' ';
@@ -395,6 +420,8 @@ static int grep_file(FILE *file)
                                                         if (!c || (!isalnum(c) && c != '_'))
                                                                 found = 1;
                                                 }
+//BUG: "echo foop foo | grep -w foo" should match, but doesn't:
+//we bail out on first "mismatch" because it's not a word.
                                         }
                                 }
                         }
@@ -646,7 +673,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 
         if (opts & OPT_C) {
                 /* -C unsets prev -A and -B, but following -A or -B
-                   may override it */
+                 * may override it */
                 if (!(opts & OPT_A)) /* not overridden */
                         lines_after = Copt;
                 if (!(opts & OPT_B)) /* not overridden */