Changeset 97531 in vbox

Timestamp:

Nov 14, 2022 2:02:16 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: A bit less code wrt translating paths. bugref:10286

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1642 +1642 @@
         Utf8Str strDstRootAbs = pList->mDstRootAbs;
 
-        GuestPath::BuildDestinationPath(strSrcRootAbs, mSession->i_getGuestPathStyle(),
-                                        strDstRootAbs, PATH_STYLE_NATIVE);
+        vrc = GuestPath::BuildDestinationPath(strSrcRootAbs, mSession->i_getGuestPathStyle() /* Source */,
+                                              strDstRootAbs, PATH_STYLE_NATIVE  /* Dest */);
+        if (RT_FAILURE(vrc))
+        {
+            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                Utf8StrFmt(tr("Building host destination root path \"%s\" failed: %Rrc"),
+                                           strDstRootAbs.c_str(), vrc));
+            break;
+        }
 
         bool fCopyIntoExisting;
@@ -1731 +1738 @@
                 break;
 
-            /* Clean up the final host destination root path (for cleaning up mixed path separators). */
-            vrc = GuestPath::Translate(strDstRootAbs,
-                                       PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */);
-            if (RT_FAILURE(vrc))
-            {
-                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Translating host destination root path \"%s\" failed: %Rrc"),
-                                               strDstRootAbs.c_str(), vrc));
-                break;
-            }
-
             /* Make sure the destination root directory exists. */
             if (pList->mSourceSpec.fDryRun == false)
@@ -1768 +1764 @@
                 strDstAbs += pEntry->strPath;
 
-                /* Clean up the final guest source path (for cleaning up mixed path separators). */
+                /* Clean up the final guest source path. */
                 vrc = GuestPath::Translate(strSrcAbs, pList->mSourceSpec.enmPathStyle /* Source */,
                                            pList->mSourceSpec.enmPathStyle /* Dest */);
@@ -1779 +1775 @@
                 }
 
-                /* Translate the final host destination path. */
+                /* Clean up the final host desitnation path. */
                 vrc = GuestPath::Translate(strDstAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */);
                 if (RT_FAILURE(vrc))
@@ -2105 +2101 @@
         Utf8Str strDstRootAbs = pList->mDstRootAbs;
 
-        /* Translate the destination path to a path compatible with the guest.
-         * Note: This needs to be done *before* GuestPath::BuildDestinationPath() below! */
-        vrc = GuestPath::Translate(strDstRootAbs, mSession->i_getGuestPathStyle() /* Source */,
-                                   mSession->i_getGuestPathStyle() /* Dest */);
-
-        GuestPath::BuildDestinationPath(strSrcRootAbs, PATH_STYLE_NATIVE,
-                                        strDstRootAbs, mSession->i_getGuestPathStyle());
-
-
+        vrc = GuestPath::BuildDestinationPath(strSrcRootAbs, PATH_STYLE_NATIVE /* Source */,
+                                              strDstRootAbs, mSession->i_getGuestPathStyle()  /* Dest */);
         if (RT_FAILURE(vrc))
         {
             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                Utf8StrFmt(tr("Translating guest destination path \"%s\" failed: %Rrc"),
+                                Utf8StrFmt(tr("Building guest destination root path \"%s\" failed: %Rrc"),
                                            strDstRootAbs.c_str(), vrc));
             break;
@@ -2221 +2210 @@
                 break;
 
-            /* Clean up the final guest destination root path (for cleaning up mixed path separators). */
-            vrc = GuestPath::Translate(strDstRootAbs,
-                                       mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */);
-            if (RT_FAILURE(vrc))
-            {
-                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Translating guest destination root path \"%s\" failed: %Rrc"),
-                                               strDstRootAbs.c_str(), vrc));
-                break;
-            }
-
             /* Make sure the destination root directory exists. */
             if (pList->mSourceSpec.fDryRun == false)
@@ -2258 +2236 @@
                 strDstAbs += pEntry->strPath;
 
-                /* Clean up the final host source path (for cleaning up mixed path separators). */
+                /* Clean up the final host source path. */
                 vrc = GuestPath::Translate(strSrcAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */);
                 if (RT_FAILURE(vrc))
@@ -2268 +2246 @@
                 }
 
-                /* Translate the final guest destination path. */
+                /* Clean up the final guest destination path. */
                 vrc = GuestPath::Translate(strDstAbs,
                                            mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */);