commit 1dbc17f630fa92e2ee3ac0f1e2bccb6adf6f9032
author Erik Andersen <andersen@codepoet.org> Sat Jan 08 21:16:29 2000 +0000
committer Erik Andersen <andersen@codepoet.org> Sat Jan 08 21:16:29 2000 +0000
tree f86b3ad6f14114543da369473d0f4b20a4fdc436
parent 5338ce19c873e7fc2a312eb0fd6443514b5cdb05

Fix cp and mv so 'cp foo/README bar' where foo and bar are directories,
and README is a file.
 -Erik

mv.c

diff --git a/mv.c b/mv.c
index 92c40c9..467a360 100644
--- a/mv.c
+++ b/mv.c
@@ -40,6 +40,7 @@
 static int fileAction(const char *fileName, struct stat* statbuf)
 {
     char newdestName[NAME_MAX];
+    char* newsrcName = NULL;
 
     strcpy(newdestName, destName);
     if ( srcDirFlag == TRUE ) {
@@ -50,7 +51,11 @@
 	if (newdestName[strlen(newdestName)-1] != '/' ) {
 	    strcat(newdestName, "/");
 	}
-	strcat(newdestName, srcName);
+	newsrcName = strrchr(srcName, '/');
+	if (newsrcName && *newsrcName != '\0')
+	    strcat(newdestName, newsrcName);
+	else
+	    strcat(newdestName, srcName);
     }
     
     return (copyFile(fileName, newdestName, TRUE, TRUE));