Changeset 31599 in vbox

Timestamp:

Aug 12, 2010 1:02:55 PM (14 years ago)

Author:

vboxsync

Message:

FE/VBoxManage: fix the usage output for convertfromraw on Windows (no stdin support), and simplify the #ifdefs

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageDisk.cpp (modified) (2 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxManage - The disk delated commands.
+ * VBoxManage - The disk related commands.
  */
 
@@ -759 +759 @@
                 {
                     srcfilename = ValueUnion.psz;
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
+// If you change the OS list here don't forget to update VBoxManageHelp.cpp.
+#ifndef RT_OS_WINDOWS
                     fReadFromStdIn = !strcmp(srcfilename, "stdin");
 #endif

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

@@ -511 +511 @@
                  "                            [--format VDI|VMDK|VHD]\n"
                  "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
+#ifndef RT_OS_WINDOWS
                  "VBoxManage convertfromraw   stdin <outputfile> <bytes>\n"
                  "                            [--format VDI|VMDK|VHD]\n"
                  "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
+#endif
                  "\n");
     }