Changeset 2538

Timestamp:

Feb 6, 2006, 11:12:16 PM (20 years ago)

Author:

bird

Message:

#50: Inherit umask.

Location:

branches/libc-0.6/src/emx

Files:

• include/InnoTekLIBC/sharedpm.h (modified) (3 diffs)
• src/lib/sys/__spawnve.c (modified) (3 diffs)
• src/lib/sys/b_fs.h (modified) (1 diff)
• src/lib/sys/fs.c (modified) (3 diffs)

branches/libc-0.6/src/emx/include/InnoTekLIBC/sharedpm.h

@@ -278 +278 @@
 
 /**
- * SPM fs inherit data.
+ * The SPM fs inherit data, part 1.
+ * The FS data is stored in two sections for legacy reasons.
  */
 typedef struct __libc_SPMInhFS
@@ -291 +292 @@
 /** Pointer to FS inherit data. */
 typedef __LIBC_SPMINHFS *__LIBC_PSPMINHFS;
+
+/**
+ * SPM fs inherit data, part two.
+ */
+typedef struct __libc_SPMInhFS2
+{
+    /** The size of this structure. */
+    unsigned    cb;
+    /** The umask value. */
+    unsigned    fUMask;
+} __LIBC_SPMINHFS2;
+/** Pointer to FS inherit data, part two. */
+typedef __LIBC_SPMINHFS2 *__LIBC_PSPMINHFS2;
 
 /**
@@ -326 +340 @@
      * All the strings are NULL terminated and referenced by offset. */
     char                   *pszStrings;
+    /** More file system stuff. */
+    __LIBC_PSPMINHFS2       pFS2;
 } __LIBC_SPMINHERIT;
 /** Pointer to inherit data. */

branches/libc-0.6/src/emx/src/lib/sys/__spawnve.c

@@ -58 +58 @@
         size_t              cbFS;
         __LIBC_PSPMINHFS    pFS;
-        if (!__libc_back_fsInheritPack(&pFS, &cbFS))
+        size_t              cbFS2;
+        __LIBC_PSPMINHFS2   pFS2;
+        if (!__libc_back_fsInheritPack(&pFS, &cbFS, &pFS2, &cbFS2))
         {
             /*
@@ -95 +97 @@
                         pRet->pFS = NULL;
 
+                    /* fs2 */
+                    if (pFS2)
+                    {
+                        pRet->pFS2 = (__LIBC_PSPMINHFS)p;
+                        p += ALIGNIT(cbFS2);
+                        memcpy(pRet->pFS2, pFS2, cbFS2);
+                        free(pFS2);
+                    }
+                    else
+                        pRet->pFS2 = NULL;
+
                     /* sig */
                     if (pSig)
@@ -123 +136 @@
             }
             free(pFS);
+            free(pFS2);
         }
 

branches/libc-0.6/src/emx/src/lib/sys/b_fs.h

@@ -242 +242 @@
  * @returns 0 on success.
  * @returns -1 on failure.
- * @param   ppFS    Where to store the pointer to the inherit data.
- * @param   pcbFS   Where to store the size of the inherit data.
- */
-int __libc_back_fsInheritPack(__LIBC_PSPMINHFS *ppFS, size_t *pcbFS);
+ * @param   ppFS    Where to store the pointer to the inherit data, part 1.
+ * @param   pcbFS   Where to store the size of the inherit data, part 1.
+ * @param   ppFS2   Where to store the pointer to the inherit data, part 2.
+ * @param   pcbFS2  Where to store the size of the inherit data, part 2.
+ */
+int __libc_back_fsInheritPack(__LIBC_PSPMINHFS *ppFS, size_t *pcbFS, __LIBC_PSPMINHFS2 *ppFS2, size_t *pcbFS2);
 
 /**

branches/libc-0.6/src/emx/src/lib/sys/fs.c

@@ -250 +250 @@
      */
     __LIBC_PSPMINHERIT  pInherit = __libc_spmInheritRequest();
+
+    /* part 2, the umask. */
+    __LIBC_PSPMINHFS2   pFS2;
+    if (    pInherit
+        &&  pInherit->cb > offsetof(__LIBC_SPMINHERIT, pFS2)
+        &&  (pFS2 = pInherit->pFS2) != NULL
+        &&  !(pFS2->fUMask & ~0777))
+    {
+        LIBCLOG_MSG("Inherited fUMask=%04o\n", pFS2->fUMask);
+        __libc_gfsUMask = pFS2->fUMask & 0777;
+    }
+
+    /* part 1, the unixroot. */
     __LIBC_PSPMINHFS    pFS;
     if (    pInherit
@@ -339 +352 @@
  * @returns 0 on success.
  * @returns -1 on failure.
- * @param   ppFS    Where to store the pointer to the inherit data.
- * @param   pcbFS   Where to store the size of the inherit data.
- */
-int __libc_back_fsInheritPack(__LIBC_PSPMINHFS *ppFS, size_t *pcbFS)
-{
-    LIBCLOG_ENTER("ppFS=%p pcbFS=%p\n", (void *)ppFS, (void *)pcbFS);
+ * @param   ppFS    Where to store the pointer to the inherit data, part 1.
+ * @param   pcbFS   Where to store the size of the inherit data, part 1.
+ * @param   ppFS2   Where to store the pointer to the inherit data, part 2.
+ * @param   pcbFS2  Where to store the size of the inherit data, part 2.
+ */
+int __libc_back_fsInheritPack(__LIBC_PSPMINHFS *ppFS, size_t *pcbFS, __LIBC_PSPMINHFS2 *ppFS2, size_t *pcbFS2)
+{
+    LIBCLOG_ENTER("ppFS=%p pcbFS=%p ppFS2=%p pcbFS2=%p\n", (void *)ppFS, (void *)pcbFS, (void *)ppFS2, (void *)pcbFS2);
 
     *ppFS = NULL;
     *pcbFS = 0;
+    *ppFS2 = NULL;
+    *pcbFS2 = 0;
 
     if (__libc_back_fsMutexRequest())
@@ -366 +383 @@
             *pcbFS = cb;
             *ppFS = pFS;
+        }
+        else
+            rc = -1;
+    }
+
+    if (!rc)
+    {
+        __LIBC_PSPMINHFS2 pFS2 = (__LIBC_PSPMINHFS2)malloc(sizeof(*pFS2));
+        if (pFS2)
+        {
+            pFS2->cb = sizeof(*pFS2);
+            pFS2->fUMask = __libc_gfsUMask;
+            LIBCLOG_MSG("fUMask=%04o\n", pFS2->fUMask);
+
+            *pcbFS2 = sizeof(*pFS2);
+            *ppFS2 = pFS2;
         }
         else