fleshed out a bit more... just wanted to put the current

[oweals/busybox.git] / mv.c

diff --git a/mv.c b/mv.c
index 2a7c8c1f3b8ef20c7ae24ee00cd9cf62dcd1d8f0..467a360dea59121875842a39fbfbc88b07c868ab 100644 (file)
--- a/mv.c
+++ b/mv.c
@@ -1,7 +1,9 @@
 /*
  * Mini mv implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * 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
@@ -25,53 +27,84 @@
 #include <utime.h>
 #include <dirent.h>
 
-
 static const char mv_usage[] = "mv SOURCE DEST\n"
-"   or: mv SOURCE... DIRECTORY\n"
+"   or: mv SOURCE... DIRECTORY\n\n"
 "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n";
 
 
 static const char *srcName;
 static const char *destName;
-static const char *skipName;
-static int dirFlag = FALSE;
-
+static int destDirFlag = FALSE;
+static int srcDirFlag = FALSE;
 
-extern int mv_main(int argc, char **argv)
+static int fileAction(const char *fileName, struct stat* statbuf)
 {
     char newdestName[NAME_MAX];
+    char* newsrcName = NULL;
+
+    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, "/");
+       }
+       newsrcName = strrchr(srcName, '/');
+       if (newsrcName && *newsrcName != '\0')
+           strcat(newdestName, newsrcName);
+       else
+           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);
+}
+
+static int rmdirAction(const char *fileName, struct stat* statbuf)
+{
+    if (rmdir( fileName) < 0 ) {
+       perror( fileName);
+       return ( FALSE);
+    }
+    return ( TRUE);
+}
+
+
+extern int mv_main(int argc, char **argv)
+{
     if (argc < 3) {
-       fprintf(stderr, "Usage: %s", mv_usage);
-       exit (FALSE);
+       usage (mv_usage);
     }
     argc--;
     argv++;
 
     destName = argv[argc - 1];
-    dirFlag = isDirectory(destName);
+    destDirFlag = isDirectory(destName);
 
-    if ((argc > 3) && dirFlag==FALSE) {
+    if ((argc > 3) && destDirFlag==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));
-       }
-       if (copyFile(srcName, newdestName, FALSE, FALSE)  == FALSE) {
+       srcDirFlag = isDirectory(srcName);
+       if (recursiveAction(srcName, TRUE, TRUE, FALSE,
+                              fileAction, fileAction) == FALSE) {
            exit( FALSE);
        }
-       if (unlink (srcName) < 0) {
-           perror (srcName);
+       if (recursiveAction(srcName, TRUE, TRUE, TRUE,
+                              rmfileAction, rmdirAction) == FALSE) {
            exit( FALSE);
        }
     }