Changeset 87f525e for conf.c

Timestamp:

2008-08-10T10:42:52Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

a2b99ec

Parents:

8661caa (diff), a830512 (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:

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

File:

• conf.c (modified) (2 diffs)

conf.c

@@ -79 +79 @@
         }
         
-        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. */
         {
@@ -146 +146 @@
                                 "  -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' )