More stuff

[oweals/busybox.git] / cp.c

diff --git a/cp.c b/cp.c
index 4016fc7602aac2cc09d49418f9f46a0abcef98cd..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"
@@ -48,7 +48,7 @@ static int fileAction(const char *fileName, struct stat* statbuf)
 {
     char newdestName[NAME_MAX];
     strcpy(newdestName, destName);
-    if (dirFlag==TRUE && newdestName[strlen(newdestName)-1]!= '/' ) {
+    if (dirFlag==TRUE) {
        strcat(newdestName, "/");
        if ( skipName != NULL)
            strcat(newdestName, strstr(fileName, skipName));
@@ -60,8 +60,7 @@ extern int cp_main(int argc, char **argv)
 {
 
     if (argc < 3) {
-       fprintf(stderr, "Usage: %s", cp_usage);
-       exit (FALSE);
+       usage (cp_usage);
     }
     argc--;
     argv++;
@@ -85,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++;
@@ -104,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);
 }