diff options
| author | Cao ZhenXiang <caozhenxiang@protonmail.com> | 2021-09-05 13:04:38 +0800 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-09-06 16:59:08 +0200 |
| commit | 7a3e981781d6c18ab62f51342b6aeed3e816b696 (patch) | |
| tree | cf16eb5ec07759d58b958b13c1a2f54a2ff19915 | |
| parent | 033d15a6c56158c29d971a146156e87be9485623 (diff) | |
| download | curl-7a3e981781d6c18ab62f51342b6aeed3e816b696.tar.gz | |
curl: add warning for incompatible parameters usage
--continue-at - and --remote-header-name are known incompatible parameters
Closes #7674
| -rw-r--r-- | src/tool_getparam.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 00e9542b3..56fc35cf5 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -1890,11 +1890,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ } break; case 'i': - if(config->content_disposition) { - warnf(global, - "--include and --remote-header-name cannot be combined.\n"); - return PARAM_BAD_USE; - } config->show_headers = toggle; /* show the headers as well in the general output stream */ break; @@ -1910,11 +1905,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ return PARAM_BAD_USE; break; case 'J': /* --remote-header-name */ - if(config->show_headers) { - warnf(global, - "--include and --remote-header-name cannot be combined.\n"); - return PARAM_BAD_USE; - } config->content_disposition = toggle; break; case 'k': /* allow insecure SSL connects */ @@ -2394,6 +2384,19 @@ ParameterError parse_args(struct GlobalConfig *global, int argc, curlx_unicodefree(orig_opt); } + if(config->content_disposition) { + if(config->show_headers) { + helpf(global->errors, "--include and --remote-header-name " + "cannot be combined.\n"); + return PARAM_BAD_USE; + } + if(config->resume_from_current) { + helpf(global->errors, "--continue-at - and --remote-header-name " + "cannot be combined.\n"); + return PARAM_BAD_USE; + } + } + if(result && result != PARAM_HELP_REQUESTED && result != PARAM_MANUAL_REQUESTED && result != PARAM_VERSION_INFO_REQUESTED && |