Added SILC Thread Queue API

[runtime.git] / apps / irssi / src / core / core.c

diff --git a/apps/irssi/src/core/core.c b/apps/irssi/src/core/core.c
index 041d75a46b7707aeedbbee4dbdbdcb31ded6313b..2f2f7329e00a92b02f7ef713388607beea54149d 100644 (file)
--- a/apps/irssi/src/core/core.c
+++ b/apps/irssi/src/core/core.c
@@ -40,6 +40,7 @@
 #include "log.h"
 #include "rawlog.h"
 #include "ignore.h"
+#include "recode.h"
 
 #include "channels.h"
 #include "queries.h"
@@ -59,6 +60,8 @@ void log_away_deinit(void);
 
 int irssi_gui;
 int irssi_init_finished;
+int reload_config;
+time_t client_start_time;
 
 static char *irssi_dir, *irssi_config_file;
 static GSList *dialog_type_queue, *dialog_text_queue;
@@ -74,15 +77,20 @@ const char *get_irssi_config(void)
         return irssi_config_file;
 }
 
+static void sig_reload_config(int signo)
+{
+        reload_config = TRUE;
+}
+
 static void read_settings(void)
 {
 #ifndef WIN32
        static int signals[] = {
-               SIGHUP, SIGINT, SIGQUIT, SIGTERM,
+               SIGINT, SIGQUIT, SIGTERM,
                SIGALRM, SIGUSR1, SIGUSR2
        };
        static char *signames[] = {
-               "hup", "int", "quit", "term",
+               "int", "quit", "term",
                "alrm", "usr1", "usr2"
        };
 
@@ -95,6 +103,10 @@ static void read_settings(void)
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
 
+       /* reload config on SIGHUP */
+        act.sa_handler = sig_reload_config;
+       sigaction(SIGHUP, &act, NULL);
+
        for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
                act.sa_handler = find_substr(ignores, signames[n]) ?
                        SIG_IGN : SIG_DFL;
@@ -149,6 +161,7 @@ void core_init_paths(int argc, char *argv[])
                { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.irssi)", "PATH" },
                { NULL, '\0', 0, NULL }
        };
+       const char *home;
        char *str;
        int n, len;
 
@@ -181,8 +194,13 @@ void core_init_paths(int argc, char *argv[])
 
        args_register(options);
 
-        if (irssi_dir == NULL)
-               irssi_dir = g_strdup_printf(IRSSI_DIR_FULL, g_get_home_dir());
+       if (irssi_dir == NULL) {
+               home = g_get_home_dir();
+               if (home == NULL)
+                       home = ".";
+
+               irssi_dir = g_strdup_printf(IRSSI_DIR_FULL, home);
+       }
        if (irssi_config_file == NULL)
                irssi_config_file = g_strdup_printf("%s/"IRSSI_HOME_CONFIG, irssi_dir);
 
@@ -198,6 +216,7 @@ void core_init(int argc, char *argv[])
 {
        dialog_type_queue = NULL;
        dialog_text_queue = NULL;
+       client_start_time = time(NULL);
 
        modules_init();
 #ifndef WIN32
@@ -225,6 +244,7 @@ void core_init(int argc, char *argv[])
        log_init();
        log_away_init();
        rawlog_init();
+       recode_init();
 
        channels_init();
        queries_init();
@@ -233,7 +253,7 @@ void core_init(int argc, char *argv[])
        chat_commands_init();
 
        settings_add_str("misc", "ignore_signals", "");
-       settings_add_bool("misc", "override_coredump_limit", TRUE);
+       settings_add_bool("misc", "override_coredump_limit", FALSE);
 
 #ifdef HAVE_SYS_RESOURCE_H
        getrlimit(RLIMIT_CORE, &orig_core_rlimit);
@@ -260,6 +280,7 @@ void core_deinit(void)
        queries_deinit();
        channels_deinit();
 
+       recode_deinit();
        rawlog_deinit();
        log_away_deinit();
        log_deinit();