Changeset 18819 in vbox for trunk/src

Timestamp:

Apr 7, 2009 1:02:43 PM (16 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: when registering VMs try it with the client's idea of relative paths (by converting them to absolute). Helps with unexpected behavior of the API.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)

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

@@ -201 +201 @@
 
     ComPtr<IMachine> machine;
-    CHECK_ERROR(a->virtualBox, OpenMachine(Bstr(a->argv[0]), machine.asOutParam()));
+    /** @todo Ugly hack to get both the API interpretation of relative paths
+     * and the client's interpretation of relative paths. Remove after the API
+     * has been redesigned. */
+    rc = a->virtualBox->OpenMachine(Bstr(a->argv[0]), machine.asOutParam());
+    if (rc == VBOX_E_FILE_ERROR)
+    {
+        char szVMFileAbs[RTPATH_MAX] = "";
+        int vrc = RTPathAbs(a->argv[0], szVMFileAbs, sizeof(szVMFileAbs));
+        if (RT_FAILURE(vrc))
+        {
+            RTPrintf("Cannot convert filename \"%s\" to absolute path\n", a->argv[0]);
+            return 1;
+        }
+        CHECK_ERROR(a->virtualBox, OpenMachine(Bstr(szVMFileAbs), machine.asOutParam()));
+    }
+    else
+        CHECK_ERROR(a->virtualBox, OpenMachine(Bstr(a->argv[0]), machine.asOutParam()));
     if (SUCCEEDED(rc))
     {