aboutsummaryrefslogtreecommitdiff
path: root/cp_mv.c
diff options
context:
space:
mode:
authorerik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-03-28 00:58:14 +0000
committererik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-03-28 00:58:14 +0000
commit040468363becb832f77036a5de1276d9fdd34e13 (patch)
tree36b57afb6f3eefcdc8fdaf40e51fa6956264db50 /cp_mv.c
parent943443ecbd7fb41f08fe551aa7695a3ae7a9eb3d (diff)
downloadbusybox-w32-040468363becb832f77036a5de1276d9fdd34e13.tar.gz
busybox-w32-040468363becb832f77036a5de1276d9fdd34e13.tar.bz2
busybox-w32-040468363becb832f77036a5de1276d9fdd34e13.zip
Yet another installment in the ongoing tar saga
-Erik git-svn-id: svn://busybox.net/trunk/busybox@424 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'cp_mv.c')
-rw-r--r--cp_mv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cp_mv.c b/cp_mv.c
index 8dbc4e8f1..72b0791c2 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -105,7 +105,7 @@ fill_baseDest_buf(char *_buf, size_t * _buflen) {
105} 105}
106 106
107static int 107static int
108cp_mv_Action(const char *fileName, struct stat *statbuf) 108cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk)
109{ 109{
110 char destName[PATH_MAX + 1]; 110 char destName[PATH_MAX + 1];
111 size_t destLen; 111 size_t destLen;
@@ -165,7 +165,7 @@ cp_mv_Action(const char *fileName, struct stat *statbuf)
165} 165}
166 166
167static int 167static int
168rm_Action(const char *fileName, struct stat *statbuf) 168rm_Action(const char *fileName, struct stat *statbuf, void* junk)
169{ 169{
170 int status = TRUE; 170 int status = TRUE;
171 171
@@ -310,11 +310,11 @@ extern int cp_mv_main(int argc, char **argv)
310 mv_Action_first_time = 1; 310 mv_Action_first_time = 1;
311 if (recursiveAction(baseSrcName, 311 if (recursiveAction(baseSrcName,
312 recursiveFlag, followLinks, FALSE, 312 recursiveFlag, followLinks, FALSE,
313 cp_mv_Action, cp_mv_Action) == FALSE) goto exit_false; 313 cp_mv_Action, cp_mv_Action, NULL) == FALSE) goto exit_false;
314 if (dz_i == is_mv && 314 if (dz_i == is_mv &&
315 recursiveAction(baseSrcName, 315 recursiveAction(baseSrcName,
316 recursiveFlag, followLinks, TRUE, 316 recursiveFlag, followLinks, TRUE,
317 rm_Action, rm_Action) == FALSE) goto exit_false; 317 rm_Action, rm_Action, NULL) == FALSE) goto exit_false;
318 } 318 }
319 if (flags_memo) 319 if (flags_memo)
320 *(baseDestName + baseDestLen) = '\0'; 320 *(baseDestName + baseDestLen) = '\0';