Changeset 4aa0f6b for unix.c

Timestamp:

2010-06-07T14:31:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (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.

Message:

Merging killerbee stuff, bringing all the bleeding-edge stuff together.

File:

• unix.c (modified) (4 diffs)

unix.c

@@ -56 +56 @@
         
         log_init();
+        
         global.conf_file = g_strdup( CONF_FILE_DEF );
         global.conf = conf_load( argc, argv );
@@ -62 +63 @@
         
         b_main_init();
-        nogaim_init();
         
         srand( time( NULL ) ^ getpid() );
+        
         global.helpfile = g_strdup( HELP_FILE );
+        if( help_init( &global.help, global.helpfile ) == NULL )
+                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
+
+        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 );
+                return( 1 );
+        }
         
         if( global.conf->runmode == RUNMODE_INETD )
@@ -116 +126 @@
                         setuid( pw->pw_uid );
                 }
-        }
-
-        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 );
-                return( 1 );
         }
         
@@ -142 +145 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( help_init( &global.help, global.helpfile ) == NULL )
-                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
         b_main_run();