diff options
| -rw-r--r-- | findutils/grep.c | 2 | ||||
| -rwxr-xr-x | testsuite/grep.tests | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index a4033a4..9d9da42 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -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)) { diff --git a/testsuite/grep.tests b/testsuite/grep.tests index e578897..26f8e69 100755 --- a/testsuite/grep.tests +++ b/testsuite/grep.tests @@ -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 |