From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 Oct 2013 16:32:59 +0000 (-0400)
Subject: Make --version, --help, etc incremement quiet level, never decrease it
X-Git-Tag: tor-0.2.5.2-alpha~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f9584b3fd5346bfc7ee58dedee2f1c292bf0354;p=thirdparty%2Ftor.git

Make --version, --help, etc incremement quiet level, never decrease it

Fixes other case of #9578
---

diff --git a/changes/bug9578 b/changes/bug9578
new file mode 100644
index 0000000000..96d66fe1f7
--- /dev/null
+++ b/changes/bug9578
@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - When a command-line option such as --version or --help that ordinarily
+      implies --hush appears on the command line along with --quiet, obey
+      --quiet. Previously, we obeyed --quiet only if it appeared later on the
+      command line. Fixes bug 9578; bugfix on 0.2.5.1-alpha.
+
diff --git a/src/or/main.c b/src/or/main.c
index ac756de5d2..4d691bb189 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2355,8 +2355,10 @@ tor_init(int argc, char *argv[])
       if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
           !strcmp(cl->key, "--list-torrc-options") ||
           !strcmp(cl->key, "--library-versions") ||
-          !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help"))
-        quiet = 1;
+          !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) {
+        if (quiet < 1)
+          quiet = 1;
+      }
     }
     config_free_lines(opts);
     config_free_lines(cmdline_opts);