Changeset 1916 in vbox for trunk

Timestamp:

Apr 4, 2007 9:41:12 AM (18 years ago)

Author:

vboxsync

Message:

FE/VBoxManage: 'convertdd' accepts the special file stdin now to read from stdin (third size parameter required in that case); 'convertdd' does not need to instantiate a VM session

File:

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

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

@@ -442 +442 @@
     {
         RTPrintf("VBoxManage convertdd        <filename> <outputfile>\n"
+                 "VBoxManage convertdd        stdin <outputfile> <bytes>\n"
                  "\n");
     }
@@ -2327 +2328 @@
 }
 
-static int handleConvertDDImage(int argc, char *argv[],
-                                ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)
+static int handleConvertDDImage(int argc, char *argv[])
 {
-    if (argc != 2)
-    {
+#ifdef __LINUX__
+    const bool fReadFromStdIn = !strcmp(argv[0], "stdin");
+#else
+    const bool fReadFromStdIn = false;
+#endif
+
+    if ((!fReadFromStdIn && argc != 2) || (fReadFromStdIn && argc != 3))
         return errorSyntax(USAGE_CONVERTDD, "Incorrect number of parameters");
-    }
-
 
     RTPrintf("Converting VDI: from DD image file=\"%s\" to file=\"%s\"...\n",
@@ -2341 +2344 @@
     /* open raw image file. */
     RTFILE File;
-    int rc = RTFileOpen(&File, argv[0], RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
+    int rc = VINF_SUCCESS;
+    if (fReadFromStdIn)
+        File = 0;
+    else
+        rc = RTFileOpen(&File, argv[0], RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
     if (VBOX_FAILURE(rc))
     {
@@ -2348 +2355 @@
     }
 
+    uint64_t cbFile;
     /* get image size. */
-    uint64_t cbFile;
-    rc = RTFileGetSize(File, &cbFile);
+    if (fReadFromStdIn)
+        cbFile = RTStrToUInt64(argv[2]);
+    else
+        rc = RTFileGetSize(File, &cbFile);
     if (VBOX_SUCCESS(rc))
     {
-        RTPrintf("Creating fixed image with size %u Bytes...\n", (unsigned)cbFile);
+        RTPrintf("Creating fixed image with size %RU64Bytes (%RU64MB)...\n", cbFile, (cbFile + _1M - 1) / _1M);
+        char pszComment[256];
+        RTStrPrintf(pszComment, sizeof(pszComment), "Converted image from %s", argv[0]);
         rc = VDICreateBaseImage(argv[1],
                                 VDI_IMAGE_TYPE_FIXED,
                                 cbFile,
-                                "Converted from DD test image", NULL, NULL);
+                                pszComment, NULL, NULL);
         if (VBOX_SUCCESS(rc))
         {
@@ -2396 +2408 @@
             }
         }
+        else
+            RTPrintf("Failed to create output file (%Vrc)!\n", rc);
     }
     RTFileClose(File);
@@ -6094 +6108 @@
     ////////////////////////////////////////////////////////////////////////////
 
-    /* update settings command (no VirtualBox instantiation!)*/
+    /* update settings command (no VirtualBox instantiation!) */
     if (argc >= 2 && (strcmp(argv[1], "updatesettings") == 0))
     {
-        rc = handleUpdateSettings(argc - 2 , argv + 2);
+        rc = handleUpdateSettings(argc - 2, argv + 2);
+        break;
+    }
+
+    /* convertdd: does not need a VirtualBox instantiation) */
+    if (argc >= 2 && (strcmp(argv[1], "convertdd") == 0))
+    {
+        rc = handleConvertDDImage(argc - 2, argv + 2);
         break;
     }
@@ -6146 +6167 @@
         { "modifyvm",         handleModifyVM },
         { "clonevdi",         handleCloneVDI },
-        { "convertdd",        handleConvertDDImage },
         { "startvm",          handleStartVM },
         { "controlvm",        handleControlVM },