Changeset devel,406

Timestamp:

2008-06-29T12:47:39Z (2 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

branch-nick:

devel

revision id:

wilmer@gaast.net-20080629124739-q2rjwq2idog17d31

Message:

Now using an environment variable instead of a flag to pass state info when
restarting the ForkDaemon. Preparing for a proper fallback when execv()
fails. (Bug #425)

Location:

devel

Files:

• bitlbee.c (modified) (1 diff)
• conf.c (modified) (2 diffs)
• ipc.c (modified) (4 diffs)
• ipc.h (modified) (1 diff)
• unix.c (modified) (2 diffs)

devel/bitlbee.c

@@ -118 +118 @@
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
-                ipc_master_load_state();
+                ipc_master_load_state( getenv( "_BITLBEE_RESTART_STATE" ) );
 
         if( global.conf->runmode == RUNMODE_DAEMON || global.conf->runmode == RUNMODE_FORKDAEMON )

devel/conf.c

@@ -78 +78 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -145 +145 @@
                                 "  -h  Show this help page.\n" );
                         return NULL;
-                }
-                else if( opt == 'R' )
-                {
-                        /* We can't load the statefile yet (and should make very sure we do this
-                           only once), so set the filename here and load the state information
-                           when initializing ForkDaemon. (This option only makes sense in that
-                           mode anyway!) */
-                        ipc_master_set_statefile( optarg );
                 }
                 else if( opt == 'u' )

devel/ipc.c

@@ -33 +33 @@
 
 GSList *child_list = NULL;
-static char *statefile = NULL;
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -501 +500 @@
 }
 
-void ipc_master_set_statefile( char *fn )
-{
-        statefile = g_strdup( fn );
-}
-
 
 static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
@@ -566 +560 @@
 #endif
 
-int ipc_master_load_state()
+int ipc_master_load_state( char *statefile )
 {
         struct bitlbee_child *child;
@@ -574 +568 @@
         if( statefile == NULL )
                 return 0;
+        
         fp = fopen( statefile, "r" );
         unlink( statefile );    /* Why do it later? :-) */

devel/ipc.h

@@ -58 +58 @@
 
 char *ipc_master_save_state();
-void ipc_master_set_statefile( char *fn );
-int ipc_master_load_state();
+int ipc_master_load_state( char *statefile );
 int ipc_master_listen_socket();
 

devel/unix.c

@@ -40 +40 @@
 static void sighandler( int signal );
 
-int main( int argc, char *argv[], char **envp )
+int main( int argc, char *argv[] )
 {
         int i = 0;
@@ -135 +135 @@
         {
                 char *fn = ipc_master_save_state();
-                char **args;
-                int n, i;
                 
                 chdir( old_cwd );
                 
-                n = 0;
-                args = g_new0( char *, argc + 3 );
-                args[n++] = argv[0];
-                if( fn )
-                {
-                        args[n++] = "-R";
-                        args[n++] = fn;
-                }
-                for( i = 1; argv[i] && i < argc; i ++ )
-                {
-                        if( strcmp( argv[i], "-R" ) == 0 )
-                                i += 2;
-                        
-                        args[n++] = argv[i];
-                }
+                setenv( "_BITLBEE_RESTART_STATE", fn, 1 );
+                g_free( fn );
                 
                 close( global.listen_socket );
                 
-                execve( args[0], args, envp );
+                if( execv( argv[0], argv ) == -1 )
+                        /* Apparently the execve() failed, so let's just
+                           jump back into our own/current main(). */
+                        /* Need more cleanup code to make this work. */
+                        return 1; /* main( argc, argv ); */
         }