Merged in upstream r416 which includes my msn_write_msg patch. w00t! ;)

1 files changed, 8 insertions, 1 deletions

diff --git a/conf.c b/conf.c
index f0c7ce27..02b1eb98 100644
--- a/conf.c
+++ b/conf.c
@@ -78,7 +78,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: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. */
 	{
 		if( opt == 'i' )
@@ -146,6 +146,13 @@ conf_t *conf_load( int argc, char *argv[] )
 			        "  -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' )
 		{
 			g_free( conf->user );