[project @ 1999-09-16 13:14:38 by simonmar]

[ghc-hetmet.git] / ghc / lib / misc / cbits / acceptSocket.c

diff --git a/ghc/lib/misc/cbits/acceptSocket.c b/ghc/lib/misc/cbits/acceptSocket.c
index efd13b9..3995795 100644 (file)
--- a/ghc/lib/misc/cbits/acceptSocket.c
+++ b/ghc/lib/misc/cbits/acceptSocket.c
@@ -16,37 +16,47 @@ StgInt
 acceptSocket(I_ sockfd, A_ peer, A_ addrlen)
 {
     StgInt fd;
-    
+    long flags;
+
     while ((fd = accept((int)sockfd, (struct sockaddr *)peer, (int *)addrlen)) < 0) {
-      if (errno != EINTR) {
-         cvtErrno();
-         switch (ghc_errno) {
-         default:
-             stdErrno();
-             break;
-         case GHC_EBADF:
-                     ghc_errtype = ERR_INVALIDARGUMENT;
-              ghc_errstr  = "Not a valid descriptor";
-             break;
-         case GHC_EFAULT:
-                     ghc_errtype = ERR_INVALIDARGUMENT;
-              ghc_errstr  = "Address not in writeable part of user address space";
-             break;
-         case GHC_ENOTSOCK:
-             ghc_errtype = ERR_INVALIDARGUMENT;
-             ghc_errstr  = "Descriptor not a socket";
-             break;
-         case GHC_EOPNOTSUPP:
-             ghc_errtype = ERR_INVALIDARGUMENT;
-             ghc_errstr  = "Socket not of type that supports listen";
-             break;
-         case GHC_EWOULDBLOCK:
-             ghc_errtype = ERR_OTHERERROR;
-             ghc_errstr  = "No sockets are present to be accepted";
-             break;
-         }
-         return -1;
+      if (errno == EAGAIN) {
+       errno = 0;
+       return FILEOBJ_BLOCKED_READ;
+
+      } else if (errno != EINTR) {
+       cvtErrno();
+       switch (ghc_errno) {
+       default:
+         stdErrno();
+         break;
+       case GHC_EBADF:
+         ghc_errtype = ERR_INVALIDARGUMENT;
+         ghc_errstr  = "Not a valid descriptor";
+         break;
+       case GHC_EFAULT:
+         ghc_errtype = ERR_INVALIDARGUMENT;
+         ghc_errstr  = "Address not in writeable part of user address space";
+         break;
+       case GHC_ENOTSOCK:
+         ghc_errtype = ERR_INVALIDARGUMENT;
+         ghc_errstr  = "Descriptor not a socket";
+         break;
+       case GHC_EOPNOTSUPP:
+         ghc_errtype = ERR_INVALIDARGUMENT;
+         ghc_errstr  = "Socket not of type that supports listen";
+         break;
+       case GHC_EWOULDBLOCK:
+         ghc_errtype = ERR_OTHERERROR;
+         ghc_errstr  = "No sockets are present to be accepted";
+         break;
+       }
+       return -1;
       }
     }
+
+    /* set the non-blocking flag on this file descriptor */
+    flags = fcntl(fd, F_GETFL);
+    fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+
     return fd;
 }