X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fmutt_signal.c;h=2728656df09d97812ad5576ac152813d4ff10b62;hp=ea86e3bae71c857f8d00b513fb42ca2038121972;hb=bb8c11821cc88fef9da474587cc42e0f7554cf28;hpb=f435868132e200bfa71ac155f037cf64bf5414ba diff --git a/lib-sys/mutt_signal.c b/lib-sys/mutt_signal.c index ea86e3b..2728656 100644 --- a/lib-sys/mutt_signal.c +++ b/lib-sys/mutt_signal.c @@ -22,15 +22,10 @@ static int IsEndwin = 0; /* Attempt to catch "ordinary" signals and shut down gracefully. */ static void exit_handler (int sig) { - curs_set (1); - endwin (); /* just to be safe */ - printf(_("Caught %s... Exiting.\n"), strsignal(sig)); - exit (0); -} - -static void chld_handler(int sig __attribute__((unused))) -{ - /* empty */ + curs_set(1); + endwin(); /* just to be safe */ + printf(_("Caught %s... Exiting.\n"), strsignal(sig)); + exit(0); } static void sighandler (int sig) @@ -39,8 +34,6 @@ static void sighandler (int sig) switch (sig) { case SIGTSTP: /* user requested a suspend */ - if (!option (OPTSUSPEND)) - break; IsEndwin = isendwin (); curs_set (1); if (!IsEndwin) @@ -49,7 +42,7 @@ static void sighandler (int sig) case SIGCONT: if (!IsEndwin) - wrefresh (stdscr); + refresh(); mutt_curs_set (-1); /* We don't receive SIGWINCH when suspended; however, no harm is done by * just assuming we received one, and triggering the 'resize' anyway. */ @@ -57,6 +50,10 @@ static void sighandler (int sig) SigWinch = 1; break; + case SIGCHLD: + SigChild = 1; + break; + case SIGINT: SigInt = 1; break; @@ -102,7 +99,6 @@ void mutt_signal_initialize (void) /* POSIX doesn't allow us to ignore SIGCHLD, * so we just install a dummy handler for it */ - act.sa_handler = chld_handler; /* don't need to block any other signals here */ sigemptyset (&act.sa_mask); /* we don't want to mess with stopped children */