Changeset 28248 in vbox for trunk/src/VBox

Timestamp:

Apr 13, 2010 12:52:38 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage/Control: More syntax.

File:

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

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

@@ -71 +71 @@
 static int handleExecProgram(HandlerArg *a)
 {
-    HRESULT rc = S_OK;
-
     /*
      * Check the syntax.  We can deduce the correct syntax from the number of
      * arguments.
      */
-    bool usageOK = true;
     if (a->argc < 2) /* At least the command we want to execute in the guest should be present :-). */
         return errorSyntax(USAGE_GUESTCONTROL, "Incorrect parameters");
@@ -95 +92 @@
 
     /* Iterate through all possible commands (if available). */
+    bool usageOK = true;
     for (int i = 2; usageOK && i < a->argc; i++)
     {
@@ -215 +213 @@
     ComPtr<IMachine> machine;
     /* assume it's an UUID */
-    rc = a->virtualBox->GetMachine(Bstr(a->argv[0]), machine.asOutParam());
+    HRESULT rc = a->virtualBox->GetMachine(Bstr(a->argv[0]), machine.asOutParam());
     if (FAILED(rc) || !machine)
     {
@@ -221 +219 @@
         CHECK_ERROR(a->virtualBox, FindMachine(Bstr(a->argv[0]), machine.asOutParam()));
     }
+
     if (machine)
     {
@@ -279 +278 @@
 
     /* switch (cmd) */
-    if (strcmp(a->argv[0], "exec") == 0)
+    if (   strcmp(a->argv[0], "exec") == 0
+        || strcmp(a->argv[0], "execute") == 0)
         return handleExecProgram(&arg);