Changes in unix.c [cd63d58:51bbec0]

File:

• unix.c (modified) (2 diffs)

unix.c

@@ -40 +40 @@
 static void sighandler( int signal );
 
-int main( int argc, char *argv[] )
+int main( int argc, char *argv[], char **envp )
 {
         int i = 0;
@@ -135 +135 @@
         {
                 char *fn = ipc_master_save_state();
+                char **args;
+                int n, i;
                 
                 chdir( old_cwd );
                 
-                setenv( "_BITLBEE_RESTART_STATE", fn, 1 );
-                g_free( fn );
+                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];
+                }
                 
                 close( global.listen_socket );
                 
-                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 ); */
+                execve( args[0], args, envp );
         }