Changeset 33288 in vbox for trunk

Timestamp:

Oct 21, 2010 9:55:24 AM (14 years ago)

Author:

vboxsync

Message:

Storage/vbox-img: improve mandatory parameter checking and default/dummy parameter values

File:

• trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -624 +624 @@
     bool fStdIn = false;
     bool fStdOut = false;
-    char *pszSrcFormat = NULL;
+    const char *pszSrcFormat = NULL;
     const char *pszDstFormat = NULL;
     const char *pszVariant = NULL;
@@ -670 +670 @@
                 break;
             case 's':   // --srcformat
-                pszSrcFormat = RTStrDup(ValueUnion.psz);
+                pszSrcFormat = ValueUnion.psz;
                 break;
             case 'd':   // --dstformat
-                pszDstFormat = RTStrDup(ValueUnion.psz);
+                pszDstFormat = ValueUnion.psz;
                 break;
             case 'v':   // --variant
@@ -686 +686 @@
     }
 
-    /* Check for mandatory parameters. */
+    /* Check for mandatory parameters and handle dummies/defaults. */
+    if (fStdIn && !pszSrcFormat)
+        return errorSyntax("Mandatory --srcformat option missing\n");
+    if (!pszDstFormat)
+        pszDstFormat = "VDI";
+    if (fStdIn && !pszSrcFilename)
+    {
+        /* Complete dummy, will be just passed to various calls to fulfill
+         * the "must be non-NULL" requirement, and is completely ignored
+         * otherwise. It shown in the stderr message below. */
+        pszSrcFilename = "stdin";
+    }
+    if (fStdOut && !pszDstFilename)
+    {
+        /* Will be stored in the destination image if it is a streamOptimized
+         * VMDK, but it isn't really relevant - use it for "branding". */
+        if (!RTStrICmp(pszDstFormat, "VMDK"))
+            pszDstFilename = "VirtualBoxStream.vmdk";
+        else
+            pszDstFilename = "stdout";
+    }
     if (!pszSrcFilename)
         return errorSyntax("Mandatory --srcfilename option missing\n");
@@ -768 +788 @@
         if (!pszSrcFormat)
         {
-            rc = VDGetFormat(NULL, NULL, pszSrcFilename, &pszSrcFormat);
+            char *pszFormat;
+            rc = VDGetFormat(NULL, NULL, pszSrcFilename, &pszFormat);
             if (RT_FAILURE(rc))
             {
@@ -774 +795 @@
                 break;
             }
+            pszSrcFormat = pszFormat;
         }
 
@@ -791 +813 @@
             break;
         }
-
-        /* output format defaults to VDI */
-        if (!pszDstFormat)
-            pszDstFormat = "VDI";
 
         rc = VDCreate(pVDIfs, &pDstDisk);