diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-07-28 23:45:20 +0000 |
---|---|---|
committer | Laurent Bercot <ska@appnovation.com> | 2021-07-28 23:45:20 +0000 |
commit | 9592bfd0dda7c575de07bce2c7a81b8432d845a4 (patch) | |
tree | 57c66c3e0dfeb63cfd3ebfef18e30a2145ae3f88 /src/libstddjb/selfpipe_untrap.c | |
parent | c15bccec3fd551583ff838673ba284ee6c7e788a (diff) | |
download | skalibs-9592bfd0dda7c575de07bce2c7a81b8432d845a4.tar.xz |
Huge incompatible changes.
- Obsolete skalibs/environ.h and skalibs/getpeereid.h removed.
- rc4 and md5 removed.
- All *_t types renamed to avoid treading on POSIX namespace.
- subgetopt() renamed to lgetopt().
- signal functions reworked; skasigaction removed; sig_stack removed
- Various functions removed: skaoffsetof(), selfpipe_untrap()
- New posixplz function: munmap_void.
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libstddjb/selfpipe_untrap.c')
-rw-r--r-- | src/libstddjb/selfpipe_untrap.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/src/libstddjb/selfpipe_untrap.c b/src/libstddjb/selfpipe_untrap.c deleted file mode 100644 index 7d82cf4..0000000 --- a/src/libstddjb/selfpipe_untrap.c +++ /dev/null @@ -1,54 +0,0 @@ -/* ISC license. */ - -/* MT-unsafe */ - -#include <errno.h> -#include <signal.h> -#include <skalibs/sysdeps.h> -#include "selfpipe-internal.h" -#include <skalibs/selfpipe.h> - -#ifdef SKALIBS_HASSIGNALFD - -#include <sys/signalfd.h> - -int selfpipe_untrap (int sig) -{ - sigset_t ss = selfpipe_caught ; - sigset_t blah ; - int r = sigismember(&selfpipe_caught, sig) ; - if (selfpipe_fd < 0) return (errno = EBADF, -1) ; - if (r < 0) return -1 ; - if (!r) return (errno = EINVAL, -1) ; - if ((sigdelset(&ss, sig) < 0) - || (signalfd(selfpipe_fd, &ss, SFD_NONBLOCK | SFD_CLOEXEC) < 0)) - return -1 ; - sigemptyset(&blah) ; - sigaddset(&blah, sig) ; - if (sigprocmask(SIG_UNBLOCK, &blah, 0) < 0) - { - int e = errno ; - signalfd(selfpipe_fd, &selfpipe_caught, SFD_NONBLOCK | SFD_CLOEXEC) ; - errno = e ; - return -1 ; - } - selfpipe_caught = ss ; - return 0 ; -} - -#else - -#include <skalibs/sig.h> - -int selfpipe_untrap (int sig) -{ - int r = sigismember(&selfpipe_caught, sig) ; - if (selfpipe_fd < 0) return (errno = EBADF, -1) ; - if (r < 0) return -1 ; - if (!r) return (errno = EINVAL, -1) ; - if (sig_restore(sig) < 0) return -1 ; - sigdelset(&selfpipe_caught, sig) ; - return 0 ; -} - -#endif |