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

grep: fix grep -Fw not respecting the -w option. Closes 5792

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-01-20 16:57:19 +01:00
parent 81fa999540
commit 2f5b5beb28
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
findutils/grep.c
View File

@ -344,10 +344,34 @@ static int grep_file(FILE *file)
while (pattern_ptr) { while (pattern_ptr) {
gl = (grep_list_data_t *)pattern_ptr->data; gl = (grep_list_data_t *)pattern_ptr->data;
if (FGREP_FLAG) { if (FGREP_FLAG) {
found |= (((option_mask32 & OPT_i) char *match;
? strcasestr(line, gl->pattern) char *str = line;
: strstr(line, gl->pattern) opt_f_again:
) != NULL); match = ((option_mask32 & OPT_i)
? strcasestr(str, gl->pattern)
: strstr(str, gl->pattern)
);
if (match) {
if (option_mask32 & OPT_x) {
if (match != str)
goto opt_f_not_found;
if (str[strlen(gl->pattern)] != '\0')
goto opt_f_not_found;
} else
if (option_mask32 & OPT_w) {
char c = (match != str) ? match[-1] : ' ';
if (!isalnum(c) && c != '_') {
c = match[strlen(gl->pattern)];
if (!c || (!isalnum(c) && c != '_'))
goto opt_f_found;
}
str = match + 1;
goto opt_f_again;
}
opt_f_found:
found = 1;
opt_f_not_found: ;
}
} else { } else {
if (!(gl->flg_mem_alocated_compiled & COMPILED)) { if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
gl->flg_mem_alocated_compiled |= COMPILED; gl->flg_mem_alocated_compiled |= COMPILED;
@ -376,7 +400,8 @@ static int grep_file(FILE *file)
if (option_mask32 & OPT_x) { if (option_mask32 & OPT_x) {
found = (gl->matched_range.rm_so == 0 found = (gl->matched_range.rm_so == 0
&& line[gl->matched_range.rm_eo] == '\0'); && line[gl->matched_range.rm_eo] == '\0');
} else if (!(option_mask32 & OPT_w)) { } else
if (!(option_mask32 & OPT_w)) {
found = 1; found = 1;
} else { } else {
char c = ' '; char c = ' ';
@ -387,6 +412,8 @@ static int grep_file(FILE *file)
if (!c || (!isalnum(c) && c != '_')) if (!c || (!isalnum(c) && c != '_'))
found = 1; found = 1;
} }
//BUG: "echo foop foo | grep -w foo" should match, but doesn't:
//we bail out on first "mismatch" because it's not a word.
} }
} }
} }

12
testsuite/grep.tests
View File

@ -115,6 +115,18 @@ testing "grep -v -f EMPTY_FILE" \
"" \ "" \
"test\n" "test\n"
testing "grep -Fw matches only words" \
"grep -Fw foo input" \
"" \
"foop\n" \
""
testing "grep -Fw doesn't stop on 1st mismatch" \
"grep -Fw foo input" \
"foop foo\n" \
"foop foo\n" \
""
# testing "test name" "commands" "expected result" "file input" "stdin" # testing "test name" "commands" "expected result" "file input" "stdin"
# file input will be file called "input" # file input will be file called "input"
# test can create a file "actual" instead of writing to stdout # test can create a file "actual" instead of writing to stdout