Comment on kernel stuff

[oweals/busybox.git] / coreutils / rm.c

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 5901c5da9b631ff37d25be79f87c6ce4ebaee825..2067d878c269f266dc9d05a8d06f6cc23de10b5c 100644 (file)
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -68,14 +68,12 @@ 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 (--argc >= 0 && *argv && **argv && stopIt==FALSE) {
-               while (**argv == '-') {
+       while (argc > 0 && stopIt == FALSE) {
+               if (**argv == '-') {
                        while (*++(*argv))
                                switch (**argv) {
                                        case 'R':
@@ -91,8 +89,15 @@ extern int rm_main(int argc, char **argv)
                                        default:
                                                usage(rm_usage);
                                }
+                       argc--;
+                       argv++;
                }
-               argv++;
+               else
+                       break;
+       }
+
+       if (argc < 1 && forceFlag == FALSE) {
+               usage(rm_usage);
        }
 
        while (argc-- > 0) {
@@ -107,5 +112,5 @@ extern int rm_main(int argc, char **argv)
                        }
                }
        }
-       exit(TRUE);
+       return(TRUE);
 }