Changeset 4eb4c0f for conf.c

Timestamp:

2008-02-16T17:15:31Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (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 in upstream changes

File:

• conf.c (modified) (14 diffs)

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 );
@@ -67 +65 @@
         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. */
         }
         
@@ -107 +107 @@
                 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, 
@@ -116 +116 @@
                                    works with all libcs BTW.. */
                                 optind = 1;
-                                return( conf_load( argc, argv ) );
+                                return conf_load( argc, argv );
                         }
                 }
@@ -144 +144 @@
                                 "  -d  Specify alternative user configuration directory\n"
                                 "  -h  Show this help page.\n" );
-                        return( NULL );
+                        return NULL;
                 }
                 else if( opt == 'R' )
@@ -170 +170 @@
         }
         
-        return( conf );
+        if( config_missing )
+                fprintf( stderr, "Warning: Unable to read configuration file `%s'.\n", global.conf_file );
+        
+        return conf;
 }
 
@@ -179 +182 @@
         
         ini = ini_open( file );
-        if( ini == NULL ) return( -1 );
+        if( ini == NULL ) return -1;
         while( ini_read( ini ) )
         {
@@ -262 +265 @@
                                 {
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
-                                        return( 0 );
+                                        return 0;
                                 }
                                 conf->ping_interval = i;
@@ -271 +274 @@
                                 {
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
-                                        return( 0 );
+                                        return 0;
                                 }
                                 conf->ping_timeout = i;
@@ -283 +286 @@
                                         fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
                                         g_free( url );
-                                        return( 0 );
+                                        return 0;
                                 }
                                 
@@ -307 +310 @@
                         {
                                 fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );
-                                return( 0 );
+                                return 0;
                                 /* For now just ignore unknown keys... */
                         }
@@ -315 +318 @@
                         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;
 }
 
@@ -327 +330 @@
         ini_t *ini;
         
-        ini = ini_open( CONF_FILE );
+        ini = ini_open( global.conf_file );
         if( ini == NULL ) return;
         while( ini_read( ini ) )