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 /coreutils/rm.c | |
| parent | 2975a34f239c417d3439c58f51f83dc43b7c82d1 (diff) | |
| download | busybox-w32-ed897e541502045245699f028dfe986abaecf1ba.tar.gz busybox-w32-ed897e541502045245699f028dfe986abaecf1ba.tar.bz2 busybox-w32-ed897e541502045245699f028dfe986abaecf1ba.zip | |
Vladimir's patch to reverse previous patch
Diffstat (limited to 'coreutils/rm.c')
| -rw-r--r-- | coreutils/rm.c | 12 |
1 files changed, 6 insertions, 6 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) | |||
| 101 | break; | 101 | break; |
| 102 | case 'f': | 102 | case 'f': |
| 103 | forceFlag = TRUE; | 103 | forceFlag = TRUE; |
| 104 | #ifdef BB_FEATURE_RM_INTERACTIVE | ||
| 105 | |||
| 106 | interactiveFlag = FALSE; | ||
| 107 | #endif | ||
| 104 | break; | 108 | break; |
| 105 | #ifdef BB_FEATURE_RM_INTERACTIVE | 109 | #ifdef BB_FEATURE_RM_INTERACTIVE |
| 106 | case 'i': | 110 | case 'i': |
| 107 | interactiveFlag = TRUE; | 111 | interactiveFlag = TRUE; |
| 108 | #endif | 112 | forceFlag = FALSE; |
| 109 | break; | 113 | break; |
| 114 | #endif | ||
| 110 | default: | 115 | default: |
| 111 | show_usage(); | 116 | show_usage(); |
| 112 | } | 117 | } |
| @@ -115,11 +120,6 @@ extern int rm_main(int argc, char **argv) | |||
| 115 | if (argc == optind && forceFlag == FALSE) { | 120 | if (argc == optind && forceFlag == FALSE) { |
| 116 | show_usage(); | 121 | show_usage(); |
| 117 | } | 122 | } |
| 118 | #ifdef BB_FEATURE_RM_INTERACTIVE | ||
| 119 | if (forceFlag == TRUE) | ||
| 120 | interactiveFlag = FALSE; | ||
| 121 | #endif | ||
| 122 | |||
| 123 | 123 | ||
| 124 | while (optind < argc) { | 124 | while (optind < argc) { |
| 125 | srcName = argv[optind]; | 125 | srcName = argv[optind]; |