mirror of
https://github.com/sheumann/hush.git
synced 2024-09-28 13:54:53 +00:00
Vladimir's patch to reverse previous patch
This commit is contained in:
parent
2975a34f23
commit
ed897e5415
@ -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
12
rm.c
@ -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];
|
||||||
|
Loading…
Reference in New Issue
Block a user