Fix an obscure option parsing bug.

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index 2067d878c269f266dc9d05a8d06f6cc23de10b5c..c93a94ce10b87a5ad021ac2437049571af556119 100644 (file)
--- a/rm.c
+++ b/rm.c
@@ -29,17 +29,6 @@
 #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
-       ;
-
-
 static int recursiveFlag = FALSE;
 static int forceFlag = FALSE;
 static const char *srcName;
@@ -56,6 +45,11 @@ 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(fileName);
+               return (FALSE);
+       } 
        if (rmdir(fileName) < 0) {
                perror(fileName);
                return (FALSE);