diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2001-04-11 17:20:44 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2001-04-11 17:20:44 +0000 |
| commit | ed897e541502045245699f028dfe986abaecf1ba (patch) | |
| tree | 43c9440880ebf630956e5812affc48087326ae90 | |
| parent | 2975a34f239c417d3439c58f51f83dc43b7c82d1 (diff) | |
| download | busybox-ed897e541502045245699f028dfe986abaecf1ba.tar.gz | |
Vladimir's patch to reverse previous patch
| -rw-r--r-- | coreutils/rm.c | 12 | ||||
| -rw-r--r-- | rm.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c index 768e3ca64..ea7f86ce1 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]; @@ -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]; |