emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vladimir's patch to reverse previous patch

Browse Source
This commit is contained in:
Glenn L McGrath 2001-04-11 17:20:44 +00:00
parent 2975a34f23
commit ed897e5415
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils/rm.c
View File

@ -101,12 +101,17 @@ extern int rm_main(int argc, char **argv)
break; break;
case 'f': case 'f':
forceFlag = TRUE; forceFlag = TRUE;
#ifdef BB_FEATURE_RM_INTERACTIVE
interactiveFlag = FALSE;
#endif
break; break;
#ifdef BB_FEATURE_RM_INTERACTIVE #ifdef BB_FEATURE_RM_INTERACTIVE
case 'i': case 'i':
interactiveFlag = TRUE; interactiveFlag = TRUE;
#endif forceFlag = FALSE;
break; break;
#endif
default: default:
show_usage(); show_usage();
} }
@ -115,11 +120,6 @@ extern int rm_main(int argc, char **argv)
if (argc == optind && forceFlag == FALSE) { if (argc == optind && forceFlag == FALSE) {
show_usage(); show_usage();
} }
#ifdef BB_FEATURE_RM_INTERACTIVE
if (forceFlag == TRUE)
interactiveFlag = FALSE;
#endif
while (optind < argc) { while (optind < argc) {
srcName = argv[optind]; srcName = argv[optind];

12
rm.c
View File

@ -101,12 +101,17 @@ extern int rm_main(int argc, char **argv)
break; break;
case 'f': case 'f':
forceFlag = TRUE; forceFlag = TRUE;
#ifdef BB_FEATURE_RM_INTERACTIVE
interactiveFlag = FALSE;
#endif
break; break;
#ifdef BB_FEATURE_RM_INTERACTIVE #ifdef BB_FEATURE_RM_INTERACTIVE
case 'i': case 'i':
interactiveFlag = TRUE; interactiveFlag = TRUE;
#endif forceFlag = FALSE;
break; break;
#endif
default: default:
show_usage(); show_usage();
} }
@ -115,11 +120,6 @@ extern int rm_main(int argc, char **argv)
if (argc == optind && forceFlag == FALSE) { if (argc == optind && forceFlag == FALSE) {
show_usage(); show_usage();
} }
#ifdef BB_FEATURE_RM_INTERACTIVE
if (forceFlag == TRUE)
interactiveFlag = FALSE;
#endif
while (optind < argc) { while (optind < argc) {
srcName = argv[optind]; srcName = argv[optind];