X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fmv.c;h=55da2cc6884ce499578d9c2f9e5f873aca6ae75b;hb=303b7d83f0f791478d3ff79dfdf82c8e06a82ec6;hp=92c40c9b7866bf8f8b1f2f9f9a0345e9b32783ae;hpb=f664c004db12cdb3e379c1745351e225c7b92de7;p=oweals%2Fbusybox.git

diff --git a/coreutils/mv.c b/coreutils/mv.c
index 92c40c9b7..55da2cc68 100644
--- 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,124 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
+/* 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 mv_usage[] = "mv SOURCE DEST\n"
-"   or: mv SOURCE... DIRECTORY\n\n"
-"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n";
+static const struct option mv_long_options[] = {
+	{ "interactive", 0, NULL, 'i' },
+	{ "force", 0, NULL, 'f' },
+	{ 0, 0, 0, 0 }
+};
 
+static const char mv_getopt_short_option[] = "fi";
+#define OPT_FILEUTILS_FORCE       1
+#define OPT_FILEUTILS_INTERACTIVE 2
 
-static const char *srcName;
-static const char *destName;
-static int destDirFlag = FALSE;
-static int srcDirFlag = FALSE;
+static const char fmt[] = "cannot overwrite %sdirectory with %sdirectory";
 
-static int fileAction(const char *fileName, struct stat* statbuf)
+extern int mv_main(int argc, char **argv)
 {
-    char newdestName[NAME_MAX];
+	struct stat source_stat;
+	struct stat dest_stat;
+	const char *last;
+	const char *dest;
+	int dest_exists;
+	int source_exists;
+	unsigned long flags;
+	int status = 0;
 
-    strcpy(newdestName, destName);
-    if ( srcDirFlag == TRUE ) {
-	strcat(newdestName, strstr(fileName, srcName) + strlen(srcName));
-    } 
-    
-    if (destDirFlag==TRUE && srcDirFlag == FALSE) {
-	if (newdestName[strlen(newdestName)-1] != '/' ) {
-	    strcat(newdestName, "/");
-	}
-	strcat(newdestName, srcName);
-    }
-    
-    return (copyFile(fileName, newdestName, TRUE, TRUE));
-}
+	bb_applet_long_options = mv_long_options;
+	bb_opt_complementaly = "f-i:i-f";
+	flags = bb_getopt_ulflags(argc, argv, mv_getopt_short_option);
 
-static int rmfileAction(const char *fileName, struct stat* statbuf)
-{
-    if (unlink( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
-}
+	if (optind + 2 > argc)
+		bb_show_usage();
 
-static int rmdirAction(const char *fileName, struct stat* statbuf)
-{
-    if (rmdir( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
-}
+	last = argv[argc - 1];
+	argv += optind;
 
+	if (optind + 2 == argc) {
+		if ((dest_exists = cp_mv_stat(last, &dest_stat)) < 0) {
+			return 1;
+		}
 
-extern int mv_main(int argc, char **argv)
-{
-    if (argc < 3) {
-	usage (mv_usage);
-    }
-    argc--;
-    argv++;
+		if (!(dest_exists & 2)) {
+			dest = last;
+			goto DO_MOVE;
+		}
+	}
+	
+	do {
+		dest = concat_path_file(last, bb_get_last_path_component(*argv));
 
-    destName = argv[argc - 1];
-    destDirFlag = isDirectory(destName);
+		if ((dest_exists = cp_mv_stat(dest, &dest_stat)) < 0) {
+			goto RET_1;
+		}
 
-    if ((argc > 3) && destDirFlag==FALSE) {
-	fprintf(stderr, "%s: not a directory\n", destName);
-	exit (FALSE);
-    }
+	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) {
+				if (dest_exists) {
+					if (dest_exists & 2) {
+						if (!(source_exists & 2)) {
+							bb_error_msg(fmt, "", "non-");
+							goto RET_1;
+						}
+					} else {
+						if (source_exists & 2) {
+							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;
+		}
 
-    while (argc-- > 1) {
-	srcName = *(argv++);
-	srcDirFlag = isDirectory(srcName);
-	if (recursiveAction(srcName, TRUE, TRUE, FALSE,
-			       fileAction, fileAction) == FALSE) {
-	    exit( FALSE);
-	}
-	if (recursiveAction(srcName, TRUE, TRUE, TRUE,
-			       rmfileAction, rmdirAction) == FALSE) {
-	    exit( FALSE);
-	}
-    }
-    exit( TRUE);
+	RET_0:
+		if (dest != last) {
+			free((void *) dest);
+		}
+		
+	} while (*++argv != last);
+	
+	exit(status);
 }