Changeset 1764

Timestamp:

Jan 17, 2005, 2:56:43 AM (21 years ago)

Author:

bird

Message:

Fixed a couple of filehandle conversion bugs. Thanks to Froloff.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• src/libsocket/os2_select.c (modified) (4 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -10 +10 @@
         o Implemented nl_langinfo(CODESET).
         o Added bunch a of ASCII codeset name conversions.
+    - libsocket:
+        o os2_select: Fixed a couple of filehandle conversion bugs. Thanks to Froloff.
 
 2004-12-20: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/src/libsocket/os2_select.c

@@ -4 +4 @@
  * os2_select().
  *
- * Copyright (c) 2003 knut st. osmundsen <bird-srcspam@anduin.net>
+ * Copyright (c) 2003-2005 knut st. osmundsen <bird-srcspam@anduin.net>
  *
  *
@@ -39 +39 @@
 int os2_select(int *s, int nreads, int nwrites, int nexcepts, long timeout)
 {
-    LIBCLOG_ENTER("s=%p nreads=%d nwrites=%d nexcepts=%d timeout=%ld\n", s, nreads, nwrites, nexcepts, timeout);
+    LIBCLOG_ENTER("s=%p nreads=%d nwrites=%d nexcepts=%d timeout=%ld\n", (void *)s, nreads, nwrites, nexcepts, timeout);
     int     cSockets;
     int    *aSockets;
@@ -50 +50 @@
     cSockets = nreads + nwrites + nexcepts;
     aSockets = alloca(cSockets * sizeof(int));
-    if (aSockets)
+    if (!aSockets)
     {
         __libc_TcpipSetErrno(ENOMEM);
@@ -71 +71 @@
     rc = __libsocket_os2_select(aSockets, nreads, nwrites, nexcepts, timeout);
     if (rc >= 0)
+    {
+        /*
+         * Sync back the non-ready indicators (-1) to the passed in table.
+         */
+        for (i = 0; i < cSockets; i++)
+            if (aSockets[i] == -1)
+                s[i] = -1;
         LIBCLOG_RETURN_INT(rc);
+    }
     __libc_TcpipUpdateErrno();
     LIBCLOG_RETURN_INT(-1);
 }
 
-
-