int irssi_gui;
int irssi_init_finished;
+int reload_config;
static char *irssi_dir, *irssi_config_file;
static GSList *dialog_type_queue, *dialog_text_queue;
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"
};
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;
void core_init_paths(int argc, char *argv[])
{
static struct poptOption options[] = {
- { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.irssi/config)", "PATH" },
- { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.irssi)", "PATH" },
+ { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.silc/config)", "PATH" },
+ { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.silc)", "PATH" },
{ NULL, '\0', 0, NULL }
};
+ const char *home;
char *str;
int n, len;
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);