Changes in conf.c [eeb85a8:8961950]

File:

• conf.c (modified) (16 diffs)

conf.c

@@ -36 +36 @@
 #include "proxy.h"
 
+char *CONF_FILE;
+
 static int conf_loadini( conf_t *conf, char *file );
 
@@ -41 +43 @@
 {
         conf_t *conf;
-        int opt, i, config_missing = 0;
+        int opt, i;
         
         conf = g_new0( conf_t, 1 );
@@ -59 +61 @@
         conf->pidfile = g_strdup( PIDFILE );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
+        conf->welcomefile = g_strdup( ETCDIR "/welcome.txt" );
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
@@ -64 +67 @@
         proxytype = 0;
         
-        i = conf_loadini( conf, global.conf_file );
+        i = conf_loadini( conf, CONF_FILE );
         if( i == 0 )
         {
-                fprintf( stderr, "Error: Syntax error in configuration file `%s'.\n", global.conf_file );
-                return NULL;
+                fprintf( stderr, "Error: Syntax error in configuration file `%s'.\n", CONF_FILE );
+                return( NULL );
         }
         else if( i == -1 )
         {
-                config_missing ++;
-                /* Whine after parsing the options if there was no -c pointing
-                   at a *valid* configuration file. */
+                fprintf( stderr, "Warning: Unable to read configuration file `%s'.\n", CONF_FILE );
         }
         
@@ -106 +107 @@
                 else if( opt == 'c' )
                 {
-                        if( strcmp( global.conf_file, optarg ) != 0 )
-                        {
-                                g_free( global.conf_file );
-                                global.conf_file = g_strdup( optarg );
+                        if( strcmp( CONF_FILE, optarg ) != 0 )
+                        {
+                                g_free( CONF_FILE );
+                                CONF_FILE = g_strdup( optarg );
                                 g_free( conf );
                                 /* Re-evaluate arguments. Don't use this option twice, 
@@ -115 +116 @@
                                    works with all libcs BTW.. */
                                 optind = 1;
-                                return conf_load( argc, argv );
+                                return( conf_load( argc, argv ) );
                         }
                 }
@@ -143 +144 @@
                                 "  -d  Specify alternative user configuration directory\n"
                                 "  -h  Show this help page.\n" );
-                        return NULL;
+                        return( NULL );
                 }
                 else if( opt == 'R' )
@@ -169 +170 @@
         }
         
-        if( config_missing )
-                fprintf( stderr, "Warning: Unable to read configuration file `%s'.\n", global.conf_file );
-        
-        return conf;
+        return( conf );
 }
 
@@ -181 +179 @@
         
         ini = ini_open( file );
-        if( ini == NULL ) return -1;
+        if( ini == NULL ) return( -1 );
         while( ini_read( ini ) )
         {
@@ -244 +242 @@
                                 conf->motdfile = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "welcomefile" ) == 0 )
+                        {
+                                g_free( conf->welcomefile );
+                                conf->welcomefile = g_strdup( ini->value );
+                        }
                         else if( g_strcasecmp( ini->key, "account_storage" ) == 0 )
                         {
@@ -259 +262 @@
                                 {
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
-                                        return 0;
+                                        return( 0 );
                                 }
                                 conf->ping_interval = i;
@@ -268 +271 @@
                                 {
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
-                                        return 0;
+                                        return( 0 );
                                 }
                                 conf->ping_timeout = i;
@@ -280 +283 @@
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
                                         g_free( url );
-                                        return 0;
+                                        return( 0 );
                                 }
                                 
@@ -304 +307 @@
                         {
                                 fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );
-                                return 0;
+                                return( 0 );
                                 /* For now just ignore unknown keys... */
                         }
@@ -312 +315 @@
                         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 );
 }
 
@@ -324 +327 @@
         ini_t *ini;
         
-        ini = ini_open( global.conf_file );
+        ini = ini_open( CONF_FILE );
         if( ini == NULL ) return;
         while( ini_read( ini ) )