jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1169 from Pinguin1234/feature/close_on_sighup

Browse Source 
Added option to quit in SIGHUP
This commit is contained in:
ailin-nemui 2020-04-06 15:14:40 +00:00 committed by GitHub
commit f1647bdfa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.h
View File

@ -6,7 +6,7 @@
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */ #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */ #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
#define IRSSI_ABI_VERSION 25 #define IRSSI_ABI_VERSION 26
#define DEFAULT_SERVER_ADD_PORT 6667 #define DEFAULT_SERVER_ADD_PORT 6667
#define DEFAULT_SERVER_ADD_TLS_PORT 6697 #define DEFAULT_SERVER_ADD_TLS_PORT 6697

10
src/core/core.c
View File

@ -66,7 +66,7 @@ void wcwidth_wrapper_deinit(void);
int irssi_gui; int irssi_gui;
int irssi_init_finished; int irssi_init_finished;
int reload_config; int sighup_received;
time_t client_start_time; time_t client_start_time;
static char *irssi_dir, *irssi_config_file; static char *irssi_dir, *irssi_config_file;
@ -83,9 +83,9 @@ const char *get_irssi_config(void)
return irssi_config_file; return irssi_config_file;
} }
static void sig_reload_config(int signo) static void sig_hup(int signo)
{ {
reload_config = TRUE; sighup_received = TRUE;
} }
static void read_settings(void) static void read_settings(void)
@ -108,8 +108,7 @@ 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_hup;
act.sa_handler = sig_reload_config;
sigaction(SIGHUP, &act, NULL); sigaction(SIGHUP, &act, NULL);
for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) { for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
@ -267,6 +266,7 @@ void core_init(void)
settings_add_str("misc", "ignore_signals", ""); settings_add_str("misc", "ignore_signals", "");
settings_add_bool("misc", "override_coredump_limit", FALSE); settings_add_bool("misc", "override_coredump_limit", FALSE);
settings_add_bool("misc", "quit_on_hup", FALSE);
#ifdef HAVE_SYS_RESOURCE_H #ifdef HAVE_SYS_RESOURCE_H
getrlimit(RLIMIT_CORE, &orig_core_rlimit); getrlimit(RLIMIT_CORE, &orig_core_rlimit);

2
src/core/core.h
View File

@ -13,7 +13,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. */ extern int sighup_received; /* TRUE after received SIGHUP. */
extern time_t client_start_time; extern time_t client_start_time;
void core_preinit(const char *path); void core_preinit(const char *path);

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

@ -339,11 +339,16 @@ int main(int argc, char **argv)
/* Does the same as g_main_run(main_loop), except we /* Does the same as g_main_run(main_loop), except we
can call our dirty-checker after each iteration */ can call our dirty-checker after each iteration */
while (!quitting) { while (!quitting) {
if (reload_config) { if (sighup_received) {
/* SIGHUP received, do /RELOAD */ sighup_received = FALSE;
reload_config = FALSE;
if (settings_get_bool("quit_on_hup")) {
signal_emit("gui exit", 0);
}
else {
signal_emit("command reload", 1, ""); signal_emit("command reload", 1, "");
} }
}
dirty_check(); dirty_check();