Patch from vodz to correct 'grep -e pattern1 -e pattern2' logic

git-svn-id: svn://busybox.net/trunk/busybox@8868 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 5 deletions

diff --git a/findutils/grep.c b/findutils/grep.c
index 3ba746373..6ece0ab12 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -20,8 +20,8 @@
  *
  */
 /*
- * Jun 2003 by Vladimir Oleynik <dzo@simtreas.ru> -
- * correction "-e pattern1 -e -e pattern2" logic and more optimizations.
+ * Apr 2004 by Vladimir Oleynik <dzo@simtreas.ru> -
+ * correction "-e pattern1 -e pattern2" logic and more optimizations.
 */
 
 #include <stdio.h>
@@ -135,11 +135,9 @@ static int grep_file(FILE *file)
                                  */
                                 regex_t regex;
                                 xregcomp(&regex, pattern_ptr->data, reflags);
-                                ret = regexec(&regex, line, 0, NULL, 0) == 0;
+                                ret |= regexec(&regex, line, 0, NULL, 0) == 0;
                                 regfree(&regex);
                         }
-                        if (!ret)
-                                break;
                         pattern_ptr = pattern_ptr->link;
                 } /* while (pattern_ptr) */