Fix an obscure option parsing bug.

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index 41afedaf9010be196c5f47b5bb7ce3238a2a3100..c93a94ce10b87a5ad021ac2437049571af556119 100644 (file)
--- a/rm.c
+++ b/rm.c
@@ -3,7 +3,7 @@
  * Mini rm implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 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
@@ -29,20 +29,12 @@
 #include <dirent.h>
 #include <errno.h>
 
-static const char *rm_usage = "rm [OPTION]... FILE...\n\n"
-       "Remove (unlink) the FILE(s).\n\n"
-       "Options:\n"
-
-       "\t-f\t\tremove existing destinations, never prompt\n"
-       "\t-r or -R\tremove the contents of directories recursively\n";
-
-
 static int recursiveFlag = FALSE;
 static int forceFlag = FALSE;
 static const char *srcName;
 
 
-static int fileAction(const char *fileName, struct stat *statbuf)
+static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
        if (unlink(fileName) < 0) {
                perror(fileName);
@@ -51,8 +43,13 @@ static int fileAction(const char *fileName, struct stat *statbuf)
        return (TRUE);
 }
 
-static int dirAction(const char *fileName, struct stat *statbuf)
+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);
@@ -62,30 +59,39 @@ static int dirAction(const char *fileName, struct stat *statbuf)
 
 extern int rm_main(int argc, char **argv)
 {
+       int stopIt=FALSE;
        struct stat statbuf;
 
-       if (argc < 2) {
-               usage(rm_usage);
-       }
        argc--;
        argv++;
 
        /* Parse any options */
-       while (**argv == '-') {
-               while (*++(*argv))
-                       switch (**argv) {
-                       case 'R':
-                       case 'r':
-                               recursiveFlag = TRUE;
-                               break;
-                       case 'f':
-                               forceFlag = TRUE;
-                               break;
-                       default:
-                               usage(rm_usage);
-                       }
-               argc--;
-               argv++;
+       while (argc > 0 && stopIt == FALSE) {
+               if (**argv == '-') {
+                       while (*++(*argv))
+                               switch (**argv) {
+                                       case 'R':
+                                       case 'r':
+                                               recursiveFlag = TRUE;
+                                               break;
+                                       case 'f':
+                                               forceFlag = TRUE;
+                                               break;
+                                       case '-':
+                                               stopIt = TRUE;
+                                               break;
+                                       default:
+                                               usage(rm_usage);
+                               }
+                       argc--;
+                       argv++;
+               }
+               else
+                       break;
+       }
+
+       if (argc < 1 && forceFlag == FALSE) {
+               usage(rm_usage);
        }
 
        while (argc-- > 0) {
@@ -95,10 +101,10 @@ extern int rm_main(int argc, char **argv)
                        /* do not reports errors for non-existent files if -f, just skip them */
                } else {
                        if (recursiveAction(srcName, recursiveFlag, FALSE,
-                                                               TRUE, fileAction, dirAction) == FALSE) {
+                                                               TRUE, fileAction, dirAction, NULL) == FALSE) {
                                exit(FALSE);
                        }
                }
        }
-       exit(TRUE);
+       return(TRUE);
 }