commit f70f1d283e4fb46882f9a72810af09c11cd626b4 Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 14 12:12:53 2015 -0400
Do not printf success messages when we are --quieted or --hushed.
Fixes 14994. Calling this a bug on when --quiet and --hush began to have their current behavior. --- changes/bug14994 | 8 ++++++++ src/or/main.c | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/changes/bug14994 b/changes/bug14994 new file mode 100644 index 0000000..aafeac4 --- /dev/null +++ b/changes/bug14994 @@ -0,0 +1,8 @@ + o Minor bugfixes (command-line interface): + - When "--quiet" is provided along with "--validate-config", do not + write anything to stdout on success. Fixes bug 14994; bugfix on + 0.2.3.3-alpha. + - When complaining about bad arguments to "--dump-config", use + stderr, not stdout. + + diff --git a/src/or/main.c b/src/or/main.c index bc89458..49c1b66 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2783,8 +2783,8 @@ do_dump_config(void) } else if (!strcmp(arg, "full")) { how = OPTIONS_DUMP_ALL; } else { - printf("%s is not a recognized argument to --dump-config. " - "Please select 'short', 'non-builtin', or 'full'", arg); + fprintf(stderr, "%s is not a recognized argument to --dump-config. " + "Please select 'short', 'non-builtin', or 'full'", arg); return -1; }
@@ -3085,7 +3085,8 @@ tor_main(int argc, char *argv[]) result = 0; break; case CMD_VERIFY_CONFIG: - printf("Configuration was valid\n"); + if (get_options()->quiet_level) + printf("Configuration was valid\n"); result = 0; break; case CMD_DUMP_CONFIG: