diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-08 10:52:28 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-08 10:52:28 +0000 |
| commit | bbd695d8010ab453a5a89ba6d7ebfe1a96b87b7d (patch) | |
| tree | 98df39594da2e7f1fbe560aec04eeb09426947f0 /coreutils | |
| parent | ca3484103e6b99d0c433988f2f809840d780d88b (diff) | |
| download | busybox-w32-bbd695d8010ab453a5a89ba6d7ebfe1a96b87b7d.tar.gz busybox-w32-bbd695d8010ab453a5a89ba6d7ebfe1a96b87b7d.tar.bz2 busybox-w32-bbd695d8010ab453a5a89ba6d7ebfe1a96b87b7d.zip | |
find: fix handling of -prune
recursive_actions: uppercase flag constants
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/chown.c | 4 | ||||
| -rw-r--r-- | coreutils/diff.c | 2 |
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 { |