Commit b9617322 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

add --version, note that --help is probably obsolete

parent 1147289d
......@@ -328,10 +328,10 @@ static int config_assign_default(or_options_t *options) {
/* prints the usage of tor. */
static void print_usage(void) {
printf("tor -f <torrc> [args]\n"
"See man page for more options.\n\n"
"See man page for more options. This -h is probably obsolete.\n\n"
"-b <bandwidth>\t\tbytes/second rate limiting\n"
"-d <file>\t\tDebug file\n"
"-m <max>\t\tMax number of connections\n"
// "-m <max>\t\tMax number of connections\n"
"-l <level>\t\tLog level\n"
"-r <file>\t\tList of known routers\n");
printf("\nClient options:\n"
......@@ -429,6 +429,11 @@ int getconfig(int argc, char **argv, or_options_t *options) {
if(argc > 1 && (!strcmp(argv[1],"--version"))) {
printf("Tor version %s.\n",VERSION);
/* learn config file name, get config lines, assign them */
i = 1;
while(i < argc-1 && strcmp(argv[i],"-f")) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment