Changes in unix.c [58bc4e6:b73ac9c]

File:

• unix.c (modified) (8 diffs)

unix.c

@@ -29 +29 @@
 #include "protocols/nogaim.h"
 #include "help.h"
-#include "ipc.h"
 #include <signal.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <sys/wait.h>
 
 global_t global;        /* Against global namespace pollution */
@@ -39 +37 @@
 static void sighandler( int signal );
 
-int main( int argc, char *argv[], char **envp )
+int main( int argc, char *argv[] )
 {
         int i = 0;
-        char *old_cwd = NULL;
         struct sigaction sig, old;
         
@@ -49 +46 @@
         global.loop = g_main_new( FALSE );
         
-        log_init();
-
-        nogaim_init();
-
+        log_init( );
+        nogaim_init( );
+        
         CONF_FILE = g_strdup( CONF_FILE_DEF );
         
@@ -73 +69 @@
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
         }
-        else if( global.conf->runmode == RUNMODE_FORKDAEMON )
-        {
-                /* In case the operator requests a restart, we need this. */
-                old_cwd = g_malloc( 256 );
-                if( getcwd( old_cwd, 255 ) == NULL )
-                {
-                        log_message( LOGLVL_WARNING, "Could not save current directory: %s", strerror( errno ) );
-                        g_free( old_cwd );
-                        old_cwd = NULL;
-                }
-                
-                i = bitlbee_daemon_init();
-                log_message( LOGLVL_INFO, "Bitlbee %s starting in forking daemon mode.", BITLBEE_VERSION );
-        }
         if( i != 0 )
                 return( i );
 
-        global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
+        global.storage = storage_init( global.conf->primary_storage, 
+                                                                   global.conf->migrate_storage );
         if ( global.storage == NULL) {
                 log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
@@ -100 +83 @@
         memset( &sig, 0, sizeof( sig ) );
         sig.sa_handler = sighandler;
-        sigaction( SIGCHLD, &sig, &old );
         sigaction( SIGPIPE, &sig, &old );
         sig.sa_flags = SA_RESETHAND;
@@ -119 +101 @@
         g_main_run( global.loop );
         
-        if( global.restart )
-        {
-                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];
-                }
-                
-                close( global.listen_socket );
-                
-                execve( args[0], args, envp );
-        }
-        
         return( 0 );
 }
@@ -153 +106 @@
 static void sighandler( int signal )
 {
-        /* FIXME: Calling log_message() here is not a very good idea! */
+        /* FIXME: In fact, calling log_message() here can be dangerous. But well, let's take the risk for now. */
         
         if( signal == SIGTERM )
@@ -179 +132 @@
                 }
         }
-        else if( signal == SIGCHLD )
-        {
-                pid_t pid;
-                int st;
-                
-                while( ( pid = waitpid( 0, &st, WNOHANG ) ) > 0 )
-                {
-                        if( WIFSIGNALED( st ) )
-                                log_message( LOGLVL_INFO, "Client %d terminated normally. (status = %d)", pid, WEXITSTATUS( st ) );
-                        else if( WIFEXITED( st ) )
-                                log_message( LOGLVL_INFO, "Client %d killed by signal %d.", pid, WTERMSIG( st ) );
-                }
-        }
         else if( signal != SIGPIPE )
         {