Some fixes and such

git-svn-id: svn://busybox.net/trunk/busybox@29 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 8 insertions, 6 deletions

diff --git a/cp.c b/cp.c
index 6ca66e642..4016fc760 100644
--- a/cp.c
+++ b/cp.c
@@ -41,21 +41,24 @@ static int preserveFlag = FALSE;
 static const char *srcName;
 static const char *destName;
 static const char *skipName;
+static int dirFlag = FALSE;
 
 
-static int fileAction(const char *fileName)
+static int fileAction(const char *fileName, struct stat* statbuf)
 {
     char newdestName[NAME_MAX];
     strcpy(newdestName, destName);
-    strcat(newdestName, strstr(fileName, skipName));
+    if (dirFlag==TRUE && newdestName[strlen(newdestName)-1]!= '/' ) {
+        strcat(newdestName, "/");
+        if ( skipName != NULL)
+            strcat(newdestName, strstr(fileName, skipName));
+    }
     return (copyFile(fileName, newdestName, preserveFlag, followLinks));
 }
 
 extern int cp_main(int argc, char **argv)
 {
 
-    int dirFlag;
-
     if (argc < 3) {
         fprintf(stderr, "Usage: %s", cp_usage);
         exit (FALSE);
@@ -91,10 +94,9 @@ extern int cp_main(int argc, char **argv)
 
 
     destName = argv[argc - 1];
-
     dirFlag = isDirectory(destName);
 
-    if ((argc > 3) && !dirFlag) {
+    if ((argc > 3) && dirFlag==FALSE) {
         fprintf(stderr, "%s: not a directory\n", destName);
         exit (FALSE);
     }