Jean Wolter writes:

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

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 82d43adff625824fcc98ef535333797be8a840a9..6a82f6bffcc61a4257eb2600ec351d44f469cb89 100644 (file)
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -2,7 +2,6 @@
 /*
  * Mini cp implementation for busybox
  *
- *
  * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,6 +20,15 @@
  *
  */
 
+/* BB_AUDIT SUSv3 defects - unsupported options -H, -L, and -P. */
+/* BB_AUDIT GNU defects - only extension options supported are -a and -d.  */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/cp.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Size reduction.
+ */
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -29,86 +37,83 @@
 #include <errno.h>
 #include <dirent.h>
 #include <stdlib.h>
-
+#include <assert.h>
 #include "busybox.h"
+#include "libcoreutils/coreutils.h"
+
+/* WARNING!! ORDER IS IMPORTANT!! */
+static const char cp_opts[] = "pdRfiar";
 
 extern int cp_main(int argc, char **argv)
 {
+       struct stat source_stat;
+       struct stat dest_stat;
+       const char *last;
+       const char *dest;
+       int s_flags;
+       int d_flags;
+       int flags;
        int status = 0;
-       int opt;
-       int flags = 0;
-       int i;
 
-       while ((opt = getopt(argc, argv, "adfipR")) != -1)
-               switch (opt) {
-               case 'a':
-                       flags |= FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR;
-                       /* fallthrough */
-               case 'd':
-                       flags |= FILEUTILS_PRESERVE_SYMLINKS;
-                       break;
-               case 'f':
-                       flags |= FILEUTILS_FORCE;
-                       break;
-               case 'i':
-                       flags |= FILEUTILS_INTERACTIVE;
-                       break;
-               case 'p':
-                       flags |= FILEUTILS_PRESERVE_STATUS;
-                       break;
-               case 'R':
-                       flags |= FILEUTILS_RECUR;
-                       break;
-               default:
-                       show_usage();
-               }
-       
-       if (optind + 2 > argc)
-               show_usage();
+       /* Since these are enums, #if tests will not work.  So use assert()s. */
+       assert(FILEUTILS_PRESERVE_STATUS == 1);
+       assert(FILEUTILS_DEREFERENCE == 2);
+       assert(FILEUTILS_RECUR == 4);
+       assert(FILEUTILS_FORCE == 8);
+       assert(FILEUTILS_INTERACTIVE == 16);
 
-       /* If there are only two arguments and...  */
-       if (optind + 2 == argc) {
-               struct stat source_stat;
-               struct stat dest_stat;
-               int source_exists = 1;
-               int dest_exists = 1;
+       flags = bb_getopt_ulflags(argc, argv, cp_opts);
 
-               if (((flags & FILEUTILS_PRESERVE_SYMLINKS) &&
-                               lstat(argv[optind], &source_stat) < 0) ||
-                               (!(flags & FILEUTILS_PRESERVE_SYMLINKS) &&
-                                stat(argv[optind], &source_stat))) {
-                       if (errno != ENOENT)
-                               perror_msg_and_die("unable to stat `%s'", argv[optind]);
-                       source_exists = 0;
-               }
+       if (flags & 32) {
+               flags |= (FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR | FILEUTILS_DEREFERENCE);
+       }
+       if (flags & 64) {
+               /* Make -r a synonym for -R,
+                * -r was marked as obsolete in SUSv3, but is included for compatability
+                */
+               flags |= FILEUTILS_RECUR;
+       }
+
+       flags ^= FILEUTILS_DEREFERENCE;         /* The sense of this flag was reversed. */
+
+       if (optind + 2 > argc) {
+               bb_show_usage();
+       }
 
-               if (stat(argv[optind + 1], &dest_stat) < 0) {
-                       if (errno != ENOENT)
-                               perror_msg_and_die("unable to stat `%s'", argv[optind + 1]);
-                       dest_exists = 0;
+       last = argv[argc - 1];
+       argv += optind;
+
+       /* If there are only two arguments and...  */
+       if (optind + 2 == argc) {
+               s_flags = cp_mv_stat2(*argv, &source_stat,
+                                                                (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
+               if ((s_flags < 0) || ((d_flags = cp_mv_stat(last, &dest_stat)) < 0)) {
+                       exit(EXIT_FAILURE);
                }
-               
                /* ...if neither is a directory or...  */
-               if (((!source_exists || !S_ISDIR(source_stat.st_mode)) &&
-                               (!dest_exists || !S_ISDIR(dest_stat.st_mode))) ||
-                               /* ...recursing, the first is a directory, and the
-                                * second doesn't exist, then... */
-                               ((flags & FILEUTILS_RECUR) && S_ISDIR(source_stat.st_mode) &&
-                                !dest_exists)) {
+               if ( !((s_flags | d_flags) & 2) ||
+                       /* ...recursing, the 1st is a directory, and the 2nd doesn't exist... */
+                       /* ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags) */
+                       /* Simplify the above since FILEUTILS_RECUR >> 1 == 2. */
+                       ((((flags & FILEUTILS_RECUR) >> 1) & s_flags) && !d_flags)
+               ) {
                        /* ...do a simple copy.  */
-                       if (copy_file(argv[optind], argv[optind + 1], flags) < 0)
-                               status = 1;
-                       return status;
+                               dest = last;
+                               goto DO_COPY; /* Note: optind+2==argc implies argv[1]==last below. */
                }
        }
 
-       for (i = optind; i < argc - 1; i++) {
-               char *dest = concat_path_file(argv[argc - 1],
-                               get_last_path_component(argv[i]));
-               if (copy_file(argv[i], dest, flags) < 0)
+       do {
+               dest = concat_path_file(last, bb_get_last_path_component(*argv));
+       DO_COPY:
+               if (copy_file(*argv, dest, flags) < 0) {
                        status = 1;
-               free(dest);
-       }
+               }
+               if (*++argv == last) {
+                       break;
+               }
+               free((void *) dest);
+       } while (1);
 
-       return status;
+       exit(status);
 }