Changeset f4a5940 for conf.c

Timestamp:

2006-01-15T20:31:59Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

daa9e02

Parents:

6fda350

Message:

Added REHASH command, IPC emulation in daemon (non-forked) mode.

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -64 +64 @@
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
+        proxytype = 0;
         
         i = conf_loadini( conf, CONF_FILE );
@@ -76 +77 @@
         }
         
-        while( ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
+        /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
                 if( opt == 'i' )
@@ -108 +110 @@
                                 CONF_FILE = g_strdup( optarg );
                                 g_free( conf );
-                                /* Re-evaluate arguments. */
+                                /* Re-evaluate arguments. Don't use this option twice, 
+                                   you'll end up in an infinite loop! Hope this trick
+                                   works with all libcs BTW.. */
                                 optind = 1;
                                 return( conf_load( argc, argv ) );