Changes in conf.c [34b17d9:7cf85e7]

File:

• conf.c (modified) (4 diffs)

conf.c

@@ -32 +32 @@
 #include "ini.h"
 #include "url.h"
+#include "ipc.h"
 
 #include "protocols/proxy.h"
@@ -78 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:h" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -138 +139 @@
                                 "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
                                 "  -F  Forking daemon. (one process per client)\n"
+                                "  -P  Specify PID-file (not for inetd mode)\n"
                                 "  -i  Specify the interface (by IP address) to listen on.\n"
                                 "      (Default: 0.0.0.0 (any interface))\n"
@@ -147 +149 @@
                                 "  -h  Show this help page.\n" );
                         return( NULL );
+                }
+                else if( opt == 'R' )
+                {
+                        /* We can't load the statefile yet (and should make very sure we do this
+                           only once), so set the filename here and load the state information
+                           when initializing ForkDaemon. (This option only makes sense in that
+                           mode anyway!) */
+                        ipc_master_set_statefile( optarg );
                 }
         }