Fixed cp so it works as God intended it to.

[oweals/busybox.git] / coreutils / cp.c

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 4cdfc843b2fcabe67741ee681888e0b863fc511c..1e10f286839035b0ced254c0df02895d47b7b802 100644 (file)
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -1,7 +1,9 @@
 /*
  * Mini cp implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,8 +27,8 @@
 #include <utime.h>
 #include <dirent.h>
 
-const char cp_usage[] = "cp [OPTION]... SOURCE DEST\n"
-    "   or: cp [OPTION]... SOURCE... DIRECTORY\n"
+static const char cp_usage[] = "cp [OPTION]... SOURCE DEST\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"
@@ -40,58 +42,39 @@ static int followLinks = FALSE;
 static int preserveFlag = FALSE;
 static const char *srcName;
 static const char *destName;
+static int destDirFlag = FALSE;
+static int destExistsFlag = FALSE;
+static int srcDirFlag = 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, fileName+(strlen(srcName)));
-    fprintf(stderr, "A: copying %s to %s\n", fileName, newdestName);
-    return (copyFile(fileName, newdestName, preserveFlag, followLinks));
-}
-
-static int dirAction(const char *fileName)
-{
-    char newdestName[NAME_MAX];
-    struct stat statBuf;
-    struct  utimbuf times;
 
     strcpy(newdestName, destName);
-    strcat(newdestName, fileName+(strlen(srcName)));
-    if (stat(newdestName, &statBuf)) {
-       if (mkdir( newdestName, 0777777 ^ umask (0))) {
-           perror(newdestName);
-           return( FALSE);
+    if ( srcDirFlag == TRUE ) {
+       if (recursiveFlag!=TRUE ) {
+           fprintf(stderr, "cp: %s: omitting directory\n", srcName);
+           return( TRUE);
        }
-    }
-    else if (!S_ISDIR (statBuf.st_mode)) {
-       fprintf(stderr, "`%s' exists but is not a directory", newdestName);
-       return( FALSE);
-    }
-    if (preserveFlag==TRUE) {
-       /* Try to preserve premissions, but don't whine on failure */
-       if (stat(newdestName, &statBuf)) {
-           perror(newdestName);
-           return( FALSE);
+       strcat(newdestName, strstr(fileName, srcName) + strlen(srcName));
+    } 
+    
+    if (destDirFlag==TRUE && srcDirFlag == FALSE) {
+       if (newdestName[strlen(newdestName)-1] != '/' ) {
+           strcat(newdestName, "/");
        }
-       chmod(newdestName, statBuf.st_mode);
-       chown(newdestName, statBuf.st_uid, statBuf.st_gid);
-       times.actime = statBuf.st_atime;
-       times.modtime = statBuf.st_mtime;
-       utime(newdestName, &times);
+       strcat(newdestName, srcName);
     }
-    return TRUE;
+    
+    return (copyFile(fileName, newdestName, preserveFlag, followLinks));
 }
 
 extern int cp_main(int argc, char **argv)
 {
-
-    int dirFlag;
+    struct stat statBuf;
 
     if (argc < 3) {
-       fprintf(stderr, "Usage: %s", cp_usage);
-       exit (FALSE);
+       usage (cp_usage);
     }
     argc--;
     argv++;
@@ -115,8 +98,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++;
@@ -124,18 +106,24 @@ extern int cp_main(int argc, char **argv)
 
 
     destName = argv[argc - 1];
+    if (stat(destName, &statBuf) >= 0) {
+       destExistsFlag = TRUE;
+       if (S_ISDIR(statBuf.st_mode))
+           destDirFlag = TRUE;
+    }
 
-    dirFlag = isDirectory(destName);
-
-    if ((argc > 3) && !dirFlag) {
+    if ((argc > 3) && destDirFlag==FALSE) {
        fprintf(stderr, "%s: not a directory\n", destName);
        exit (FALSE);
     }
 
-    while (argc-- >= 2) {
+    while (argc-- > 1) {
        srcName = *(argv++);
-       exit( recursiveAction(srcName, recursiveFlag, followLinks,
-                              fileAction, fileAction));
+       srcDirFlag = isDirectory(srcName);
+       if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE,
+                              fileAction, fileAction) == FALSE) {
+           exit( FALSE);
+       }
     }
     exit( TRUE);
 }