Changeset 6215 in vbox for trunk

Timestamp:

Dec 28, 2007 5:41:03 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27018

Message:

Added cmd "getversion" to VBoxControl.

Location:

trunk/src/VBox/Additions/WINNT/VBoxControl

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxControl.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxControl/Makefile.kmk

@@ -29 +29 @@
         VBoxControl.rc
 
+# VBoxControl.cpp uses VBOX_SVN_REV.
+VBoxControl.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
+VBoxControl.cpp_DEPS = $(VBOX_SVN_REV_KMK)
+
 include $(PATH_KBUILD)/subfooter.kmk
 

trunk/src/VBox/Additions/WINNT/VBoxControl/VBoxControl.cpp

@@ -19 +19 @@
 #include <malloc.h>
 
+#include <VBox/VBoxGuest.h>
+#include <VBox/version.h>
+
 void printHelp()
 {
-    printf("VBoxControl   getvideoacceleration\n"
+    printf("VBoxControl   getversion\n"
+           "\n"
+           "VBoxControl   getvideoacceleration\n"
            "\n"
            "VBoxControl   setvideoacceleration <on|off>\n"
@@ -32 +37 @@
            "\n"
            "VBoxControl   setvideomode <width> <height> <bpp> <screen>\n");
+}
+
+void printVersion()
+{
+    printf("%d.%d.%dr%d\n", VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
 }
 
@@ -775 +785 @@
     }
 
+    /* todo: add better / stable command line handling here! */
+
     /* determine which command */
-    if (strcmp(argv[1], "getvideoacceleration") == 0)
+    if ((stricmp(argv[1], "getversion") == 0) ||
+        (stricmp(argv[1], "-v") == 0) ||
+        (stricmp(argv[1], "--version") == 0) ||
+        (stricmp(argv[1], "-version") == 0))
+    {
+        printVersion();
+    }
+    else if (stricmp(argv[1], "getvideoacceleration") == 0)
     {
         handleGetVideoAcceleration(argc - 2, &argv[2]);
     }
-    else if (strcmp(argv[1], "setvideoacceleration") == 0)
+    else if (stricmp(argv[1], "setvideoacceleration") == 0)
     {
         handleSetVideoAcceleration(argc - 2, &argv[2]);
     }
-    else if (strcmp(argv[1], "listcustommodes") == 0)
+    else if (stricmp(argv[1], "listcustommodes") == 0)
     {
         handleListCustomModes(argc - 2, &argv[2]);
     }
-    else if (strcmp(argv[1], "addcustommode") == 0)
+    else if (stricmp(argv[1], "addcustommode") == 0)
     {
         handleAddCustomMode(argc - 2, &argv[2]);
     }
-    else if (strcmp(argv[1], "removecustommode") == 0)
+    else if (stricmp(argv[1], "removecustommode") == 0)
     {
         handleRemoveCustomMode(argc - 2, &argv[2]);
     }
-    else if (strcmp(argv[1], "setvideomode") == 0)
+    else if (stricmp(argv[1], "setvideomode") == 0)
     {
         handleSetVideoMode(argc - 2, &argv[2]);