Changeset 11105 in vbox for trunk

Timestamp:

Aug 4, 2008 2:40:46 PM (16 years ago)

Author:

vboxsync

Message:

FE/VBoxManage, Additions/VBoxControl: guestproperty set with flags but without a value is not allowed

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxControl/VBoxControl.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageGuestProp.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -107 +107 @@
     {
         doUsage("get <property> [-verbose]\n", g_pszProgName, "guestproperty");
-        doUsage("set <property> [<value>] [-flags <flags>]\n", g_pszProgName, "guestproperty");
+        doUsage("set <property> [<value> [-flags <flags>]]\n", g_pszProgName, "guestproperty");
         doUsage("enumerate [-patterns <patterns>]\n", g_pszProgName, "guestproperty");
     }
@@ -981 +981 @@
         if (strcmp(argv[1], "-flags") != 0)
             usageOK = false;
-        pszFlags = argv[2];
+        else
+        {
+            RTPrintf("You may not specify flags without a value");
+            return 1;
+        }
     }
     else if (4 == argc)

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

@@ -45 +45 @@
              "\n");
     RTPrintf("VBoxManage guestproperty    set <vmname>|<uuid>\n"
-             "                            <property> [<value>] [-flags <flags>]\n"
+             "                            <property> [<value> [-flags <flags>]]\n"
              "\n");
     RTPrintf("VBoxManage guestproperty    enumerate <vmname>|<uuid>\n"
@@ -123 +123 @@
         if (strcmp(argv[2], "-flags") != 0)
             usageOK = false;
-        pszFlags = argv[3];
+        else
+            return errorSyntax(USAGE_GUESTPROPERTY,
+                               "You may not specify flags without a value");
     }
     else if (5 == argc)