Changeset 32709 in vbox
- Timestamp:
- Sep 23, 2010 11:29:12 AM (14 years ago)
- Location:
- trunk/src/VBox/Frontends/VBoxManage
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
r32701 r32709 130 130 * Print the usage info. 131 131 */ 132 void printUsageInternal(USAGECATEGORY u64Cmd )133 { 134 RTStrmPrintf( g_pStdErr,132 void printUsageInternal(USAGECATEGORY u64Cmd, PRTSTREAM pStrm) 133 { 134 RTStrmPrintf(pStrm, 135 135 "Usage: VBoxManage internalcommands <command> [command arguments]\n" 136 136 "\n" -
trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
r32701 r32709 209 209 RTR3Init(); 210 210 211 bool fShowLogo = true; 211 bool fShowLogo = false; 212 bool fShowHelp = false; 212 213 int iCmd = 1; 213 214 int iCmdArg; … … 223 224 || !strcmp(argv[i], "--help")) 224 225 { 225 showLogo(); 226 printUsage(USAGE_ALL); 227 return 0; 226 if (i >= argc - 1) 227 { 228 showLogo(g_pStdOut); 229 printUsage(USAGE_ALL, g_pStdOut); 230 return 0; 231 } 232 fShowLogo = true; 233 fShowHelp = true; 234 iCmd++; 235 continue; 228 236 } 229 237 … … 243 251 /* Special option to dump really all commands, 244 252 * even the ones not understood on this platform. */ 245 printUsage(USAGE_DUMPOPTS );253 printUsage(USAGE_DUMPOPTS, g_pStdOut); 246 254 return 0; 247 255 } … … 264 272 265 273 if (fShowLogo) 266 showLogo( );274 showLogo(g_pStdOut); 267 275 268 276 … … 344 352 { 345 353 const char *command; 354 USAGECATEGORY help; 346 355 int (*handler)(HandlerArg *a); 347 356 } s_commandHandlers[] = 348 357 { 349 { "internalcommands", handleInternalCommands },350 { "list", handleList },351 { "showvminfo", handleShowVMInfo },352 { "registervm", handleRegisterVM },353 { "unregistervm", handleUnregisterVM },354 { "createhd", handleCreateHardDisk },355 { "createvdi", handleCreateHardDisk }, /* backward compatiblity */356 { "modifyhd", handleModifyHardDisk },357 { "modifyvdi", handleModifyHardDisk }, /* backward compatiblity */358 { "clonehd", handleCloneHardDisk },359 { "clonevdi", handleCloneHardDisk }, /* backward compatiblity */360 { "addiscsidisk", handleAddiSCSIDisk },361 { "createvm", handleCreateVM },362 { "modifyvm", handleModifyVM },363 { "startvm", handleStartVM },364 { "controlvm", handleControlVM },365 { "discardstate", handleDiscardState },366 { "adoptstate", handleAdoptState },367 { "snapshot", handleSnapshot },368 { "openmedium", handleOpenMedium },369 { "registerimage", handleOpenMedium }, /* backward compatiblity */370 { "closemedium", handleCloseMedium },371 { "unregisterimage", handleCloseMedium }, /* backward compatiblity */372 { "storageattach", handleStorageAttach },373 { "storagectl", handleStorageController },374 { "showhdinfo", handleShowHardDiskInfo },375 { "showvdiinfo", handleShowHardDiskInfo }, /* backward compatiblity */376 { "getextradata", handleGetExtraData },377 { "setextradata", handleSetExtraData },378 { "setproperty", handleSetProperty },379 { "usbfilter", handleUSBFilter },380 { "sharedfolder", handleSharedFolder },381 { "vmstatistics", handleVMStatistics },358 { "internalcommands", 0, handleInternalCommands }, 359 { "list", USAGE_LIST, handleList }, 360 { "showvminfo", USAGE_SHOWVMINFO, handleShowVMInfo }, 361 { "registervm", USAGE_REGISTERVM, handleRegisterVM }, 362 { "unregistervm", USAGE_UNREGISTERVM, handleUnregisterVM }, 363 { "createhd", USAGE_CREATEHD, handleCreateHardDisk }, 364 { "createvdi", USAGE_CREATEHD, handleCreateHardDisk }, /* backward compatiblity */ 365 { "modifyhd", USAGE_MODIFYHD, handleModifyHardDisk }, 366 { "modifyvdi", USAGE_MODIFYHD, handleModifyHardDisk }, /* backward compatiblity */ 367 { "clonehd", USAGE_CLONEHD, handleCloneHardDisk }, 368 { "clonevdi", USAGE_CLONEHD, handleCloneHardDisk }, /* backward compatiblity */ 369 { "addiscsidisk", USAGE_ADDISCSIDISK, handleAddiSCSIDisk }, 370 { "createvm", USAGE_CREATEVM, handleCreateVM }, 371 { "modifyvm", USAGE_MODIFYVM, handleModifyVM }, 372 { "startvm", USAGE_STARTVM, handleStartVM }, 373 { "controlvm", USAGE_CONTROLVM, handleControlVM }, 374 { "discardstate", USAGE_DISCARDSTATE, handleDiscardState }, 375 { "adoptstate", USAGE_ADOPTSTATE, handleAdoptState }, 376 { "snapshot", USAGE_SNAPSHOT, handleSnapshot }, 377 { "openmedium", USAGE_OPENMEDIUM, handleOpenMedium }, 378 { "registerimage", USAGE_OPENMEDIUM, handleOpenMedium }, /* backward compatiblity */ 379 { "closemedium", USAGE_CLOSEMEDIUM, handleCloseMedium }, 380 { "unregisterimage", USAGE_CLOSEMEDIUM, handleCloseMedium }, /* backward compatiblity */ 381 { "storageattach", USAGE_STORAGEATTACH, handleStorageAttach }, 382 { "storagectl", USAGE_STORAGECONTROLLER, handleStorageController }, 383 { "showhdinfo", USAGE_SHOWHDINFO, handleShowHardDiskInfo }, 384 { "showvdiinfo", USAGE_SHOWHDINFO, handleShowHardDiskInfo }, /* backward compatiblity */ 385 { "getextradata", USAGE_GETEXTRADATA, handleGetExtraData }, 386 { "setextradata", USAGE_SETEXTRADATA, handleSetExtraData }, 387 { "setproperty", USAGE_SETPROPERTY, handleSetProperty }, 388 { "usbfilter", USAGE_USBFILTER, handleUSBFilter }, 389 { "sharedfolder", USAGE_SHAREDFOLDER, handleSharedFolder }, 390 { "vmstatistics", USAGE_VM_STATISTICS, handleVMStatistics }, 382 391 #ifdef VBOX_WITH_GUEST_PROPS 383 { "guestproperty", handleGuestProperty },392 { "guestproperty", USAGE_GUESTPROPERTY, handleGuestProperty }, 384 393 #endif 385 394 #ifdef VBOX_WITH_GUEST_CONTROL 386 { "guestcontrol", handleGuestControl },395 { "guestcontrol", USAGE_GUESTCONTROL, handleGuestControl }, 387 396 #endif 388 { "metrics", handleMetrics },389 { "import", handleImportAppliance },390 { "export", handleExportAppliance },397 { "metrics", USAGE_METRICS, handleMetrics }, 398 { "import", USAGE_IMPORTAPPLIANCE, handleImportAppliance }, 399 { "export", USAGE_EXPORTAPPLIANCE, handleExportAppliance }, 391 400 #ifdef VBOX_WITH_NETFLT 392 { "hostonlyif", handleHostonlyIf },401 { "hostonlyif", USAGE_HOSTONLYIFS, handleHostonlyIf }, 393 402 #endif 394 { "dhcpserver", handleDHCPServer},395 { NULL, NULL }403 { "dhcpserver", USAGE_DHCPSERVER, handleDHCPServer}, 404 { NULL, 0, NULL } 396 405 }; 397 406 … … 404 413 handlerArg.argv = &argv[iCmdArg]; 405 414 406 rc = s_commandHandlers[commandIndex].handler(&handlerArg); 415 if ( fShowHelp 416 || ( argc - iCmdArg == 0 417 && s_commandHandlers[commandIndex].help)) 418 { 419 printUsage(s_commandHandlers[commandIndex].help, g_pStdOut); 420 rc = 1; /* error */ 421 } 422 else 423 rc = s_commandHandlers[commandIndex].handler(&handlerArg); 407 424 break; 408 425 } -
trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h
r32701 r32709 28 28 #include <iprt/types.h> 29 29 #include <iprt/message.h> 30 #include <iprt/stream.h> 30 31 31 32 //////////////////////////////////////////////////////////////////////////////// … … 141 142 142 143 /* VBoxManageHelp.cpp */ 143 void printUsage(USAGECATEGORY u64Cmd );144 void printUsage(USAGECATEGORY u64Cmd, PRTSTREAM pStrm); 144 145 int errorSyntax(USAGECATEGORY u64Cmd, const char *pszFormat, ...); 145 146 int errorGetOpt(USAGECATEGORY u64Cmd, int rc, union RTGETOPTUNION const *pValueUnion); 146 147 int errorArgument(const char *pszFormat, ...); 147 148 148 void printUsageInternal(USAGECATEGORY u64Cmd );149 void printUsageInternal(USAGECATEGORY u64Cmd, PRTSTREAM pStrm); 149 150 150 151 #ifndef VBOX_ONLY_DOCS … … 153 154 154 155 /* VBoxManage.cpp */ 155 void showLogo( void);156 void showLogo(PRTSTREAM pStrm); 156 157 157 158 #ifndef VBOX_ONLY_DOCS -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
r32701 r32709 31 31 32 32 33 void showLogo( void)33 void showLogo(PRTSTREAM pStrm) 34 34 { 35 35 static bool s_fShown; /* show only once */ … … 37 37 if (!s_fShown) 38 38 { 39 RTStrmPrintf( g_pStdErr, VBOX_PRODUCT " Command Line Management Interface Version "39 RTStrmPrintf(pStrm, VBOX_PRODUCT " Command Line Management Interface Version " 40 40 VBOX_VERSION_STRING "\n" 41 41 "(C) 2005-" VBOX_C_YEAR " " VBOX_VENDOR "\n" … … 46 46 } 47 47 48 void printUsage(USAGECATEGORY u64Cmd )48 void printUsage(USAGECATEGORY u64Cmd, PRTSTREAM pStrm) 49 49 { 50 50 bool fDumpOpts = false; … … 98 98 } 99 99 100 RTStrmPrintf( g_pStdErr,100 RTStrmPrintf(pStrm, 101 101 "Usage:\n" 102 102 "\n"); … … 104 104 if (u64Cmd == USAGE_ALL) 105 105 { 106 RTStrmPrintf( g_pStdErr,106 RTStrmPrintf(pStrm, 107 107 "VBoxManage [-v|--version] print version number and exit\n" 108 108 "VBoxManage [-q|--nologo] ... suppress the logo\n" … … 112 112 if (u64Cmd & USAGE_LIST) 113 113 { 114 RTStrmPrintf( g_pStdErr,114 RTStrmPrintf(pStrm, 115 115 "VBoxManage list [--long|-l] vms|runningvms|ostypes|hostdvds|hostfloppies|\n" 116 116 #if defined(VBOX_WITH_NETFLT) … … 126 126 if (u64Cmd & USAGE_SHOWVMINFO) 127 127 { 128 RTStrmPrintf( g_pStdErr,128 RTStrmPrintf(pStrm, 129 129 "VBoxManage showvminfo <uuid>|<name> [--details] [--statistics]\n" 130 130 " [--machinereadable]\n" … … 135 135 if (u64Cmd & USAGE_REGISTERVM) 136 136 { 137 RTStrmPrintf( g_pStdErr,137 RTStrmPrintf(pStrm, 138 138 "VBoxManage registervm <filename>\n" 139 139 "\n"); … … 142 142 if (u64Cmd & USAGE_UNREGISTERVM) 143 143 { 144 RTStrmPrintf( g_pStdErr,144 RTStrmPrintf(pStrm, 145 145 "VBoxManage unregistervm <uuid>|<name> [--delete]\n" 146 146 "\n"); … … 149 149 if (u64Cmd & USAGE_CREATEVM) 150 150 { 151 RTStrmPrintf( g_pStdErr,151 RTStrmPrintf(pStrm, 152 152 "VBoxManage createvm --name <name>\n" 153 153 " [--ostype <ostype>]\n" … … 160 160 if (u64Cmd & USAGE_MODIFYVM) 161 161 { 162 RTStrmPrintf( g_pStdErr,162 RTStrmPrintf(pStrm, 163 163 "VBoxManage modifyvm <uuid|name>\n" 164 164 " [--name <name>]\n" … … 259 259 { 260 260 #ifdef VBOX_WITH_WINMM 261 RTStrmPrintf( g_pStdErr, "|winmm|dsound");261 RTStrmPrintf(pStrm, "|winmm|dsound"); 262 262 #else 263 RTStrmPrintf( g_pStdErr, "|dsound");263 RTStrmPrintf(pStrm, "|dsound"); 264 264 #endif 265 265 } 266 266 if (fSolaris) 267 267 { 268 RTStrmPrintf( g_pStdErr, "|solaudio"268 RTStrmPrintf(pStrm, "|solaudio" 269 269 #ifdef VBOX_WITH_SOLARIS_OSS 270 270 "|oss" … … 274 274 if (fLinux) 275 275 { 276 RTStrmPrintf( g_pStdErr, "|oss"276 RTStrmPrintf(pStrm, "|oss" 277 277 #ifdef VBOX_WITH_ALSA 278 278 "|alsa" … … 288 288 if (fDumpOpts) 289 289 { 290 RTStrmPrintf( g_pStdErr, "|\n"290 RTStrmPrintf(pStrm, "|\n" 291 291 " oss"); 292 292 } 293 293 else 294 RTStrmPrintf( g_pStdErr, "|oss");294 RTStrmPrintf(pStrm, "|oss"); 295 295 #ifdef VBOX_WITH_PULSE 296 RTStrmPrintf( g_pStdErr, "|pulse");296 RTStrmPrintf(pStrm, "|pulse"); 297 297 #endif 298 298 } 299 299 if (fDarwin) 300 300 { 301 RTStrmPrintf( g_pStdErr, "|coreaudio");301 RTStrmPrintf(pStrm, "|coreaudio"); 302 302 } 303 RTStrmPrintf( g_pStdErr, "]\n");304 RTStrmPrintf( g_pStdErr,303 RTStrmPrintf(pStrm, "]\n"); 304 RTStrmPrintf(pStrm, 305 305 " [--audiocontroller ac97|hda|sb16]\n" 306 306 " [--clipboard disabled|hosttoguest|guesttohost|\n" … … 308 308 if (fVRDP) 309 309 { 310 RTStrmPrintf( g_pStdErr,310 RTStrmPrintf(pStrm, 311 311 " [--vrdp on|off]\n" 312 312 " [--vrdpport default|<ports>]\n" … … 318 318 " [--vrdpvideochannelquality <percent>]\n"); 319 319 } 320 RTStrmPrintf( g_pStdErr,320 RTStrmPrintf(pStrm, 321 321 " [--usb on|off]\n" 322 322 " [--usbehci on|off]\n" … … 340 340 if (u64Cmd & USAGE_IMPORTAPPLIANCE) 341 341 { 342 RTStrmPrintf( g_pStdErr,342 RTStrmPrintf(pStrm, 343 343 "VBoxManage import <ovf> [--dry-run|-n] [more options]\n" 344 344 " (run with -n to have options displayed\n" … … 348 348 if (u64Cmd & USAGE_EXPORTAPPLIANCE) 349 349 { 350 RTStrmPrintf( g_pStdErr,350 RTStrmPrintf(pStrm, 351 351 "VBoxManage export <machines> --output|-o <ovf>\n" 352 352 " [--legacy09]\n" … … 365 365 if (u64Cmd & USAGE_STARTVM) 366 366 { 367 RTStrmPrintf( g_pStdErr,367 RTStrmPrintf(pStrm, 368 368 "VBoxManage startvm <uuid>|<name>\n"); 369 RTStrmPrintf( g_pStdErr,369 RTStrmPrintf(pStrm, 370 370 " [--type gui"); 371 371 if (fVBoxSDL) 372 RTStrmPrintf( g_pStdErr, "|sdl");372 RTStrmPrintf(pStrm, "|sdl"); 373 373 if (fVRDP) 374 RTStrmPrintf( g_pStdErr, "|vrdp");375 RTStrmPrintf( g_pStdErr, "|headless]\n");376 RTStrmPrintf( g_pStdErr,374 RTStrmPrintf(pStrm, "|vrdp"); 375 RTStrmPrintf(pStrm, "|headless]\n"); 376 RTStrmPrintf(pStrm, 377 377 "\n"); 378 378 } … … 380 380 if (u64Cmd & USAGE_CONTROLVM) 381 381 { 382 RTStrmPrintf( g_pStdErr,382 RTStrmPrintf(pStrm, 383 383 "VBoxManage controlvm <uuid>|<name>\n" 384 384 " pause|resume|reset|poweroff|savestate|\n" … … 404 404 if (fVRDP) 405 405 { 406 RTStrmPrintf( g_pStdErr,406 RTStrmPrintf(pStrm, 407 407 " vrdp on|off |\n"); 408 RTStrmPrintf( g_pStdErr,408 RTStrmPrintf(pStrm, 409 409 " vrdpport default|<ports> |\n" 410 410 " vrdpvideochannelquality <percent>\n"); 411 411 } 412 RTStrmPrintf( g_pStdErr,412 RTStrmPrintf(pStrm, 413 413 " setvideomodehint <xres> <yres> <bpp> [display] |\n" 414 414 " setcredentials <username> <password> <domain>\n" … … 423 423 if (u64Cmd & USAGE_DISCARDSTATE) 424 424 { 425 RTStrmPrintf( g_pStdErr,425 RTStrmPrintf(pStrm, 426 426 "VBoxManage discardstate <uuid>|<name>\n" 427 427 "\n"); … … 430 430 if (u64Cmd & USAGE_ADOPTSTATE) 431 431 { 432 RTStrmPrintf( g_pStdErr,432 RTStrmPrintf(pStrm, 433 433 "VBoxManage adoptstate <uuid>|<name> <state_file>\n" 434 434 "\n"); … … 437 437 if (u64Cmd & USAGE_SNAPSHOT) 438 438 { 439 RTStrmPrintf( g_pStdErr,439 RTStrmPrintf(pStrm, 440 440 "VBoxManage snapshot <uuid>|<name>\n" 441 441 " take <name> [--description <desc>] [--pause] |\n" … … 452 452 if (u64Cmd & USAGE_OPENMEDIUM) 453 453 { 454 RTStrmPrintf( g_pStdErr,454 RTStrmPrintf(pStrm, 455 455 "VBoxManage openmedium disk|dvd|floppy <filename>\n" 456 456 " [--type normal|immutable|writethrough|\n" … … 463 463 if (u64Cmd & USAGE_CLOSEMEDIUM) 464 464 { 465 RTStrmPrintf( g_pStdErr,465 RTStrmPrintf(pStrm, 466 466 "VBoxManage closemedium disk|dvd|floppy <uuid>|<filename>\n" 467 467 " [--delete]\n" … … 471 471 if (u64Cmd & USAGE_STORAGEATTACH) 472 472 { 473 RTStrmPrintf( g_pStdErr,473 RTStrmPrintf(pStrm, 474 474 "VBoxManage storageattach <uuid|vmname>\n" 475 475 " --storagectl <name>\n" … … 486 486 if (u64Cmd & USAGE_STORAGECONTROLLER) 487 487 { 488 RTStrmPrintf( g_pStdErr,488 RTStrmPrintf(pStrm, 489 489 "VBoxManage storagectl <uuid|vmname>\n" 490 490 " --name <name>\n" … … 501 501 if (u64Cmd & USAGE_SHOWHDINFO) 502 502 { 503 RTStrmPrintf( g_pStdErr,503 RTStrmPrintf(pStrm, 504 504 "VBoxManage showhdinfo <uuid>|<filename>\n" 505 505 "\n"); … … 508 508 if (u64Cmd & USAGE_CREATEHD) 509 509 { 510 RTStrmPrintf( g_pStdErr,510 RTStrmPrintf(pStrm, 511 511 "VBoxManage createhd --filename <filename>\n" 512 512 " --size <megabytes>|--sizebyte <bytes>\n" … … 522 522 if (u64Cmd & USAGE_MODIFYHD) 523 523 { 524 RTStrmPrintf( g_pStdErr,524 RTStrmPrintf(pStrm, 525 525 "VBoxManage modifyhd <uuid>|<filename>\n" 526 526 " [--type normal|writethrough|immutable|shareable]\n" … … 533 533 if (u64Cmd & USAGE_CLONEHD) 534 534 { 535 RTStrmPrintf( g_pStdErr,535 RTStrmPrintf(pStrm, 536 536 "VBoxManage clonehd <uuid>|<filename> <outputfile>\n" 537 537 " [--format VDI|VMDK|VHD|RAW|<other>]\n" … … 544 544 if (u64Cmd & USAGE_CONVERTFROMRAW) 545 545 { 546 RTStrmPrintf( g_pStdErr,546 RTStrmPrintf(pStrm, 547 547 "VBoxManage convertfromraw <filename> <outputfile>\n" 548 548 " [--format VDI|VMDK|VHD]\n" … … 558 558 if (u64Cmd & USAGE_ADDISCSIDISK) 559 559 { 560 RTStrmPrintf( g_pStdErr,560 RTStrmPrintf(pStrm, 561 561 "VBoxManage addiscsidisk --server <name>|<ip>\n" 562 562 " --target <target>\n" … … 573 573 if (u64Cmd & USAGE_GETEXTRADATA) 574 574 { 575 RTStrmPrintf( g_pStdErr,575 RTStrmPrintf(pStrm, 576 576 "VBoxManage getextradata global|<uuid>|<name>\n" 577 577 " <key>|enumerate\n" … … 581 581 if (u64Cmd & USAGE_SETEXTRADATA) 582 582 { 583 RTStrmPrintf( g_pStdErr,583 RTStrmPrintf(pStrm, 584 584 "VBoxManage setextradata global|<uuid>|<name>\n" 585 585 " <key>\n" … … 590 590 if (u64Cmd & USAGE_SETPROPERTY) 591 591 { 592 RTStrmPrintf( g_pStdErr,592 RTStrmPrintf(pStrm, 593 593 "VBoxManage setproperty hdfolder default|<folder> |\n" 594 594 " machinefolder default|<folder> |\n" … … 601 601 if (u64Cmd & USAGE_USBFILTER_ADD) 602 602 { 603 RTStrmPrintf( g_pStdErr,603 RTStrmPrintf(pStrm, 604 604 "VBoxManage usbfilter add <index,0-N>\n" 605 605 " --target <uuid>|<name>|global\n" … … 620 620 if (u64Cmd & USAGE_USBFILTER_MODIFY) 621 621 { 622 RTStrmPrintf( g_pStdErr,622 RTStrmPrintf(pStrm, 623 623 "VBoxManage usbfilter modify <index,0-N>\n" 624 624 " --target <uuid>|<name>|global\n" … … 639 639 if (u64Cmd & USAGE_USBFILTER_REMOVE) 640 640 { 641 RTStrmPrintf( g_pStdErr,641 RTStrmPrintf(pStrm, 642 642 "VBoxManage usbfilter remove <index,0-N>\n" 643 643 " --target <uuid>|<name>|global\n" … … 647 647 if (u64Cmd & USAGE_SHAREDFOLDER_ADD) 648 648 { 649 RTStrmPrintf( g_pStdErr,649 RTStrmPrintf(pStrm, 650 650 "VBoxManage sharedfolder add <vmname>|<uuid>\n" 651 651 " --name <name> --hostpath <hostpath>\n" … … 656 656 if (u64Cmd & USAGE_SHAREDFOLDER_REMOVE) 657 657 { 658 RTStrmPrintf( g_pStdErr,658 RTStrmPrintf(pStrm, 659 659 "VBoxManage sharedfolder remove <vmname>|<uuid>\n" 660 660 " --name <name> [--transient]\n" … … 664 664 if (u64Cmd & USAGE_VM_STATISTICS) 665 665 { 666 RTStrmPrintf( g_pStdErr,666 RTStrmPrintf(pStrm, 667 667 "VBoxManage vmstatistics <vmname>|<uuid> [--reset]\n" 668 668 " [--pattern <pattern>] [--descriptions]\n" … … 682 682 if (u64Cmd & USAGE_METRICS) 683 683 { 684 RTStrmPrintf( g_pStdErr,684 RTStrmPrintf(pStrm, 685 685 "VBoxManage metrics list [*|host|<vmname> [<metric_list>]]\n" 686 686 " (comma-separated)\n\n" … … 708 708 if (u64Cmd & USAGE_HOSTONLYIFS) 709 709 { 710 RTStrmPrintf( g_pStdErr,710 RTStrmPrintf(pStrm, 711 711 "VBoxManage hostonlyif ipconfig <name>\n" 712 712 " [--dhcp |\n" … … 723 723 if (u64Cmd & USAGE_DHCPSERVER) 724 724 { 725 RTStrmPrintf( g_pStdErr,725 RTStrmPrintf(pStrm, 726 726 "VBoxManage dhcpserver add|modify --netname <network_name> |\n" 727 727 #if defined(VBOX_WITH_NETFLT) … … 747 747 { 748 748 va_list args; 749 showLogo( ); // show logo even if suppressed749 showLogo(g_pStdErr); // show logo even if suppressed 750 750 #ifndef VBOX_ONLY_DOCS 751 751 if (g_fInternalMode) 752 printUsageInternal(u64Cmd );752 printUsageInternal(u64Cmd, g_pStdErr); 753 753 else 754 printUsage(u64Cmd );754 printUsage(u64Cmd, g_pStdErr); 755 755 #endif /* !VBOX_ONLY_DOCS */ 756 756 va_start(args, pszFormat); … … 771 771 int errorGetOpt(USAGECATEGORY fUsageCategory, int rc, union RTGETOPTUNION const *pValueUnion) 772 772 { 773 showLogo( ); // show logo even if suppressed773 showLogo(g_pStdErr); // show logo even if suppressed 774 774 #ifndef VBOX_ONLY_DOCS 775 775 if (g_fInternalMode) 776 printUsageInternal(fUsageCategory );776 printUsageInternal(fUsageCategory, g_pStdErr); 777 777 else 778 printUsage(fUsageCategory );778 printUsage(fUsageCategory, g_pStdErr); 779 779 #endif /* !VBOX_ONLY_DOCS */ 780 780
Note:
See TracChangeset
for help on using the changeset viewer.