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_init.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_init.c')
-rw-r--r-- | src/libstddjb/selfpipe_init.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/libstddjb/selfpipe_init.c b/src/libstddjb/selfpipe_init.c index bd26d2f..8dcdcca 100644 --- a/src/libstddjb/selfpipe_init.c +++ b/src/libstddjb/selfpipe_init.c @@ -2,26 +2,35 @@ /* MT-unsafe */ -#include <errno.h> #include <signal.h> + #include <skalibs/sysdeps.h> -#include "selfpipe-internal.h" +#include <skalibs/sig.h> #include <skalibs/selfpipe.h> +#include "selfpipe-internal.h" #ifdef SKALIBS_HASSIGNALFD + #include <sys/signalfd.h> + +int selfpipe_init (void) +{ + sigemptyset(&selfpipe_caught) ; + selfpipe_fd = signalfd(selfpipe_fd, &selfpipe_caught, SFD_NONBLOCK | SFD_CLOEXEC) ; + sig_blocknone() ; + return selfpipe_fd ; +} + #else + #include <skalibs/djbunix.h> -#endif int selfpipe_init (void) { - if (selfpipe_fd >= 0) return (errno = EBUSY, -1) ; + if (selfpipe_fd >= 0) selfpipe_finish() ; sigemptyset(&selfpipe_caught) ; -#ifdef SKALIBS_HASSIGNALFD - selfpipe_fd = signalfd(-1, &selfpipe_caught, SFD_NONBLOCK | SFD_CLOEXEC) ; -#else - if (pipenbcoe(selfpipe) < 0) return -1 ; -#endif - return selfpipe_fd ; + sig_blocknone() ; + return pipenbcoe(selfpipe) < 0 ? -1 : selfpipe_fd ; } + +#endif |