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

grep: add proper support for pattern_list

Browse Source 
From POSIX.1-2008:

	The pattern_list's value shall consist of one or more patterns
	separated by <newline> characters;

As such, given patterns need to be split at newline characters. Without
doing so, busybox grep will interpret the newline as part of the pattern
which is not in accordance with POSIX.

See also: https://bugs.busybox.net/show_bug.cgi?id=12721

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Sören Tempel 2020-03-30 11:02:08 +02:00 committed by Denys Vlasenko
parent c3295d233b
commit 42a8984abc
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
findutils/grep.c
View File

@ -650,6 +650,13 @@ static void load_regexes_from_file(llist_t *fopt)
} }
} }
static void load_pattern_list(llist_t **lst, char *pattern)
{
char *p;
while ((p = strsep(&pattern, "\n")) != NULL)
llist_add_to(lst, new_grep_list_data(p, 0));
}
static int FAST_FUNC file_action_grep(const char *filename, static int FAST_FUNC file_action_grep(const char *filename,
struct stat *statbuf, struct stat *statbuf,
void* matched, void* matched,
@ -754,10 +761,12 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
#endif #endif
invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */ invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
{ /* convert char **argv to grep_list_data_t */ { /* convert char **argv to pattern_list */
llist_t *cur; llist_t *cur, *new = NULL;
for (cur = pattern_head; cur; cur = cur->link) for (cur = pattern_head; cur; cur = cur->link)
cur->data = new_grep_list_data(cur->data, 0); load_pattern_list(&new, cur->data);
llist_free(pattern_head, NULL);
pattern_head = new;
} }
if (option_mask32 & OPT_f) { if (option_mask32 & OPT_f) {
load_regexes_from_file(fopt); load_regexes_from_file(fopt);
@ -806,11 +815,9 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
/* if we didn't get a pattern from -e and no command file was specified, /* if we didn't get a pattern from -e and no command file was specified,
* first parameter should be the pattern. no pattern, no worky */ * first parameter should be the pattern. no pattern, no worky */
if (pattern_head == NULL) { if (pattern_head == NULL) {
char *pattern;
if (*argv == NULL) if (*argv == NULL)
bb_show_usage(); bb_show_usage();
pattern = new_grep_list_data(*argv++, 0); load_pattern_list(&pattern_head, *argv++);
llist_add_to(&pattern_head, pattern);
} }
/* argv[0..(argc-1)] should be names of file to grep through. If /* argv[0..(argc-1)] should be names of file to grep through. If

12
testsuite/grep.tests
View File

@ -190,6 +190,18 @@ testing "grep -x -v -e EXP1 -e EXP2 finds nothing if either EXP matches" \
"" \ "" \
" aa bb cc\n" " aa bb cc\n"
testing "grep PATTERN can be a newline-delimited list" \
'grep -Fv "$(printf "foo\nbar\n")"' \
"baz\n" \
"" \
"foo\nbar\nbaz\n"
testing "grep -e PATTERN can be a newline-delimited list" \
'grep -Fv -e "$(printf "foo\nbar\n")"' \
"baz\n" \
"" \
"foo\nbar\nbaz\n"
# -r on symlink to dir should recurse into dir # -r on symlink to dir should recurse into dir
mkdir -p grep.testdir/foo mkdir -p grep.testdir/foo
echo bar > grep.testdir/foo/file echo bar > grep.testdir/foo/file