aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 23:42:25 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 23:42:25 +0000
commit8c35d65c43216bb840326ac7476a180e2ae36fe9 (patch)
tree13d20b31e817dcff5124498ca0bec2cdf9781014 /findutils
parente80e2a3660bf09cc549cb2dfd2bdeb77ccde1231 (diff)
downloadbusybox-w32-8c35d65c43216bb840326ac7476a180e2ae36fe9.tar.gz
busybox-w32-8c35d65c43216bb840326ac7476a180e2ae36fe9.tar.bz2
busybox-w32-8c35d65c43216bb840326ac7476a180e2ae36fe9.zip
recursive_action: add depth param
chmod: match coreutils versus following links
Diffstat (limited to 'findutils')
-rw-r--r--findutils/find.c6
-rw-r--r--findutils/grep.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/findutils/find.c b/findutils/find.c
index 62cb5d7eb..8618f3a97 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -56,7 +56,7 @@ static int num_matches;
56static int exec_opt; 56static int exec_opt;
57#endif 57#endif
58 58
59static int fileAction(const char *fileName, struct stat *statbuf, void* junk) 59static int fileAction(const char *fileName, struct stat *statbuf, void* junk, int depth)
60{ 60{
61#ifdef CONFIG_FEATURE_FIND_XDEV 61#ifdef CONFIG_FEATURE_FIND_XDEV
62 if (S_ISDIR(statbuf->st_mode) && xdev_count) { 62 if (S_ISDIR(statbuf->st_mode) && xdev_count) {
@@ -307,12 +307,12 @@ int find_main(int argc, char **argv)
307 307
308 if (firstopt == 1) { 308 if (firstopt == 1) {
309 if (!recursive_action(".", TRUE, dereference, FALSE, fileAction, 309 if (!recursive_action(".", TRUE, dereference, FALSE, fileAction,
310 fileAction, NULL)) 310 fileAction, NULL, 0))
311 status = EXIT_FAILURE; 311 status = EXIT_FAILURE;
312 } else { 312 } else {
313 for (i = 1; i < firstopt; i++) { 313 for (i = 1; i < firstopt; i++) {
314 if (!recursive_action(argv[i], TRUE, dereference, FALSE, fileAction, 314 if (!recursive_action(argv[i], TRUE, dereference, FALSE, fileAction,
315 fileAction, NULL)) 315 fileAction, NULL, 0))
316 status = EXIT_FAILURE; 316 status = EXIT_FAILURE;
317 } 317 }
318 } 318 }
diff --git a/findutils/grep.c b/findutils/grep.c
index b76a17a41..8bb38f95c 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -290,7 +290,7 @@ static void load_regexes_from_file(llist_t *fopt)
290} 290}
291 291
292 292
293static int file_action_grep(const char *filename, struct stat *statbuf, void* matched) 293static int file_action_grep(const char *filename, struct stat *statbuf, void* matched, int depth)
294{ 294{
295 FILE *file = fopen(filename, "r"); 295 FILE *file = fopen(filename, "r");
296 if (file == NULL) { 296 if (file == NULL) {
@@ -315,7 +315,8 @@ static int grep_dir(const char *dir)
315 /* depthFirst= */ 1, 315 /* depthFirst= */ 1,
316 /* fileAction= */ file_action_grep, 316 /* fileAction= */ file_action_grep,
317 /* dirAction= */ NULL, 317 /* dirAction= */ NULL,
318 /* userData= */ &matched); 318 /* userData= */ &matched,
319 /* depth= */ 0);
319 return matched; 320 return matched;
320} 321}
321 322