diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-10-15 11:41:12 +0200 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-10-15 11:41:12 +0200 |
commit | 69cb62335f8bbe46b2879aabc5fdbe288891b02b (patch) | |
tree | 38fcda3162027d741598536c28a2c0cd4c3f52c6 /unix.c | |
parent | 695e39232324711816f1db8e25fdba59a0c6456f (diff) | |
parent | e97827bee83d3a0663aa284e72a4f6c84b4b4dfe (diff) |
Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)
Diffstat (limited to 'unix.c')
-rw-r--r-- | unix.c | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -47,20 +47,18 @@ int main( int argc, char *argv[], char **envp ) memset( &global, 0, sizeof( global_t ) ); b_main_init(); - log_init(); - nogaim_init(); - - CONF_FILE = g_strdup( CONF_FILE_DEF ); + srand( time( NULL ) ^ getpid() ); + + CONF_FILE = g_strdup( CONF_FILE_DEF ); global.helpfile = g_strdup( HELP_FILE ); - + global.conf = conf_load( argc, argv ); if( global.conf == NULL ) return( 1 ); - - + if( global.conf->runmode == RUNMODE_INETD ) { i = bitlbee_inetd_init(); @@ -88,7 +86,7 @@ int main( int argc, char *argv[], char **envp ) } if( i != 0 ) return( i ); - + global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage ); if ( global.storage == NULL) { log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage ); |