aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coreutils/rm.c8
-rw-r--r--rm.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 96808aee8..013f3ee5d 100644
--- a/coreutils/rm.c
+++ b/coreutils/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];
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];