Changeset 2496 for branches/libc-0.6

Timestamp:

Dec 18, 2005, 9:56:19 AM (20 years ago)

Author:

bird

Message:

#22: Added DosFindFirst() as fallback when DosQueryPathInfo() fails to query the symlink EA in the path resolver. This problem occurs when doing stat() on an open file (pwd_mkdb example).

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/sys/fs.c (modified) (5 diffs)

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

@@ -4 +4 @@
 
 2005-12-18: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        o #22: Added DosFindFirst() as fallback when DosQueryPathInfo() fails
+          to query the symlink EA in the path resolver. This problem occurs
+          when doing stat() on an open file (pwd_mkdb example).
     - emxomfld:
         o Don't display usage() on failure, just the error message.

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

@@ -973 +973 @@
              * This'll of course also provide proper verification of the path too. :-)
              *
-             * (This is a little bit messed up since we'll have to use wildcard for
-             * getting the caseing resolved.)
+             * This is a little bit messed up since we'll have to use wildcard for
+             * getting the casing resolved.
              */
             //LIBC_ASSERT(psz - pszNativePath == cchNativePath); - figure this one.
@@ -987 +987 @@
             psz[1] = chNext;
             if (rc || cFiles == 0)
-            {
                 hDir = HDIR_CREATE;
-            }
             while (!rc && cFiles == 1 && pFindBuf->cchName != psz - pszPrev)
                 rc = DosFindNext(hDir, pFindBuf, SIZEOF_ACHBUFFER, &cFiles);
@@ -1008 +1006 @@
 
             /*
-             * Try querying the symlink EA value
+             * Try querying the symlink EA value.
              * (This operation will reuse the achBuffer overwriting the pFindBuf data!)
              *
@@ -1015 +1013 @@
              * returning the right things at some point, and besides it's return data
              * is rather clumsily laid out. So, I decided not to try my luck on it.
+             *
+             * On second thought, we seems to end up having to use DosFindFirst in some
+             * cases anyway... very nice.
              */
             if (    pFindBuf->cbList > sizeof(USHORT) * 2 + 1
                 &&  (   (fFlags & BACKFS_FLAGS_RESOLVE_FULL)
-                     || chSlash))
-            {
-                EAOP2   EaOp;
-                EaOp.fpGEA2List = (PGEA2LIST)&gGEA2ListSymlink;
-                EaOp.fpFEA2List = (PFEA2LIST)pachBuffer;
-                EaOp.oError     = 0;
-                EaOp.fpFEA2List->cbList = SIZEOF_ACHBUFFER;
-                rc = DosQueryPathInfo((PCSZ)pszNativePath, FIL_QUERYEASFROMLIST, &EaOp, sizeof(EaOp));
+                     || chSlash)
+                &&  !(pFindBuf->attrFile & FILE_DIRECTORY))
+            {
+                PEAOP2  pEaOp2 = (PEAOP2)pachBuffer;
+                pEaOp2->fpGEA2List = (PGEA2LIST)&gGEA2ListSymlink;
+                pEaOp2->fpFEA2List = (PFEA2LIST)(pEaOp2 + 1);
+                pEaOp2->oError     = 0;
+                pEaOp2->fpFEA2List->cbList = SIZEOF_ACHBUFFER - sizeof(*pEaOp2);
+                rc = DosQueryPathInfo((PCSZ)pszNativePath, FIL_QUERYEASFROMLIST, pEaOp2, sizeof(*pEaOp2));
                 if (rc)
                 {
-                    LIBCLOG_MSG("DosQueryPathInfo('%s',,,) -> %d resolving '%s'\n", pszNativePath, rc, pszUserPathIn);
-                    if ((fFlags & BACKFS_FLAGS_RESOLVE_FULL_MAYBE_) && !chSlash)
-                        rcRet = 0;
-                    else
-                        rcRet = rc == ERROR_FILE_NOT_FOUND && chSlash ? -ENOENT : -__libc_native2errno(rc);
-                    break;
+                    cFiles = 1;
+                    pEaOp2->fpGEA2List = (PGEA2LIST)&gGEA2ListSymlink;
+                    pEaOp2->fpFEA2List = (PFEA2LIST)(pEaOp2 + 1);
+                    pEaOp2->oError     = 0;
+                    pEaOp2->fpFEA2List->cbList = SIZEOF_ACHBUFFER - sizeof(*pEaOp2);
+                    rc = DosFindFirst((PCSZ)pszNativePath, &hDir, 0, pEaOp2, pEaOp2->fpFEA2List->cbList + sizeof(*pEaOp2), &cFiles, FIL_QUERYEASFROMLIST);
+                    if (rc || cFiles == 0)
+                    {
+                        hDir = HDIR_CREATE;
+                        LIBCLOG_MSG("DosFindFirst('%s',,,pEaOp2,) -> %d resolving '%s'\n", pszNativePath, rc, pszUserPathIn);
+                        if ((fFlags & BACKFS_FLAGS_RESOLVE_FULL_MAYBE_) && !chSlash)
+                            rcRet = 0;
+                        else
+                            rcRet = rc == ERROR_FILE_NOT_FOUND && chSlash ? -ENOENT : -__libc_native2errno(rc);
+                        break;
+                    }
+                    pEaOp2->fpFEA2List = (PFEA2LIST)((char *)pEaOp2 + sizeof(EAOP2) + offsetof(FILEFINDBUF3, cchName));
                 }
 
@@ -1039 +1052 @@
                  * Did we find any symlink EA?
                  */
-                if (    EaOp.fpFEA2List->cbList > sizeof(EaOp.fpFEA2List->list[0])
-                    &&  EaOp.fpFEA2List->list[0].cbValue)
+                if (    pEaOp2->fpFEA2List->cbList > sizeof(pEaOp2->fpFEA2List->list[0])
+                    &&  pEaOp2->fpFEA2List->list[0].cbValue)
                 {
                     /* Validate the EA. */
-                    PUSHORT pusType = (PUSHORT)((char *)&EaOp.fpFEA2List->list[1] + EaOp.fpFEA2List->list[0].cbName);
+                    PUSHORT pusType = (PUSHORT)((char *)&pEaOp2->fpFEA2List->list[1] + pEaOp2->fpFEA2List->list[0].cbName);
                     char   *pszSymlink = (char *)&pusType[2];
                     if (    pusType[0] != EAT_ASCII
-                        ||  pusType[1] > EaOp.fpFEA2List->list[0].cbValue
+                        ||  pusType[1] > pEaOp2->fpFEA2List->list[0].cbValue
                         ||  !pusType[1]
                         ||  !*pszSymlink)
                     {
                         LIBCLOG_ERROR("Invalid symlink EA! type=%x len=%d cbValue=%d *pszSymlink=%c\n",
-                                      pusType[0], pusType[1], EaOp.fpFEA2List->list[0].cbValue, *pszSymlink);
+                                      pusType[0], pusType[1], pEaOp2->fpFEA2List->list[0].cbValue, *pszSymlink);
                         rcRet = -EFTYPE;
                         break;