aboutsummaryrefslogtreecommitdiff
path: root/cp_mv.c
diff options
context:
space:
mode:
Diffstat (limited to 'cp_mv.c')
-rw-r--r--cp_mv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cp_mv.c b/cp_mv.c
index ae35bca19..ac1e71b82 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -70,6 +70,7 @@ static const char *cp_mv_usage[] = /* .rodata */
70static int recursiveFlag; 70static int recursiveFlag;
71static int followLinks; 71static int followLinks;
72static int preserveFlag; 72static int preserveFlag;
73static int forceFlag;
73 74
74static const char *baseSrcName; 75static const char *baseSrcName;
75static int srcDirFlag; 76static 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
173static int 174static 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]);