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

tool: Moved --trace and --verbose to the global config

Browse source
This commit is contained in:
Steve Holme 2014-02-27 20:51:49 +00:00
parent fd97c17bb7
commit 4efa1d29e2
6 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tool_getparam.c
View file

@ -522,20 +522,20 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
GetStr(&config->dns_servers, nextarg);
break;
case 'g': /* --trace */
GetStr(&config->trace_dump, nextarg);
if(config->tracetype && (config->tracetype != TRACE_BIN))
GetStr(&global->trace_dump, nextarg);
if(global->tracetype && (global->tracetype != TRACE_BIN))
warnf(config, "--trace overrides an earlier trace/verbose option\n");
config->tracetype = TRACE_BIN;
global->tracetype = TRACE_BIN;
break;
case 'G': /* --npn */
config->nonpn = (!toggle)?TRUE:FALSE;
break;
case 'h': /* --trace-ascii */
GetStr(&config->trace_dump, nextarg);
if(config->tracetype && (config->tracetype != TRACE_ASCII))
GetStr(&global->trace_dump, nextarg);
if(global->tracetype && (global->tracetype != TRACE_ASCII))
warnf(config,
"--trace-ascii overrides an earlier trace/verbose option\n");
config->tracetype = TRACE_ASCII;
global->tracetype = TRACE_ASCII;
break;
case 'H': /* --alpn */
config->noalpn = (!toggle)?TRUE:FALSE;
@ -809,7 +809,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
config->proxyanyauth = toggle;
break;
case 'o': /* --trace-time */
config->tracetime = toggle;
global->tracetime = toggle;
break;
case 'p': /* --ignore-content-length */
config->ignorecl = toggle;
@ -1684,18 +1684,18 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case 'v':
if(toggle) {
/* the '%' thing here will cause the trace get sent to stderr */
Curl_safefree(config->trace_dump);
config->trace_dump = strdup("%");
if(!config->trace_dump)
Curl_safefree(global->trace_dump);
global->trace_dump = strdup("%");
if(!global->trace_dump)
return PARAM_NO_MEM;
if(config->tracetype && (config->tracetype != TRACE_PLAIN))
if(global->tracetype && (global->tracetype != TRACE_PLAIN))
warnf(config,
"-v, --verbose overrides an earlier trace/verbose option\n");
config->tracetype = TRACE_PLAIN;
global->tracetype = TRACE_PLAIN;
}
else
/* verbose is disabled here */
config->tracetype = TRACE_NONE;
global->tracetype = TRACE_NONE;
break;
case 'V':
if(toggle) /* --no-version yields no output! */