From 16f7015722fe62e9b89cad24435ed285f7d71cd9 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 19 Mar 2001 18:54:38 +0000 Subject: [PATCH] Patch from Vladimir to force interactiveFlag=FALSE when forceFlag=TRUE --- coreutils/rm.c | 8 +++++--- rm.c | 8 +++++--- 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]; -- 2.25.1