summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorGlenn L McGrath2001-04-11 17:20:44 +0000
committerGlenn L McGrath2001-04-11 17:20:44 +0000
commited897e541502045245699f028dfe986abaecf1ba (patch)
tree43c9440880ebf630956e5812affc48087326ae90 /coreutils
parent2975a34f239c417d3439c58f51f83dc43b7c82d1 (diff)
downloadbusybox-ed897e541502045245699f028dfe986abaecf1ba.zip
busybox-ed897e541502045245699f028dfe986abaecf1ba.tar.gz
Vladimir's patch to reverse previous patch
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/rm.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 768e3ca..ea7f86c 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -101,12 +101,17 @@ extern int rm_main(int argc, char **argv)
break;
case 'f':
forceFlag = TRUE;
+#ifdef BB_FEATURE_RM_INTERACTIVE
+
+ interactiveFlag = FALSE;
+#endif
break;
#ifdef BB_FEATURE_RM_INTERACTIVE
case 'i':
interactiveFlag = TRUE;
-#endif
+ forceFlag = FALSE;
break;
+#endif
default:
show_usage();
}
@@ -115,11 +120,6 @@ extern int rm_main(int argc, char **argv)
if (argc == optind && forceFlag == FALSE) {
show_usage();
}
-#ifdef BB_FEATURE_RM_INTERACTIVE
- if (forceFlag == TRUE)
- interactiveFlag = FALSE;
-#endif
-
while (optind < argc) {
srcName = argv[optind];