Split up chmod_chown_chgrp.c into 3 separate apps. This unfortunately

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index 96808aee8bf771f8bab18d5059e5e6edabce0554..ea7f86ce100bfe7309a4b954e997cb480e936011 100644 (file)
--- a/rm.c
+++ b/rm.c
@@ -85,7 +85,6 @@ extern int rm_main(int argc, char **argv)
 {
        int opt;
        int status = EXIT_SUCCESS;
-       int stopIt=FALSE;
        struct stat statbuf;
        
        
@@ -103,23 +102,22 @@ extern int rm_main(int argc, char **argv)
                        case 'f':
                                forceFlag = TRUE;
 #ifdef BB_FEATURE_RM_INTERACTIVE
+
                                interactiveFlag = FALSE;
 #endif
                                break;
-                       case 'i':
 #ifdef BB_FEATURE_RM_INTERACTIVE
+                       case 'i':
                                interactiveFlag = TRUE;
-#endif
-                               break;
-                       case '-':
-                               stopIt = TRUE;
+                               forceFlag = FALSE;
                                break;
+#endif
                        default:
                                show_usage();
                }
        }
        
-       if ((argc-optind) < 1 && forceFlag == FALSE) {
+       if (argc == optind && forceFlag == FALSE) {
                show_usage();
        }