diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-10-06 12:50:22 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-10-06 12:50:22 +0100 |
| commit | b04d11dcbadda2620743a1dd923938f2f3043a38 (patch) | |
| tree | 971afe425a81304b79e44122e220c7a69efe2616 /findutils/grep.c | |
| parent | 124bbf02948b7ac0babb4ead04acd1559db182d3 (diff) | |
| parent | 760d035699c4a878f9109544c1d35ea0d5f6b76c (diff) | |
| download | busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.gz busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.bz2 busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils/grep.c')
| -rw-r--r-- | findutils/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 615cacac4..0336b2927 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
| @@ -676,7 +676,7 @@ static int grep_dir(const char *dir) | |||
| 676 | int matched = 0; | 676 | int matched = 0; |
| 677 | recursive_action(dir, | 677 | recursive_action(dir, |
| 678 | /* recurse=yes */ ACTION_RECURSE | | 678 | /* recurse=yes */ ACTION_RECURSE | |
| 679 | /* followLinks=no */ | 679 | /* followLinks=command line only */ ACTION_FOLLOWLINKS_L0 | |
| 680 | /* depthFirst=yes */ ACTION_DEPTHFIRST, | 680 | /* depthFirst=yes */ ACTION_DEPTHFIRST, |
| 681 | /* fileAction= */ file_action_grep, | 681 | /* fileAction= */ file_action_grep, |
| 682 | /* dirAction= */ NULL, | 682 | /* dirAction= */ NULL, |