Changeset 1608

Timestamp:

Nov 4, 2004, 7:46:04 AM (21 years ago)

Author:

bird

Message:

TcpIp and signal changes.

File:

• trunk/src/emx/src/lib/sys/sharedpm.c (modified) (10 diffs, 1 prop)

trunk/src/emx/src/lib/sys/sharedpm.c

@@ -728 +728 @@
  *
  * @returns 0 on success.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   iSocket     The new socket.
  */
@@ -746 +746 @@
     {
         LIBC_ASSERTM_FAILED("iSocket=%d is out of the range (cSockets=%d)\n", iSocket, gpSPMHdr->pTcpip->cSockets);
-        rc = -1;
-        errno = EINVAL;
+        rc = -EINVAL;
     }
     LIBCLOG_RETURN_INT(rc);
@@ -757 +756 @@
  *
  * @returns The new reference count.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   iSocket     socket to reference.
  */
@@ -774 +773 @@
         {
             LIBC_ASSERTM_FAILED("iSocket=%d is referenced too many times! uRefs=%#x\n", iSocket, uRefs);
-            rc = -1;
-            errno = EBADF;
+            rc = -EBADF;
         }
     }
@@ -781 +779 @@
     {
         LIBC_ASSERTM_FAILED("iSocket=%d is out of the range (cSockets=%d)\n", iSocket, gpSPMHdr->pTcpip->cSockets);
-        rc = -1;
-        errno = EINVAL;
+        rc = -EINVAL;
     }
     LIBCLOG_RETURN_INT(rc);
@@ -793 +790 @@
  * @returns The new reference count.
  *          The caller must close the socket if 0 is returned.
- * @returns -1 and errno on failure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   iSocket     Socket to dereference.
  */
@@ -810 +807 @@
         {
             LIBC_ASSERTM_FAILED("iSocket=%d already 0! (uRefs=%#x)\n", iSocket, uRefs);
-            rc = -1;
-            errno = EBADF;
+            rc = -EBADF;
         }
     }
@@ -817 +813 @@
     {
         LIBC_ASSERTM_FAILED("iSocket=%d is out of the range (cSockets=%d)\n", iSocket, gpSPMHdr->pTcpip->cSockets);
-        rc = -1;
-        errno = EINVAL;
+        rc = -EINVAL;
     }
     LIBCLOG_RETURN_INT(rc);
@@ -930 +925 @@
          * Check if already pending.
          */
-        __LIBC_PSPMSIGNAL   pSig = pProcess->pSigHead;
+        __LIBC_PSPMSIGNAL   pSig = NULL;
         if (!fQueued)
         {
+            pSig = pProcess->pSigHead;
             int iSignal = pSignal->si_signo;
             for (pSig = pProcess->pSigHead; pSig; pSig = pSig->pNext)
@@ -1479 +1475 @@
             /*
              * Register exit list handler and return with
-             * mutex ownership.
+             * mutex ownership. This must have a priority lower than
+             * the TCPIP library of OS/2 to prevent it from closing
+             * sockets.
              */
-            rc = DosExitList(0x9f00 | EXLST_ADD, spmExitList);
+            rc = DosExitList(0x9800 | EXLST_ADD, spmExitList);
             FS_RESTORE();
             LIBC_ASSERTM(!rc, "DosExitList failed with rc=%d\n", rc);