Land #1323 - honor SOCK_NONBLOCK in accept4 shim

1 files changed, 8 insertions, 2 deletions

diff --git a/apps/nc/compat/accept4.c b/apps/nc/compat/accept4.c
index dca42e9..7818bc0 100644
--- a/apps/nc/compat/accept4.c
+++ b/apps/nc/compat/accept4.c
@@ -5,12 +5,18 @@ int
 accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags)
 {
         int rets = accept(s, addr, addrlen);
+        int fl;
         if (rets == -1)
                 return rets;
 
         if (flags & SOCK_CLOEXEC) {
-                flags = fcntl(rets, F_GETFD);
-                fcntl(rets, F_SETFD, flags | FD_CLOEXEC);
+                fl = fcntl(rets, F_GETFD);
+                fcntl(rets, F_SETFD, fl | FD_CLOEXEC);
+        }
+
+        if (flags & SOCK_NONBLOCK) {
+                fl = fcntl(rets, F_GETFL);
+                fcntl(rets, F_SETFL, fl | O_NONBLOCK);
         }
 
         return rets;