diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-07 14:09:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-07 14:09:55 -0400 |
| commit | edde1a7844f6c0e3aafd8463edc3c10f486eb51c (patch) | |
| tree | ef784a346c07eb4edcab1d1c1efcf33dde97c66e /src/or/main.c | |
| parent | 1457364c497d5a455d41d95118caad342d63bb8f (diff) | |
| parent | 6b0c443dde31f57f00c36ef4d53bd85bdfef8d79 (diff) | |
| download | tor-edde1a7844f6c0e3aafd8463edc3c10f486eb51c.tar.gz tor-edde1a7844f6c0e3aafd8463edc3c10f486eb51c.zip | |
Merge branch 'bug15541_squashed'
Diffstat (limited to 'src/or/main.c')
| -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 a816fad2bb..a3da148023 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2803,6 +2803,7 @@ do_dump_config(void) const char *arg = options->command_arg; int how; char *opts; + if (!strcmp(arg, "short")) { how = OPTIONS_DUMP_MINIMAL; } else if (!strcmp(arg, "non-builtin")) { @@ -2810,8 +2811,9 @@ do_dump_config(void) } else if (!strcmp(arg, "full")) { how = OPTIONS_DUMP_ALL; } else { - fprintf(stderr, "%s is not a recognized argument to --dump-config. " - "Please select 'short', 'non-builtin', or 'full'", arg); + fprintf(stderr, "No valid argument to --dump-config found!\n"); + fprintf(stderr, "Please select 'short', 'non-builtin', or 'full'.\n"); + return -1; } |