Changeset 9df916f for unix.c

Timestamp:

2005-12-09T20:48:45Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

34759e6

Parents:

c2295f7 (diff), 87c24ba (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:

Merge my storage abstraction changes

File:

• unix.c (modified) (3 diffs)

unix.c

@@ -52 +52 @@
         
         global.helpfile = g_strdup( HELP_FILE );
-        
+
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
                 return( 1 );
-        
+
+
         if( global.conf->runmode == RUNMODE_INETD )
         {
@@ -70 +71 @@
         if( i != 0 )
                 return( i );
+
+        global.storage = storage_init( global.conf->storage );
+        if ( global.storage == NULL) {
+                log_message( LOGLVL_ERROR, "No such storage backend '%s'", global.conf->storage );
+                return( 1 );
+        }
+        
         
         /* Catch some signals to tell the user what's happening before quitting */
@@ -87 +95 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( access( global.conf->configdir, F_OK ) != 0 )
-                log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", CONFIG );
-        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
-                log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir );
         if( help_init( &(global.help) ) == NULL )
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );