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 a9501ec7f004c23277b5c913c0657c5f1c8da1d2..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 "busybox.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;
@@ -82,7 +84,7 @@ extern int rm_main(int argc, char **argv)
                                                stopIt = TRUE;
                                                break;
                                        default:
-                                               usage(rm_usage);
+                                               show_usage();
                                }
                        argc--;
                        argv++;
@@ -92,7 +94,7 @@ extern int rm_main(int argc, char **argv)
        }
 
        if (argc < 1 && forceFlag == FALSE) {
-               usage(rm_usage);
+               show_usage();
        }
 
        while (argc-- > 0) {