Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/cp.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/cp.c (modified) (5 diffs)

branches/2.2.9/mindi-busybox/coreutils/cp.c

@@ -6 +6 @@
  * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -21 +21 @@
 /* This is a NOEXEC applet. Be very careful! */
 
-
-int cp_main(int argc, char **argv);
+int cp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cp_main(int argc, char **argv)
 {
@@ -32 +31 @@
     int d_flags;
     int flags;
-    int status = 0;
+    int status;
     enum {
         OPT_a = 1 << (sizeof(FILEUTILS_CP_OPTSTR)-1),
         OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)),
         OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1),
-        OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
-        OPT_L = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
+        OPT_v = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+        OPT_parents = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
+#endif
     };
 
-    // Soft- and hardlinking don't mix
+    // Need at least two arguments
+    // Soft- and hardlinking doesn't mix
     // -P and -d are the same (-P is POSIX, -d is GNU)
     // -r and -R are the same
+    // -R (and therefore -r) turns on -d (coreutils does this)
     // -a = -pdR
-    opt_complementary = "l--s:s--l:Pd:rR:apdR";
-    flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHL");
-    /* Default behavior of cp is to dereference, so we don't have to do
-     * anything special when we are given -L.
-     * The behavior of -H is *almost* like -L, but not quite, so let's
-     * just ignore it too for fun.
-    if (flags & OPT_L) ...
-    if (flags & OPT_H) ... // deref command-line params only
-    */
+    opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR";
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+    applet_long_options =
+        "archive\0"        No_argument "a"
+        "force\0"          No_argument "f"
+        "interactive\0"    No_argument "i"
+        "link\0"           No_argument "l"
+        "dereference\0"    No_argument "L"
+        "no-dereference\0" No_argument "P"
+        "recursive\0"      No_argument "R"
+        "symbolic-link\0"  No_argument "s"
+        "verbose\0"        No_argument "v"
+        "parents\0"        No_argument "\xff"
+        ;
+#endif
+    // -v (--verbose) is ignored
+    flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPv");
+    /* Options of cp from GNU coreutils 6.10:
+     * -a, --archive
+     * -f, --force
+     * -i, --interactive
+     * -l, --link
+     * -L, --dereference
+     * -P, --no-dereference
+     * -R, -r, --recursive
+     * -s, --symbolic-link
+     * -v, --verbose
+     * -H   follow command-line symbolic links in SOURCE
+     * -d   same as --no-dereference --preserve=links
+     * -p   same as --preserve=mode,ownership,timestamps
+     * -c   same as --preserve=context
+     * --parents
+     *  use full source file name under DIRECTORY
+     * NOT SUPPORTED IN BBOX:
+     * --backup[=CONTROL]
+     *  make a backup of each existing destination file
+     * -b   like --backup but does not accept an argument
+     * --copy-contents
+     *  copy contents of special files when recursive
+     * --preserve[=ATTR_LIST]
+     *  preserve attributes (default: mode,ownership,timestamps),
+     *  if possible additional attributes: security context,links,all
+     * --no-preserve=ATTR_LIST
+     * --remove-destination
+     *  remove  each existing destination file before attempting to open
+     * --sparse=WHEN
+     *  control creation of sparse files
+     * --strip-trailing-slashes
+     *  remove any trailing slashes from each SOURCE argument
+     * -S, --suffix=SUFFIX
+     *  override the usual backup suffix
+     * -t, --target-directory=DIRECTORY
+     *  copy all SOURCE arguments into DIRECTORY
+     * -T, --no-target-directory
+     *  treat DEST as a normal file
+     * -u, --update
+     *  copy only when the SOURCE file is newer than the destination
+     *  file or when the destination file is missing
+     * -x, --one-file-system
+     *  stay on this file system
+     * -Z, --context=CONTEXT
+     *  (SELinux) set SELinux security context of copy to CONTEXT
+     */
+    argc -= optind;
+    argv += optind;
+    /* Reverse this bit. If there is -d, bit is not set: */
+    flags ^= FILEUTILS_DEREFERENCE;
+    /* coreutils 6.9 compat:
+     * by default, "cp" derefs symlinks (creates regular dest files),
+     * but "cp -R" does not. We switch off deref if -r or -R (see above).
+     * However, "cp -RL" must still deref symlinks: */
+    if (flags & FILEUTILS_DEREF_SOFTLINK) /* -L */
+        flags |= FILEUTILS_DEREFERENCE;
 
 #if ENABLE_SELINUX
@@ -61 +128 @@
 #endif
 
-    flags ^= FILEUTILS_DEREFERENCE;     /* The sense of this flag was reversed. */
-
-    if (optind + 2 > argc) {
-        bb_show_usage();
-    }
-
+    status = EXIT_SUCCESS;
     last = argv[argc - 1];
-    argv += optind;
-
     /* If there are only two arguments and...  */
-    if (optind + 2 == argc) {
+    if (argc == 2) {
         s_flags = cp_mv_stat2(*argv, &source_stat,
-                      (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
+                (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
         if (s_flags < 0)
             return EXIT_FAILURE;
@@ -80 +140 @@
             return EXIT_FAILURE;
 
-        /* ...if neither is a directory or...  */
-        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)
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+        if (flags & OPT_parents) {
+            if (!(d_flags & 2)) {
+                bb_error_msg_and_die("with --parents, the destination must be a directory");
+            }
+        }
+#endif
+
+        /* ...if neither is a directory...  */
+        if (!((s_flags | d_flags) & 2)
+            /* ...or: recursing, the 1st is a directory, and the 2nd doesn't exist... */
+         || ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags)
         ) {
-            /* ...do a simple copy.  */
-            dest = xstrdup(last);
-            goto DO_COPY; /* Note: optind+2==argc implies argv[1]==last below. */
+            /* Do a simple copy */
+            dest = last;
+            goto DO_COPY; /* NB: argc==2 -> *++argv==last */
         }
     }
 
-    do {
-        dest = concat_path_file(last, bb_get_last_path_component(*argv));
+    while (1) {
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+        if (flags & OPT_parents) {
+            char *dest_dup;
+            char *dest_dir;
+            dest = concat_path_file(last, *argv);
+            dest_dup = xstrdup(dest);
+            dest_dir = dirname(dest_dup);
+            if (bb_make_directory(dest_dir, -1, FILEUTILS_RECUR)) {
+                return EXIT_FAILURE;
+            }
+            free(dest_dup);
+            goto DO_COPY;
+        }
+#endif
+        dest = concat_path_file(last, bb_get_last_path_component_strip(*argv));
  DO_COPY:
         if (copy_file(*argv, dest, flags) < 0) {
-            status = 1;
+            status = EXIT_FAILURE;
         }
+        if (*++argv == last) {
+            /* possibly leaking dest... */
+            break;
+        }
+        /* don't move up: dest may be == last and not malloced! */
         free((void*)dest);
-    } while (*++argv != last);
+    }
 
+    /* Exit. We are NOEXEC, not NOFORK. We do exit at the end of main() */
     return status;
 }