Changeset 24374 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 10:50:38 AM (15 years ago)

Author:

vboxsync

Message:

Shared folders host service: preserve case of a 'rename' target (xTracker 3319).

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (5 diffs)

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

@@ -243 +243 @@
 
 static int vbsfBuildFullPath (SHFLCLIENTDATA *pClient, SHFLROOT root, PSHFLSTRING pPath,
-                              uint32_t cbPath, char **ppszFullPath, uint32_t *pcbFullPathRoot, bool fWildCard = false)
+                              uint32_t cbPath, char **ppszFullPath, uint32_t *pcbFullPathRoot,
+                              bool fWildCard = false, bool fPreserveLastComponent = false)
 {
     int rc = VINF_SUCCESS;
@@ -458 +459 @@
         {
             RTFSOBJINFO info;
-            char *pszWildCardComponent = NULL;
-
-            if (fWildCard)
-            {
-                /* strip off the last path component, that contains the wildcard(s) */
+            char *pszLastComponent = NULL;
+
+            if (fWildCard || fPreserveLastComponent)
+            {
+                /* strip off the last path component, that has to be preserved: contains the wildcard(s) or a 'rename' target. */
                 uint32_t len = (uint32_t)strlen(pszFullPath);
                 char    *src = pszFullPath + len - 1;
@@ -488 +489 @@
                     }
 
-                    if (fHaveWildcards)
+                    if (fHaveWildcards || fPreserveLastComponent)
                     {
-                        pszWildCardComponent = src;
-                        *pszWildCardComponent = 0;
+                        pszLastComponent = src;
+                        *pszLastComponent = 0;
                     }
                 }
@@ -581 +582 @@
 
             }
-            if (pszWildCardComponent)
-                *pszWildCardComponent = RTPATH_DELIMITER;
+            if (pszLastComponent)
+                *pszLastComponent = RTPATH_DELIMITER;
 
             /* might be a new file so don't fail here! */
@@ -2074 +2075 @@
         return rc;
 
-    rc = vbsfBuildFullPath (pClient, root, pDest, pDest->u16Size, &pszFullPathDest, NULL);
+    rc = vbsfBuildFullPath (pClient, root, pDest, pDest->u16Size, &pszFullPathDest, NULL, false, true);
     if (RT_SUCCESS (rc))
     {