Changeset 3383

Timestamp:

Jun 10, 2007, 12:24:01 PM (18 years ago)

Author:

bird

Message:

Calculate the correct fd_set size and max handle count for the BSD44 version. Fixes #173.

Files:

• branches/libc-0.6/src/emx/src/lib/sys/tcpipver.c (modified) (1 diff)
• trunk/libc/src/kNIX/os2/tcpipver.c (modified) (1 diff)

branches/libc-0.6/src/emx/src/lib/sys/tcpipver.c

@@ -933 +933 @@
     *pcFDs = iMax + 1;
 #else
-    for (cbRet = sizeof(u_short), i = 0; i < c; i++)
+    for (i = cbRet = 0; i < c; i++)
         if (FD_ISSET(i, pFrom))
             cbRet++;
-    *pcFDs = c;
+    if (*pcFDs < cbRet + 1)
+        *pcFDs = cbRet + 1;
+    cbRet *= sizeof(int);
+    cbRet += offsetof(my_fd_set, fd_array);
 #endif
     if (cbRet < sizeof(struct my_fd_set))

trunk/libc/src/kNIX/os2/tcpipver.c

@@ -946 +946 @@
     *pcFDs = iMax + 1;
 #else
-    for (cbRet = sizeof(u_short), i = 0; i < c; i++)
+    for (i = cbRet = 0; i < c; i++)
         if (FD_ISSET(i, pFrom))
             cbRet++;
-    *pcFDs = c;
+    if (*pcFDs < cbRet + 1)
+        *pcFDs = cbRet + 1;
+    cbRet *= sizeof(int);
+    cbRet += offsetof(my_fd_set, fd_array);
 #endif
     if (cbRet < sizeof(struct my_fd_set))