Make options no longer a global variable.

Now we can try setting an option but back out if it fails to parse, or
  if it's disallowed (e.g. changing RunAsDaemon from 1 to 0).
Use parse_line_from_str rather than parse_line_from_file.


svn:r2692

1 files changed, 4 insertions, 9 deletions

diff --git a/src/or/test.c b/src/or/test.c
index f1d1d6545..f627307e1 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -16,8 +16,6 @@
 #include "../common/test.h"
 #include "../common/torgzip.h"
 
-extern or_options_t options;
-
 int have_failed = 0;
 
 /* These functions are file-local, but are exposed so we can test. */
@@ -1094,7 +1092,7 @@ test_dir_format(void)
   test_assert(router_dump_router_to_string(buf, 2048, &r2, pk1)>0);
   cp = buf;
   test_eq(dirserv_add_descriptor((const char**)&cp), 1);
-  options.Nickname = tor_strdup("DirServer");
+  get_options()->Nickname = tor_strdup("DirServer");
   test_assert(!dirserv_dump_directory_to_string(buf,8192,pk3));
   cp = buf;
   test_assert(!router_parse_routerlist_from_directory(buf, &dir1, pk3, 1));
@@ -1202,12 +1200,9 @@ test_rend_fns(void)
 
 int
 main(int c, char**v){
-#if 0
-  or_options_t options; /* command-line and config-file options */
-
-  if(getconfig(c,v,&options))
-    exit(1);
-#endif
+  or_options_t *options = tor_malloc_zero(sizeof(or_options_t));
+  options_init(options);
+  set_options(options);
 
   crypto_seed_rng();
   setup_directory();