diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-10-01 20:27:28 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-10-01 20:27:28 +0200 |
commit | 3c3928fc658bddacd4e540589868bc28a8e4ca0a (patch) | |
tree | ed201a577877cf45911983def13513d8f6b91ef8 /findutils | |
parent | 4a0eb0370c4df8ee01973b50bb460560532b79f1 (diff) | |
download | busybox-w32-3c3928fc658bddacd4e540589868bc28a8e4ca0a.tar.gz busybox-w32-3c3928fc658bddacd4e540589868bc28a8e4ca0a.tar.bz2 busybox-w32-3c3928fc658bddacd4e540589868bc28a8e4ca0a.zip |
tydy up a few uses of recursive_action(), no logic changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils')
-rw-r--r-- | findutils/grep.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index b456ed467..0892a713a 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -694,15 +694,16 @@ static int FAST_FUNC file_action_grep(const char *filename, | |||
694 | static int grep_dir(const char *dir) | 694 | static int grep_dir(const char *dir) |
695 | { | 695 | { |
696 | int matched = 0; | 696 | int matched = 0; |
697 | recursive_action(dir, | 697 | recursive_action(dir, 0 |
698 | /* recurse=yes */ ACTION_RECURSE | | 698 | | ACTION_RECURSE |
699 | /* followLinks=always */ ((option_mask32 & OPT_R) ? ACTION_FOLLOWLINKS : 0) | | 699 | | ((option_mask32 & OPT_R) ? ACTION_FOLLOWLINKS : 0) |
700 | /* followLinks=command line only */ ACTION_FOLLOWLINKS_L0 | | 700 | | ACTION_FOLLOWLINKS_L0 /* grep -r ... SYMLINK follows it */ |
701 | /* depthFirst=yes */ ACTION_DEPTHFIRST, | 701 | | ACTION_DEPTHFIRST |
702 | | 0, | ||
702 | /* fileAction= */ file_action_grep, | 703 | /* fileAction= */ file_action_grep, |
703 | /* dirAction= */ NULL, | 704 | /* dirAction= */ NULL, |
704 | /* userData= */ &matched, | 705 | /* userData= */ &matched, |
705 | /* depth= */ 0); | 706 | 0); |
706 | return matched; | 707 | return matched; |
707 | } | 708 | } |
708 | 709 | ||