aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-08 10:52:28 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-08 10:52:28 +0000
commit2f52663264c7c37d578e72f532f01b9fd9cd7ebc (patch)
tree98df39594da2e7f1fbe560aec04eeb09426947f0 /coreutils
parent1b3f1d1383f39b07eac82cafadab811e7a21d96c (diff)
downloadbusybox-w32-2f52663264c7c37d578e72f532f01b9fd9cd7ebc.tar.gz
busybox-w32-2f52663264c7c37d578e72f532f01b9fd9cd7ebc.tar.bz2
busybox-w32-2f52663264c7c37d578e72f532f01b9fd9cd7ebc.zip
find: fix handling of -prune
recursive_actions: uppercase flag constants git-svn-id: svn://busybox.net/trunk/busybox@18362 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/chown.c4
-rw-r--r--coreutils/diff.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 09b1a595b..e64a39c3e 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -92,8 +92,8 @@ int chown_main(int argc, char **argv)
92 } 92 }
93 93
94 if (!recursive_action(arg, 94 if (!recursive_action(arg,
95 (OPT_RECURSE ? action_recurse : 0 | /* recurse */ 95 (OPT_RECURSE ? ACTION_RECURSE : 0) | /* recurse */
96 OPT_TRAVERSE ? action_followLinks : 0),/* follow links if -L */ 96 (OPT_TRAVERSE ? ACTION_FOLLOWLINKS : 0),/* follow links if -L */
97 fileAction, /* file action */ 97 fileAction, /* file action */
98 fileAction, /* dir action */ 98 fileAction, /* dir action */
99 chown_func, /* user data */ 99 chown_func, /* user data */
diff --git a/coreutils/diff.c b/coreutils/diff.c
index 75557187c..09cacbde6 100644
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -1079,7 +1079,7 @@ static char **get_dir(char *path)
1079 * add_to_dirlist then removes root dir prefix. */ 1079 * add_to_dirlist then removes root dir prefix. */
1080 1080
1081 if (option_mask32 & FLAG_r) { 1081 if (option_mask32 & FLAG_r) {
1082 recursive_action(path, action_recurse|action_followLinks, 1082 recursive_action(path, ACTION_RECURSE|ACTION_FOLLOWLINKS,
1083 add_to_dirlist, NULL, 1083 add_to_dirlist, NULL,
1084 (void*)(strlen(path)+1), 0); 1084 (void*)(strlen(path)+1), 0);
1085 } else { 1085 } else {