Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/cp.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/cp.c (modified) (7 diffs)

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

@@ -32 +32 @@
 //usage:     "\n    -i  Prompt before overwrite"
 //usage:     "\n    -l,-s   Create (sym)links"
+//usage:     "\n    -u  Copy only newer files"
 
 #include "libbb.h"
@@ -50 +51 @@
     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_v = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
-#if ENABLE_FEATURE_CP_LONG_OPTIONS
-        OPT_parents = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
+        FILEUTILS_CP_OPTNUM = sizeof(FILEUTILS_CP_OPTSTR)-1,
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+        /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTNUM */
+        OPT_parents = 1 << (FILEUTILS_CP_OPTNUM+1),
 #endif
     };
@@ -77 +76 @@
         "symbolic-link\0"  No_argument "s"
         "verbose\0"        No_argument "v"
-        "parents\0"        No_argument "\xff"
+        "update\0"         No_argument "u"
+        "remove-destination\0" No_argument "\xff"
+        "parents\0"        No_argument "\xfe"
         ;
 #endif
-    // -v (--verbose) is ignored
-    flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPv");
+    flags = getopt32(argv, FILEUTILS_CP_OPTSTR);
     /* Options of cp from GNU coreutils 6.10:
      * -a, --archive
@@ -96 +96 @@
      * -p   same as --preserve=mode,ownership,timestamps
      * -c   same as --preserve=context
+     * -u, --update
+     *  copy only when the SOURCE file is newer than the destination
+     *  file or when the destination file is missing
+     * --remove-destination
+     *  remove each existing destination file before attempting to open
      * --parents
      *  use full source file name under DIRECTORY
@@ -108 +113 @@
      *  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
@@ -120 +123 @@
      * -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
@@ -158 +158 @@
 
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
+        //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
+        //  flags, FILEUTILS_RMDEST, OPT_parents);
         if (flags & OPT_parents) {
             if (!(d_flags & 2)) {
                 bb_error_msg_and_die("with --parents, the destination must be a directory");
             }
+        }
+        if (flags & FILEUTILS_RMDEST) {
+            flags |= FILEUTILS_FORCE;
         }
 #endif