Changeset 46524 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

Timestamp:

Jun 13, 2013 12:10:23 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86380

Message:

Main/IGuest::UpdateGuestAdditions: Implemented support for passing optional command line arguments to the performing installer on the guest (untested).

Location:

trunk/src/VBox

Files:

• . (modified) (1 prop)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (8 diffs)

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

@@ -261 +261 @@
                  "                            [--source <guest additions .ISO>] [--verbose]\n"
                  "                            [--wait-start]\n"
+                 "                            [-- [<argument1>] ... [<argumentN>]]\n"
                  "\n", pcszSep1, pcszSep2);
 }
@@ -633 +634 @@
     com::SafeArray<ProcessCreateFlag_T>  aCreateFlags;
     com::SafeArray<ProcessWaitForFlag_T> aWaitFlags;
-    com::SafeArray<IN_BSTR>              args;
-    com::SafeArray<IN_BSTR>              env;
+    com::SafeArray<IN_BSTR>              aArgs;
+    com::SafeArray<IN_BSTR>              aEnv;
     Utf8Str                              strUsername;
     Utf8Str                              strPassword;
@@ -669 +670 @@
                     return errorSyntax(USAGE_GUESTCONTROL, "Failed to parse environment value, rc=%Rrc", vrc);
                 for (int j = 0; j < cArgs; j++)
-                    env.push_back(Bstr(papszArg[j]).raw());
+                    aEnv.push_back(Bstr(papszArg[j]).raw());
 
                 RTGetOptArgvFree(papszArg);
@@ -742 +743 @@
             case VINF_GETOPT_NOT_OPTION:
             {
-                if (args.size() == 0 && strCmd.isEmpty())
+                if (aArgs.size() == 0 && strCmd.isEmpty())
                     strCmd = ValueUnion.psz;
                 else
-                    args.push_back(Bstr(ValueUnion.psz).raw());
+                    aArgs.push_back(Bstr(ValueUnion.psz).raw());
                 break;
             }
@@ -837 +838 @@
         ComPtr<IGuestProcess> pProcess;
         rc = pGuestSession->ProcessCreate(Bstr(strCmd).raw(),
-                                          ComSafeArrayAsInParam(args),
-                                          ComSafeArrayAsInParam(env),
+                                          ComSafeArrayAsInParam(aArgs),
+                                          ComSafeArrayAsInParam(aEnv),
                                           ComSafeArrayAsInParam(aCreateFlags),
                                           cMsTimeout,
@@ -2652 +2653 @@
      */
     Utf8Str strSource;
+    com::SafeArray<IN_BSTR> aArgs;
     bool fVerbose = false;
     bool fWaitStartOnly = false;
@@ -2684 +2686 @@
                 fWaitStartOnly = true;
                 break;
+
+            case VINF_GETOPT_NOT_OPTION:
+            {
+                if (aArgs.size() == 0 && strSource.isEmpty())
+                    strSource = ValueUnion.psz;
+                else
+                    aArgs.push_back(Bstr(ValueUnion.psz).raw());
+                break;
+            }
 
             default:
@@ -2731 +2742 @@
         ComPtr<IProgress> pProgress;
         CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(strSource).raw(),
+                                                ComSafeArrayAsInParam(aArgs),
                                                 /* Wait for whole update process to complete. */
                                                 ComSafeArrayAsInParam(aUpdateFlags),