Changeset 1828

Timestamp:

Mar 13, 2005, 11:47:21 AM (20 years ago)

Author:

bird

Message:

Socket duplication. Fixed various close bugs.

File:

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

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

@@ -197 +197 @@
                     for (i = 0; i < c; i++)
                     {
-                        if (!TCPNAMEG44(AllocFHEx)(iFH, u.pSockets->aHandles[i].usSocket, u.pSockets->aHandles[i].fFlags, 0, NULL))
+                        int rc = TCPNAMEG44(AllocFHEx)(iFH, u.pSockets->aHandles[i].usSocket, u.pSockets->aHandles[i].fFlags, 0, NULL, NULL);
+                        if (rc)
                         {
-                            LIBC_ASSERTM_FAILED("Failed to allocated inherited socket (4.4) handle! iFH=%d iSocket=%d\n",
-                                                iFH, u.pSockets->aHandles[i].usSocket);
+                            LIBC_ASSERTM_FAILED("Failed to allocated inherited socket (4.4) handle! rc=%d iFH=%d iSocket=%d\n",
+                                                rc, iFH, u.pSockets->aHandles[i].usSocket);
                             __libc_spmInheritRelease();
                             return -1;
@@ -211 +212 @@
                     for (i = 0; i < c; i++)
                     {
-                        if (!TCPNAMEG43(AllocFHEx)(iFH, u.pSockets->aHandles[i].usSocket, u.pSockets->aHandles[i].fFlags, 0, NULL))
+                        int rc = TCPNAMEG43(AllocFHEx)(iFH, u.pSockets->aHandles[i].usSocket, u.pSockets->aHandles[i].fFlags, 0, NULL, NULL);
+                        if (rc)
                         {
-                            LIBC_ASSERTM_FAILED("Failed to allocated inherited socket (4.3) handle! iFH=%d iSocket=%d\n",
-                                                iFH, u.pSockets->aHandles[i].usSocket);
+                            LIBC_ASSERTM_FAILED("Failed to allocated inherited socket (4.3) handle! rc=%d iFH=%d iSocket=%d\n",
+                                                rc, iFH, u.pSockets->aHandles[i].usSocket);
                             __libc_spmInheritRelease();
                             return -1;
@@ -791 +793 @@
             {
                 /*
-                 * If not OS/2 filehandle, we have to make a fake handle.
+                 * Send the close call to any non-OS/2 handle.
                  */
-                if (pOps) /** @todo check out the fh duplication with respect to close. */
-                    rc = fhOpenDummy(-1, &fh);
-
+                __LIBC_PFH  pFHOld = gpapFHs[fh];
+                if (    pFHOld
+                    &&  pFHOld->pOps
+                    &&  pFHOld->pOps->pfnClose)
+                    rc = pFHOld->pOps->pfnClose(pFHOld, fh);
                 if (!rc)
                 {
                     /*
-                     * Free any old filehandle which death we didn't catch
-                     * and insert the new one.
+                     * If not OS/2 filehandle, make a fake handle.
                      */
-                    if (gpapFHs[fh])
-                        fhFreeHandle(gpapFHs[fh]);
-                    gpapFHs[fh] = pFH;
+                    if (pOps)
+                        rc = fhOpenDummy(fh, &fh);
+                    if (!rc)
+                    {
+                        /*
+                         * Free any old filehandle (replaced during dup2 or closed outside
+                         * this libc) and insert the new one.
+                         */
+                        if (pFHOld)
+                            fhFreeHandle(pFHOld);
+                        gpapFHs[fh] = pFH;
+                    }
                 }
             }
@@ -899 +911 @@
      * were successful or if the handle has become invalid.
      */
-    if (!rc || rc == ERROR_INVALID_HANDLE || rc == -EBADF)
+    if (    !rc
+        ||  rc == ERROR_INVALID_HANDLE
+        ||  rc == -EBADF
+        ||  rc == -ENOTSOCK)
     {
         int rc2;
@@ -919 +934 @@
          * we will free it now.
          */
-        if (!rc || rc == ERROR_INVALID_HANDLE)
+        if (    !rc2
+            ||  rc2 == ERROR_INVALID_HANDLE
+            ||  pFH->pOps)
         {
             gpapFHs[fh] = NULL;
@@ -1283 +1300 @@
                     if (pFH->pOps && pFH->pOps->pfnForkChild)
                     {
-                        rc = pFH->pOps->pfnForkChild(pFH, iFH, pForkHandle, __LIBC_FORK_OP_FORK_PARENT);
+                        rc = pFH->pOps->pfnForkChild(pFH, iFH, pForkHandle, __LIBC_FORK_OP_FORK_CHILD);
                         if (rc)
                         {