diff options
| -rw-r--r-- | src/tool_cfgable.h | 2 | ||||
| -rw-r--r-- | src/tool_getparam.c | 4 | ||||
| -rw-r--r-- | src/tool_msgs.c | 2 | ||||
| -rw-r--r-- | src/tool_operate.c | 11 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index 77c603752..381cd2c8a 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -87,7 +87,6 @@ struct OperationConfig { bool sasl_ir; /* Enable/disable SASL initial response */ bool proxytunnel; bool ftp_append; /* APPE on ftp */ - bool mute; /* don't show messages, --silent given */ bool use_ascii; /* select ascii or text transfer */ bool autoreferer; /* automatically set referer */ bool failonerror; /* fail on (HTTP) errors */ @@ -225,6 +224,7 @@ struct GlobalConfig { int showerror; /* -1 == unset, default => show errors 0 => -s is used to NOT show errors 1 => -S has been used to show errors */ + bool mute; /* don't show messages, --silent given */ struct OperationConfig *first; struct OperationConfig *current; diff --git a/src/tool_getparam.c b/src/tool_getparam.c index b9c5eb701..16a7275bb 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -1619,9 +1619,9 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ case 's': /* don't show progress meter, don't show errors : */ if(toggle) - config->mute = config->noprogress = TRUE; + global->mute = config->noprogress = TRUE; else - config->mute = config->noprogress = FALSE; + global->mute = config->noprogress = FALSE; if(global->showerror < 0) /* if still on the default value, set showerror to the reverse of toggle. This is to allow -S and -s to be used in an independent diff --git a/src/tool_msgs.c b/src/tool_msgs.c index 54754aef9..c92fbace2 100644 --- a/src/tool_msgs.c +++ b/src/tool_msgs.c @@ -40,7 +40,7 @@ void warnf(struct OperationConfig *config, const char *fmt, ...) { - if(!config->mute) { + if(!config->global->mute) { va_list ap; int len; char *ptr; diff --git a/src/tool_operate.c b/src/tool_operate.c index faecd8f46..e48a2d595 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -209,6 +209,7 @@ static CURLcode operate_do(struct GlobalConfig *global, bool orig_isatty; errorbuffer[0] = '\0'; + /* default headers output stream is stdout */ memset(&hdrcbdata, 0, sizeof(struct HdrCbData)); memset(&heads, 0, sizeof(struct OutStruct)); @@ -752,7 +753,7 @@ static CURLcode operate_do(struct GlobalConfig *global, config->isatty = orig_isatty; } - if(urlnum > 1 && !(config->mute)) { + if(urlnum > 1 && !global->mute) { fprintf(config->errors, "\n[%lu/%lu]: %s --> %s\n", li+1, urlnum, this_url, outfile ? outfile : "<stdout>"); if(separator) @@ -1105,7 +1106,7 @@ static CURLcode operate_do(struct GlobalConfig *global, progressbarinit(&progressbar, config); if((config->progressmode == CURL_PROGRESS_BAR) && - !config->noprogress && !config->mute) { + !config->noprogress && !global->mute) { /* we want the alternative style, then we have to implement it ourselves! */ my_setopt(curl, CURLOPT_XFERINFOFUNCTION, tool_progress_cb); @@ -1371,7 +1372,7 @@ static CURLcode operate_do(struct GlobalConfig *global, #endif res = curl_easy_perform(curl); - if(outs.is_cd_filename && outs.stream && !config->mute && + if(outs.is_cd_filename && outs.stream && !global->mute && outs.filename) printf("curl: Saved to filename '%s'\n", outs.filename); @@ -1459,7 +1460,7 @@ static CURLcode operate_do(struct GlobalConfig *global, if(outs.bytes && outs.filename) { /* We have written data to a output file, we truncate file */ - if(!config->mute) + if(!global->mute) fprintf(config->errors, "Throwing away %" CURL_FORMAT_CURL_OFF_T " bytes\n", outs.bytes); @@ -1469,7 +1470,7 @@ static CURLcode operate_do(struct GlobalConfig *global, if(ftruncate( fileno(outs.stream), outs.init)) { /* when truncate fails, we can't just append as then we'll create something strange, bail out */ - if(!config->mute) + if(!global->mute) fprintf(config->errors, "failed to truncate, exiting\n"); res = CURLE_WRITE_ERROR; |