emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cp: implement -T

Browse Source 
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>
This commit is contained in:
Aaro Koskinen 2018-02-01 09:29:05 +01:00 committed by Denys Vlasenko
parent d6f0f03b68
commit d15d7a0a4b
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
coreutils/cp.c
View File

@ -48,6 +48,7 @@
//usage: "\n -f Overwrite" //usage: "\n -f Overwrite"
//usage: "\n -i Prompt before overwrite" //usage: "\n -i Prompt before overwrite"
//usage: "\n -l,-s Create (sym)links" //usage: "\n -l,-s Create (sym)links"
//usage: "\n -T Treat DEST as a normal file"
//usage: "\n -u Copy only newer files" //usage: "\n -u Copy only newer files"
#include "libbb.h" #include "libbb.h"
@ -93,6 +94,7 @@ int cp_main(int argc, char **argv)
"no-dereference\0" No_argument "P" "no-dereference\0" No_argument "P"
"recursive\0" No_argument "R" "recursive\0" No_argument "R"
"symbolic-link\0" No_argument "s" "symbolic-link\0" No_argument "s"
"no-target-directory\0" No_argument "T"
"verbose\0" No_argument "v" "verbose\0" No_argument "v"
"update\0" No_argument "u" "update\0" No_argument "u"
"remove-destination\0" No_argument "\xff" "remove-destination\0" No_argument "\xff"
@ -122,6 +124,8 @@ int cp_main(int argc, char **argv)
* remove each existing destination file before attempting to open * remove each existing destination file before attempting to open
* --parents * --parents
* use full source file name under DIRECTORY * use full source file name under DIRECTORY
* -T, --no-target-directory
* treat DEST as a normal file
* NOT SUPPORTED IN BBOX: * NOT SUPPORTED IN BBOX:
* --backup[=CONTROL] * --backup[=CONTROL]
* make a backup of each existing destination file * make a backup of each existing destination file
@ -140,8 +144,6 @@ int cp_main(int argc, char **argv)
* override the usual backup suffix * override the usual backup suffix
* -t, --target-directory=DIRECTORY * -t, --target-directory=DIRECTORY
* copy all SOURCE arguments into DIRECTORY * copy all SOURCE arguments into DIRECTORY
* -T, --no-target-directory
* treat DEST as a normal file
* -x, --one-file-system * -x, --one-file-system
* stay on this file system * stay on this file system
* -Z, --context=CONTEXT * -Z, --context=CONTEXT
@ -176,6 +178,12 @@ int cp_main(int argc, char **argv)
if (d_flags < 0) if (d_flags < 0)
return EXIT_FAILURE; 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 #if ENABLE_FEATURE_CP_LONG_OPTIONS
//bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x", //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
// flags, FILEUTILS_RMDEST, OPT_parents); // flags, FILEUTILS_RMDEST, OPT_parents);
@ -193,11 +201,14 @@ int cp_main(int argc, char **argv)
if (!((s_flags | d_flags) & 2) if (!((s_flags | d_flags) & 2)
/* ...or: recursing, the 1st is a directory, and the 2nd doesn't exist... */ /* ...or: recursing, the 1st is a directory, and the 2nd doesn't exist... */
|| ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags) || ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags)
|| (flags & FILEUTILS_NO_TARGET_DIR)
) { ) {
/* Do a simple copy */ /* Do a simple copy */
dest = last; dest = last;
goto DO_COPY; /* NB: argc==2 -> *++argv==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) { while (1) {

7
include/libbb.h
View File

@ -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) */ /* -P = -d (mapped in cp.c) */
FILEUTILS_VERBOSE = (1 << 12) * ENABLE_FEATURE_VERBOSE, /* -v */ FILEUTILS_VERBOSE = (1 << 12) * ENABLE_FEATURE_VERBOSE, /* -v */
FILEUTILS_UPDATE = 1 << 13, /* -u */ FILEUTILS_UPDATE = 1 << 13, /* -u */
FILEUTILS_NO_TARGET_DIR = 1 << 14, /* -T */
#if ENABLE_SELINUX #if ENABLE_SELINUX
FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 14, /* -c */ FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 15, /* -c */
#endif #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, * Hole. cp may have some bits set here,
* they should not affect remove_file()/copy_file() * 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 #endif
FILEUTILS_IGNORE_CHMOD_ERR = 1 << 31, 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; extern int remove_file(const char *path, int flags) FAST_FUNC;
/* NB: without FILEUTILS_RECUR in flags, it will basically "cat" /* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
* the source, not copy (unless "source" is a directory). * the source, not copy (unless "source" is a directory).