damnit.

[oweals/busybox.git] / mv.c

diff --git a/mv.c b/mv.c
index 2a7c8c1f3b8ef20c7ae24ee00cd9cf62dcd1d8f0..2be3961ca5b06f85e50b0eea35c5b23d31a48f2c 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
@@ -27,7 +29,7 @@
 
 
 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";
 
 
@@ -42,8 +44,7 @@ extern int mv_main(int argc, char **argv)
     char newdestName[NAME_MAX];
 
     if (argc < 3) {
-       fprintf(stderr, "Usage: %s", mv_usage);
-       exit (FALSE);
+       usage (mv_usage);
     }
     argc--;
     argv++;
@@ -55,7 +56,7 @@ extern int mv_main(int argc, char **argv)
        fprintf(stderr, "%s: not a directory\n", destName);
        exit (FALSE);
     }
-
+    
     while (argc-- > 1) {
        srcName = *(argv++);
        skipName = strrchr(srcName, '/');
@@ -66,6 +67,11 @@ extern int mv_main(int argc, char **argv)
            strcat(newdestName, "/");
            if ( skipName != NULL)
                strcat(newdestName, strstr(srcName, skipName));
+           else
+               strcat(newdestName, srcName);
+           fprintf(stderr, "srcName='%s'\n", srcName);
+           fprintf(stderr, "skipName='%s'\n", skipName);
+           fprintf(stderr, "newdestName='%s'\n", newdestName);
        }
        if (copyFile(srcName, newdestName, FALSE, FALSE)  == FALSE) {
            exit( FALSE);