vbox的更動 31121 路徑 trunk/src/VBox/Runtime/r3/socket.cpp

時間撮記:

2010-7-26 下午04:31:04 (14 年 以前)

作者:

vboxsync

訊息:

IPRT/Sockets: Fix switch to blocking mode

檔案:

• trunk/src/VBox/Runtime/r3/socket.cpp (修改) (1 筆差異)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -260 +260 @@
         u_long uBlocking = fBlocking ? 0 : 1;
         if (ioctlsocket(pThis->hNative, FIONBIO, &uBlocking))
-#else
-        if (fcntl(pThis->hNative, F_SETFL, O_NONBLOCK))
-#endif
             rc = rtSocketError();
+#else
+        int fFlags = fcntl(pThis->hNative, F_GETFL, 0);
+        if (fFlags != -1)
+        {
+            if (fBlocking)
+                fFlags &= ~O_NONBLOCK;
+            else
+                fFlags |= O_NONBLOCK;
+
+            if (fcntl(pThis->hNative, F_SETFL, fFlags & ~O_NONBLOCK) == -1)
+                rc = rtSocketError();
+        }
         else
+            rc = rtSocketError();
+#endif
+
+        if (RT_SUCCESS(rc))
             pThis->fBlocking = fBlocking;
     }