儲存庫 vbox 的更動 66091

時間撮記:

2017-3-14 下午02:03:16 (8 年 以前)

作者:

vboxsync

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

113966

訊息:

SharedFolders: fixed regression with Windows extended-length paths.

位置:

trunk/src/VBox/HostServices/SharedFolders

檔案:

• Makefile.kmk (修改) (1 筆差異)
• mappings.cpp (修改) (2 筆差異)
• vbsfpath.cpp (修改) (2 筆差異)
• vbsfpath.h (修改) (1 筆差異)

trunk/src/VBox/HostServices/SharedFolders/Makefile.kmk

@@ -41 +41 @@
         vbsf.cpp \
         vbsfpath.cpp \
+        vbsfpathabs.cpp \
         mappings.cpp
 VBoxSharedFolders_SOURCES.win = \

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -20 +20 @@
 
 #include "mappings.h"
+#include "vbsfpath.h"
 #include <iprt/alloc.h>
 #include <iprt/assert.h>
@@ -228 +229 @@
                likely to get into trouble with buffer sizes in vbsfPathGuestToHost. */
             char szAbsFolderName[RTPATH_MAX];
-            int rc = RTPathAbs(pszFolderName, szAbsFolderName, sizeof(szAbsFolderName));
+            int rc = vbsfPathAbs(NULL, pszFolderName, szAbsFolderName, sizeof(szAbsFolderName));
             AssertRCReturn(rc, rc);
 

trunk/src/VBox/HostServices/SharedFolders/vbsfpath.cpp

@@ -598 +598 @@
 
                     /* Construct the full host path removing '.' and '..'. */
-                    rc = RTPathAbsEx(pszRoot, pchVerifiedPath, pszFullPath, cbFullPathAlloc);
+                    rc = vbsfPathAbs(pszRoot, pchVerifiedPath, pszFullPath, cbFullPathAlloc);
                     if (RT_SUCCESS(rc))
                     {
@@ -649 +649 @@
                     else
                     {
-                        LogFunc(("RTPathAbsEx %Rrc\n", rc));
+                        LogFunc(("vbsfPathAbs %Rrc\n", rc));
                     }
                 }

trunk/src/VBox/HostServices/SharedFolders/vbsfpath.h

@@ -51 +51 @@
 void vbsfFreeHostPath(char *pszHostPath);
 
+/**
+ * Build the absolute path by combining an absolute pszRoot and a relative pszPath.
+ * The resulting path does not contain '.' and '..' components.
+ * Similar to RTPathAbsEx but with support for Windows extended-length paths ("\\?\" prefix).
+ * Uses RTPathAbsEx for regular paths and on non-Windows hosts.
+ *
+ * @param pszRoot The absolute prefix. It is copied to the pszAbsPath without any processing.
+ *                If NULL then the pszPath must be converted to the absolute path.
+ * @param pszPath The relative path to be appended to pszRoot. Already has correct delimiters (RTPATH_SLASH).
+ * @param pszAbsPath Where to store the resulting absolute path.
+ * @param cbAbsPath Size of pszAbsBuffer in bytes.
+ */
+int vbsfPathAbs(const char *pszRoot, const char *pszPath, char *pszAbsPath, size_t cbAbsPath);
+
 #endif /* __VBSFPATH__H */