diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/chmod.c | 2 | ||||
-rw-r--r-- | coreutils/chown.c | 13 | ||||
-rw-r--r-- | coreutils/diff.c | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/coreutils/chmod.c b/coreutils/chmod.c index 11c6731a1..9a73218a1 100644 --- a/coreutils/chmod.c +++ b/coreutils/chmod.c | |||
@@ -101,8 +101,6 @@ int chmod_main(int argc, char **argv) | |||
101 | do { | 101 | do { |
102 | if (!recursive_action(*argv, | 102 | if (!recursive_action(*argv, |
103 | OPT_RECURSE, // recurse | 103 | OPT_RECURSE, // recurse |
104 | FALSE, // follow links: coreutils doesn't | ||
105 | FALSE, // depth first | ||
106 | fileAction, // file action | 104 | fileAction, // file action |
107 | fileAction, // dir action | 105 | fileAction, // dir action |
108 | smode, // user data | 106 | smode, // user data |
diff --git a/coreutils/chown.c b/coreutils/chown.c index f92299e36..09b1a595b 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c | |||
@@ -92,13 +92,12 @@ int chown_main(int argc, char **argv) | |||
92 | } | 92 | } |
93 | 93 | ||
94 | if (!recursive_action(arg, | 94 | if (!recursive_action(arg, |
95 | OPT_RECURSE, // recurse | 95 | (OPT_RECURSE ? action_recurse : 0 | /* recurse */ |
96 | OPT_TRAVERSE, // follow links if -L | 96 | OPT_TRAVERSE ? action_followLinks : 0),/* follow links if -L */ |
97 | FALSE, // depth first | 97 | fileAction, /* file action */ |
98 | fileAction, // file action | 98 | fileAction, /* dir action */ |
99 | fileAction, // dir action | 99 | chown_func, /* user data */ |
100 | chown_func, // user data | 100 | 0) /* depth */ |
101 | 0) // depth | ||
102 | ) { | 101 | ) { |
103 | retval = EXIT_FAILURE; | 102 | retval = EXIT_FAILURE; |
104 | } | 103 | } |
diff --git a/coreutils/diff.c b/coreutils/diff.c index 911bfcf4d..1903bb151 100644 --- a/coreutils/diff.c +++ b/coreutils/diff.c | |||
@@ -1079,7 +1079,8 @@ 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, TRUE, TRUE, FALSE, add_to_dirlist, NULL, | 1082 | recursive_action(path, action_recurse|action_followLinks, |
1083 | add_to_dirlist, NULL, | ||
1083 | (void*)(strlen(path)+1), 0); | 1084 | (void*)(strlen(path)+1), 0); |
1084 | } else { | 1085 | } else { |
1085 | DIR *dp; | 1086 | DIR *dp; |