diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2001-04-11 21:20:44 +0400 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2001-04-11 21:20:44 +0400 |
commit | ed897e541502045245699f028dfe986abaecf1ba (patch) | |
tree | 43c9440880ebf630956e5812affc48087326ae90 /rm.c | |
parent | 2975a34f239c417d3439c58f51f83dc43b7c82d1 (diff) |
Vladimir's patch to reverse previous patch
Diffstat (limited to 'rm.c')
-rw-r--r-- | rm.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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]; |