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

grep: don't bail out on first mismatch if '-w' option is set

Browse Source 
Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Bartosz Golaszewski 2013-05-15 03:53:26 +02:00 committed by Denys Vlasenko
parent e0a6ab698f
commit 414db791d0
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
findutils/grep.c
View File

@ -373,6 +373,8 @@ static int grep_file(FILE *file)
opt_f_not_found: ; opt_f_not_found: ;
} }
} else { } else {
char *match_at;
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;
#if !ENABLE_EXTRA_COMPAT #if !ENABLE_EXTRA_COMPAT
@ -388,32 +390,36 @@ static int grep_file(FILE *file)
gl->matched_range.rm_so = 0; gl->matched_range.rm_so = 0;
gl->matched_range.rm_eo = 0; gl->matched_range.rm_eo = 0;
#endif #endif
match_at = line;
opt_w_again:
if ( if (
#if !ENABLE_EXTRA_COMPAT #if !ENABLE_EXTRA_COMPAT
regexec(&gl->compiled_regex, line, 1, &gl->matched_range, 0) == 0 regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, 0) == 0
#else #else
re_search(&gl->compiled_regex, line, line_len, re_search(&gl->compiled_regex, match_at, line_len,
/*start:*/ 0, /*range:*/ line_len, /*start:*/ 0, /*range:*/ line_len,
&gl->matched_range) >= 0 &gl->matched_range) >= 0
#endif #endif
) { ) {
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'); && match_at[gl->matched_range.rm_eo] == '\0');
} else } else
if (!(option_mask32 & OPT_w)) { if (!(option_mask32 & OPT_w)) {
found = 1; found = 1;
} else { } else {
char c = ' '; char c = ' ';
if (gl->matched_range.rm_so) if (gl->matched_range.rm_so)
c = line[gl->matched_range.rm_so - 1]; c = match_at[gl->matched_range.rm_so - 1];
if (!isalnum(c) && c != '_') { if (!isalnum(c) && c != '_') {
c = line[gl->matched_range.rm_eo]; c = match_at[gl->matched_range.rm_eo];
if (!c || (!isalnum(c) && c != '_')) if (!c || (!isalnum(c) && c != '_')) {
found = 1; found = 1;
} else {
match_at += gl->matched_range.rm_eo;
goto opt_w_again;
}
} }
//BUG: "echo foop foo | grep -w foo" should match, but doesn't:
//we bail out on first "mismatch" because it's not a word.
} }
} }
} }

6
testsuite/grep.tests
View File

@ -127,6 +127,12 @@ testing "grep -Fw doesn't stop on 1st mismatch" \
"foop foo\n" \ "foop foo\n" \
"" ""
testing "grep -w doesn't stop on 1st mismatch" \
"grep -w 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