Changeset 2173 for trunk

Timestamp:

Jul 3, 2005, 5:40:02 AM (20 years ago)

Author:

bird

Message:

Clear FD_CLOEXEC on the handle returned by dup, dup2 and fcntl(F_DUPFD_).

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• include/emx/io.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/sys/__dup.c (modified) (2 diffs, 1 prop)
• src/lib/sys/__dup2.c (modified) (2 diffs, 1 prop)
• src/lib/sys/__fcntl.c (modified) (1 diff, 1 prop)
• src/lib/sys/filehandles.c (modified) (1 diff, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -13 +13 @@
         o Fixed mixup in fts.c port.
         o Replaced the EMX ftw with the BSD one so we implement the SuS specs.
+        o Clear FD_CLOEXEC on the handle returned by dup, dup2 and fcntl(F_DUPFD,,).
 
 2005-07-01: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/include/emx/io.h

@@ -496 +496 @@
 PLIBCFH __libc_FH(int fh);
 int     __libc_FHEx(int fh, __LIBC_PFH *ppFH);
+int     __libc_FHSetFlags(__LIBC_PFH pFH, int fh, unsigned fFlags);
 
 

trunk/src/emx/src/lib/libc.def

@@ -1891 +1891 @@
     "__obstack_newchunk" @1891
     "__std_nftw" @1892
+    "___libc_FHSetFlags" @1893

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

@@ -9 +9 @@
 #include <emx/io.h>
 #include <emx/syscalls.h>
+#include <sys/fcntl.h>
 #include "syscalls.h"
 #include "b_fs.h"
@@ -61 +62 @@
                 pFHNew->Dev         = pFH->Dev;
                 pFHNew->pFsInfo     = __libc_back_fsInfoObjAddRef(pFH->pFsInfo);
+
+                /*
+                 * Clear the FD_CLOEXEC flag as per SuS.
+                 */
+                unsigned fFlags = pFH->fFlags;
+                if (fFlags & ((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT))
+                {
+                    fFlags &= ~((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT);
+                    __libc_FHSetFlags(pFH, hNew,fFlags);
+                }
             }
             else

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

@@ -8 +8 @@
 #include <emx/syscalls.h>
 #include <emx/io.h>
+#include <sys/fcntl.h>
 #include "syscalls.h"
 #include "b_fs.h"
@@ -94 +95 @@
                 pFHNew->Dev         = pFH->Dev;
                 pFHNew->pFsInfo     = __libc_back_fsInfoObjAddRef(pFH->pFsInfo);
+
+                /*
+                 * Clear the FD_CLOEXEC flag as per SuS.
+                 */
+                unsigned fFlags = pFH->fFlags;
+                if (fFlags & ((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT))
+                {
+                    fFlags &= ~((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT);
+                    __libc_FHSetFlags(pFH, hNew,fFlags);
+                }
             }
             else

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

@@ -193 +193 @@
 {
     LIBCLOG_ENTER("pFH=%p hFile=%d arg=%#x\n", (void *)pFH, hFile, arg);
-    int     rc;
-    ULONG   fulState;
-    FS_VAR();
-
-    FS_SAVE_LOAD();
-    rc = DosQueryFHState(hFile, &fulState);
+
+    /*
+     * Calc new flags.
+     */
+    unsigned fFlags = pFH->fFlags;
+    fFlags = (fFlags & ~__LIBC_FH_FDFLAGS_MASK) | (arg << __LIBC_FH_FDFLAGS_SHIFT);
+    if (arg & FD_CLOEXEC)
+        fFlags |= O_NOINHERIT;
+    else
+        fFlags &= ~O_NOINHERIT;
+
+    /*
+     * Update the flags.
+     */
+    int rc = __libc_FHSetFlags(pFH, hFile, fFlags);
     if (!rc)
-    {
-        ULONG fulNewState;
-        LIBC_ASSERTM(     ( (fulState & OPEN_FLAGS_NOINHERIT) != 0 )
-                      ==  (   (pFH->fFlags & (O_NOINHERIT | (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT)))
-                           == (O_NOINHERIT | (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT)) ),
-                     "Inherit flags are out of sync for file hFile %d (%#x)! fulState=%08lx fFlags=%08x\n",
-                     hFile, hFile, fulState, pFH->fFlags);
-        if (arg & FD_CLOEXEC)
-            fulNewState = fulState | OPEN_FLAGS_NOINHERIT;
-        else
-            fulNewState = fulState & ~OPEN_FLAGS_NOINHERIT;
-        if (fulNewState != fulState)
-        {
-            fulNewState &= 0x7f88; /* Mask the flags accepted the API. */
-            rc = DosSetFHState(hFile, fulNewState);
-        }
-    }
-    FS_RESTORE();
-
-    if (!rc)
-    {
-        unsigned fFlags = pFH->fFlags;
-        fFlags = (fFlags & ~__LIBC_FH_FDFLAGS_MASK) | (arg << __LIBC_FH_FDFLAGS_SHIFT);
-        if (arg & FD_CLOEXEC)
-            fFlags |= O_NOINHERIT;
-        else
-            fFlags &= ~O_NOINHERIT;
-        __atomic_xchg(&pFH->fFlags, fFlags);
         LIBCLOG_RETURN_INT(0);
-    }
-
-    /* error! */
-    _sys_set_errno(rc);
+    errno = -rc;
     LIBCLOG_RETURN_INT(-1);
 }

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

@@ -1143 +1143 @@
     return rc;
 }
+
+
+/**
+ * Update the flags for the filehandle.
+ *
+ * This is a service routine for unifying the updating of the flags in
+ * the __LIBC_FH structure. It will not call any FH operators, since
+ * it assumes that the caller takes care of such things.
+ *
+ * @returns 0 on success.
+ * @returns Negated errno on failure.
+ * @param   pFH     The filehandle struct.
+ * @param   fh      The filehandle.
+ * @param   fFlags  The new flags.
+ */
+int __libc_FHSetFlags(__LIBC_PFH pFH, int fh, unsigned fFlags)
+{
+    LIBCLOG_ENTER("pFH=%p fh=%d fFlags=%#x\n", (void *)pFH, fh, fFlags);
+    int     rc;
+    ULONG   fulState;
+    FS_VAR();
+    LIBC_ASSERT(((fFlags & O_NOINHERIT) == 0) == ((fFlags & (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT)) != 0));
+
+    FS_SAVE_LOAD();
+    rc = DosQueryFHState(fh, &fulState);
+    if (!rc)
+    {
+        ULONG fulNewState;
+        LIBC_ASSERTM(     ( (fulState & OPEN_FLAGS_NOINHERIT) != 0 )
+                      ==  (   (pFH->fFlags & (O_NOINHERIT | (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT)))
+                           == (O_NOINHERIT | (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT)) ),
+                     "Inherit flags are out of sync for file hFile %d (%#x)! fulState=%08lx fFlags=%08x\n",
+                     fh, fh, fulState, pFH->fFlags);
+        if (fFlags & (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT))
+            fulNewState = fulState | OPEN_FLAGS_NOINHERIT;
+        else
+            fulNewState = fulState & ~OPEN_FLAGS_NOINHERIT;
+        if (fulNewState != fulState)
+        {
+            fulNewState &= 0x7f88; /* Mask the flags accepted the API. */
+            rc = DosSetFHState(fh, fulNewState);
+        }
+    }
+    FS_RESTORE();
+
+    if (!rc)
+    {
+        __atomic_xchg(&pFH->fFlags, fFlags);
+        LIBCLOG_RETURN_INT(0);
+    }
+
+    rc = -__libc_native2errno(rc);
+    LIBCLOG_RETURN_INT(rc);
+}
+
+