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

diff --git a/coreutils/mv.c b/coreutils/mv.c
index 92c40c9b7..1c4a34788 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -1,9 +1,9 @@
+/* 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 +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>
 
-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";
+#include "busybox.h"
 
+static int flags;
 
-static const char *srcName;
-static const char *destName;
-static int destDirFlag = FALSE;
-static int srcDirFlag = FALSE;
-
-static int fileAction(const char *fileName, struct stat* statbuf)
+static int manual_rename(const char *source, const char *dest)
 {
-    char newdestName[NAME_MAX];
-
-    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, "/");
+	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;
 	}
-	strcat(newdestName, srcName);
-    }
-    
-    return (copyFile(fileName, newdestName, TRUE, TRUE));
-}
 
-static int rmfileAction(const char *fileName, struct stat* statbuf)
-{
-    if (unlink( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
+	if (stat(dest, &dest_stat) < 0) {
+		if (errno != ENOENT) {
+			perror_msg("unable to stat `%s'", dest);
+			return -1;
+		}
+		dest_exists = 0;
+	}
+
+	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) < 0)
+		return -1;
+
+	if (remove_file(source, FILEUTILS_RECUR | FILEUTILS_FORCE) < 0)
+		return -1;
+
+	return 0;
 }
 
-static int rmdirAction(const char *fileName, struct stat* statbuf)
+static int move_file(const char *source, const char *dest)
 {
-    if (rmdir( fileName) < 0 ) {
-	perror( fileName);
-	return ( FALSE);
-    }
-    return ( TRUE);
-}
+	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 (rename(source, dest) < 0) {
+		if (errno == EXDEV)
+			return manual_rename(source, dest);
+
+		perror_msg("unable to rename `%s'", source);
+		return -1;
+	}
+	
+	return 0;
+}
 
 extern int mv_main(int argc, char **argv)
 {
-    if (argc < 3) {
-	usage (mv_usage);
-    }
-    argc--;
-    argv++;
-
-    destName = argv[argc - 1];
-    destDirFlag = isDirectory(destName);
-
-    if ((argc > 3) && destDirFlag==FALSE) {
-	fprintf(stderr, "%s: not a directory\n", destName);
-	exit (FALSE);
-    }
-
-    while (argc-- > 1) {
-	srcName = *(argv++);
-	srcDirFlag = isDirectory(srcName);
-	if (recursiveAction(srcName, TRUE, TRUE, FALSE,
-			       fileAction, fileAction) == FALSE) {
-	    exit( FALSE);
+	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 (recursiveAction(srcName, TRUE, TRUE, TRUE,
-			       rmfileAction, rmdirAction) == FALSE) {
-	    exit( FALSE);
+
+	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);
 	}
-    }
-    exit( TRUE);
+
+	return status;
 }