diff options
| author | Denis Vlasenko | 2006-10-27 23:42:25 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-10-27 23:42:25 +0000 |
| commit | 8c35d65c43216bb840326ac7476a180e2ae36fe9 (patch) | |
| tree | 13d20b31e817dcff5124498ca0bec2cdf9781014 /findutils | |
| parent | e80e2a3660bf09cc549cb2dfd2bdeb77ccde1231 (diff) | |
| download | busybox-8c35d65c43216bb840326ac7476a180e2ae36fe9.zip busybox-8c35d65c43216bb840326ac7476a180e2ae36fe9.tar.gz | |
recursive_action: add depth param
chmod: match coreutils versus following links
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/find.c | 6 | ||||
| -rw-r--r-- | findutils/grep.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/findutils/find.c b/findutils/find.c index 62cb5d7..8618f3a 100644 --- a/findutils/find.c +++ b/findutils/find.c @@ -56,7 +56,7 @@ static int num_matches; static int exec_opt; #endif -static int fileAction(const char *fileName, struct stat *statbuf, void* junk) +static int fileAction(const char *fileName, struct stat *statbuf, void* junk, int depth) { #ifdef CONFIG_FEATURE_FIND_XDEV if (S_ISDIR(statbuf->st_mode) && xdev_count) { @@ -307,12 +307,12 @@ int find_main(int argc, char **argv) if (firstopt == 1) { if (!recursive_action(".", TRUE, dereference, FALSE, fileAction, - fileAction, NULL)) + fileAction, NULL, 0)) status = EXIT_FAILURE; } else { for (i = 1; i < firstopt; i++) { if (!recursive_action(argv[i], TRUE, dereference, FALSE, fileAction, - fileAction, NULL)) + fileAction, NULL, 0)) status = EXIT_FAILURE; } } diff --git a/findutils/grep.c b/findutils/grep.c index b76a17a..8bb38f9 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -290,7 +290,7 @@ static void load_regexes_from_file(llist_t *fopt) } -static int file_action_grep(const char *filename, struct stat *statbuf, void* matched) +static int file_action_grep(const char *filename, struct stat *statbuf, void* matched, int depth) { FILE *file = fopen(filename, "r"); if (file == NULL) { @@ -315,7 +315,8 @@ static int grep_dir(const char *dir) /* depthFirst= */ 1, /* fileAction= */ file_action_grep, /* dirAction= */ NULL, - /* userData= */ &matched); + /* userData= */ &matched, + /* depth= */ 0); return matched; } |