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

mv: implement -t and -T

Browse Source 
function                                             old     new   delta
mv_main                                              496     585     +89
.rodata                                           103188  103242     +54
packed_usage                                       33549   33590     +41
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 184/0)             Total: 184 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-17 12:59:33 +02:00
parent 894466cc51
commit 91bc01c59b
1 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
coreutils/mv.c
View File

@ -23,13 +23,15 @@
//kbuild:lib-$(CONFIG_MV) += mv.o //kbuild:lib-$(CONFIG_MV) += mv.o
//usage:#define mv_trivial_usage //usage:#define mv_trivial_usage
//usage: "[-fin] SOURCE DEST\n" //usage: "[-finT] SOURCE DEST\n"
//usage: "or: mv [-fin] SOURCE... DIRECTORY" //usage: "or: mv [-fin] SOURCE... { -t DIRECTORY | DIRECTORY }"
//usage:#define mv_full_usage "\n\n" //usage:#define mv_full_usage "\n\n"
//usage: "Rename SOURCE to DEST, or move SOURCEs to DIRECTORY\n" //usage: "Rename SOURCE to DEST, or move SOURCEs to DIRECTORY\n"
//usage: "\n -f Don't prompt before overwriting" //usage: "\n -f Don't prompt before overwriting"
//usage: "\n -i Interactive, prompt before overwrite" //usage: "\n -i Interactive, prompt before overwrite"
//usage: "\n -n Don't overwrite an existing file" //usage: "\n -n Don't overwrite an existing file"
//usage: "\n -T Refuse to move if DEST is a directory"
//usage: "\n -t DIR Move all SOURCEs into DIR"
//usage: //usage:
//usage:#define mv_example_usage //usage:#define mv_example_usage
//usage: "$ mv /tmp/foo /bin/bar\n" //usage: "$ mv /tmp/foo /bin/bar\n"
@ -40,7 +42,7 @@
int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int mv_main(int argc, char **argv) int mv_main(int argc, char **argv)
{ {
struct stat dest_stat; struct stat statbuf;
const char *last; const char *last;
const char *dest; const char *dest;
unsigned flags; unsigned flags;
@ -51,41 +53,66 @@ int mv_main(int argc, char **argv)
#define OPT_FORCE (1 << 0) #define OPT_FORCE (1 << 0)
#define OPT_INTERACTIVE (1 << 1) #define OPT_INTERACTIVE (1 << 1)
#define OPT_NOCLOBBER (1 << 2) #define OPT_NOCLOBBER (1 << 2)
#define OPT_VERBOSE ((1 << 3) * ENABLE_FEATURE_VERBOSE) #define OPT_DESTNOTDIR (1 << 3)
/* Need at least two arguments. #define OPT_DESTDIR (1 << 4)
* If more than one of -f, -i, -n is specified , only the final one #define OPT_VERBOSE ((1 << 5) * ENABLE_FEATURE_VERBOSE)
* takes effect (it unsets previous options).
*/
flags = getopt32long(argv, "^" flags = getopt32long(argv, "^"
"finv" "finTt:v"
"\0" "\0"
"-2:f-in:i-fn:n-fi", /* At least one argument. (Usually two+, but -t DIR can have only one) */
"-1"
/* only the final one of -f, -i, -n takes effect */
":f-in:i-fn:n-fi"
/* -t and -T don't mix */
":t--T:T--t",
"interactive\0" No_argument "i" "interactive\0" No_argument "i"
"force\0" No_argument "f" "force\0" No_argument "f"
"no-clobber\0" No_argument "n" "no-clobber\0" No_argument "n"
"no-target-directory\0" No_argument "T"
"target-directory\0" Required_argument "t"
IF_FEATURE_VERBOSE( IF_FEATURE_VERBOSE(
"verbose\0" No_argument "v" "verbose\0" No_argument "v",
&last
) )
); );
argc -= optind; argc -= optind;
argv += optind; argv += optind;
last = argv[argc - 1];
if (argc == 2) { if (!(flags & OPT_DESTDIR)) {
dest_exists = cp_mv_stat(last, &dest_stat); last = argv[argc - 1];
if (dest_exists < 0) { if (argc < 2)
bb_show_usage();
if (argc != 2) {
if (flags & OPT_DESTNOTDIR)
bb_show_usage();
/* "mv A B C... DIR" - target must be dir */
} else /* argc == 2 */ {
/* "mv A B" - only case where target can be not a dir */
dest_exists = cp_mv_stat(last, &statbuf);
if (dest_exists < 0) { /* error other than ENOENT */
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!(dest_exists & 2)) {
if (!(dest_exists & 2)) { /* last is not a directory */ /* last is not a directory */
dest = last; dest = last;
goto DO_MOVE; goto DO_MOVE;
} }
/* last is a directory */
if (flags & OPT_DESTNOTDIR) {
if (stat(argv[0], &statbuf) == 0 && !S_ISDIR(statbuf.st_mode))
bb_error_msg_and_die("'%s' is a directory", last);
/* "mv -T DIR1 DIR2" is allowed (renames a dir) */
dest = last;
goto DO_MOVE;
} }
/* else: fall through into "do { move SRC to DIR/SRC } while" loop */
}
}
/* else: last is DIR from "t -DIR" */
do { do {
dest = concat_path_file(last, bb_get_last_path_component_strip(*argv)); dest = concat_path_file(last, bb_get_last_path_component_strip(*argv));
dest_exists = cp_mv_stat(dest, &dest_stat); dest_exists = cp_mv_stat(dest, &statbuf);
if (dest_exists < 0) { if (dest_exists < 0) {
goto RET_1; goto RET_1;
} }
@ -108,11 +135,10 @@ int mv_main(int argc, char **argv)
} }
if (rename(*argv, dest) < 0) { if (rename(*argv, dest) < 0) {
struct stat source_stat;
int source_exists; int source_exists;
if (errno != EXDEV if (errno != EXDEV
|| (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1 || (source_exists = cp_mv_stat2(*argv, &statbuf, lstat)) < 1
) { ) {
bb_perror_msg("can't rename '%s'", *argv); bb_perror_msg("can't rename '%s'", *argv);
} else { } else {