9a9c6e39b
Ari Sundholm
2019-01-29
Subject
grep: fix -x -v with certain pattern orders
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
findutils/grep.c+1 -1
| @@ -404,7 +404,7 @@ static int grep_file(FILE *file) | |
| #endif | |
| ) { | |
| if (option_mask32 & OPT_x) { | |
| - | found = (gl->matched_range.rm_so == 0 |
| + | found |= (gl->matched_range.rm_so == 0 |
| && match_at[gl->matched_range.rm_eo] == '\0'); | |
| } else | |
| if (!(option_mask32 & OPT_w)) { | |
testsuite/grep.tests+7 -0
| @@ -177,6 +177,13 @@ testing "grep -w word match second word" \ | |
| "bword,word\n""wordb,word\n""bwordb,word\n" \ | |
| "" | |
| + | |
| + | testing "grep -x -v -e EXP1 -e EXP2 finds nothing if either EXP matches" \ |
| + | "grep -x -v -e '.*aa.*' -e 'bb.*'; echo \$?" \ |
| + | "1\n" \ |
| + | "" \ |
| + | " aa bb cc\n" |
| + | |
| # -r on symlink to dir should recurse into dir | |
| mkdir -p grep.testdir/foo | |
| echo bar > grep.testdir/foo/file | |