tool: Moved --silient to the global config

Other global options such as --libcurl, --trace and --verbose to
follow.

diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index 77c603752ff353c665e94e028047df78810c9d00..381cd2c8aac1e8180ae2b112cb6990e244b2f438 100644 (file)
--- 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 b9c5eb7019a86c049af24583520e0725643ed2a2..16a7275bbc538fdb0cf68f089daae3e6f14b47d1 100644 (file)
--- 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 54754aef9cf806fb50e17c35cb4cc930ce846193..c92fbace2530fffd75bbe0ac401147a5ab4e347a 100644 (file)
--- 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 faecd8f4662cda93b2825db99ead04630348ee0a..e48a2d5952eaa8d21bca725e72b86fb47b1e2eb2 100644 (file)
--- 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;