romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 00:33:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_getparam: make --fail and --fail-with-body override each other

Browse source 
This allows users to put one of them in their .curlrc and still easily
use the other one at will in command lines.

The --no-* versions disable both of them.

Reported-by: Mitchell Blank Jr
Fixes #19029
Closes #19034
This commit is contained in:
Daniel Stenberg 2025-10-12 15:58:43 +02:00
parent 56450ce26f
commit 27375ca364
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/tool_getparam.c
View file

@ -2037,14 +2037,6 @@ static ParameterError opt_bool(struct OperationConfig *config,
case C_MAIL_RCPT_ALLOWFAILS: /* --mail-rcpt-allowfails */
config->mail_rcpt_allowfails = toggle;
break;
case C_FAIL_WITH_BODY: /* --fail-with-body */
config->failwithbody = toggle;
if(config->failonerror && config->failwithbody) {
errorf("You must select either --fail or "
"--fail-with-body, not both.");
return PARAM_BAD_USE;
}
break;
case C_REMOVE_ON_ERROR: /* --remove-on-error */
if(config->use_resume && toggle) {
errorf("--continue-at is mutually exclusive with --remove-on-error");
@ -2052,13 +2044,15 @@ static ParameterError opt_bool(struct OperationConfig *config,
}
config->rm_partial = toggle;
break;
case C_FAIL: /* --fail */
config->failonerror = toggle;
if(config->failonerror && config->failwithbody) {
errorf("You must select either --fail or "
"--fail-with-body, not both.");
return PARAM_BAD_USE;
}
case C_FAIL: /* --fail without body */
if(toggle && (config->fail == FAIL_WITH_BODY))
warnf("--fail deselects --fail-with-body here");
config->fail = toggle ? FAIL_WO_BODY : FAIL_NONE;
break;
case C_FAIL_WITH_BODY: /* --fail-with-body */
if(toggle && (config->fail == FAIL_WO_BODY))
warnf("--fail-with-body deselects --fail here");
config->fail = toggle ? FAIL_WITH_BODY : FAIL_NONE;
break;
case C_GLOBOFF: /* --globoff */
config->globoff = toggle;