Changes in conf.c [f4a5940:34b17d9]

File:

• conf.c (modified) (4 diffs)

conf.c

@@ -61 +61 @@
         conf->configdir = g_strdup( CONFIG );
         conf->plugindir = g_strdup( PLUGINDIR );
+        conf->pidfile = g_strdup( "/var/run/bitlbee.pid" );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
         conf->ping_interval = 180;
@@ -77 +78 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:h" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -92 +93 @@
                         }
                         conf->port = i;
+                }
+                else if( opt == 'p' )
+                {
+                        g_free( conf->pidfile );
+                        conf->pidfile = g_strdup( optarg );
                 }
                 else if( opt == 'n' )
@@ -175 +181 @@
                                 else
                                         conf->runmode = RUNMODE_INETD;
+                        }
+                        else if( g_strcasecmp( ini->key, "pidfile" ) == 0 )
+                        {
+                                g_free( conf->pidfile );
+                                conf->pidfile = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )