Changes in conf.c [cd63d58:7c9db24]

File:

• conf.c (modified) (5 diffs)

conf.c

@@ -78 +78 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -127 +127 @@
                 {
                         printf( "Usage: bitlbee [-D/-F [-i <interface>] [-p <port>] [-n] [-v]] [-I]\n"
-                                "               [-c <file>] [-d <dir>] [-h]\n"
+                                "               [-c <file>] [-d <dir>] [-x] [-h]\n"
                                 "\n"
                                 "An IRC-to-other-chat-networks gateway\n"
@@ -143 +143 @@
                                 "  -c  Load alternative configuration file\n"
                                 "  -d  Specify alternative user configuration directory\n"
+                                "  -x  Command-line interface to password encryption/hashing\n"
                                 "  -h  Show this help page.\n" );
                         return NULL;
+                }
+                else if( opt == 'R' )
+                {
+                        /* Backward compatibility; older BitlBees passed this
+                           info using a command-line flag. Allow people to
+                           upgrade from such a version for now. */
+                        setenv( "_BITLBEE_RESTART_STATE", optarg, 0 );
                 }
                 else if( opt == 'u' )
@@ -301 +309 @@
                         else
                         {
-                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );
+                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file (line %d).\n", ini->key, ini->line );
                                 return 0;
                                 /* For now just ignore unknown keys... */
@@ -308 +316 @@
                 else if( g_strcasecmp( ini->section, "defaults" ) != 0 )
                 {
-                        fprintf( stderr, "Error: Unknown section [%s] in configuration file. "
-                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section );
+                        fprintf( stderr, "Error: Unknown section [%s] in configuration file (line %d). "
+                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section, ini->line );
                         return 0;
                 }