emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Andersen 2004-05-26 09:46:41 +00:00
parent f086ed8ddd
commit 7f164cd052
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
findutils/grep.c
View File

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