From 35e9e12f9c195c6027cbaef410c662723cb4d168 Mon Sep 17 00:00:00 2001
From: andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Mon, 19 Mar 2001 18:54:38 +0000
Subject: Patch from Vladimir to force interactiveFlag=FALSE when
 forceFlag=TRUE

git-svn-id: svn://busybox.net/trunk/busybox@2142 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
 rm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'rm.c')

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];
-- 
cgit v1.2.3-55-g6feb