aboutsummaryrefslogtreecommitdiff
path: root/coreutils/cp.c
diff options
context:
space:
mode:
authorErik Andersen <andersen@codepoet.org>2000-01-08 21:16:29 +0000
committerErik Andersen <andersen@codepoet.org>2000-01-08 21:16:29 +0000
commit1dbc17f630fa92e2ee3ac0f1e2bccb6adf6f9032 (patch)
treef86b3ad6f14114543da369473d0f4b20a4fdc436 /coreutils/cp.c
parent5338ce19c873e7fc2a312eb0fd6443514b5cdb05 (diff)
downloadbusybox-w32-1dbc17f630fa92e2ee3ac0f1e2bccb6adf6f9032.tar.gz
busybox-w32-1dbc17f630fa92e2ee3ac0f1e2bccb6adf6f9032.tar.bz2
busybox-w32-1dbc17f630fa92e2ee3ac0f1e2bccb6adf6f9032.zip
Fix cp and mv so 'cp foo/README bar' where foo and bar are directories,
and README is a file. -Erik
Diffstat (limited to 'coreutils/cp.c')
-rw-r--r--coreutils/cp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 4af73c274..e96012d50 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -48,6 +48,7 @@ static int srcDirFlag = FALSE;
48static int fileAction(const char *fileName, struct stat* statbuf) 48static int fileAction(const char *fileName, struct stat* statbuf)
49{ 49{
50 char newdestName[NAME_MAX]; 50 char newdestName[NAME_MAX];
51 char* newsrcName = NULL;
51 52
52 strcpy(newdestName, destName); 53 strcpy(newdestName, destName);
53 if ( srcDirFlag == TRUE ) { 54 if ( srcDirFlag == TRUE ) {
@@ -62,7 +63,11 @@ static int fileAction(const char *fileName, struct stat* statbuf)
62 if (newdestName[strlen(newdestName)-1] != '/' ) { 63 if (newdestName[strlen(newdestName)-1] != '/' ) {
63 strcat(newdestName, "/"); 64 strcat(newdestName, "/");
64 } 65 }
65 strcat(newdestName, srcName); 66 newsrcName = strrchr(srcName, '/');
67 if (newsrcName && *newsrcName != '\0')
68 strcat(newdestName, newsrcName);
69 else
70 strcat(newdestName, srcName);
66 } 71 }
67 72
68 return (copyFile(fileName, newdestName, preserveFlag, followLinks)); 73 return (copyFile(fileName, newdestName, preserveFlag, followLinks));