More stuff

[oweals/busybox.git] / cp.c

diff --git a/cp.c b/cp.c
index 6ca66e642c8a14a75b50c021c2f442299f803d3b..34c12922dbbfbfe53d7fd99200e1b3b1b75e4725 100644 (file)
--- a/cp.c
+++ b/cp.c
@@ -25,7 +25,7 @@
 #include <utime.h>
 #include <dirent.h>
 
-const char cp_usage[] = "cp [OPTION]... SOURCE DEST\n"
+static const char cp_usage[] = "cp [OPTION]... SOURCE DEST\n"
     "   or: cp [OPTION]... SOURCE... DIRECTORY\n"
     "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
     "\n"
@@ -41,24 +41,26 @@ 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) {
+       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);
+       usage (cp_usage);
     }
     argc--;
     argv++;
@@ -82,8 +84,7 @@ extern int cp_main(int argc, char **argv)
                recursiveFlag = TRUE;
                break;
            default:
-               fprintf(stderr, "Usage: %s\n", cp_usage);
-               exit(FALSE);
+               usage (cp_usage);
            }
        argc--;
        argv++;
@@ -91,10 +92,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);
     }
@@ -102,10 +102,12 @@ extern int cp_main(int argc, char **argv)
     while (argc-- > 1) {
        srcName = *(argv++);
        skipName = strrchr(srcName, '/');
-       if (skipName) skipName++;
-       if (recursiveAction(srcName, recursiveFlag, followLinks,
-                              fileAction, fileAction) == FALSE)
+       if (skipName) 
+           skipName++;
+       if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE,
+                              fileAction, fileAction) == FALSE) {
            exit( FALSE);
+       }
     }
     exit( TRUE);
 }