Patch from Vladimir to force interactiveFlag=FALSE when forceFlag=TRUE

git-svn-id: svn://busybox.net/trunk/busybox@2142 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 3 deletions

diff --git a/rm.c b/rm.c
index 96808aee8..013f3ee5d 100644
--- a/rm.c
+++ b/rm.c
@@ -102,9 +102,6 @@ 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
@@ -122,6 +119,11 @@ extern int rm_main(int argc, char **argv)
         if ((argc-optind) < 1 && forceFlag == FALSE) {
                 show_usage();
         }
+#ifdef BB_FEATURE_RM_INTERACTIVE
+        if (forceFlag == TRUE)
+                interactiveFlag = FALSE;
+#endif
+
 
         while (optind < argc) {
                 srcName = argv[optind];