[tor-commits] [tor/master] Add '--digests' to "that which implies --hush."

nickm at torproject.org nickm at torproject.org
Fri Sep 13 16:41:20 UTC 2013


commit a6cad4db7063885aee2eceea7c481bc7583e1a4f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 26 14:32:56 2013 -0400

    Add '--digests' to "that which implies --hush."
    
    And have these various commandline options imply "hush", not "quiet",
    since we like to see warnings.
---
 src/or/main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index 22519f0..598d099 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2345,10 +2345,10 @@ tor_init(int argc, char *argv[])
         quiet = 1;
       if (!strcmp(cl->key, "--quiet"))
         quiet = 2;
-      /* --version and --help imply --quiet */
-      if (!strcmp(cl->key, "--version") ||
+      /* --version, --digests, and --help imply --quiet */
+      if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
           !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help"))
-        quiet = 2;
+        quiet = 1;
     }
     config_free_lines(opts);
     config_free_lines(cmdline_opts);





More information about the tor-commits mailing list