From 487406c3c0d86c5ef3fd323df35db71467b02a92 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sun, 22 Jul 2012 01:55:45 +0200 Subject: [PATCH] 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! --- src/tool_operate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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. */