Changeset 39626 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Dec 15, 2011 11:33:47 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75420

Message:

more symlink stuff

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• dir-posix.cpp (modified) (2 diffs)
• fileio-posix.cpp (modified) (1 diff)
• rtPathOpenPathFh.cpp (added)

trunk/src/VBox/Runtime/r3/posix/dir-posix.cpp

@@ -194 +194 @@
 
 
-int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf)
+int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf, uint32_t fOpen)
 {
     NOREF(pszPathBuf); /* only used on windows */
@@ -205 +205 @@
     if (RT_SUCCESS(rc))
     {
-        pDir->pDir = opendir(pszNativePath);
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+        /* XXX Darwin? */
+        if (fOpen & RTDIROPEN_FLAGS_NO_SYMLINKS)
+        {
+            const char *pszName;
+            int fhDir;
+            rc = rtPathOpenPathNoFollowFh(pszNativePath, &fhDir, &pszName);
+            printf("rtPathOpenPathNoFollowFh '%s' => %d\n", pszNativePath, rc);
+            AssertRCReturn(rc, rc);
+            if (pszName != NULL)
+            {
+                AssertMsgFailed(("Path name '%s' contains filename\n", pszNativePath));
+                return VERR_INVALID_PARAMETER;
+            }
+            pDir->pDir = fdopendir(fhDir);
+            /*
+             * do NOT close fhDir, it will be closed implicitely when closing pDir!
+             */
+        }
+        else
+#endif
+        {
+            pDir->pDir = opendir(pszNativePath);
+        }
         if (pDir->pDir)
         {

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -204 +204 @@
         return (rc);
 
-    int fh = open(pszNativeFilename, fOpenMode, fMode);
+    int fh;
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+    /* XXX Darwin? */
+    if (fOpen & RTFILE_O_NO_SYMLINKS)
+    {
+        const char *pszName;
+        int fhDir;
+        rc = rtPathOpenPathNoFollowFh(pszNativeFilename, &fhDir, &pszName);
+        if (RT_FAILURE(rc))
+        {
+            rtPathFreeNative(pszNativeFilename, pszFilename);
+            return rc;
+        }
+        fh = openat(fhDir, pszName, fOpenMode, fMode | O_NOFOLLOW);
+        close(fhDir);
+    }
+    else
+#endif
+    {
+        fh = open(pszNativeFilename, fOpenMode, fMode);
+    }
     int iErr = errno;