From: Kamil Dudka <kdudka@redhat.com>
Date: Sat, 21 Jul 2012 23:55:45 +0000 (+0200)
Subject: tool_operate: fix misplaced initialization of orig_noprogress
X-Git-Tag: curl-7_27_0~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=487406c3c0d86c5ef3fd323df35db71467b02a92;p=curl

tool_operate: fix misplaced initialization of orig_noprogress

... and orig_isatty which caused --silent to be entirely ignored in case
the standard output was redirected to a file!
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 7c0b8b5fe..f4abc3b75 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -140,8 +140,8 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
   int res = 0;
   int i;
 
-  bool orig_noprogress = config->noprogress;
-  bool orig_isatty = config->isatty;
+  bool orig_noprogress;
+  bool orig_isatty;
 
   errorbuffer[0] = '\0';
   /* default headers output stream is stdout */
@@ -396,6 +396,10 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
     }
   }
 
+  /* save the values of noprogress and isatty to restore them later on */
+  orig_noprogress = config->noprogress;
+  orig_isatty = config->isatty;
+
   /*
   ** Nested loops start here.
   */