Changeset 70431 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 2, 2018 3:14:30 PM (7 years ago)

Author:

vboxsync

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

120036

Message:

VBoxControl: Added gzip, ls, tar and unzip commands.

Location:

trunk/src/VBox/Additions/common/VBoxControl

Files:

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

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

@@ -43 +43 @@
 VBoxControl_DEFS.win += \
         $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
+VBoxControl_SDKS = VBOX_ZLIB_STATIC
 VBoxControl_SOURCES = \
         VBoxControl.cpp

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

@@ -30 +30 @@
 #include <iprt/string.h>
 #include <iprt/stream.h>
+#include <iprt/zip.h>
 #include <VBox/log.h>
 #include <VBox/version.h>
@@ -1847 +1848 @@
 }
 
+/**
+ * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: ls}
+ */
+static DECLCALLBACK(RTEXITCODE) handleLs(int argc, char *argv[])
+{
+    return RTFsCmdLs(argc + 1, argv - 1);
+}
+
+/**
+ * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: tar}
+ */
+static DECLCALLBACK(RTEXITCODE) handleTar(int argc, char *argv[])
+{
+    return RTZipTarCmd(argc + 1, argv - 1);
+}
+
+/**
+ * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: tar}
+ */
+static DECLCALLBACK(RTEXITCODE) handleGzip(int argc, char *argv[])
+{
+    return RTZipGzipCmd(argc + 1, argv - 1);
+}
+
+/**
+ * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: unzip}
+ */
+static DECLCALLBACK(RTEXITCODE) handleUnzip(int argc, char *argv[])
+{
+    return RTZipUnzipCmd(argc + 1, argv - 1);
+}
+
 
 /** command handler type */
@@ -1855 +1888 @@
 struct COMMANDHANDLER
 {
-    const char *pszCommand;
-    PFNVBOXCTRLCMDHANDLER pfnHandler;
+    const char             *pszCommand;
+    PFNVBOXCTRLCMDHANDLER   pfnHandler;
+    bool                    fNeedDevice;
 } g_aCommandHandlers[] =
 {
 #if defined(RT_OS_WINDOWS) && !defined(VBOX_CONTROL_TEST)
-    { "getvideoacceleration",   handleGetVideoAcceleration },
-    { "setvideoacceleration",   handleSetVideoAcceleration },
-    { "videoflags",             handleVideoFlags },
-    { "listcustommodes",        handleListCustomModes },
-    { "addcustommode",          handleAddCustomMode },
-    { "removecustommode",       handleRemoveCustomMode },
-    { "setvideomode",           handleSetVideoMode },
+    { "getvideoacceleration",   handleGetVideoAcceleration, true  },
+    { "setvideoacceleration",   handleSetVideoAcceleration, true  },
+    { "videoflags",             handleVideoFlags,           true  },
+    { "listcustommodes",        handleListCustomModes,      true  },
+    { "addcustommode",          handleAddCustomMode,        true  },
+    { "removecustommode",       handleRemoveCustomMode,     true  },
+    { "setvideomode",           handleSetVideoMode,         true  },
 #endif
 #ifdef VBOX_WITH_GUEST_PROPS
-    { "guestproperty",          handleGuestProperty },
+    { "guestproperty",          handleGuestProperty,        true  },
 #endif
 #ifdef VBOX_WITH_SHARED_FOLDERS
-    { "sharedfolder",           handleSharedFolder },
+    { "sharedfolder",           handleSharedFolder,         true  },
 #endif
 #if !defined(VBOX_CONTROL_TEST)
-    { "writecoredump",          handleWriteCoreDump },
+    { "writecoredump",          handleWriteCoreDump,        true  },
 #endif
 #ifdef VBOX_WITH_DPC_LATENCY_CHECKER
-    { "dpc",                    handleDpc },
+    { "dpc",                    handleDpc,                  true  },
 #endif
-    { "writelog",               handleWriteLog },
-    { "takesnapshot",           handleTakeSnapshot },
-    { "savestate",              handleSaveState },
-    { "suspend",                handleSuspend },
-    { "pause",                  handleSuspend },
-    { "poweroff",               handlePowerOff },
-    { "powerdown",              handlePowerOff },
-    { "getversion",             handleVersion },
-    { "version",                handleVersion },
-    { "help",                   handleHelp }
+    { "writelog",               handleWriteLog,             true  },
+    { "takesnapshot",           handleTakeSnapshot,         true  },
+    { "savestate",              handleSaveState,            true  },
+    { "suspend",                handleSuspend,              true  },
+    { "pause",                  handleSuspend,              true  },
+    { "poweroff",               handlePowerOff,             true  },
+    { "powerdown",              handlePowerOff,             true  },
+    { "getversion",             handleVersion,              false },
+    { "version",                handleVersion,              false },
+    { "help",                   handleHelp,                 false },
+    /* Hany tricks that doesn't cost much space: */
+    { "gzip",                   handleGzip,                 false },
+    { "ls",                     handleLs,                   false },
+    { "tar",                    handleTar,                  false },
+    { "unzip",                  handleUnzip,                false },
 };
 
@@ -1963 +2002 @@
 
     /*
-     * Do global initialisation for the programme if we will be handling a command
-     */
-    if (!fOnlyInfo)
-    {
-        rrc = VbglR3Init();
-        if (RT_FAILURE(rrc))
-        {
-            VBoxControlError("Could not contact the host system.  Make sure that you are running this\n"
-                             "application inside a VirtualBox guest system, and that you have sufficient\n"
-                             "user permissions.\n");
-            rcExit = RTEXITCODE_FAILURE;
-        }
-    }
-
-    /*
      * Now look for an actual command in the argument list and handle it.
      */
-
     if (!fOnlyInfo && rcExit == RTEXITCODE_SUCCESS)
     {
@@ -1992 +2015 @@
                 if (!strcmp(argv[iArg], g_aCommandHandlers[i].pszCommand))
                 {
-                    rcExit = g_aCommandHandlers[i].pfnHandler(argc - iArg - 1, argv + iArg + 1);
+                    if (g_aCommandHandlers[i].fNeedDevice)
+                    {
+                        rrc = VbglR3Init();
+                        if (RT_FAILURE(rrc))
+                        {
+                            VBoxControlError("Could not contact the host system.  Make sure that you are running this\n"
+                                             "application inside a VirtualBox guest system, and that you have sufficient\n"
+                                             "user permissions.\n");
+                            rcExit = RTEXITCODE_FAILURE;
+                        }
+                    }
+                    if (rcExit == RTEXITCODE_SUCCESS)
+                        rcExit = g_aCommandHandlers[i].pfnHandler(argc - iArg - 1, argv + iArg + 1);
                     break;
                 }
             if (i >= RT_ELEMENTS(g_aCommandHandlers))
             {
-                rcExit = RTEXITCODE_FAILURE;
                 usage();
+                rcExit = RTEXITCODE_SYNTAX;
             }
         }
@@ -2004 +2039 @@
         {
             /* The user didn't specify a command. */
-            rcExit = RTEXITCODE_FAILURE;
             usage();
+            rcExit = RTEXITCODE_SYNTAX;
         }
     }