Changes in conf.c [823de9d:489f996]
Legend:
- Unmodified
- Added
- Removed
-
conf.c
r823de9d r489f996 60 60 conf->pidfile = g_strdup( PIDFILE ); 61 61 conf->motdfile = g_strdup( ETCDIR "/motd.txt" ); 62 conf->welcomefile = g_strdup( ETCDIR "/welcome.txt" );63 62 conf->ping_interval = 180; 64 63 conf->ping_timeout = 300; … … 79 78 } 80 79 81 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:h u:" ) ) >= 0 )80 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 ) 82 81 /* ^^^^ Just to make sure we skip this step from the REHASH handler. */ 83 82 { … … 249 248 g_free( conf->motdfile ); 250 249 conf->motdfile = g_strdup( ini->value ); 251 }252 else if( g_strcasecmp( ini->key, "welcomefile" ) == 0 )253 {254 g_free( conf->welcomefile );255 conf->welcomefile = g_strdup( ini->value );256 250 } 257 251 else if( g_strcasecmp( ini->key, "account_storage" ) == 0 ) … … 314 308 else 315 309 { 316 fprintf( stderr, "Error: Unknown setting `%s` in configuration file .\n", ini->key);310 fprintf( stderr, "Error: Unknown setting `%s` in configuration file (line %d).\n", ini->key, ini->line ); 317 311 return 0; 318 312 /* For now just ignore unknown keys... */ … … 321 315 else if( g_strcasecmp( ini->section, "defaults" ) != 0 ) 322 316 { 323 fprintf( stderr, "Error: Unknown section [%s] in configuration file . "324 "BitlBee configuration must be put in a [settings] section!\n", ini->section );317 fprintf( stderr, "Error: Unknown section [%s] in configuration file (line %d). " 318 "BitlBee configuration must be put in a [settings] section!\n", ini->section, ini->line ); 325 319 return 0; 326 320 }
Note: See TracChangeset
for help on using the changeset viewer.