diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-11 12:32:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-11 12:32:59 -0400 |
| commit | 6f9584b3fd5346bfc7ee58dedee2f1c292bf0354 (patch) | |
| tree | 03487ec15b3ead556e81d087094de0519210fbdc /src | |
| parent | 3e3b9219ec968f21ab0956dd785c17541a908d5b (diff) | |
| download | tor-6f9584b3fd5346bfc7ee58dedee2f1c292bf0354.tar.gz tor-6f9584b3fd5346bfc7ee58dedee2f1c292bf0354.zip | |
Make --version, --help, etc incremement quiet level, never decrease it
Fixes other case of #9578
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |