Stuff

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

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 797663d2b9874ebf681311e29a213d400eb5399d..9dac2afbc916c58bc23477bdb205ed771e83fd1a 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,7 +27,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"
@@ -40,58 +42,27 @@ 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 fileAction(const char *fileName)
-{
-    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)
+static int fileAction(const char *fileName, struct stat* statbuf)
 {
     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);
-       }
-    }
-    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);
-       }
-       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);
+    if (dirFlag==TRUE) {
+       strcat(newdestName, "/");
+       if ( skipName != NULL)
+           strcat(newdestName, strstr(fileName, skipName));
     }
-    return TRUE;
+    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);
-       return (FALSE);
+       usage (cp_usage);
     }
     argc--;
     argv++;
@@ -115,8 +86,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 +94,22 @@ 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);
-       return (FALSE);
+       exit (FALSE);
     }
 
-    while (argc-- >= 2) {
+    while (argc-- > 1) {
        srcName = *(argv++);
-       return recursiveAction(srcName, recursiveFlag, followLinks,
-                              fileAction, fileAction);
+       skipName = strrchr(srcName, '/');
+       if (skipName) 
+           skipName++;
+       if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE,
+                              fileAction, fileAction) == FALSE) {
+           exit( FALSE);
+       }
     }
-    return( TRUE);
+    exit( TRUE);
 }