Changeset 91131 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

Timestamp:

Sep 6, 2021 7:02:28 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage: For movevm, treat the "no target specified" case so that the API knows to move to the same location.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -317 +317 @@
     HRESULT                        rc;
     const char                    *pszSrcName      = NULL;
-    const char                    *pszTargetFolder = NULL;
     const char                    *pszType         = NULL;
+    char                          szTargetFolder[RTPATH_MAX];
 
     int c;
@@ -337 +337 @@
 
             case 'f':   // --target folder
-
-                char szPath[RTPATH_MAX];
-                pszTargetFolder = ValueUnion.psz;
-
-                vrc = RTPathAbs(pszTargetFolder, szPath, sizeof(szPath));
-                if (RT_FAILURE(vrc))
-                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs(%s,,) failed with rc=%Rrc", pszTargetFolder, vrc);
+                if (ValueUnion.psz && ValueUnion.psz[0] != '\0')
+                {
+                    vrc = RTPathAbs(ValueUnion.psz, szTargetFolder, sizeof(szTargetFolder));
+                    if (RT_FAILURE(vrc))
+                        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs(%s,,) failed with rc=%Rrc", ValueUnion.psz, vrc);
+                } else {
+                    szTargetFolder[0] = '\0';
+                }
                 break;
 
@@ -384 +385 @@
 
         CHECK_ERROR_RET(a->session, COMGETTER(Machine)(sessionMachine.asOutParam()), RTEXITCODE_FAILURE);
-        CHECK_ERROR_RET(sessionMachine, MoveTo(Bstr(pszTargetFolder).raw(),
+        CHECK_ERROR_RET(sessionMachine,
+                        MoveTo(Bstr(szTargetFolder).raw(),
                                Bstr(pszType).raw(),
-                               progress.asOutParam()), RTEXITCODE_FAILURE);
+                               progress.asOutParam()),
+                        RTEXITCODE_FAILURE);
         rc = showProgress(progress);
         CHECK_PROGRESS_ERROR_RET(progress, ("Move VM failed"), RTEXITCODE_FAILURE);
@@ -393 +396 @@
         CHECK_ERROR_RET(a->session, UnlockMachine(), RTEXITCODE_FAILURE);
 
-//        do
-//        {
-//            /* we have to open a session for this task */
-//            CHECK_ERROR_BREAK(srcMachine, LockMachine(a->session, LockType_Write));
-//            ComPtr<IMachine> sessionMachine;
-//            do
-//            {
-//                CHECK_ERROR_BREAK(a->session, COMGETTER(Machine)(sessionMachine.asOutParam()));
-//                CHECK_ERROR_BREAK(sessionMachine, MoveTo(Bstr(pszTargetFolder).raw(),
-//                                       Bstr(pszType).raw(),
-//                                       progress.asOutParam()));
-//                rc = showProgress(progress);
-//                CHECK_PROGRESS_ERROR_RET(progress, ("Move VM failed"), RTEXITCODE_FAILURE);
-////              CHECK_ERROR_BREAK(sessionMachine, SaveSettings());
-//            } while (0);
-//
-//            sessionMachine.setNull();
-//            CHECK_ERROR_BREAK(a->session, UnlockMachine());
-//        } while (0);
-        RTPrintf("Machine has been successfully moved into %s\n", pszTargetFolder);
+        RTPrintf("Machine has been successfully moved into %s\n", szTargetFolder[0] != '\0' ? szTargetFolder : "the same location");
     }