diff options
Diffstat (limited to 'release/src/router/busybox/coreutils/mv.c')
| -rw-r--r-- | release/src/router/busybox/coreutils/mv.c | 154 |
1 files changed, 73 insertions, 81 deletions
diff --git a/release/src/router/busybox/coreutils/mv.c b/release/src/router/busybox/coreutils/mv.c index 55da2cc6..be10b030 100644 --- a/release/src/router/busybox/coreutils/mv.c +++ b/release/src/router/busybox/coreutils/mv.c @@ -3,21 +3,9 @@ * Mini mv implementation for busybox * * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu> + * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) @@ -25,119 +13,123 @@ * Size reduction and improved error checking. */ -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <dirent.h> -#include <errno.h> -#include <stdlib.h> -#include <getopt.h> -#include "busybox.h" +#include "libbb.h" #include "libcoreutils/coreutils.h" -static const struct option mv_long_options[] = { - { "interactive", 0, NULL, 'i' }, - { "force", 0, NULL, 'f' }, - { 0, 0, 0, 0 } -}; +#if ENABLE_FEATURE_MV_LONG_OPTIONS +static const char mv_longopts[] ALIGN1 = + "interactive\0" No_argument "i" + "force\0" No_argument "f" + ; +#endif -static const char mv_getopt_short_option[] = "fi"; #define OPT_FILEUTILS_FORCE 1 #define OPT_FILEUTILS_INTERACTIVE 2 -static const char fmt[] = "cannot overwrite %sdirectory with %sdirectory"; - -extern int mv_main(int argc, char **argv) +int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int mv_main(int argc, char **argv) { - struct stat source_stat; struct stat dest_stat; const char *last; const char *dest; + unsigned flags; int dest_exists; - int source_exists; - unsigned long flags; int status = 0; + int copy_flag = 0; - bb_applet_long_options = mv_long_options; - bb_opt_complementaly = "f-i:i-f"; - flags = bb_getopt_ulflags(argc, argv, mv_getopt_short_option); - - if (optind + 2 > argc) - bb_show_usage(); - - last = argv[argc - 1]; +#if ENABLE_FEATURE_MV_LONG_OPTIONS + applet_long_options = mv_longopts; +#endif + // Need at least two arguments + // -f unsets -i, -i unsets -f + opt_complementary = "-2:f-i:i-f"; + flags = getopt32(argv, "fi"); + argc -= optind; argv += optind; + last = argv[argc - 1]; - if (optind + 2 == argc) { - if ((dest_exists = cp_mv_stat(last, &dest_stat)) < 0) { - return 1; + if (argc == 2) { + dest_exists = cp_mv_stat(last, &dest_stat); + if (dest_exists < 0) { + return EXIT_FAILURE; } - if (!(dest_exists & 2)) { + if (!(dest_exists & 2)) { /* last is not a directory */ dest = last; goto DO_MOVE; } } - - do { - dest = concat_path_file(last, bb_get_last_path_component(*argv)); - if ((dest_exists = cp_mv_stat(dest, &dest_stat)) < 0) { + do { + dest = concat_path_file(last, bb_get_last_path_component_strip(*argv)); + dest_exists = cp_mv_stat(dest, &dest_stat); + if (dest_exists < 0) { goto RET_1; } - DO_MOVE: - - if (dest_exists && !(flags & OPT_FILEUTILS_FORCE) && - ((access(dest, W_OK) < 0 && isatty(0)) || - (flags & OPT_FILEUTILS_INTERACTIVE))) { - if (fprintf(stderr, "mv: overwrite `%s'? ", dest) < 0) { - goto RET_1; /* Ouch! fprintf failed! */ - } - if (!bb_ask_confirmation()) - goto RET_0; - } - + DO_MOVE: + if (dest_exists + && !(flags & OPT_FILEUTILS_FORCE) + && ((access(dest, W_OK) < 0 && isatty(0)) + || (flags & OPT_FILEUTILS_INTERACTIVE)) + ) { + if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) { + goto RET_1; /* Ouch! fprintf failed! */ + } + if (!bb_ask_confirmation()) { + goto RET_0; + } + } if (rename(*argv, dest) < 0) { - if (errno != EXDEV) { - bb_perror_msg("unable to rename `%s'", *argv); - } else if ((source_exists = cp_mv_stat(*argv, &source_stat)) >= 0) { + struct stat source_stat; + int source_exists; + + if (errno != EXDEV + || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1 + ) { + bb_perror_msg("cannot rename '%s'", *argv); + } else { + static const char fmt[] ALIGN1 = + "cannot overwrite %sdirectory with %sdirectory"; + if (dest_exists) { - if (dest_exists & 2) { - if (!(source_exists & 2)) { + if (dest_exists == 3) { + if (source_exists != 3) { bb_error_msg(fmt, "", "non-"); goto RET_1; } } else { - if (source_exists & 2) { + if (source_exists == 3) { bb_error_msg(fmt, "non-", ""); goto RET_1; } } if (unlink(dest) < 0) { - bb_perror_msg("cannot remove `%s'", dest); + bb_perror_msg("cannot remove '%s'", dest); goto RET_1; } } - - if ((copy_file(*argv, dest, - FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS) >= 0) - && (remove_file(*argv, FILEUTILS_RECUR | FILEUTILS_FORCE) >= 0) - ) { + /* FILEUTILS_RECUR also prevents nasties like + * "read from device and write contents to dst" + * instead of "create same device node" */ + copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS; +#if ENABLE_SELINUX + copy_flag |= FILEUTILS_PRESERVE_SECURITY_CONTEXT; +#endif + if ((copy_file(*argv, dest, copy_flag) >= 0) + && (remove_file(*argv, FILEUTILS_RECUR | FILEUTILS_FORCE) >= 0) + ) { goto RET_0; } - } - RET_1: + RET_1: status = 1; } - - RET_0: + RET_0: if (dest != last) { free((void *) dest); } - } while (*++argv != last); - - exit(status); + + return status; } |