X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcp.c;h=1e10f286839035b0ced254c0df02895d47b7b802;hb=2fe08c7afb3ddef42f304e78cb6edfa28e0741ef;hp=4016fc7602aac2cc09d49418f9f46a0abcef98cd;hpb=9b5871888989b16f94cbba5dd304ac444def3afd;p=oweals%2Fbusybox.git

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 4016fc760..1e10f2868 100644
--- 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,28 +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 destExistsFlag = FALSE;
+static int srcDirFlag = FALSE;
 
 static int fileAction(const char *fileName, struct stat* statbuf)
 {
     char newdestName[NAME_MAX];
+
     strcpy(newdestName, destName);
-    if (dirFlag==TRUE && newdestName[strlen(newdestName)-1]!= '/' ) {
-	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, "/");
+	}
+	strcat(newdestName, srcName);
     }
+    
     return (copyFile(fileName, newdestName, preserveFlag, followLinks));
 }
 
 extern int cp_main(int argc, char **argv)
 {
+    struct stat statBuf;
 
     if (argc < 3) {
-	fprintf(stderr, "Usage: %s", cp_usage);
-	exit (FALSE);
+	usage (cp_usage);
     }
     argc--;
     argv++;
@@ -85,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++;
@@ -94,20 +106,24 @@ extern int cp_main(int argc, char **argv)
 
 
     destName = argv[argc - 1];
-    dirFlag = isDirectory(destName);
+    if (stat(destName, &statBuf) >= 0) {
+	destExistsFlag = TRUE;
+	if (S_ISDIR(statBuf.st_mode))
+	    destDirFlag = TRUE;
+    }
 
-    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++;
-	if (recursiveAction(srcName, recursiveFlag, followLinks,
-			       fileAction, fileAction) == FALSE)
+	srcDirFlag = isDirectory(srcName);
+	if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE,
+			       fileAction, fileAction) == FALSE) {
 	    exit( FALSE);
+	}
     }
     exit( TRUE);
 }