[or-cvs] stop breaking the get_options() abstraction in config.c

[Roger Dingledine]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	config.c 
Log Message:
stop breaking the get_options() abstraction in config.c


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- config.c	9 Nov 2004 01:23:52 -0000	1.216
+++ config.c	9 Nov 2004 02:12:55 -0000	1.217
@@ -1231,15 +1231,14 @@
   static char **backup_argv;
   static int backup_argc;
 
-  /* we don't use get_options() here, since it's null on the first call */
-  oldoptions = global_options;
-
   if (argv) { /* first time we're called. save commandline args */
     backup_argv = argv;
     backup_argc = argc;
+    oldoptions = NULL;
   } else { /* we're reloading. need to clean up old options first. */
     argv = backup_argv;
     argc = backup_argc;
+    oldoptions = get_options();
   }
   if (argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
     print_usage();