diff options
Diffstat (limited to 'src/libstddjb/ipc_accept.c')
| -rw-r--r-- | src/libstddjb/ipc_accept.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libstddjb/ipc_accept.c b/src/libstddjb/ipc_accept.c index 83886ff..1a6f48d 100644 --- a/src/libstddjb/ipc_accept.c +++ b/src/libstddjb/ipc_accept.c @@ -2,6 +2,7 @@ #include <skalibs/sysdeps.h> #include <skalibs/nonposix.h> + #include <sys/socket.h> #include <sys/un.h> #include <string.h> @@ -14,33 +15,35 @@ int ipc_accept_internal (int s, char *p, size_t l, int *trunc, unsigned int options) { + int e = errno ; struct sockaddr_un sa ; socklen_t dummy = sizeof sa ; int fd ; memset(&sa, 0, dummy) ; do #ifdef SKALIBS_HASACCEPT4 - fd = accept4(s, (struct sockaddr *)&sa, &dummy, ((options & O_NONBLOCK) ? SOCK_NONBLOCK : 0) | ((options & O_CLOEXEC) ? SOCK_CLOEXEC : 0)) ; + fd = accept4(s, (struct sockaddr *)&sa, &dummy, (options & O_NONBLOCK ? SOCK_NONBLOCK : 0) | (options & O_CLOEXEC ? SOCK_CLOEXEC : 0)) ; #else fd = accept(s, (struct sockaddr *)&sa, &dummy) ; #endif - while ((fd == -1) && (errno == EINTR)) ; + while (fd == -1 && errno == EINTR) ; if (fd == -1) return -1 ; #ifndef SKALIBS_HASACCEPT4 - if ((((options & O_NONBLOCK) ? ndelay_on(fd) : ndelay_off(fd)) < 0) - || (((options & O_CLOEXEC) ? coe(fd) : uncoe(fd)) < 0)) + if (((options & O_NONBLOCK ? ndelay_on(fd) : ndelay_off(fd)) == -1) + || ((options & O_CLOEXEC ? coe(fd) : uncoe(fd)) == -1)) { fd_close(fd) ; return -1 ; } #endif + errno = e ; if (p) { dummy = byte_chr(sa.sun_path, dummy, 0) ; *trunc = 1 ; if (!l) return fd ; - if (l < (dummy + 1)) dummy = l - 1 ; + if (l < dummy + 1) dummy = l - 1 ; else *trunc = 0 ; memcpy(p, sa.sun_path, dummy) ; p[dummy] = 0 ; |