aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

SIGHUP now does /RELOAD - useful with for example /SBAR prompt DISABLE when

Browse Source 
you don't have an input line to recover :)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2556 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-03-10 15:20:44 +00:00 committed by cras
parent ee8229be48
commit 0d54e4e299
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/core.c
View File

@ -59,6 +59,7 @@ void log_away_deinit(void);
int irssi_gui; int irssi_gui;
int irssi_init_finished; int irssi_init_finished;
int reload_config;
static char *irssi_dir, *irssi_config_file; static char *irssi_dir, *irssi_config_file;
static GSList *dialog_type_queue, *dialog_text_queue; static GSList *dialog_type_queue, *dialog_text_queue;
@ -74,15 +75,20 @@ const char *get_irssi_config(void)
return irssi_config_file; return irssi_config_file;
} }
static void sig_reload_config(int signo)
{
reload_config = TRUE;
}
static void read_settings(void) static void read_settings(void)
{ {
#ifndef WIN32 #ifndef WIN32
static int signals[] = { static int signals[] = {
SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGINT, SIGQUIT, SIGTERM,
SIGALRM, SIGUSR1, SIGUSR2 SIGALRM, SIGUSR1, SIGUSR2
}; };
static char *signames[] = { static char *signames[] = {
"hup", "int", "quit", "term", "int", "quit", "term",
"alrm", "usr1", "usr2" "alrm", "usr1", "usr2"
}; };
@ -95,6 +101,10 @@ static void read_settings(void)
sigemptyset (&act.sa_mask); sigemptyset (&act.sa_mask);
act.sa_flags = 0; 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++) { for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
act.sa_handler = find_substr(ignores, signames[n]) ? act.sa_handler = find_substr(ignores, signames[n]) ?
SIG_IGN : SIG_DFL; SIG_IGN : SIG_DFL;

1
src/core/core.h
View File

@ -11,6 +11,7 @@
extern int irssi_gui; extern int irssi_gui;
extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is sent */ extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is sent */
extern int reload_config; /* TRUE after received SIGHUP. */
void core_init_paths(int argc, char *argv[]); void core_init_paths(int argc, char *argv[]);

9
src/fe-text/irssi.c
View File

@ -348,7 +348,14 @@ int main(int argc, char **argv)
can call our dirty-checker after each iteration */ can call our dirty-checker after each iteration */
while (!quitting) { while (!quitting) {
g_main_iteration(TRUE); g_main_iteration(TRUE);
dirty_check();
if (reload_config) {
/* SIGHUP received, do /RELOAD */
reload_config = FALSE;
signal_emit("command reload", 1, "");
}
dirty_check();
} }
g_main_destroy(main_loop); g_main_destroy(main_loop);