X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=rm.c;h=ea7f86ce100bfe7309a4b954e997cb480e936011;hb=9f0fedb8f693829e7869439a2ad43cc1c21a3786;hp=96808aee8bf771f8bab18d5059e5e6edabce0554;hpb=7c25441792a0685a1eb27c6563ed293e505f5b2c;p=oweals%2Fbusybox.git diff --git a/rm.c b/rm.c index 96808aee8..ea7f86ce1 100644 --- 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(); }