Use an int to hold the result of fgetc (bug noted by David Kimdon).

[oweals/busybox.git] / coreutils / mv.c

diff --git a/coreutils/mv.c b/coreutils/mv.c
index 2a7c8c1f3b8ef20c7ae24ee00cd9cf62dcd1d8f0..1c4a3478816c6b89a918a837d640adcb74d6eb86 100644 (file)
--- a/coreutils/mv.c
+++ b/coreutils/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,61 +21,148 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
+#include <sys/types.h>
+#include <sys/stat.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;
 
-static const char mv_usage[] = "mv SOURCE DEST\n"
-"   or: mv SOURCE... DIRECTORY\n"
-"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n";
+       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;
+       }
 
-static const char *srcName;
-static const char *destName;
-static const char *skipName;
-static int dirFlag = FALSE;
+       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;
+               }
 
-extern int mv_main(int argc, char **argv)
+               if (unlink(dest) < 0) {
+                       perror_msg("cannot remove `%s'", dest);
+                       return -1;
+               }
+       }
+
+       if (copy_file(source, dest,
+                       FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS) < 0)
+               return -1;
+
+       if (remove_file(source, FILEUTILS_RECUR | FILEUTILS_FORCE) < 0)
+               return -1;
+
+       return 0;
+}
+
+static int move_file(const char *source, const char *dest)
 {
-    char newdestName[NAME_MAX];
-
-    if (argc < 3) {
-       fprintf(stderr, "Usage: %s", mv_usage);
-       exit (FALSE);
-    }
-    argc--;
-    argv++;
-
-    destName = argv[argc - 1];
-    dirFlag = isDirectory(destName);
-
-    if ((argc > 3) && dirFlag==FALSE) {
-       fprintf(stderr, "%s: not a directory\n", destName);
-       exit (FALSE);
-    }
-
-    while (argc-- > 1) {
-       srcName = *(argv++);
-       skipName = strrchr(srcName, '/');
-       if (skipName) 
-           skipName++;
-       strcpy(newdestName, destName);
-       if (dirFlag==TRUE) {
-           strcat(newdestName, "/");
-           if ( skipName != NULL)
-               strcat(newdestName, strstr(srcName, skipName));
+       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;
+       }
+
+       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 (copyFile(srcName, newdestName, FALSE, FALSE)  == FALSE) {
-           exit( FALSE);
+
+       if (rename(source, dest) < 0) {
+               if (errno == EXDEV)
+                       return manual_rename(source, dest);
+
+               perror_msg("unable to rename `%s'", source);
+               return -1;
        }
-       if (unlink (srcName) < 0) {
-           perror (srcName);
-           exit( FALSE);
+       
+       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 (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;
+               }
        }
-    }
-    exit( TRUE);
+
+       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);
+       }
+
+       return status;
 }