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