summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-10-11 14:12:16 +1100
committerDarren Tucker <dtucker@dtucker.net>2019-10-11 14:12:16 +1100
commit9b9e3ca6945351eefb821ff783a4a8e6d9b98b9a (patch)
treef72fa93e6874ab4edfb2808ca4c78553ff8234dd
parent0bd312a362168c1eae3cd6b3889395a78e6fd0f8 (diff)
Re-add SA_RESTART to mysignal.
This makes mysignal implement reliable BSD semantics according to Stevens' APUE. This was first attempted in 2001 but was reverted due to problems with HP-UX 10.20 and select() and possibly grantpt(). Modern systems should be fine with it, but if any current platforms have a problem with it now we can disable it just for those. ok djm@
-rw-r--r--openbsd-compat/bsd-signal.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/openbsd-compat/bsd-signal.c b/openbsd-compat/bsd-signal.c
index 0b816a3a..104ab653 100644
--- a/openbsd-compat/bsd-signal.c
+++ b/openbsd-compat/bsd-signal.c
@@ -37,10 +37,15 @@ mysignal(int sig, mysig_t act)
memset(&sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
+ if (sig == SIGALRM) {
#ifdef SA_INTERRUPT
- if (sig == SIGALRM)
sa.sa_flags |= SA_INTERRUPT;
#endif
+ } else {
+#ifdef SA_RESTART
+ sa.sa_flags |= SA_RESTART;
+#endif
+ }
sa.sa_handler = act;
if (sigaction(sig, &sa, NULL) == -1)
return (mysig_t) -1;