Making note of my changes

[oweals/busybox.git] / cp.c

diff --git a/cp.c b/cp.c
index 9dac2afbc916c58bc23477bdb205ed771e83fd1a..e96012d500fea7916d4b84ae2ad6545ef521a26d 100644 (file)
--- a/cp.c
+++ b/cp.c
@@ -28,12 +28,12 @@
 #include <dirent.h>
 
 static const char cp_usage[] = "cp [OPTION]... SOURCE DEST\n"
-    "   or: cp [OPTION]... SOURCE... DIRECTORY\n"
+    "   or: cp [OPTION]... SOURCE... DIRECTORY\n\n"
     "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
     "\n"
     "\t-a\tsame as -dpR\n"
     "\t-d\tpreserve links\n"
-    "\t-p\tpreserve file attributes if possable\n"
+    "\t-p\tpreserve file attributes if possible\n"
     "\t-R\tcopy directories recursively\n";
 
 
@@ -42,25 +42,39 @@ static int followLinks = FALSE;
 static int preserveFlag = FALSE;
 static const char *srcName;
 static const char *destName;
-static const char *skipName;
-static int dirFlag = FALSE;
-
+static int destDirFlag = FALSE;
+static int srcDirFlag = FALSE;
 
 static int fileAction(const char *fileName, struct stat* statbuf)
 {
     char newdestName[NAME_MAX];
+    char* newsrcName = NULL;
+
     strcpy(newdestName, destName);
-    if (dirFlag==TRUE) {
-       strcat(newdestName, "/");
-       if ( skipName != NULL)
-           strcat(newdestName, strstr(fileName, skipName));
+    if ( srcDirFlag == TRUE ) {
+       if (recursiveFlag!=TRUE ) {
+           fprintf(stderr, "cp: %s: omitting directory\n", srcName);
+           return( TRUE);
+       }
+       strcat(newdestName, strstr(fileName, srcName) + strlen(srcName));
+    } 
+    
+    if (destDirFlag==TRUE && srcDirFlag == FALSE) {
+       if (newdestName[strlen(newdestName)-1] != '/' ) {
+           strcat(newdestName, "/");
+       }
+       newsrcName = strrchr(srcName, '/');
+       if (newsrcName && *newsrcName != '\0')
+           strcat(newdestName, newsrcName);
+       else
+           strcat(newdestName, srcName);
     }
+    
     return (copyFile(fileName, newdestName, preserveFlag, followLinks));
 }
 
 extern int cp_main(int argc, char **argv)
 {
-
     if (argc < 3) {
        usage (cp_usage);
     }
@@ -94,18 +108,16 @@ extern int cp_main(int argc, char **argv)
 
 
     destName = argv[argc - 1];
-    dirFlag = isDirectory(destName);
+    destDirFlag = isDirectory(destName);
 
-    if ((argc > 3) && dirFlag==FALSE) {
+    if ((argc > 3) && destDirFlag==FALSE) {
        fprintf(stderr, "%s: not a directory\n", destName);
        exit (FALSE);
     }
 
     while (argc-- > 1) {
        srcName = *(argv++);
-       skipName = strrchr(srcName, '/');
-       if (skipName) 
-           skipName++;
+       srcDirFlag = isDirectory(srcName);
        if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE,
                               fileAction, fileAction) == FALSE) {
            exit( FALSE);