Changeset 103411 in vbox for trunk/src

Timestamp:

Feb 19, 2024 7:12:34 AM (12 months ago)

Author:

vboxsync

Message:

FE/VBoxManage: Redo weird logic in handleRegisterVM to fix some parfait warnings, bugref:3409

File:

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

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

@@ -77 +77 @@
 {
     HRESULT hrc;
-    const char *VMName = NULL;
-
-    Bstr bstrVMName;
-    Bstr bstrPasswordFile;
+
+    const char *pszVmFile = NULL;
+    const char *pszPasswordFile = NULL;
 
     int c;
@@ -93 +92 @@
         {
             case 'p':   // --password
-                bstrPasswordFile = ValueUnion.psz;
+                pszPasswordFile = ValueUnion.psz;
                 break;
 
             case VINF_GETOPT_NOT_OPTION:
-                if (bstrVMName.isEmpty())
-                    VMName = ValueUnion.psz;
+                if (!pszVmFile)
+                    pszVmFile = ValueUnion.psz;
                 else
                     return errorSyntax(Misc::tr("Invalid parameter '%s'"), ValueUnion.psz);
@@ -120 +119 @@
     Utf8Str strPassword;
 
-    if (bstrPasswordFile.isNotEmpty())
-    {
-        if (bstrPasswordFile == "-")
+    if (pszPasswordFile)
+    {
+        if (pszPasswordFile[0] == '-' && pszPasswordFile[1] == '\0')
         {
             /* Get password from console. */
@@ -131 +130 @@
         else
         {
-            RTEXITCODE rcExit = readPasswordFile(a->argv[3], &strPassword);
+            RTEXITCODE rcExit = readPasswordFile(pszPasswordFile, &strPassword);
             if (rcExit == RTEXITCODE_FAILURE)
                 return RTMsgErrorExitFailure(Misc::tr("Failed to read password from file"));
@@ -141 +140 @@
      * and the client's interpretation of relative paths. Remove after the API
      * has been redesigned. */
-    hrc = a->virtualBox->OpenMachine(Bstr(a->argv[0]).raw(),
+    hrc = a->virtualBox->OpenMachine(Bstr(pszVmFile).raw(),
                                      Bstr(strPassword).raw(),
                                      machine.asOutParam());
-    if (FAILED(hrc) && !RTPathStartsWithRoot(a->argv[0]))
+    if (FAILED(hrc) && !RTPathStartsWithRoot(pszVmFile))
     {
         char szVMFileAbs[RTPATH_MAX] = "";
-        int vrc = RTPathAbs(a->argv[0], szVMFileAbs, sizeof(szVMFileAbs));
+        int vrc = RTPathAbs(pszVmFile, szVMFileAbs, sizeof(szVMFileAbs));
         if (RT_FAILURE(vrc))
             return RTMsgErrorExitFailure(Misc::tr("Failed to convert \"%s\" to an absolute path: %Rrc"),
-                                         a->argv[0], vrc);
+                                         pszVmFile, vrc);
         CHECK_ERROR(a->virtualBox, OpenMachine(Bstr(szVMFileAbs).raw(),
                                                Bstr(strPassword).raw(),