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

Patch from Vladimir to force interactiveFlag=FALSE when forceFlag=TRUE

Browse Source
This commit is contained in:
Eric Andersen 2001-03-19 18:54:38 +00:00
parent 7c25441792
commit 16f7015722
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coreutils/rm.c
View File

@ -102,9 +102,6 @@ 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;
case 'i': case 'i':
#ifdef BB_FEATURE_RM_INTERACTIVE #ifdef BB_FEATURE_RM_INTERACTIVE
@ -122,6 +119,11 @@ extern int rm_main(int argc, char **argv)
if ((argc-optind) < 1 && forceFlag == FALSE) { if ((argc-optind) < 1 && 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];

8
rm.c
View File

@ -102,9 +102,6 @@ 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;
case 'i': case 'i':
#ifdef BB_FEATURE_RM_INTERACTIVE #ifdef BB_FEATURE_RM_INTERACTIVE
@ -122,6 +119,11 @@ extern int rm_main(int argc, char **argv)
if ((argc-optind) < 1 && forceFlag == FALSE) { if ((argc-optind) < 1 && 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];