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

1 files changed, 5 insertions, 3 deletions

diff --git a/rm.c b/rm.c
index 96808ae..013f3ee 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];