Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 08:53:02 +01:00
Code Issues Projects Releases Wiki Activity

try to end curses session gracefully on SIGSEGV

Browse Source
This commit is contained in:
Jfreegman 2014-08-03 00:26:44 -04:00
parent c14f2a3fcd
commit 53663a7832
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/toxic.c
View File

@ -81,11 +81,25 @@ static void catch_SIGINT(int sig)
Winthread.sig_exit_toxic = true; Winthread.sig_exit_toxic = true;
} }
static void catch_SIGSEGV(int sig)
{
endwin();
fprintf(stderr, "Caught SIGSEGV: Aborting toxic session.\n");
exit(EXIT_FAILURE);
}
static void flag_window_resize(int sig) static void flag_window_resize(int sig)
{ {
Winthread.flag_resize = true; Winthread.flag_resize = true;
} }
static void init_signal_catchers(void)
{
signal(SIGWINCH, flag_window_resize);
signal(SIGINT, catch_SIGINT);
signal(SIGSEGV, catch_SIGSEGV);
}
void exit_toxic_success(Tox *m) void exit_toxic_success(Tox *m)
{ {
store_data(m, DATA_FILE); store_data(m, DATA_FILE);
@ -120,8 +134,6 @@ void exit_toxic_err(const char *errmsg, int errcode)
static void init_term(void) static void init_term(void)
{ {
signal(SIGWINCH, flag_window_resize);
#if HAVE_WIDECHAR #if HAVE_WIDECHAR
if (!arg_opts.default_locale) { if (!arg_opts.default_locale) {
@ -622,10 +634,11 @@ static useconds_t optimal_msleepval(uint64_t *looptimer, uint64_t *loopcount, ui
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
init_signal_catchers();
parse_args(argc, argv); parse_args(argc, argv);
/* Make sure all written files are read/writeable only by the current user. */ /* Make sure all written files are read/writeable only by the current user. */
umask(S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); umask(S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
signal(SIGINT, catch_SIGINT);
int config_err = init_data_files(); int config_err = init_data_files();
/* init user_settings struct and load settings from conf file */ /* init user_settings struct and load settings from conf file */