diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 9 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 977af4981..c1733905e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -191,6 +191,10 @@ static void config_assign(or_options_t *options, struct config_line *list) { } } +void print_usage(void) { + +} + /* return 0 if success, <0 if failure. */ int getconfig(int argc, char **argv, or_options_t *options) { struct config_line *cl; @@ -215,6 +219,11 @@ int getconfig(int argc, char **argv, or_options_t *options) { options->TotalBandwidth = 800000; /* at most 800kB/s total sustained incoming */ options->NumCpus = 1; + if(argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) { + print_usage(); + exit(0); + } + /* learn config file name, get config lines, assign them */ i = 1; while(i < argc-1 && strcmp(argv[i],"-f")) { diff --git a/src/or/main.c b/src/or/main.c index dd42865c4..441944389 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -784,7 +784,7 @@ int tor_main(int argc, char *argv[]) { add_stream_log(LOG_INFO, "<stdout>", stdout); if(getconfig(argc,argv,&options)) { - log_fn(LOG_ERR,"Reading config file failed. exiting."); + log_fn(LOG_ERR,"Reading config failed. For usage, try -h."); return -1; } log_set_severity(options.loglevel); /* assign logging severity level from options */ |