Update applet define from BB_CP_MV to BB_CP and BB_MV.

[oweals/busybox.git] / rm.c

diff --git a/rm.c b/rm.c
index a5b2ef42034f18f674a242df62ea4a29a3ca4c6b..ea7f86ce100bfe7309a4b954e997cb480e936011 100644 (file)
--- a/rm.c
+++ b/rm.c
@@ -101,25 +101,25 @@ extern int rm_main(int argc, char **argv)
                                break;
                        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
+                               forceFlag = FALSE;
                                break;
+#endif
                        default:
                                show_usage();
                }
        }
        
-       if ((argc-optind) < 1 && forceFlag == FALSE) {
+       if (argc == optind && forceFlag == FALSE) {
                show_usage();
        }
-#ifdef BB_FEATURE_RM_INTERACTIVE
-       if (forceFlag == TRUE)
-               interactiveFlag = FALSE;
-#endif
-
 
        while (optind < argc) {
                srcName = argv[optind];