From daae10fbfe16bac26f74af91faf253d377f1b166 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 7 Aug 2010 17:33:02 +0100 Subject: OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen with some changes. --- conf.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'conf.c') diff --git a/conf.c b/conf.c index 2bb938fa..b5993b4b 100644 --- a/conf.c +++ b/conf.c @@ -81,7 +81,7 @@ conf_t *conf_load( int argc, char *argv[] ) at a *valid* configuration file. */ } - while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:V" ) ) >= 0 ) + while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:V" ) ) >= 0 ) /* ^^^^ Just to make sure we skip this step from the REHASH handler. */ { if( opt == 'i' ) @@ -157,13 +157,6 @@ conf_t *conf_load( int argc, char *argv[] ) BITLBEE_VERSION, BITLBEE_VERSION_CODE ); 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' ) { g_free( conf->user ); -- cgit v1.2.3