Changes in unix.c [aaf92a9:eeb85a8]

File:

• unix.c (modified) (3 diffs)

unix.c

@@ -47 +47 @@
         
         log_init();
-        CONF_FILE = g_strdup( CONF_FILE_DEF );
+        global.conf_file = g_strdup( CONF_FILE_DEF );
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
@@ -124 +124 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( help_init( &(global.help), global.helpfile ) == NULL )
+        if( help_init( &global.help, global.helpfile ) == NULL )
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
         b_main_run();
+        
+        /* Mainly good for restarting, to make sure we close the help.txt fd. */
+        help_free( &global.help );
         
         if( global.restart )
@@ -197 +200 @@
                 {
                         if( WIFSIGNALED( st ) )
-                                log_message( LOGLVL_INFO, "Client %d terminated normally. (status = %d)", pid, WEXITSTATUS( st ) );
+                                log_message( LOGLVL_INFO, "Client %d terminated normally. (status = %d)", (int) pid, WEXITSTATUS( st ) );
                         else if( WIFEXITED( st ) )
-                                log_message( LOGLVL_INFO, "Client %d killed by signal %d.", pid, WTERMSIG( st ) );
+                                log_message( LOGLVL_INFO, "Client %d killed by signal %d.", (int) pid, WTERMSIG( st ) );
                 }
         }