Patchs from Jeff Garzik <jgarzik@mandrakesoft.com> to cleanup

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

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 5901c5da9b631ff37d25be79f87c6ce4ebaee825..a84163272e3b8ae9ae9035e85977fb3eba2031b2 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -3,7 +3,7 @@
  * Mini rm implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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
@@ -22,23 +22,14 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
 #include <dirent.h>
 #include <errno.h>
-
-static const char *rm_usage = "rm [OPTION]... FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nRemove (unlink) the FILE(s).  You may use '--' to\n"
-       "indicate that all following arguments are non-options.\n\n"
-       "Options:\n"
-       "\t-f\t\tremove existing destinations, never prompt\n"
-       "\t-r or -R\tremove the contents of directories recursively\n"
-#endif
-       ;
-
+#include <unistd.h>
+#include <stdlib.h>
+#include "busybox.h"
 
 static int recursiveFlag = FALSE;
 static int forceFlag = FALSE;
@@ -48,7 +39,7 @@ static const char *srcName;
 static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
        if (unlink(fileName) < 0) {
-               perror(fileName);
+               perror_msg("%s", fileName);
                return (FALSE);
        }
        return (TRUE);
@@ -56,8 +47,13 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 
 static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 {
+       if (recursiveFlag == FALSE) {
+               errno = EISDIR;
+               perror_msg("%s", fileName);
+               return (FALSE);
+       } 
        if (rmdir(fileName) < 0) {
-               perror(fileName);
+               perror_msg("%s", fileName);
                return (FALSE);
        }
        return (TRUE);
@@ -65,17 +61,16 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 
 extern int rm_main(int argc, char **argv)
 {
+       int status = EXIT_SUCCESS;
        int stopIt=FALSE;
        struct stat statbuf;
 
-       if (argc < 2) {
-               usage(rm_usage);
-       }
+       argc--;
        argv++;
 
        /* Parse any options */
-       while (--argc >= 0 && *argv && **argv && stopIt==FALSE) {
-               while (**argv == '-') {
+       while (argc > 0 && stopIt == FALSE) {
+               if (**argv == '-') {
                        while (*++(*argv))
                                switch (**argv) {
                                        case 'R':
@@ -89,10 +84,17 @@ extern int rm_main(int argc, char **argv)
                                                stopIt = TRUE;
                                                break;
                                        default:
-                                               usage(rm_usage);
+                                               show_usage();
                                }
+                       argc--;
+                       argv++;
                }
-               argv++;
+               else
+                       break;
+       }
+
+       if (argc < 1 && forceFlag == FALSE) {
+               show_usage();
        }
 
        while (argc-- > 0) {
@@ -101,11 +103,11 @@ extern int rm_main(int argc, char **argv)
                        && errno == ENOENT) {
                        /* do not reports errors for non-existent files if -f, just skip them */
                } else {
-                       if (recursiveAction(srcName, recursiveFlag, FALSE,
+                       if (recursive_action(srcName, recursiveFlag, FALSE,
                                                                TRUE, fileAction, dirAction, NULL) == FALSE) {
-                               exit(FALSE);
+                               status = EXIT_FAILURE;
                        }
                }
        }
-       exit(TRUE);
+       return status;
 }