Changeset 3372 for trunk

Timestamp:

May 27, 2007, 12:37:44 PM (18 years ago)

Author:

bird

Message:

Fixes #166.

File:

• trunk/libc/src/kNIX/os2/tcpipver.c (modified) (9 diffs)

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

@@ -155 +155 @@
 
 static void TCPNAME(Cleanup)(void);
-static int  tcpipForkChild1(__LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation);
 
 
@@ -227 +226 @@
                 __libc_spmSocketRef(pSocketFH->iSocket);
             }
+            /** @todo deal with EALREADY, it will leave an unclosed and soon to be invalid handle behind... */
         }
     }
@@ -241 +241 @@
          * Please note that removesocketfromlist returns a boolean success indicator and proably no errno.
          */
+        int iSavedTcpipErrno = TCPNAME(imp_sock_errno)();
+        TCPNAME(imp_set_errno)(0);
         rc = TCPNAME(imp_removesocketfromlist)(pSocketFH->iSocket);
         if (!rc)
@@ -247 +249 @@
             rc = -EBADF; /* this is an internal error, it should *NOT* happen! */
         }
+        else
+            rc = 0;
+        TCPNAME(imp_set_errno)(iSavedTcpipErrno);
     }
 
     /*
-     * Unlink from our list.
+     * Unlink from our list (rc list must correspond to __libc_FHClose!).
      */
-    if (rc != -EBADF && rc != -ENOTSOCK && rc != -EALREADY)
-    {
+    if (    !rc
+        ||  rc == -EBADF
+        ||  rc == -ENOTSOCK)
+    {
+        LIBCLOG_MSG("Unlinking pSocketFH=%p:{iSocket=%d} fh=%d\n", pSocketFH, pSocketFH->iSocket, fh);
         _smutex_request(&gsmtxSockets);
         if (pSocketFH->pNext)
@@ -856 +864 @@
  *                      list for the current process.
  *                      If clear we only increment the global reference counter.
- * @param   pfh         Where to store the filename.
+ * @param   pfh         Where to store the file handle.
  * @param   ppFHSocket  Where to store the allocated socket handle. Optional.
  */
 int TCPNAMEG(AllocFHEx)(int fh, int iSocket, unsigned fFlags, int fNew, int *pfh, PLIBCSOCKETFH *ppFHSocket)
 {
-    LIBCLOG_ENTER("iSocket=%d\n", iSocket);
+    LIBCLOG_ENTER("fh=%d iSocket=%d fFlags=%#x fNew=%d pfh=%p:{%d} ppFHSocket=%p\n", fh, iSocket, fFlags, fNew, (void *)pfh, pfh ? *pfh : -2, (void *)ppFHSocket);
     __LIBC_PFH         pFHLibc;
     int rc = __libc_FHAllocate(sizeof(LIBCSOCKETFH), &gSocketOps, iSocket, fh, fFlags, &pFHLibc);
@@ -906 +914 @@
         else
             __libc_FHPut(pFHLibc);
-        LIBCLOG_RETURN_INT(0);
+        LIBCLOG_RETURN_MSG(0, "ret 0 *pfh=%d *ppFHSocket=%p\n", pfh ? *pfh : -2, pFH);
     }
     LIBCLOG_ERROR_RETURN_P(rc);
@@ -1212 +1220 @@
         HMODULE hmod;
         char    szErr[16];
-        rc = DosLoadModule((PSZ)szErr, sizeof(szErr), (PCSZ)gszDllName, &hmod);
+        rc = DosLoadModuleEx((PSZ)szErr, sizeof(szErr), (PCSZ)gszDllName, &hmod);
         if (rc)
         {
@@ -1388 +1396 @@
              * Please note that removesocketfromlist is returning a boolean success indicator and probably no errno.
              */
+            TCPNAME(imp_set_errno)(0);
             rc = TCPNAME(imp_removesocketfromlist)(pFH->iSocket);
             LIBC_ASSERTM(rc == 1, "removesocketfromlist(%d) -> rc=%d sock_errno()->%d\n", pFH->iSocket, rc, TCPNAME(imp_sock_errno)());
@@ -1398 +1407 @@
 }
 
-
-#undef  __LIBC_LOG_GROUP
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_FORK
-
-_FORK_CHILD1(0xffffff00, tcpipForkChild1)
-
-/**
- * Reload the DLL in the child process.
- *
- * @returns 0 on success.
- * @returns negative errno on failure.
- * @param   pForkHandle     Pointer to fork handle.
- * @param   enmOperation    Callback operation.
- */
-static int tcpipForkChild1(__LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation)
-{
-    LIBCLOG_ENTER("pForkHandle=%p enmOperation=%d\n", (void *)pForkHandle, enmOperation);
-    int rc;
-    switch (enmOperation)
-    {
-        case __LIBC_FORK_OP_FORK_CHILD:
-        {
-            rc = 0;
-            if (ghmod)
-                rc = __libc_tcpipForkLoadModule(ghmod, gszDllName);
-            break;
-        }
-
-        default:
-            rc = 0;
-            break;
-    }
-
-    LIBCLOG_RETURN_INT(rc);
-}
-
-