diff options
Diffstat (limited to 'cp_mv.c')
-rw-r--r-- | cp_mv.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -70,6 +70,7 @@ static const char *cp_mv_usage[] = /* .rodata */ | |||
70 | static int recursiveFlag; | 70 | static int recursiveFlag; |
71 | static int followLinks; | 71 | static int followLinks; |
72 | static int preserveFlag; | 72 | static int preserveFlag; |
73 | static int forceFlag; | ||
73 | 74 | ||
74 | static const char *baseSrcName; | 75 | static const char *baseSrcName; |
75 | static int srcDirFlag; | 76 | static int srcDirFlag; |
@@ -167,7 +168,7 @@ cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk) | |||
167 | add_to_ino_dev_hashtable(statbuf, destName); | 168 | add_to_ino_dev_hashtable(statbuf, destName); |
168 | } | 169 | } |
169 | } | 170 | } |
170 | return copyFile(fileName, destName, preserveFlag, followLinks); | 171 | return copyFile(fileName, destName, preserveFlag, followLinks, forceFlag); |
171 | } | 172 | } |
172 | 173 | ||
173 | static int | 174 | static int |
@@ -200,7 +201,7 @@ extern int cp_mv_main(int argc, char **argv) | |||
200 | argv++; | 201 | argv++; |
201 | 202 | ||
202 | if (dz_i == is_cp) { | 203 | if (dz_i == is_cp) { |
203 | recursiveFlag = preserveFlag = FALSE; | 204 | recursiveFlag = preserveFlag = forceFlag = FALSE; |
204 | followLinks = TRUE; | 205 | followLinks = TRUE; |
205 | while (**argv == '-') { | 206 | while (**argv == '-') { |
206 | while (*++(*argv)) { | 207 | while (*++(*argv)) { |
@@ -220,7 +221,7 @@ extern int cp_mv_main(int argc, char **argv) | |||
220 | recursiveFlag = TRUE; | 221 | recursiveFlag = TRUE; |
221 | break; | 222 | break; |
222 | case 'f': | 223 | case 'f': |
223 | /* for compatibility; busybox cp/mv always does force */ | 224 | forceFlag = TRUE; |
224 | break; | 225 | break; |
225 | default: | 226 | default: |
226 | usage(cp_mv_usage[is_cp]); | 227 | usage(cp_mv_usage[is_cp]); |