summaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorAri Sundholm2019-01-29 14:42:57 +0100
committerDenys Vlasenko2019-01-29 14:42:57 +0100
commit9a9c6e39ba4c8f4f2cecb147c7e6464bec2d8b55 (patch)
treeffd9a73b098670937ef0a2d33966a6669ec59d96 /findutils
parent53799506acf69e7f7137d91fa5a4451211621469 (diff)
downloadbusybox-9a9c6e39ba4c8f4f2cecb147c7e6464bec2d8b55.zip
busybox-9a9c6e39ba4c8f4f2cecb147c7e6464bec2d8b55.tar.gz
grep: fix -x -v with certain pattern orders
We found out that busybox -x -v is a bit broken: ari@ari-thinkpad:~/busybox$ echo ' aa bb cc' | ./busybox grep -x -e 'aa.*' -e '.*bb.*' aa bb cc ari@ari-thinkpad:~/busybox$ echo ' aa bb cc' | ./busybox grep -x -v -e 'aa.*' -e '.*bb.*' ari@ari-thinkpad:~/busybox$ echo ' aa bb cc' | ./busybox grep -x -e '.*aa.*' -e 'bb.*' aa bb cc ari@ari-thinkpad:~/busybox$ echo ' aa bb cc' | ./busybox grep -x -v -e '.*aa.*' -e 'bb.*' aa bb cc Last one is wrong. This patch fixes the issue by making sure that the variable 'found' never makes a transition from 1 to 0, as this would mean that grep previously found a match on this input line. Signed-off-by: Ari Sundholm <ari@tuxera.com> Signed-off-by: Niko Vähäsarja <niko@tuxera.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils')
-rw-r--r--findutils/grep.c2
1 files changed, 1 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)) {