1 files changed, 18 insertions, 6 deletions
diff --git a/src/libstddjb/selfpipe_finish.c b/src/libstddjb/selfpipe_finish.c
index 60899eb..db42430 100644
--- a/src/libstddjb/selfpipe_finish.c
+++ b/src/libstddjb/selfpipe_finish.c
@@ -6,36 +6,48 @@
 
 #ifdef SKALIBS_HASSIGNALFD
 
+#include <errno.h>
 #include <signal.h>
+
 #include <skalibs/djbunix.h>
-#include "selfpipe-internal.h"
 #include <skalibs/selfpipe.h>
+#include "selfpipe-internal.h"
 
 void selfpipe_finish (void)
 {
+  int e = errno ;
+  fd_close(selfpipe_fd) ;
   sigprocmask(SIG_UNBLOCK, &selfpipe_caught, 0) ;
   sigemptyset(&selfpipe_caught) ;
-  fd_close(selfpipe_fd) ;
   selfpipe_fd = -1 ;
+  errno = e ;
 }
 
 #else
 
 #include <skalibs/nonposix.h>
+#include <skalibs/bsdsnowflake.h>
+
+#include <errno.h>
 #include <signal.h>
-#include <skalibs/sig.h>
+
 #include <skalibs/nsig.h>
+#include <skalibs/sig.h>
 #include <skalibs/djbunix.h>
-#include "selfpipe-internal.h"
 #include <skalibs/selfpipe.h>
+#include "selfpipe-internal.h"
 
 void selfpipe_finish (void)
 {
-  sig_restoreto(&selfpipe_caught, SKALIBS_NSIG-1) ;
-  sigemptyset(&selfpipe_caught) ;
+  int e = errno ;
+  sigprocmask(SIG_BLOCK, &selfpipe_caught, 0) ;
+  sig_restoreto(&selfpipe_caught, SKALIBS_NSIG) ;
   fd_close(selfpipe[1]) ;
   fd_close(selfpipe[0]) ;
+  sigprocmask(SIG_UNBLOCK, &selfpipe_caught, 0) ;
+  sigemptyset(&selfpipe_caught) ;
   selfpipe[0] = selfpipe[1] = -1 ;
+  errno = e ;
 }
 
 #endif