projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some useful macros.
[apps/madmutt.git]
/
lib-sys
/
mutt_signal.c
diff --git
a/lib-sys/mutt_signal.c
b/lib-sys/mutt_signal.c
index
8609671
..
2728656
100644
(file)
--- a/
lib-sys/mutt_signal.c
+++ b/
lib-sys/mutt_signal.c
@@
-9,7
+9,7
@@
#include <lib-lib/lib-lib.h>
#include <lib-lib/lib-lib.h>
-#include <lib-ui/
curses
.h>
+#include <lib-ui/
lib-ui
.h>
#include "mutt_signal.h"
#include "mutt_signal.h"
@@
-22,15
+22,10
@@
static int IsEndwin = 0;
/* Attempt to catch "ordinary" signals and shut down gracefully. */
static void exit_handler (int sig)
{
/* 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)
}
static void sighandler (int sig)
@@
-39,8
+34,6
@@
static void sighandler (int sig)
switch (sig) {
case SIGTSTP: /* user requested a suspend */
switch (sig) {
case SIGTSTP: /* user requested a suspend */
- if (!option (OPTSUSPEND))
- break;
IsEndwin = isendwin ();
curs_set (1);
if (!IsEndwin)
IsEndwin = isendwin ();
curs_set (1);
if (!IsEndwin)
@@
-49,25
+42,21
@@
static void sighandler (int sig)
case SIGCONT:
if (!IsEndwin)
case SIGCONT:
if (!IsEndwin)
- refresh
();
+ refresh();
mutt_curs_set (-1);
mutt_curs_set (-1);
-#if defined (HAVE_RESIZETERM)
/* We don't receive SIGWINCH when suspended; however, no harm is done by
* just assuming we received one, and triggering the 'resize' anyway. */
/* We don't receive SIGWINCH when suspended; however, no harm is done by
* just assuming we received one, and triggering the 'resize' anyway. */
+ case SIGWINCH:
SigWinch = 1;
SigWinch = 1;
-#endif
break;
break;
-#if defined (HAVE_RESIZETERM)
- case SIGWINCH:
- SigWinch = 1;
+ case SIGCHLD:
+ SigChild = 1;
break;
break;
-#endif
case SIGINT:
SigInt = 1;
break;
case SIGINT:
SigInt = 1;
break;
-
}
errno = save_errno;
}
}
errno = save_errno;
}
@@
-105,14
+94,11
@@
void mutt_signal_initialize (void)
sigaction (SIGCONT, &act, NULL);
sigaction (SIGTSTP, &act, NULL);
sigaction (SIGINT, &act, NULL);
sigaction (SIGCONT, &act, NULL);
sigaction (SIGTSTP, &act, NULL);
sigaction (SIGINT, &act, NULL);
-#if defined (HAVE_RESIZETERM)
sigaction (SIGWINCH, &act, NULL);
sigaction (SIGWINCH, &act, NULL);
-#endif
/* POSIX doesn't allow us to ignore SIGCHLD,
* so we just install a dummy handler for it
*/
/* 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 */
/* don't need to block any other signals here */
sigemptyset (&act.sa_mask);
/* we don't want to mess with stopped children */
@@
-129,9
+115,7
@@
void mutt_block_signals (void)
sigaddset (&Sigset, SIGHUP);
sigaddset (&Sigset, SIGTSTP);
sigaddset (&Sigset, SIGINT);
sigaddset (&Sigset, SIGHUP);
sigaddset (&Sigset, SIGTSTP);
sigaddset (&Sigset, SIGINT);
-#if defined (HAVE_RESIZETERM)
sigaddset (&Sigset, SIGWINCH);
sigaddset (&Sigset, SIGWINCH);
-#endif
sigprocmask (SIG_BLOCK, &Sigset, 0);
set_option (OPTSIGNALSBLOCKED);
}
sigprocmask (SIG_BLOCK, &Sigset, 0);
set_option (OPTSIGNALSBLOCKED);
}