Changeset 93126 in vbox

Timestamp:

Jan 5, 2022 1:04:16 AM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended/os2_util: Added a --file-to-backdoor for uploading a whole file to VBox.log. Handy for failure situations. Fixed the treat-as-zero feature (uninitialized variable). Flag the executable for long-filename support and mark it protected mode only.

Location:

trunk/src/VBox/Main/src-helper-apps/os2

Files:

• Makefile.kmk (modified) (1 diff)
• os2_util.c (modified) (13 diffs)

trunk/src/VBox/Main/src-helper-apps/os2/Makefile.kmk

@@ -42 +42 @@
         OPTION STACK=8192 \
         OPTION HEAPSize=4096 \
-        OPTION MANYAUTODATA \
+        OPTION NEWFile \
+        OPTION PROTmode \
         SEGMENT IOPL IOPL EXECUTEREAD
 if 0

trunk/src/VBox/Main/src-helper-apps/os2/os2_util.c

@@ -57 +57 @@
 *********************************************************************************************************************************/
 void __far VBoxBackdoorPrint(PSZ psz, unsigned cch);
+static PSZ MyGetOptValue(PSZ psz, PSZ pszOption, PSZ *ppszValue);
 
 
@@ -143 +144 @@
 
 
-static void MyApiErrorAndQuit(PSZ pszOperation, USHORT rc)
+static DECL_NO_RETURN(void) MyApiErrorAndQuit(PSZ pszOperation, USHORT rc)
 {
     MyOutStr("Os2Util: error: ");
@@ -154 +155 @@
 
 
-static void MyApiError3AndQuit(PSZ pszOperation, PSZ psz2, PSZ psz3, USHORT rc)
+static DECL_NO_RETURN(void) MyApiError3AndQuit(PSZ pszOperation, PSZ psz2, PSZ psz3, USHORT rc)
 {
     MyOutStr("Os2Util: error: ");
@@ -167 +168 @@
 
 
-static void MySyntaxErrorAndQuit(PSZ pszMsg)
+static DECL_NO_RETURN(void) MySyntaxErrorAndQuit(PSZ pszMsg)
 {
     MyOutStr("Os2Util: syntax error: ");
@@ -184 +185 @@
     USHORT    rc;
     rc = DosOpen(pszTeeToFile, &hFile, &usAction, 0 /*cbInitial*/, 0 /*fFileAttribs*/,
-                  OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                  OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYNONE | OPEN_FLAGS_NOINHERIT | OPEN_FLAGS_SEQUENTIAL, 0 /*Reserved*/);
+                 OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                 OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYNONE | OPEN_FLAGS_NOINHERIT | OPEN_FLAGS_SEQUENTIAL, 0 /*Reserved*/);
     if (rc == NO_ERROR)
     {
@@ -352 +353 @@
 
 
+/**
+ * Handles --file-to-backdoor / -c.
+ */
+static void CopyFileToBackdoorAndQuit(PSZ psz, BOOL fLongOpt, PSZ pszBuf, USHORT cbBuf)
+{
+    HFILE  hFile    = 0;
+    USHORT usAction = 0;
+    USHORT rc;
+
+    /*
+     * Get the filename and check that it is the last thing on the commandline.
+     */
+    PSZ  pszFilename = NULL;
+    CHAR ch;
+    psz = MyGetOptValue(psz, fLongOpt ? "--file-to-backdoor" : "-c", &pszFilename);
+    while ((ch = *psz) != '\0' && IS_BLANK(ch))
+        psz++;
+    if (ch != '\0')
+        MySyntaxErrorAndQuit("No options allowed after -c/--file-to-backdoor");
+
+    /*
+     * Open the file
+     */
+    rc = DosOpen(pszFilename, &hFile, &usAction, 0 /*cbInitial*/, 0 /*fFileAttribs*/,
+                 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                 OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE | OPEN_FLAGS_NOINHERIT | OPEN_FLAGS_SEQUENTIAL, 0 /*Reserved*/);
+    if (rc != NO_ERROR)
+        MyApiError3AndQuit("Failed to open \"", pszFilename, "\" for reading", rc);
+
+    VBoxBackdoorPrint(RT_STR_TUPLE("--- BEGIN OF \""));
+    VBoxBackdoorPrint(pszFilename, MyStrLen(pszFilename));
+    VBoxBackdoorPrint(RT_STR_TUPLE("\" ---\n"));
+
+    for (;;)
+    {
+        USHORT cbRead = 0;
+        rc = DosRead(hFile, pszBuf, cbBuf, &cbRead);
+        if (rc == NO_ERROR)
+        {
+            if (cbRead == 0)
+                break;
+            VBoxBackdoorPrint(pszBuf, cbRead);
+        }
+        else if (rc != ERROR_INTERRUPT)
+            MyApiError3AndQuit("Reading \"", pszFilename, "\"", rc);
+    }
+
+    VBoxBackdoorPrint(RT_STR_TUPLE("--- END OF \""));
+    VBoxBackdoorPrint(pszFilename, MyStrLen(pszFilename));
+    VBoxBackdoorPrint(RT_STR_TUPLE("\" ---\n"));
+
+    DosClose(hFile);
+    DosExit(EXIT_PROCESS, 1);
+}
+
+
 /** Displays version string and quits.   */
-static void ShowVersionAndQuit(void)
+static DECL_NO_RETURN(void) ShowVersionAndQuit(void)
 {
     CHAR szVer[] = "$Rev$\r\n";
@@ -363 +420 @@
 
 /** Displays usage info and quits.   */
-static void ShowUsageAndQuit(void)
+static DECL_NO_RETURN(void) ShowUsageAndQuit(void)
 {
     static char s_szHelp[] =
@@ -377 +434 @@
         "                   -- <prog> [args]\r\n"
         "   or  Os2Util.exe <-w<msg>|--write-backdoor <msg>>\r\n"
+        "   or  Os2Util.exe <-c<file>|--file-to-backdoor <file>>\r\n"
         "\r\n"
         "Note! Does not supported any kind of quoting before the child arguments.\r\n"
@@ -419 +477 @@
 static PSZ MyGetOptNum(PSZ psz, PSZ pszOption, PUSHORT puValue)
 {
-    PSZ    pszError = NULL;
-    PSZ    pszValueStart = NULL;
-    PSZ    pszValue;
-    CHAR   ch;
-    USHORT uValue;
-    psz = MyGetOptValue(psz, pszOption, &pszValueStart);
-
-    pszValue = pszValueStart;
-    uValue   = 0;
+    PSZ         pszError      = NULL;
+    PSZ         pszValue      = NULL;
+    PSZ const   pszRet        = MyGetOptValue(psz, pszOption, &pszValue);
+    PSZ const   pszValueStart = pszValue;
+    USHORT      uValue        = 0;
+    CHAR        ch;
     if (pszValue[0] == '0' && ((ch = pszValue[1]) == 'x' || ch == 'X'))
     {
@@ -487 +542 @@
 
     *puValue = uValue;
-    return psz;
+    return pszRet;
 }
 
@@ -545 +600 @@
     HQUEUE      hQueue         = ~(HQUEUE)0;
     CHAR        szQueueName[64];
-    unsigned    cAsZero;
+    unsigned    cAsZero        = 0;
     USHORT      auAsZero[16];
 
@@ -584 +639 @@
                     if (cAsZero > RT_ELEMENTS(auAsZero))
                         MySyntaxErrorAndQuit("Too many --as-zero/-z options");
-                    psz = MyGetOptNum(psz + 1, "--as-zero", &auAsZero[cAsZero]);
+                    psz = MyGetOptNum(psz, "--as-zero", &auAsZero[cAsZero]);
                     cAsZero++;
                 }
+                else if (ch == 'f' && MyMatchLongOption(&psz, RT_STR_TUPLE("file-to-backdoor")))
+                    CopyFileToBackdoorAndQuit(psz, TRUE /*fLongOpt*/, szBuf, sizeof(szBuf));
                 else if (ch == 'h' && MyMatchLongOption(&psz, RT_STR_TUPLE("help")))
                     ShowUsageAndQuit();
@@ -617 +674 @@
                     else if (ch == 'b')
                         g_fOutputToBackdoor = fTeeToBackdoor = TRUE;
+                    else if (ch == 'c')
+                        CopyFileToBackdoorAndQuit(psz + 1, FALSE /*fLongOpt*/, szBuf, sizeof(szBuf));
                     else if (ch == 'f')
                     {