- Timestamp:
- 2006-02-12T07:20:49Z (18 years ago)
- Branches:
- master
- Children:
- 58bc4e6
- Parents:
- 9fae35c (diff), 1d2e3c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
conf.c
r9fae35c rec3e411 32 32 #include "ini.h" 33 33 #include "url.h" 34 #include "ipc.h" 34 35 35 36 #include "protocols/proxy.h" … … 61 62 conf->configdir = g_strdup( CONFIG ); 62 63 conf->plugindir = g_strdup( PLUGINDIR ); 64 conf->pidfile = g_strdup( "/var/run/bitlbee.pid" ); 63 65 conf->motdfile = g_strdup( ETCDIR "/motd.txt" ); 64 66 conf->ping_interval = 180; … … 77 79 } 78 80 79 while( argc > 0 && ( opt = getopt( argc, argv, "i:p: nvIDFc:d:h" ) ) >= 0 )81 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:" ) ) >= 0 ) 80 82 /* ^^^^ Just to make sure we skip this step from the REHASH handler. */ 81 83 { … … 92 94 } 93 95 conf->port = i; 96 } 97 else if( opt == 'p' ) 98 { 99 g_free( conf->pidfile ); 100 conf->pidfile = g_strdup( optarg ); 94 101 } 95 102 else if( opt == 'n' ) … … 142 149 return( NULL ); 143 150 } 151 else if( opt == 'R' ) 152 { 153 /* We can't load the statefile yet (and should make very sure we do this 154 only once), so set the filename here and load the state information 155 when initializing ForkDaemon. (This option only makes sense in that 156 mode anyway!) */ 157 ipc_master_set_statefile( optarg ); 158 } 144 159 } 145 160 … … 175 190 else 176 191 conf->runmode = RUNMODE_INETD; 192 } 193 else if( g_strcasecmp( ini->key, "pidfile" ) == 0 ) 194 { 195 g_free( conf->pidfile ); 196 conf->pidfile = g_strdup( ini->value ); 177 197 } 178 198 else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )
Note: See TracChangeset
for help on using the changeset viewer.