Some changelog updates.

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index c62d68abad0f53a102544b95cbe828fa9172dc37..2067d878c269f266dc9d05a8d06f6cc23de10b5c 100644 (file)
--- a/rm.c
+++ b/rm.c
@@ -31,7 +31,8 @@
 
 static const char *rm_usage = "rm [OPTION]... FILE...\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nRemove (unlink) the FILE(s).\n\n"
+       "\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"
@@ -64,30 +65,39 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 
 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) {
@@ -102,5 +112,5 @@ extern int rm_main(int argc, char **argv)
                        }
                }
        }
-       exit(TRUE);
+       return(TRUE);
 }