Save/restore errno in all safe wrappers

7 files changed, 20 insertions, 6 deletions

diff --git a/src/libunixonacid/ancil_recv_fd.c b/src/libunixonacid/ancil_recv_fd.c
index 5ecbb31..0148a43 100644
--- a/src/libunixonacid/ancil_recv_fd.c
+++ b/src/libunixonacid/ancil_recv_fd.c
@@ -50,10 +50,12 @@ int ancil_recv_fd (int sock, char expected_ch)
     .msg_control = ancilbuf,
     .msg_controllen = CMSG_SPACE(sizeof(int))
   } ;
+  int e = errno ;
   do r = recvmsg(sock, &msghdr, awesomeflags) ;
   while (r < 0 && errno == EINTR) ;
   if (r < 0) return r ;
   if (!r) return (errno = EPIPE, -1) ;
+  errno = e ;
   c = CMSG_FIRSTHDR(&msghdr) ;
   if (ch != expected_ch
    || !c
@@ -62,7 +64,7 @@ int ancil_recv_fd (int sock, char expected_ch)
    || (size_t)(c->cmsg_len - (CMSG_DATA(c) - (unsigned char *)c)) != sizeof(int)) return (errno = EPROTO, -1) ;
   memcpy(&fd, CMSG_DATA(c), sizeof(int)) ;
 #ifndef SKALIBS_HASCMSGCLOEXEC
-  if (coe(fd) < 0)
+  if (coe(fd) == -1)
   {
     fd_close(fd) ;
     return -1 ;
diff --git a/src/libunixonacid/ancil_send_fd.c b/src/libunixonacid/ancil_send_fd.c
index 5573d5c..7258eb1 100644
--- a/src/libunixonacid/ancil_send_fd.c
+++ b/src/libunixonacid/ancil_send_fd.c
@@ -31,13 +31,15 @@ int ancil_send_fd (int sock, int fd, char ch)
     .msg_controllen = CMSG_SPACE(sizeof(int))
   } ;
   struct cmsghdr *c = CMSG_FIRSTHDR(&hdr) ;
+  int e = errno ;
   memset(hdr.msg_control, 0, hdr.msg_controllen) ;
   c->cmsg_level = SOL_SOCKET ;
   c->cmsg_type = SCM_RIGHTS ;
   c->cmsg_len = CMSG_LEN(sizeof(int)) ;
   memcpy(CMSG_DATA(c), &fd, sizeof(int)) ;
   do r = sendmsg(sock, &hdr, MSG_NOSIGNAL) ;
-  while (r < 0 && errno == EINTR) ;
+  while (r == -1 && errno == EINTR) ;
   if (r <= 0) return 0 ;
+  errno = e ;
   return 1 ;
 }
diff --git a/src/libunixonacid/open2_at.c b/src/libunixonacid/open2_at.c
index 3afc4fb..0b07f0e 100644
--- a/src/libunixonacid/open2_at.c
+++ b/src/libunixonacid/open2_at.c
@@ -18,9 +18,11 @@
 
 int open2_at (int dirfd, char const *file, int flags)
 {
+  int e = errno ;
   int fd ;
   do fd = openat(dirfd, file, flags) ;  /* all systems supporting openat() have O_CLOEXEC */
   while (fd == -1 && errno == EINTR) ;
+  if (fd >= 0) errno = e ;
   return fd ;
 }
 
diff --git a/src/libunixonacid/open3_at.c b/src/libunixonacid/open3_at.c
index a960339..d1d3f68 100644
--- a/src/libunixonacid/open3_at.c
+++ b/src/libunixonacid/open3_at.c
@@ -17,9 +17,11 @@
 
 int open3_at (int dirfd, char const *file, int flags, unsigned int mode)
 {
+  int e = errno ;
   int fd ;
   do fd = openat(dirfd, file, flags, mode) ; /* all systems that support openat() have O_CLOEXEC */
   while (fd == -1 && errno == EINTR) ;
+  if (fd >= 0) errno = e ;
   return fd ;
 }
 
diff --git a/src/libunixonacid/symlink_at.c b/src/libunixonacid/symlink_at.c
index 3919a80..3bf98f4 100644
--- a/src/libunixonacid/symlink_at.c
+++ b/src/libunixonacid/symlink_at.c
@@ -18,9 +18,11 @@
 
 int symlink_at (char const *src, int dirfd, char const *dst)
 {
+  int e = errno ;
   int r ;
   do r = symlinkat(src, dirfd, dst) ;
   while (r == -1 && errno == EINTR) ;
+  if (r >= 0) errno = e ;
   return r ;
 }
 
diff --git a/src/libunixonacid/unixmessage_receive.c b/src/libunixonacid/unixmessage_receive.c
index c3e1107..812f5b9 100644
--- a/src/libunixonacid/unixmessage_receive.c
+++ b/src/libunixonacid/unixmessage_receive.c
@@ -50,15 +50,17 @@ static int unixmessage_receiver_fill (unixmessage_receiver *b)
     .msg_control = b->fds_ok & 1 ? ancilbuf : 0,
     .msg_controllen = b->fds_ok & 1 ? CMSG_SPACE(b->auxb.a - 1) : 0
   } ;
+  int e = errno ;
   ssize_t r = -1 ;
   if (cbuffer_isfull(&b->mainb) || ((b->fds_ok & 1) && cbuffer_isfull(&b->auxb)))
     return (errno = ENOBUFS, -1) ;
   cbuffer_wpeek(&b->mainb, iov) ;
-  while (r < 0)
+  while (r == -1)
   {
     r = recvmsg(b->fd, &msghdr, awesomeflags) ;
-    if (!r || (r < 0 && errno != EINTR)) return r ;
+    if (!r || (r == -1 && errno != EINTR)) return r ;
   }
+  if (r > 0) errno = e ;
   if (b->fds_ok & 1)
   {
     struct cmsghdr *c = CMSG_FIRSTHDR(&msghdr) ;
@@ -78,7 +80,7 @@ static int unixmessage_receiver_fill (unixmessage_receiver *b)
       {
         size_t i = 0 ;
         for (; i < auxlen / sizeof(int) ; i++)
-          if (coe(((int *)CMSG_DATA(c))[i]) < 0)
+          if (coe(((int *)CMSG_DATA(c))[i]) == -1)
           {
             i++ ;
             while (i--) fd_close(((int *)CMSG_DATA(c))[i]) ;
diff --git a/src/libunixonacid/unixmessage_sender_flush.c b/src/libunixonacid/unixmessage_sender_flush.c
index 93bbbd7..35178b9 100644
--- a/src/libunixonacid/unixmessage_sender_flush.c
+++ b/src/libunixonacid/unixmessage_sender_flush.c
@@ -98,9 +98,11 @@ int unixmessage_sender_flush (unixmessage_sender *b)
         ((int *)CMSG_DATA(cp))[i] = fd < 0 ? -(fd+1) : fd ;
       }
     }
+    int e = errno ;
     do r = sendmsg(b->fd, &hdr, MSG_NOSIGNAL) ;
-    while (r < 0 && errno == EINTR) ;
+    while (r == -1 && errno == EINTR) ;
     if (r <= 0) return 0 ;
+    errno = e ;
     if (nfds)
     {
       size_t i = 0 ;