Another update from Larry:

[oweals/busybox.git] / mv.c

diff --git a/mv.c b/mv.c
index 10a08221014eac582b1b7b53106fb45ad089a91a..b890abf6efcc89c402b3ea4df40469742e8437ec 100644 (file)
--- a/mv.c
+++ b/mv.c
@@ -1,7 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mv implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * 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
@@ -19,65 +21,148 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <utime.h>
+#include <unistd.h>
+#include <dirent.h>
 #include <errno.h>
+#include <stdlib.h>
+
+#include "busybox.h"
+
+static int flags;
+
+static int manual_rename(const char *source, const char *dest)
+{
+       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;
+       }
+
+       if (stat(dest, &dest_stat) < 0) {
+               if (errno != ENOENT) {
+                       perror_msg("unable to stat `%s'", dest);
+                       return -1;
+               }
+               dest_exists = 0;
+       }
 
-const char mv_usage[] = "source-file [source-file ...] destination-file\n"
-    "\n" "\tMove the source files to the destination.\n" "\n";
+       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;
+               }
+
+               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 (unlink(dest) < 0) {
+                       perror_msg("cannot remove `%s'", dest);
+                       return -1;
+               }
+       }
+
+       if (copy_file(source, dest, FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS |
+                       FILEUTILS_PRESERVE_SYMLINKS) < 0)
+               return -1;
 
+       if (remove_file(source, FILEUTILS_RECUR | FILEUTILS_FORCE) < 0)
+               return -1;
 
+       return 0;
+}
 
-extern int mv_main (int argc, char **argv)
+static int move_file(const char *source, const char *dest)
 {
-    const char *srcName;
-    const char *destName;
-    const char *lastArg;
-    int dirFlag;
-
-    if (argc < 3) {
-       fprintf (stderr, "Usage: %s %s", *argv, mv_usage);
-       exit (FALSE);
-    }
-    lastArg = argv[argc - 1];
-
-    dirFlag = isDirectory (lastArg);
-
-    if ((argc > 3) && !dirFlag) {
-       fprintf (stderr, "%s: not a directory\n", lastArg);
-       exit (FALSE);
-    }
-
-    while (argc-- > 2) {
-       srcName = *(++argv);
-
-       if (access (srcName, 0) < 0) {
-           perror (srcName);
-           continue;
+       struct stat dest_stat;
+       int dest_exists = 1;
+
+       if (stat(dest, &dest_stat) < 0) {
+               if (errno != ENOENT) {
+                       perror_msg("unable to stat `%s'", dest);
+                       return -1;
+               }
+               dest_exists = 0;
        }
 
-       destName = lastArg;
+       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 (dirFlag==TRUE)
-           destName = buildName (destName, srcName);
+       if (rename(source, dest) < 0) {
+               if (errno == EXDEV)
+                       return manual_rename(source, dest);
 
-       if (rename (srcName, destName) >= 0)
-           continue;
+               perror_msg("unable to rename `%s'", source);
+               return -1;
+       }
+       
+       return 0;
+}
 
-       if (errno != EXDEV) {
-           perror (destName);
-           continue;
+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 (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 (!dest_exists || !S_ISDIR(dest_stat.st_mode)) {
+                       if (move_file(argv[optind], argv[optind + 1]) < 0)
+                               status = 1;
+                       return status;
+               }
        }
 
-       if (!copyFile (srcName, destName, TRUE, FALSE))
-           continue;
+       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);
+       }
 
-       if (unlink (srcName) < 0)
-           perror (srcName);
-    }
-    exit (TRUE);
+       return status;
 }