Changeset 57782 in vbox for trunk/src/VBox/HostServices/SharedFolders

Timestamp:

Sep 16, 2015 12:15:31 PM (9 years ago)

Author:

vboxsync

Message:

SharedFolders: options for guest to host path conversion.

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• vbsf.cpp (modified) (2 diffs)
• vbsfpath.cpp (modified) (3 diffs)
• vbsfpath.h (modified) (2 diffs)

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

@@ -115 +115 @@
     char *pszHostPath = NULL;
     uint32_t fu32PathFlags = 0;
+    uint32_t fu32Options =   VBSF_O_PATH_CHECK_ROOT_ESCAPE
+                           | (fWildCard? VBSF_O_PATH_WILDCARD: 0)
+                           | (fPreserveLastComponent? VBSF_O_PATH_PRESERVE_LAST_COMPONENT: 0);
+
     int rc = vbsfPathGuestToHost(pClient, root, pPath, cbPath,
-                                 &pszHostPath, pcbFullPathRoot, fWildCard, fPreserveLastComponent, &fu32PathFlags);
+                                 &pszHostPath, pcbFullPathRoot, fu32Options, &fu32PathFlags);
     if (BIT_FLAG(pClient->fu32Flags, SHFL_CF_UTF8))
     {
@@ -1874 +1878 @@
 
     /* Verify that the link target can be a valid host path, i.e. does not contain invalid characters. */
-    rc = vbsfBuildFullPath(pClient, root, pOldPath, pOldPath->u16Size + SHFLSTRING_HEADER_SIZE, &pszFullOldPath, NULL);
+    uint32_t fu32PathFlags = 0;
+    uint32_t fu32Options = 0;
+    rc = vbsfPathGuestToHost(pClient, root, pOldPath, pOldPath->u16Size + SHFLSTRING_HEADER_SIZE,
+                             &pszFullOldPath, NULL, fu32Options, &fu32PathFlags);
     if (RT_FAILURE(rc))
     {

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

@@ -499 +499 @@
                         PSHFLSTRING pGuestString, uint32_t cbGuestString,
                         char **ppszHostPath, uint32_t *pcbHostPathRoot,
-                        bool fWildCard, bool fPreserveLastComponent,
+                        uint32_t fu32Options,
                         uint32_t *pfu32PathFlags)
 {
@@ -688 +688 @@
 
                 /* Check the appended path for root escapes. */
-                rc = vbsfPathCheckRootEscape(&pszFullPath[cbRootLen]);
+                if (fu32Options & VBSF_O_PATH_CHECK_ROOT_ESCAPE)
+                {
+                    rc = vbsfPathCheckRootEscape(&pszFullPath[cbRootLen]);
+                }
                 if (RT_SUCCESS(rc))
                 {
@@ -698 +701 @@
                         && !vbsfIsGuestMappingCaseSensitive(hRoot))
                     {
+                        bool fWildCard = RT_BOOL(fu32Options & VBSF_O_PATH_WILDCARD);
+                        bool fPreserveLastComponent = RT_BOOL(fu32Options & VBSF_O_PATH_PRESERVE_LAST_COMPONENT);
                         rc = vbsfCorrectPathCasing(pClient, pszFullPath, cbFullPathLength, fWildCard, fPreserveLastComponent);
                     }

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

@@ -22 +22 @@
 #include <VBox/shflsvc.h>
 
+#define VBSF_O_PATH_WILDCARD                UINT32_C(0x00000001)
+#define VBSF_O_PATH_PRESERVE_LAST_COMPONENT UINT32_C(0x00000002)
+#define VBSF_O_PATH_CHECK_ROOT_ESCAPE       UINT32_C(0x00000004)
+
 #define VBSF_F_PATH_HAS_WILDCARD_IN_PREFIX UINT32_C(0x00000001) /* A component before the last one contains a wildcard. */
 #define VBSF_F_PATH_HAS_WILDCARD_IN_LAST   UINT32_C(0x00000002) /* The last component contains a wildcard. */
@@ -43 +47 @@
                         PSHFLSTRING pGuestString, uint32_t cbGuestString,
                         char **ppszHostPath, uint32_t *pcbHostPathRoot,
-                        bool fWildCard, bool fPreserveLastComponent,
+                        uint32_t fu32Options,
                         uint32_t *pfu32PathFlags);