Changeset 79980 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 25, 2019 1:54:08 PM (6 years ago)

Author:

vboxsync

Message:

OCI: improve parameter handling in a few more commands.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (9 diffs)

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

@@ -494 +494 @@
 
     Utf8Str strInstanceId;
+
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -500 +501 @@
         {
             case 'i':
-                    strInstanceId = ValueUnion.psz;
-                break;
+            {
+                if (strInstanceId.isNotEmpty())
+                    return errorArgument("Duplicate parameter: --id");
+
+                strInstanceId = ValueUnion.psz;
+                if (strInstanceId.isEmpty())
+                    return errorArgument("Empty parameter: --id");
+
+                break;
+            }
+
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);
+
             default:
                 return errorGetOpt(c, &ValueUnion);
         }
     }
+
+    if (strInstanceId.isEmpty())
+        return errorArgument("Missing parameter: --id");
+
 
     ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;
@@ -609 +624 @@
 
     Utf8Str strInstanceId;
+
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -615 +631 @@
         {
             case 'i':
-                    strInstanceId = ValueUnion.psz;
-                break;
+            {
+                if (strInstanceId.isNotEmpty())
+                    return errorArgument("Duplicate parameter: --id");
+
+                strInstanceId = ValueUnion.psz;
+                if (strInstanceId.isEmpty())
+                    return errorArgument("Empty parameter: --id");
+
+                break;
+            }
+
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);
+
             default:
                 return errorGetOpt(c, &ValueUnion);
         }
     }
+
+    if (strInstanceId.isEmpty())
+        return errorArgument("Missing parameter: --id");
+
 
     ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;
@@ -666 +696 @@
 
     Utf8Str strInstanceId;
+
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -672 +703 @@
         {
             case 'i':
-                    strInstanceId = ValueUnion.psz;
-                break;
+            {
+                if (strInstanceId.isNotEmpty())
+                    return errorArgument("Duplicate parameter: --id");
+
+                strInstanceId = ValueUnion.psz;
+                if (strInstanceId.isEmpty())
+                    return errorArgument("Empty parameter: --id");
+
+                break;
+            }
+
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);
+
             default:
                 return errorGetOpt(c, &ValueUnion);
         }
     }
+
+    if (strInstanceId.isEmpty())
+        return errorArgument("Missing parameter: --id");
+
 
     ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;
@@ -723 +768 @@
 
     Utf8Str strInstanceId;
+
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -729 +775 @@
         {
             case 'i':
-                    strInstanceId = ValueUnion.psz;
-                break;
+            {
+                if (strInstanceId.isNotEmpty())
+                    return errorArgument("Duplicate parameter: --id");
+
+                strInstanceId = ValueUnion.psz;
+                if (strInstanceId.isEmpty())
+                    return errorArgument("Empty parameter: --id");
+
+                break;
+            }
+
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);
+
             default:
                 return errorGetOpt(c, &ValueUnion);
         }
     }
+
+    if (strInstanceId.isEmpty())
+        return errorArgument("Missing parameter: --id");
+
 
     ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;
@@ -1233 +1293 @@
     }
 
+    if (strImageId.isEmpty())
+        return errorArgument("Missing parameter: --id");
+
+
     ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;