nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes other case of #9578
This commit is contained in:
Nick Mathewson 2013-10-11 12:32:59 -04:00
parent 3e3b9219ec
commit 6f9584b3fd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug9578 Normal file
View File

@ -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
src/or/main.c
View File

@ -2355,9 +2355,11 @@ tor_init(int argc, char *argv[])
if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
!strcmp(cl->key, "--list-torrc-options") || !strcmp(cl->key, "--list-torrc-options") ||
!strcmp(cl->key, "--library-versions") || !strcmp(cl->key, "--library-versions") ||
!strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) {
if (quiet < 1)
quiet = 1; quiet = 1;
} }
}
config_free_lines(opts); config_free_lines(opts);
config_free_lines(cmdline_opts); config_free_lines(cmdline_opts);
} }