mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-27 05:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

tool: Moved --silient to the global config

Browse Source 
Other global options such as --libcurl, --trace and --verbose to
follow.
This commit is contained in:
Steve Holme 2014-02-27 20:21:23 +00:00
parent 17df2d8f8e
commit 5577540ad5
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tool_cfgable.h
View File

@ -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;

4
src/tool_getparam.c
View File

@ -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

2
src/tool_msgs.c
View File

@ -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;

11
src/tool_operate.c
View File

@ -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;