Patch from Shaun Jackman to save a few bytes.

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

diff --git a/coreutils/mv.c b/coreutils/mv.c
index d0f346196636e2908cadc0d0dd5bbdd467a3edb4..4f08dedc08329fd53fcfb73ec2efd021dc359f45 100644 (file)
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -1,9 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mv implementation for busybox
  *
- *
- * Copyright (C) 1999 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <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
@@ -21,87 +20,120 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
-
-
-static const char mv_usage[] = "mv SOURCE DEST\n"
-"   or: mv SOURCE... DIRECTORY\n\n"
-"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n";
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * 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 "libcoreutils/coreutils.h"
 
-static const char *srcName;
-static const char *destName;
-static int dirFlag = FALSE;
+static const struct option mv_long_options[] = {
+       { "interactive", 0, NULL, 'i' },
+       { "force", 0, NULL, 'f' },
+       { 0, 0, 0, 0 }
+};
 
-static int fileAction(const char *fileName, struct stat* statbuf)
-{
-    char newdestName[NAME_MAX];
-
-    fprintf(stderr, "srcName='%s'  destName='%s'\n", srcName, destName);
-    strcpy(newdestName, destName);
-    strcat(newdestName, "/");
-    strcat(newdestName, strstr(fileName, fileName));
-    fprintf(stderr, "newdestName='%s'\n", newdestName); 
-    return (copyFile(fileName, newdestName, TRUE, TRUE));
-}
+#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)
 {
-    char newdestName[NAME_MAX];
-    char *skipName;
-
-    if (argc < 3) {
-       usage (mv_usage);
-    }
-    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));
-           else
-               strcat(newdestName, srcName);
+       struct stat dest_stat;
+       const char *last;
+       const char *dest;
+       unsigned long flags;
+       int dest_exists;
+       int status = 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 (isDirectory(srcName)==TRUE && newdestName[strlen(newdestName)] != '/') {
-               strcat(newdestName, "/");
-           createPath(newdestName, 0777);
-           fprintf(stderr, "srcName = '%s'\n", srcName);
-           fprintf(stderr, "newdestName = '%s'\n", newdestName);
-           if (recursiveAction(srcName, TRUE, TRUE, FALSE,
-                                  fileAction, fileAction) == FALSE) 
-           {
-               exit( FALSE);
-           }
-           exit( TRUE);
-       } else {
-           if (copyFile(srcName, newdestName, FALSE, FALSE)  == FALSE) {
-               exit( FALSE);
-           }
-           if (unlink (srcName) < 0) {
-               perror (srcName);
-               exit( FALSE);
-           }
+
+       last = argv[argc - 1];
+       argv += optind;
+
+       if (optind + 2 == argc) {
+               if ((dest_exists = cp_mv_stat(last, &dest_stat)) < 0) {
+                       return 1;
+               }
+
+               if (!(dest_exists & 2)) {
+                       dest = last;
+                       goto DO_MOVE;
+               }
        }
-    }
-    exit( TRUE);
+
+       do {
+               dest = concat_path_file(last, bb_get_last_path_component(*argv));
+
+               if ((dest_exists = cp_mv_stat(dest, &dest_stat)) < 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;
+                       }
+               }
+               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;
+               }
+RET_0:
+               if (dest != last) {
+                       free((void *) dest);
+               }
+       } while (*++argv != last);
+
+       return (status);
 }