commit 16f7015722fe62e9b89cad24435ed285f7d71cd9
author Eric Andersen <andersen@codepoet.org> Mon Mar 19 18:54:38 2001 +0000
committer Eric Andersen <andersen@codepoet.org> Mon Mar 19 18:54:38 2001 +0000
tree 06468b14ec0078ca67035ed38f67d2dea5719eb1
parent 7c25441792a0685a1eb27c6563ed293e505f5b2c

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

coreutils/rm.c

diff --git a/coreutils/rm.c b/coreutils/rm.c
index 96808ae..013f3ee 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -102,9 +102,6 @@
 				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 @@
 	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];