X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fmv.c;h=4f08dedc08329fd53fcfb73ec2efd021dc359f45;hb=47bc802e9e8942182cd3cec1b5a6c3fb62427d16;hp=efc4ae6d87d0990ead0ea8bc7ff2c74643f70631;hpb=01441036e9754425e2b09b43deec879ca46206cb;p=oweals%2Fbusybox.git diff --git a/coreutils/mv.c b/coreutils/mv.c index efc4ae6d8..4f08dedc0 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -2,7 +2,6 @@ /* * Mini mv implementation for busybox * - * * Copyright (C) 2000 by Matt Kraai * * This program is free software; you can redistribute it and/or modify @@ -21,163 +20,120 @@ * */ +/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) + * + * Size reduction and improved error checking. + */ + #include #include #include #include #include #include - +#include #include "busybox.h" +#include "libcoreutils/coreutils.h" -static int flags; +static const struct option mv_long_options[] = { + { "interactive", 0, NULL, 'i' }, + { "force", 0, NULL, 'f' }, + { 0, 0, 0, 0 } +}; -static int remove_file(const char *path, struct stat *statbuf, void *junk) -{ - if (unlink(path) < 0) - return FALSE; - return TRUE; -} +#define OPT_FILEUTILS_FORCE 1 +#define OPT_FILEUTILS_INTERACTIVE 2 -static int remove_directory(const char *path, struct stat *statbuf, void *junk) -{ - if (rmdir(path) < 0) - return FALSE; - return TRUE; -} +static const char fmt[] = "cannot overwrite %sdirectory with %sdirectory"; -static int manual_rename(const char *source, const char *dest) +extern int mv_main(int argc, char **argv) { - struct stat source_stat; struct stat dest_stat; - int source_exists = 1; - int dest_exists = 1; - - if (stat(source, &source_stat) < 0) { - if (errno != ENOENT) { - perror_msg("unable to stat `%s'", source); - return -1; - } - source_exists = 0; - } + const char *last; + const char *dest; + unsigned long flags; + int dest_exists; + int status = 0; - if (stat(dest, &dest_stat) < 0) { - if (errno != ENOENT) { - perror_msg("unable to stat `%s'", dest); - return -1; - } - dest_exists = 0; + bb_applet_long_options = mv_long_options; + bb_opt_complementaly = "f-i:i-f"; + flags = bb_getopt_ulflags(argc, argv, "fi"); + if (optind + 2 > argc) { + bb_show_usage(); } - if (dest_exists) { - if (S_ISDIR(dest_stat.st_mode) && - (!source_exists || !S_ISDIR(source_stat.st_mode))) { - error_msg("cannot overwrite directory with non-directory"); - return -1; - } + last = argv[argc - 1]; + argv += optind; - if (!S_ISDIR(dest_stat.st_mode) && source_exists && - S_ISDIR(source_stat.st_mode)) { - error_msg("cannot overwrite non-directory with directory"); - return -1; + if (optind + 2 == argc) { + if ((dest_exists = cp_mv_stat(last, &dest_stat)) < 0) { + return 1; } - if (unlink(dest) < 0) { - perror_msg("cannot remove `%s'", dest); - return -1; + if (!(dest_exists & 2)) { + dest = last; + goto DO_MOVE; } } - if (copy_file(source, dest, FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS | - FILEUTILS_PRESERVE_SYMLINKS) < 0) - return -1; - - if (!recursive_action(source, TRUE, FALSE, TRUE, remove_file, - remove_directory, NULL)) - return -1; - - return 0; -} - -static int move_file(const char *source, const char *dest) -{ - struct stat dest_stat; - int dest_exists = 1; + do { + dest = concat_path_file(last, bb_get_last_path_component(*argv)); - if (stat(dest, &dest_stat) < 0) { - if (errno != ENOENT) { - perror_msg("unable to stat `%s'", dest); - return -1; + if ((dest_exists = cp_mv_stat(dest, &dest_stat)) < 0) { + goto RET_1; } - dest_exists = 0; - } - - if (dest_exists && !(flags & FILEUTILS_FORCE) && - ((access(dest, W_OK) < 0 && isatty(0)) || - (flags & FILEUTILS_INTERACTIVE))) { - fprintf(stderr, "mv: overwrite `%s'? ", dest); - if (!ask_confirmation()) - return 0; - } - if (rename(source, dest) < 0) { - if (errno == EXDEV) - return manual_rename(source, dest); +DO_MOVE: - perror_msg("unable to rename `%s'", source); - return -1; - } - - return 0; -} - -extern int mv_main(int argc, char **argv) -{ - int status = 0; - int opt; - int i; - - while ((opt = getopt(argc, argv, "fi")) != -1) - switch (opt) { - case 'f': - flags &= ~FILEUTILS_INTERACTIVE; - flags |= FILEUTILS_FORCE; - break; - case 'i': - flags &= ~FILEUTILS_FORCE; - flags |= FILEUTILS_INTERACTIVE; - break; - default: - show_usage(); + 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 (optind + 2 > argc) - show_usage(); - - if (optind + 2 == argc) { - struct stat dest_stat; - int dest_exists = 1; - - if (stat(argv[optind + 1], &dest_stat) < 0) { - if (errno != ENOENT) - perror_msg_and_die("unable to stat `%s'", argv[optind + 1]); - dest_exists = 0; + if (rename(*argv, dest) < 0) { + struct stat source_stat; + int source_exists; + + if (errno != EXDEV) { + bb_perror_msg("unable to rename `%s'", *argv); + } + else if ((source_exists = cp_mv_stat(*argv, &source_stat)) >= 0) { + if (dest_exists) { + if (dest_exists == 3) { + if (source_exists != 3) { + bb_error_msg(fmt, "", "non-"); + goto RET_1; + } + } else { + if (source_exists == 3) { + bb_error_msg(fmt, "non-", ""); + goto RET_1; + } + } + if (unlink(dest) < 0) { + 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)) { + goto RET_0; + } + } +RET_1: + status = 1; } - - if (!dest_exists || !S_ISDIR(dest_stat.st_mode)) { - if (move_file(argv[optind], argv[optind + 1]) < 0) - status = 1; - return status; +RET_0: + if (dest != last) { + free((void *) dest); } - } - - for (i = optind; i < argc - 1; i++) { - char *dest = concat_path_file(argv[argc - 1], - get_last_path_component(argv[i])); - if (move_file(argv[i], dest) < 0) - status = 1; - free(dest); - } + } while (*++argv != last); - return status; + return (status); }