Applied patch from Gennady Feldman to use single-thread instead of forking.

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index c93a94ce10b87a5ad021ac2437049571af556119..a84163272e3b8ae9ae9035e85977fb3eba2031b2 100644 (file)
--- a/rm.c
+++ b/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,12 +22,14 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
 #include <dirent.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "busybox.h"
 
 static int recursiveFlag = FALSE;
 static int forceFlag = FALSE;
@@ -37,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);
@@ -47,11 +49,11 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 {
        if (recursiveFlag == FALSE) {
                errno = EISDIR;
-               perror(fileName);
+               perror_msg("%s", fileName);
                return (FALSE);
        } 
        if (rmdir(fileName) < 0) {
-               perror(fileName);
+               perror_msg("%s", fileName);
                return (FALSE);
        }
        return (TRUE);
@@ -59,6 +61,7 @@ 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;
 
@@ -81,7 +84,7 @@ extern int rm_main(int argc, char **argv)
                                                stopIt = TRUE;
                                                break;
                                        default:
-                                               usage(rm_usage);
+                                               show_usage();
                                }
                        argc--;
                        argv++;
@@ -91,7 +94,7 @@ extern int rm_main(int argc, char **argv)
        }
 
        if (argc < 1 && forceFlag == FALSE) {
-               usage(rm_usage);
+               show_usage();
        }
 
        while (argc-- > 0) {
@@ -100,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;
                        }
                }
        }
-       return(TRUE);
+       return status;
 }