Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues 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> -
* 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) */