From 00a9e3732e88d73860b772dcbac0b8275aa7f467 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 23 Nov 2002 06:49:01 +0000 Subject: remove popt dependency, consolidate config stuff reformat parts of onion.c svn:r136 --- src/or/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/or/main.c') diff --git a/src/or/main.c b/src/or/main.c index 6295bf0d6..ef0f3e55f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -645,9 +645,10 @@ int main(int argc, char *argv[]) { signal (SIGUSR1, catch); /* to dump stats to stdout */ signal (SIGHUP, catch); /* to reload directory */ - if ( getoptions(argc,argv,&options) ) exit(1); + if(getconfig(argc,argv,&options)) + exit(1); log(options.loglevel,NULL); /* assign logging severity level from options */ - global_role = options.Role; /* assign global_role from options. FIX: remove from global namespace later. */ + global_role = options.Role; /* assign global_role from options. FIXME: remove from global namespace later. */ crypto_global_init(); retval = do_main_loop(); -- cgit v1.2.3