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

grep: fix -w match if first match isn't a word, but second is. Closes 4520

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-02-27 14:56:12 +01:00
parent 6f068904dc
commit 83e49ade57
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
findutils/grep.c
View File

@ -418,13 +418,15 @@ static int grep_file(FILE *file)
found = 1;
} else {
char c = ' ';
if (match_at > line || gl->matched_range.rm_so != 0)
if (match_at > line || gl->matched_range.rm_so != 0) {
c = match_at[gl->matched_range.rm_so - 1];
}
if (!isalnum(c) && c != '_') {
c = match_at[gl->matched_range.rm_eo];
if (!c || (!isalnum(c) && c != '_')) {
found = 1;
} else {
}
if (!isalnum(c) && c != '_') {
found = 1;
} else {
/*
* Why check gl->matched_range.rm_eo?
* Zero-length match makes -w skip the line:
@ -433,18 +435,17 @@ static int grep_file(FILE *file)
* Without such check, we can loop forever.
*/
#if !ENABLE_EXTRA_COMPAT
if (gl->matched_range.rm_eo != 0) {
match_at += gl->matched_range.rm_eo;
match_flg |= REG_NOTBOL;
goto opt_w_again;
}
#else
if (gl->matched_range.rm_eo > start_pos) {
start_pos = gl->matched_range.rm_eo;
goto opt_w_again;
}
#endif
if (gl->matched_range.rm_eo != 0) {
match_at += gl->matched_range.rm_eo;
match_flg |= REG_NOTBOL;
goto opt_w_again;
}
#else
if (gl->matched_range.rm_eo > start_pos) {
start_pos = gl->matched_range.rm_eo;
goto opt_w_again;
}
#endif
}
}
}

6
testsuite/grep.tests
View File

@ -165,6 +165,12 @@ testing "grep -w word doesn't match wordword" \
"wordword\n" \
""
testing "grep -w word match second word" \
"grep -w word input" \
"bword,word\n""wordb,word\n""bwordb,word\n" \
"bword,word\n""wordb,word\n""bwordb,word\n" \
""
# testing "test name" "commands" "expected result" "file input" "stdin"
# file input will be file called "input"
# test can create a file "actual" instead of writing to stdout