summaryrefslogtreecommitdiff
path: root/findutils/grep.c
diff options
context:
space:
mode:
authorDenys Vlasenko2020-10-01 20:27:28 +0200
committerDenys Vlasenko2020-10-01 20:27:28 +0200
commit3c3928fc658bddacd4e540589868bc28a8e4ca0a (patch)
treeed201a577877cf45911983def13513d8f6b91ef8 /findutils/grep.c
parent4a0eb0370c4df8ee01973b50bb460560532b79f1 (diff)
downloadbusybox-3c3928fc658bddacd4e540589868bc28a8e4ca0a.zip
busybox-3c3928fc658bddacd4e540589868bc28a8e4ca0a.tar.gz
tydy up a few uses of recursive_action(), no logic changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils/grep.c')
-rw-r--r--findutils/grep.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index b456ed4..0892a71 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -694,15 +694,16 @@ static int FAST_FUNC file_action_grep(const char *filename,
static int grep_dir(const char *dir)
{
int matched = 0;
- recursive_action(dir,
- /* recurse=yes */ ACTION_RECURSE |
- /* followLinks=always */ ((option_mask32 & OPT_R) ? ACTION_FOLLOWLINKS : 0) |
- /* followLinks=command line only */ ACTION_FOLLOWLINKS_L0 |
- /* depthFirst=yes */ ACTION_DEPTHFIRST,
+ recursive_action(dir, 0
+ | ACTION_RECURSE
+ | ((option_mask32 & OPT_R) ? ACTION_FOLLOWLINKS : 0)
+ | ACTION_FOLLOWLINKS_L0 /* grep -r ... SYMLINK follows it */
+ | ACTION_DEPTHFIRST
+ | 0,
/* fileAction= */ file_action_grep,
/* dirAction= */ NULL,
/* userData= */ &matched,
- /* depth= */ 0);
+ 0);
return matched;
}