[tor-commits] [tor/master] The --version option should imply --quiet.

[nickm at torproject.org]

commit a80d8e09d3b5f393f2dc83148ef66c6e1d7f4015
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 1 11:01:18 2012 -0400

    The --version option should imply --quiet.
    
    Patch from 'maker'.
---
 changes/ticket6997 |    2 ++
 src/or/main.c      |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/changes/ticket6997 b/changes/ticket6997
new file mode 100644
index 0000000..0a33b37
--- /dev/null
+++ b/changes/ticket6997
@@ -0,0 +1,2 @@
+  o Minor bugfixes:
+    - Command-line option "--version" implies "--quiet". Closes ticket #6997.
diff --git a/src/or/main.c b/src/or/main.c
index 635dcb4..74bb696 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2293,6 +2293,9 @@ tor_init(int argc, char *argv[])
       quiet = 1;
     if (!strcmp(argv[i], "--quiet"))
       quiet = 2;
+    /* --version implies --quiet */
+    if (!strcmp(argv[i], "--version"))
+      quiet = 2;
   }
  /* give it somewhere to log to initially */
   switch (quiet) {