diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-19 16:20:29 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-19 16:20:29 +0000 |
| commit | 347f8a8a14e3fb736ea6f42c7a0da1a0472f947f (patch) | |
| tree | 02733a960b201ec3466f97d53329b85505de1315 /src/libstddjb/skasigaction.c | |
| parent | 16de50671c7ad77f2acb4ca19d8806aad0490f03 (diff) | |
| download | skalibs-347f8a8a14e3fb736ea6f42c7a0da1a0472f947f.tar.xz | |
- Added unixconnection
- Added sig_name & sig_number (suggestion from Olivier Brunel)
- version bumped to 2.2.1.0, rc
Diffstat (limited to 'src/libstddjb/skasigaction.c')
| -rw-r--r-- | src/libstddjb/skasigaction.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstddjb/skasigaction.c b/src/libstddjb/skasigaction.c index a673fcb..bb55642 100644 --- a/src/libstddjb/skasigaction.c +++ b/src/libstddjb/skasigaction.c @@ -1,7 +1,6 @@ /* ISC license. */ #include <signal.h> -#include <skalibs/sysdeps.h> #include <skalibs/sig.h> int skasigaction (int sig, struct skasigaction const *new, struct skasigaction *old) @@ -10,11 +9,11 @@ int skasigaction (int sig, struct skasigaction const *new, struct skasigaction * if (((new->flags & SKASA_MASKALL) ? sigfillset(&sanew.sa_mask) : sigemptyset(&sanew.sa_mask)) == -1) return -1 ; sanew.sa_handler = new->handler ; sanew.sa_flags = (new->flags & SKASA_NOCLDSTOP) ? SA_NOCLDSTOP : 0 ; - if (sigaction(sig, &sanew, &saold) == -1) return -1 ; + if (sigaction(sig, &sanew, &saold) < 0) return -1 ; if (old) { register int r = sigismember(&saold.sa_mask, (sig == SIGTERM) ? SIGPIPE : SIGTERM) ; - if (r == -1) return -1 ; + if (r < 0) return -1 ; old->flags = 0 ; if (r) old->flags |= SKASA_MASKALL ; if (saold.sa_flags & SA_NOCLDSTOP) old->flags |= SKASA_NOCLDSTOP ; |