Changeset eeb85a8

Timestamp:

2008-02-11T12:35:01Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1ba7e8f, 2799ff9

Parents:

3038e47

Message:

Got rid of some noise at startup: complaining when the default configuration
file couldn't be found while the user specified an alternative location with
the -c option, and double complaints about /var/lib/bitlbee/ permissions.

Files:

• bitlbee.h (modified) (2 diffs)
• conf.c (modified) (14 diffs)
• irc_commands.c (modified) (1 diff)
• storage_text.c (modified) (1 diff)
• storage_xml.c (modified) (1 diff)
• unix.c (modified) (1 diff)

bitlbee.h

@@ -122 +122 @@
 #define CONF_FILE_DEF ETCDIR "bitlbee.conf"
 
-extern char *CONF_FILE;
-
 #include "irc.h"
 #include "storage.h"
@@ -145 +143 @@
         gint listen_watch_source_id;
         help_t *help;
+        char *conf_file;
         conf_t *conf;
         GList *storage; /* The first backend in the list will be used for saving */

conf.c

@@ -36 +36 @@
 #include "proxy.h"
 
-char *CONF_FILE;
-
 static int conf_loadini( conf_t *conf, char *file );
 
@@ -43 +41 @@
 {
         conf_t *conf;
-        int opt, i;
+        int opt, i, config_missing = 0;
         
         conf = g_new0( conf_t, 1 );
@@ -66 +64 @@
         proxytype = 0;
         
-        i = conf_loadini( conf, CONF_FILE );
+        i = conf_loadini( conf, global.conf_file );
         if( i == 0 )
         {
-                fprintf( stderr, "Error: Syntax error in configuration file `%s'.\n", CONF_FILE );
-                return( NULL );
+                fprintf( stderr, "Error: Syntax error in configuration file `%s'.\n", global.conf_file );
+                return NULL;
         }
         else if( i == -1 )
         {
-                fprintf( stderr, "Warning: Unable to read configuration file `%s'.\n", CONF_FILE );
+                config_missing ++;
+                /* Whine after parsing the options if there was no -c pointing
+                   at a *valid* configuration file. */
         }
         
@@ -106 +106 @@
                 else if( opt == 'c' )
                 {
-                        if( strcmp( CONF_FILE, optarg ) != 0 )
-                        {
-                                g_free( CONF_FILE );
-                                CONF_FILE = g_strdup( optarg );
+                        if( strcmp( global.conf_file, optarg ) != 0 )
+                        {
+                                g_free( global.conf_file );
+                                global.conf_file = g_strdup( optarg );
                                 g_free( conf );
                                 /* Re-evaluate arguments. Don't use this option twice, 
@@ -115 +115 @@
                                    works with all libcs BTW.. */
                                 optind = 1;
-                                return( conf_load( argc, argv ) );
+                                return conf_load( argc, argv );
                         }
                 }
@@ -143 +143 @@
                                 "  -d  Specify alternative user configuration directory\n"
                                 "  -h  Show this help page.\n" );
-                        return( NULL );
+                        return NULL;
                 }
                 else if( opt == 'R' )
@@ -169 +169 @@
         }
         
-        return( conf );
+        if( config_missing )
+                fprintf( stderr, "Warning: Unable to read configuration file `%s'.\n", global.conf_file );
+        
+        return conf;
 }
 
@@ -178 +181 @@
         
         ini = ini_open( file );
-        if( ini == NULL ) return( -1 );
+        if( ini == NULL ) return -1;
         while( ini_read( ini ) )
         {
@@ -256 +259 @@
                                 {
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
-                                        return( 0 );
+                                        return 0;
                                 }
                                 conf->ping_interval = i;
@@ -265 +268 @@
                                 {
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
-                                        return( 0 );
+                                        return 0;
                                 }
                                 conf->ping_timeout = i;
@@ -277 +280 @@
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
                                         g_free( url );
-                                        return( 0 );
+                                        return 0;
                                 }
                                 
@@ -301 +304 @@
                         {
                                 fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );
-                                return( 0 );
+                                return 0;
                                 /* For now just ignore unknown keys... */
                         }
@@ -309 +312 @@
                         fprintf( stderr, "Error: Unknown section [%s] in configuration file. "
                                          "BitlBee configuration must be put in a [settings] section!\n", ini->section );
-                        return( 0 );
+                        return 0;
                 }
         }
         ini_close( ini );
         
-        return( 1 );
+        return 1;
 }
 
@@ -321 +324 @@
         ini_t *ini;
         
-        ini = ini_open( CONF_FILE );
+        ini = ini_open( global.conf_file );
         if( ini == NULL ) return;
         while( ini_read( ini ) )

irc_commands.c

@@ -571 +571 @@
                 ipc_to_master( cmd );
         
-        irc_reply( irc, 382, "%s :Rehashing", CONF_FILE );
+        irc_reply( irc, 382, "%s :Rehashing", global.conf_file );
 }
 

storage_text.c

@@ -30 +30 @@
 static void text_init (void)
 {
-        if( access( global.conf->configdir, F_OK ) != 0 )
-                log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", global.conf->configdir );
-        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 );
+        /* Don't complain about the configuration directory anymore, leave it
+           up to the XML storage module, which uses the same directory for it
+           anyway. Nobody should be using just the text plugin anymore since
+           it's read only! */
 }
 

storage_xml.c

@@ -263 +263 @@
 {
         if( access( global.conf->configdir, F_OK ) != 0 )
-                log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", global.conf->configdir );
+                log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir );
         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 );
+                log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir );
 }
 

unix.c

@@ -47 +47 @@
         
         log_init();
-        CONF_FILE = g_strdup( CONF_FILE_DEF );
+        global.conf_file = g_strdup( CONF_FILE_DEF );
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )