Browse Source

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

Fixes other case of #9578
Nick Mathewson 10 years ago
parent
commit
6f9584b3fd
2 changed files with 10 additions and 2 deletions
  1. 6 0
      changes/bug9578
  2. 4 2
      src/or/main.c

+ 6 - 0
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.
+

+ 4 - 2
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);