Changeset 8661caa for unix.c

Timestamp:

2008-08-04T14:45:24Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

87f525e

Parents:

4ac647d (diff), 718e05f (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 r410.

Only conflict was the correction of jabber normalization which I had already done.

File:

• unix.c (modified) (5 diffs)

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;
@@ -60 +60 @@
         if( global.conf->runmode == RUNMODE_INETD )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
+        
                 i = bitlbee_inetd_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
@@ -66 +69 @@
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+
                 i = bitlbee_daemon_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
@@ -135 +141 @@
         {
                 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 ); */
         }
         
@@ -219 +214 @@
         return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
 }
+
+