Changeset 2543 for branches/libc-0.6

Timestamp:

Feb 7, 2006, 4:10:33 AM (20 years ago)

Author:

bird

Message:

#52: Fixed two 'symlink/' problems in the path resolver.

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

@@ -5 +5 @@
 2006-02-06: knut st. osmundsen <bird-gccos2-spam@anduin.net>
     - libc:
+        o #52: Fixed two 'symlink/' problems in the path resolver.
+        o #51: Made unlink able to delete readonly files.
         o #50: Inherit umask.
         o #30: Committed forgotten header.

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

@@ -499 +499 @@
 }
 
+
+/**
+ * Checks if the specified path is a symlink or not.
+ * @returns true / false.
+ * @param   pszNativePath       Path to the potential symlink.
+ */
+static int fsIsSymlink(const char *pszNativePath)
+{
+    char sz[16];
+    return __libc_back_fsNativeSymlinkRead(pszNativePath, sz, sizeof(sz)) >= 0;
+}
+
+
 #if 0 //just testing, not useful.
 /**
@@ -622 +635 @@
     /*
      * Remove trailing slash if the path may be pointing to a directory.
+     * A symlink search is converted to a directory search if this is encountered.
      */
     int cch = pszTrg - pszPath;
-    if (    (fFlags & BACKFS_FLAGS_RESOLVE_DIR)
+    if (    (fFlags & (BACKFS_FLAGS_RESOLVE_DIR | BACKFS_FLAGS_RESOLVE_FULL_SYMLINK))
         &&  cch > 1
         &&  pszTrg[-1] == '/'
@@ -632 +646 @@
         pszPath[--cch] = '\0';
         if (pfFlags)
-            *pfFlags &= ~BACKFS_FLAGS_RESOLVE_DIR_MAYBE_;
+        {
+            *pfFlags &= ~(BACKFS_FLAGS_RESOLVE_DIR_MAYBE_ | BACKFS_FLAGS_RESOLVE_FULL_SYMLINK);
+            if (fFlags & BACKFS_FLAGS_RESOLVE_FULL_SYMLINK)
+                *pfFlags |= BACKFS_FLAGS_RESOLVE_DIR | BACKFS_FLAGS_RESOLVE_FULL;
+        }
     }
 
@@ -1086 +1104 @@
                 &&  (   (fFlags & BACKFS_FLAGS_RESOLVE_FULL)
                      || chSlash)
-                &&  !(pFindBuf4->attrFile & FILE_DIRECTORY))
+                &&  !fIsDirectory)
             {
                 PEAOP2  pEaOp2 = (PEAOP2)pachBuffer;
@@ -1229 +1247 @@
                 rcRet = 0;
                 if (    (fFlags & (BACKFS_FLAGS_RESOLVE_DIR | BACKFS_FLAGS_RESOLVE_DIR_MAYBE_)) == BACKFS_FLAGS_RESOLVE_DIR
-                    &&  !fIsDirectory)
+                    &&  !fIsDirectory
+                    &&  (     !fUnixEAs
+                         ||    pFindBuf4->cbList <= sizeof(USHORT) * 2 + 1
+                         ||   !fsIsSymlink(pszNativePath)))
                     rcRet = -ENOTDIR;
                 break;