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

grep: fix "grep -r PATTRN SYMLINK_TO_DIR"

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-08-28 15:50:09 +02:00
parent 6ff0551157
commit 34cc6c91a2
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
findutils/grep.c
View File

@ -668,7 +668,7 @@ static int grep_dir(const char *dir)
int matched = 0;
recursive_action(dir,
/* recurse=yes */ ACTION_RECURSE |
/* followLinks=no */
/* followLinks=command line only */ ACTION_FOLLOWLINKS_L0 |
/* depthFirst=yes */ ACTION_DEPTHFIRST,
/* fileAction= */ file_action_grep,
/* dirAction= */ NULL,

20
testsuite/grep.tests
View File

@ -171,6 +171,26 @@ testing "grep -w word match second word" \
"bword,word\n""wordb,word\n""bwordb,word\n" \
""
# -r on symlink to dir should recurse into dir
mkdir -p grep.testdir/foo
echo bar > grep.testdir/foo/file
ln -s foo grep.testdir/symfoo
testing "grep -r on symlink to dir" \
"grep -r . grep.testdir/symfoo" \
"grep.testdir/symfoo/file:bar\n" \
"" ""
rm -Rf grep.testdir
# But -r on dir/symlink_to_dir should not recurse into symlink_to_dir
mkdir -p grep.testdir/foo
echo bar > grep.testdir/foo/file
ln -s foo grep.testdir/symfoo
testing "grep -r on dir/symlink to dir" \
"grep -r . grep.testdir" \
"grep.testdir/foo/file:bar\n" \
"" ""
rm -Rf grep.testdir
# 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