cp: implement -T

Implement "cp -T". Some Linux kernel Makefiles started using this recently,
so allow also building on systems using busybox cp.

function                                             old     new   delta
cp_main                                              360     428     +68
copy_file                                           1678    1676      -2
packed_usage                                       32290   32259     -31
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 76/-39)             Total: 35 bytes

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 5b34c27e7c27e4677c28e46e9815bd3e0917a32e..a76af7b7c4a7984c07556699598cf113023367f6 100644 (file)
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -47,6 +47,7 @@
 //usage:     "\n       -f      Overwrite"
 //usage:     "\n       -i      Prompt before overwrite"
 //usage:     "\n       -l,-s   Create (sym)links"
+//usage:     "\n       -T      Treat DEST as a normal file"
 //usage:     "\n       -u      Copy only newer files"
 
 #include "libbb.h"
@@ -92,6 +93,7 @@ int cp_main(int argc, char **argv)
                "no-dereference\0" No_argument "P"
                "recursive\0"      No_argument "R"
                "symbolic-link\0"  No_argument "s"
+               "no-target-directory\0" No_argument "T"
                "verbose\0"        No_argument "v"
                "update\0"         No_argument "u"
                "remove-destination\0" No_argument "\xff"
@@ -121,6 +123,8 @@ int cp_main(int argc, char **argv)
         *      remove each existing destination file before attempting to open
         * --parents
         *      use full source file name under DIRECTORY
+        * -T, --no-target-directory
+        *      treat DEST as a normal file
         * NOT SUPPORTED IN BBOX:
         * --backup[=CONTROL]
         *      make a backup of each existing destination file
@@ -139,8 +143,6 @@ int cp_main(int argc, char **argv)
         *      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
         * -x, --one-file-system
         *      stay on this file system
         * -Z, --context=CONTEXT
@@ -175,6 +177,12 @@ int cp_main(int argc, char **argv)
                if (d_flags < 0)
                        return EXIT_FAILURE;
 
+               if (flags & FILEUTILS_NO_TARGET_DIR) { /* -T */
+                       if (!(s_flags & 2) && (d_flags & 2))
+                               /* cp -T NOTDIR DIR */
+                               bb_error_msg_and_die("'%s' is a directory", last);
+               }
+
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
                //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
                //      flags, FILEUTILS_RMDEST, OPT_parents);
@@ -192,11 +200,14 @@ int cp_main(int argc, char **argv)
                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)
+                || (flags & FILEUTILS_NO_TARGET_DIR)
                ) {
                        /* Do a simple copy */
                        dest = last;
                        goto DO_COPY; /* NB: argc==2 -> *++argv==last */
                }
+       } else if (flags & FILEUTILS_NO_TARGET_DIR) {
+               bb_error_msg_and_die("too many arguments");
        }
 
        while (1) {

diff --git a/include/libbb.h b/include/libbb.h
index daccf154a339a005210f4a3bec8ff7b0ba3af1a0..1dbec3d0fd34c69ca667c82dff7e7539dc6ffb53 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -404,10 +404,11 @@ enum {    /* cp.c, mv.c, install.c depend on these values. CAREFUL when changing th
        /* -P = -d   (mapped in cp.c) */
        FILEUTILS_VERBOSE         = (1 << 12) * ENABLE_FEATURE_VERBOSE, /* -v */
        FILEUTILS_UPDATE          = 1 << 13, /* -u */
+       FILEUTILS_NO_TARGET_DIR   = 1 << 14, /* -T */
 #if ENABLE_SELINUX
-       FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 14, /* -c */
+       FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 15, /* -c */
 #endif
-       FILEUTILS_RMDEST          = 1 << (15 - !ENABLE_SELINUX), /* --remove-destination */
+       FILEUTILS_RMDEST          = 1 << (16 - !ENABLE_SELINUX), /* --remove-destination */
        /*
         * Hole. cp may have some bits set here,
         * they should not affect remove_file()/copy_file()
@@ -417,7 +418,7 @@ enum {      /* cp.c, mv.c, install.c depend on these values. CAREFUL when changing th
 #endif
        FILEUTILS_IGNORE_CHMOD_ERR = 1 << 31,
 };
-#define FILEUTILS_CP_OPTSTR "pdRfilsLHarPvu" IF_SELINUX("c")
+#define FILEUTILS_CP_OPTSTR "pdRfilsLHarPvuT" IF_SELINUX("c")
 extern int remove_file(const char *path, int flags) FAST_FUNC;
 /* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
  * the source, not copy (unless "source" is a directory).