Changeset 2525 for branches

Timestamp:

Feb 5, 2006, 3:54:47 AM (20 years ago)

Author:

bird

Message:

#41: Calc st_ino and st_dev at the end of the unix attrib getter if they are not present. And added separate file mode mask getter.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/sys/b_fs.h (modified) (1 diff)
• src/lib/sys/b_fsFileModeSetFH.c (modified) (1 diff)
• src/lib/sys/b_fsNativeFileModeSet.c (modified) (1 diff)
• src/lib/sys/fs.c (modified) (2 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -12 +12 @@
         o #25: Ensure correct address length returns from recvmsg and recvfrom.
     - libc:
+        o #41: Calc st_ino and st_dev at the end of the unix attrib getter if they
+          are not present. And added special file mode mask getter.
         o #40: Fixed double slash preventing root directories from being opened.
         o #23: Fixed two incorrect EA size fields, now creating symlinks really works.

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

@@ -332 +332 @@
 int __libc_back_fsUnixAttribsGet(int hFile, const char *pszNativePath, struct stat *pStat);
 
+/**
+ * Reads the unix file mode EA.
+ *
+ * @returns 0 on success.
+ * @returns -ENOTSUP if the file mode EA is not present or if Unix EAs isn't supported on the volume.
+ * @returns Negative errno on failure.
+ * @param   hFile           File handle to the fs object. If no handle handy, set to -1.
+ * @param   pszNativePath   Native path to the fs object. If handle is give this will be ignored.
+ * @param   pMode           Where to store the mode mask.
+ */
+int __libc_back_fsUnixAttribsGetMode(int hFile, const char *pszNativePath, mode_t *pMode);
 
 /**

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

@@ -125 +125 @@
             &&  pFH->pFsInfo->fUnixEAs)
         {
-            struct stat st = {0};
-            rc = __libc_back_fsUnixAttribsGet(fh, pFH->pszNativePath, &st);
+            mode_t CurMode;
+            rc = __libc_back_fsUnixAttribsGetMode(fh, pFH->pszNativePath, &CurMode);
             if (__predict_true(!rc))
             {
                 /* correct the passed in Mode mask. */
                 Mode &= ALLPERMS; /** @todo sticky bit and set uid/gid access validation... */
-                Mode |= st.st_mode & ~ALLPERMS;
+                Mode |= CurMode & ~ALLPERMS;
 
                 /* construct FEA2 stuff. */

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

@@ -159 +159 @@
     if (fUnixEAs)
     {
-        struct stat st = {0};
-        rc = __libc_back_fsUnixAttribsGet(-1, pszNativePath, &st);
+        mode_t CurMode;
+        rc = __libc_back_fsUnixAttribsGetMode(-1, pszNativePath, &CurMode);
         if (__predict_true(!rc))
         {
             /* correct the passed in Mode mask. */
             Mode &= ALLPERMS; /** @todo sticky bit and set uid/gid access validation... */
-            Mode |= st.st_mode & ~ALLPERMS;
+            Mode |= Mode & ~ALLPERMS;
 
             /* construct FEA2 stuff. */

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

@@ -137 +137 @@
     0,                         sizeof(EA_FLAGS) - 1,   EA_FLAGS
 #undef OFF
+};
+#pragma pack()
+
+/**
+ * The prefilled GEA2LIST construct for querying all the mode attribute.
+ */
+#pragma pack(1)
+static const struct
+{
+    ULONG   cbList;
+    ULONG   oNextEntryOffset;
+    BYTE    cbName;
+    CHAR    szName[sizeof(EA_MODE)];
+} gGEA2ListMode =
+{
+    sizeof(gGEA2ListMode),
+    0,
+    sizeof(EA_MODE) - 1,
+    EA_MODE
 };
 #pragma pack()
@@ -1466 +1485 @@
     }
 
+    /*
+     * Calc st_ino and st_dev if not found.
+     */
+    if ((!pStat->st_ino || !pStat->st_dev) && pszNativePath)
+    {
+        ino_t Inode;
+        dev_t Dev = __libc_back_fsPathCalcInodeAndDev(pszNativePath, &Inode);
+        if (!pStat->st_ino)
+            pStat->st_ino = Inode;
+        if (!pStat->st_dev)
+            pStat->st_dev = Dev;
+    }
+
     LIBCLOG_RETURN_INT(0);
+}
+
+
+/**
+ * Reads the unix file mode EA.
+ *
+ * @returns 0 on success.
+ * @returns -ENOTSUP if the file mode EA is not present or if Unix EAs isn't supported on the volume.
+ * @returns Negative errno on failure.
+ * @param   hFile           File handle to the fs object. If no handle handy, set to -1.
+ * @param   pszNativePath   Native path to the fs object. If handle is give this will be ignored.
+ * @param   pMode           Where to store the mode mask.
+ */
+int __libc_back_fsUnixAttribsGetMode(int hFile, const char *pszNativePath, mode_t *pMode)
+{
+     LIBCLOG_ENTER("hFile=%d pszNativePath=%p:{%s} pMode=%p\n", hFile, (void *)pszNativePath, pszNativePath, (void *)pMode);
+
+     /* Try come up with an accurate max estimate of a maximum result. */
+     char    achBuffer[sizeof(EAOP2) + sizeof(FILEFINDBUF3) + sizeof(gGEA2ListMode) + 1 * (sizeof(USHORT) * 2 + sizeof(BYTE)) + 1 * sizeof(uint32_t) + 0x30];
+     char   *pachBuffer = (char *)((uintptr_t)&achBuffer[3] & ~3);
+     PEAOP2  pEaOp2 = (PEAOP2)pachBuffer;
+     int     rc = -1000;
+
+     *pMode = 0;
+
+/** @todo the following query is generic! It's repeated 3 times already in this file (only the gea list and buffer size varies). */
+     /*
+      * Issue the query.
+      */
+     if (hFile >= 0)
+     {
+         pEaOp2->fpGEA2List = (PGEA2LIST)&gGEA2ListMode;
+         pEaOp2->fpFEA2List = (PFEA2LIST)(pEaOp2 + 1);
+         pEaOp2->oError     = 0;
+         pEaOp2->fpFEA2List->cbList = sizeof(achBuffer) - 4 - sizeof(EAOP2);
+         rc = DosQueryFileInfo(hFile, FIL_QUERYEASFROMLIST, pEaOp2, sizeof(EAOP2));
+     }
+     if (rc && pszNativePath)
+     {
+         pEaOp2->fpGEA2List = (PGEA2LIST)&gGEA2ListMode;
+         pEaOp2->fpFEA2List = (PFEA2LIST)(pEaOp2 + 1);
+         pEaOp2->oError     = 0;
+         pEaOp2->fpFEA2List->cbList = sizeof(achBuffer) - 4 - sizeof(EAOP2);
+         rc = DosQueryPathInfo((PCSZ)pszNativePath, FIL_QUERYEASFROMLIST, pEaOp2, sizeof(EAOP2));
+         if (rc == ERROR_SHARING_VIOLATION || rc == ERROR_ACCESS_DENIED || rc == ERROR_INVALID_ACCESS)
+         {
+             HDIR hDir = HDIR_CREATE;
+             ULONG cFiles = 1;
+             pEaOp2->fpGEA2List = (PGEA2LIST)&gGEA2ListMode;
+             pEaOp2->fpFEA2List = (PFEA2LIST)(pEaOp2 + 1);
+             pEaOp2->oError     = 0;
+             pEaOp2->fpFEA2List->cbList = sizeof(achBuffer) - 4 - sizeof(EAOP2);
+             rc = DosFindFirst((PCSZ)pszNativePath, &hDir, 0, pEaOp2, pEaOp2->fpFEA2List->cbList + sizeof(*pEaOp2), &cFiles, FIL_QUERYEASFROMLIST);
+             if (!rc)
+             {
+                 DosFindClose(hDir);
+                 pEaOp2->fpFEA2List = (PFEA2LIST)((char *)pEaOp2 + sizeof(EAOP2) + offsetof(FILEFINDBUF3, cchName));
+             }
+         }
+     }
+     if (rc)
+     {
+         LIBC_ASSERTM(rc == ERROR_ACCESS_DENIED || rc == ERROR_SHARING_VIOLATION || rc == ERROR_EAS_NOT_SUPPORTED,
+                      "Bogus EAs? rc=%d oError=%ld\n", rc, pEaOp2->oError);
+         rc = -__libc_native2errno(rc);
+         LIBCLOG_ERROR_RETURN_INT(rc);
+     }
+
+     /*
+      * Parse the result.
+      * There is only one EA here, so this is gonna be pretty simple...
+      */
+     rc = -ENOTSUP;
+     PFEA2   pFea2 = &pEaOp2->fpFEA2List->list[0];
+     if (   pEaOp2->fpFEA2List->cbList > sizeof(*pFea2)
+         && pFea2->cbValue > 0
+         && pFea2->cbName == sizeof(EA_MODE) - 1
+         && !memcmp(EA_MODE, pFea2->szName, sizeof(EA_MODE) - 1)
+        )
+     {
+         PUSHORT pusType = (PUSHORT)&pFea2->szName[pFea2->cbName + 1];
+         if (   pusType[0] == EAT_BINARY
+             && pusType[1] == sizeof(uint32_t)
+             )
+         {
+             uint32_t u32 = *(uint32_t *)(pusType + 2);
+             *pMode = u32;
+             rc = 0;
+         }
+         else
+             LIBC_ASSERTM_FAILED("Invalid LIBC EA! '%s' type=%#x len=%#x, expected type=%#x and len=4.\n",
+                                 pFea2->szName, pusType[0], pusType[1], EAT_BINARY);
+     }
+
+     LIBCLOG_RETURN_MSG(rc, "ret %d *pMode=#%x\n", rc, *pMode);
 }