Changeset 93136 in vbox for trunk

Timestamp:

Jan 7, 2022 3:05:59 AM (3 years ago)

Author:

vboxsync

Message:

Add/os2: More installer code.

Location:

trunk/src/VBox/Additions/os2

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxOs2AdditionsInstall.cpp (modified) (14 diffs)

trunk/src/VBox/Additions/os2/Makefile.kmk

@@ -47 +47 @@
 # A barebone installer.
 #
-if 0
+if 1
 PROGRAMS += VBoxOs2AdditionsInstall
 endif
@@ -85 +85 @@
  VBoxOs2AdditionsInstall_SOURCES        += \
         VBoxOs2AdditionsInstallA.asm \
+        $(VBOX_PATH_RUNTIME_SRC)/common/string/strcpy.cpp \
+        $(VBOX_PATH_RUNTIME_SRC)/common/string/strchr.cpp \
         $(VBOX_PATH_RUNTIME_SRC)/common/string/strlen.cpp \
         $(VBOX_PATH_RUNTIME_SRC)/common/string/strncmp.cpp \
-        $(VBOX_PATH_RUNTIME_SRC)/common/string/memcpy.cpp
+        $(VBOX_PATH_RUNTIME_SRC)/common/string/memchr.cpp \
+        $(VBOX_PATH_RUNTIME_SRC)/common/string/memcmp.cpp \
+        $(VBOX_PATH_RUNTIME_SRC)/common/string/memcpy.cpp \
+        $(VBOX_PATH_RUNTIME_SRC)/common/string/memrchr.cpp \
+        $(VBOX_PATH_RUNTIME_SRC)/common/string/memset.cpp
  VBoxOs2AdditionsInstall_LIBS             = \
         $(PATH_TOOL_OPENWATCOM)/lib386/os2/os2386.lib

trunk/src/VBox/Additions/os2/VBoxOs2AdditionsInstall.cpp

@@ -27 +27 @@
 #include <iprt/ctype.h>
 #include <iprt/path.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#define SKIP_CONFIG_SYS     0x01
+#define SKIP_STARTUP_CMD    0x02
+#define SKIP_SERVICE        0x04
+#define SKIP_SHARED_FOLDERS 0x08
+#define SKIP_GRAPHICS       0x10
+#define SKIP_MOUSE          0x20
+#define SKIP_LIBC_DLLS      0x40
+
+/** NIL HFILE value. */
+#define MY_NIL_HFILE        (~(HFILE)0)
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+typedef struct FILEEDITOR
+{
+    size_t          cbOrg;
+    char           *pszOrg;
+    size_t          cbNew;
+    size_t          cbNewAlloc;
+    char           *pszNew;
+    bool            fOverflowed;
+} FILEEDITOR;
 
 
@@ -44 +73 @@
 /** The length of g_szDstPath, including a trailing slash. */
 static size_t       g_cchDstPath                    = sizeof("C:\\VBoxGA\\") - 1;
-/** Whether to install shared folders. */
-static bool         g_fSharedFolders                = true;
-/** Whether to install the mouse driver. */
-static bool         g_fMouse                        = true;
-/** Whether to install the graphics driver. */
-static bool         g_fGraphics                     = true;
-/** Whether to install the service. */
-static bool         g_fService                      = true;
-/** Whether to modify startup.cmd to start VBoxService. */
-static bool         g_fModifyStartupCmd             = true;
-/** Whether to install the kLibC DLLs. */
-static bool         g_fLibcDlls                     = true;
+/** Mask of SKIP_XXX flags of components/tasks to skip. */
+static uint8_t      g_fSkipMask                     = 0;
+/** Verbose or quiet. */
+static bool         g_fVerbose                      = true;
 
 /** The standard output handle. */
-static HFILE const g_hStdOut = (HFILE)1;
+static HFILE const  g_hStdOut = (HFILE)1;
 /** The standard error handle. */
-static HFILE const g_hStdErr = (HFILE)2;
-
+static HFILE const  g_hStdErr = (HFILE)2;
+
+
+/** File editor for Config.sys. */
+static FILEEDITOR   g_ConfigSys;
+/** File editor for Startup.cmd. */
+static FILEEDITOR   g_StartupCmd;
+
+
+/*********************************************************************************************************************************
+*   Messaging.                                                                                                                   *
+*********************************************************************************************************************************/
 
 static void DoWriteNStr(HFILE hFile, const char *psz, size_t cch)
@@ -74 +105 @@
 {
     DoWriteNStr(hFile, psz, strlen(psz));
+}
+
+
+/** Writes a variable number of strings to @a hFile, stopping at NULL. */
+static void WriteStrings(HFILE hFile, ...)
+{
+    va_list va;
+    va_start(va, hFile);
+    for (;;)
+    {
+        const char *psz = va_arg(va, const char *);
+        if (psz)
+            DoWriteStr(hFile, psz);
+        else
+            break;
+    }
+    va_end(va);
 }
 
@@ -103 +151 @@
 }
 
-
-static RTEXITCODE ApiError(const char *pszMsg, APIRET rc)
+static RTEXITCODE ApiErrorN(APIRET rc, unsigned cMsgs, ...)
 {
     DoWriteNStr(g_hStdErr, RT_STR_TUPLE("VBoxOs2AdditionsInstall: error: "));
-    DoWriteStr(g_hStdErr, pszMsg);
+    va_list va;
+    va_start(va, cMsgs);
+    while (cMsgs-- > 0)
+    {
+        const char *pszMsg = va_arg(va, const char *);
+        DoWriteStr(g_hStdErr, pszMsg);
+    }
+    va_end(va);
     DoWriteNStr(g_hStdErr, RT_STR_TUPLE(": "));
     DoWriteNumber(g_hStdErr, rc);
     DoWriteNStr(g_hStdErr, RT_STR_TUPLE("\r\n"));
-    return RTEXITCODE_SYNTAX;
-}
-
+    return RTEXITCODE_FAILURE;
+}
+
+
+DECLINLINE(RTEXITCODE) ApiError(const char *pszMsg, APIRET rc)
+{
+    return ApiErrorN(rc, 1, pszMsg);
+}
 
 
@@ -125 +184 @@
 
 
+/*********************************************************************************************************************************
+*   Editor.                                                                                                                      *
+*********************************************************************************************************************************/
+
+/**
+ * Reads a file into the editor.
+ */
+static RTEXITCODE EditorReadInFile(FILEEDITOR *pEditor, const char *pszFilename, size_t cbExtraEdit, bool fMustExist)
+{
+    if (g_fVerbose)
+        WriteStrings(g_hStdOut, "info: Preparing \"", pszFilename, "\" modifications...\r\n", NULL);
+
+    /*
+     * Open the file.
+     */
+    HFILE  hFile   = MY_NIL_HFILE;
+    ULONG  uAction = ~0U;
+    APIRET rc = DosOpen(pszFilename, &hFile, &uAction, 0, FILE_NORMAL,
+                        OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
+                        OPEN_ACCESS_READONLY | OPEN_SHARE_DENYWRITE | OPEN_FLAGS_SEQUENTIAL | OPEN_FLAGS_NOINHERIT,
+                        NULL /*pEaOp2*/);
+    if (rc == ERROR_FILE_NOT_FOUND)
+        hFile = MY_NIL_HFILE;
+    else if (rc != NO_ERROR)
+        return ApiErrorN(rc, 3, "DosOpen(\"", pszFilename, "\",READONLY)");
+
+    /*
+     * Get it's size and check that it's sane.
+     */
+    FILESTATUS3 FileSts;
+    if (hFile != MY_NIL_HFILE)
+    {
+        rc = DosQueryFileInfo(hFile, FIL_STANDARD, &FileSts, sizeof(FileSts));
+        if (rc != NO_ERROR)
+            return ApiErrorN(rc, 3, "DosQueryFileInfo(\"", pszFilename, "\",FIL_STANDARD,,)");
+
+        if (FileSts.cbFile > _2M)
+            return ApiErrorN(rc, FileSts.cbFile, "File \"", pszFilename, "\" is too large");
+    }
+    else
+        FileSts.cbFile = 0;
+
+    /*
+     * Allocate buffers.
+     */
+    PVOID  pvAlloc = NULL;
+    size_t cbAlloc = FileSts.cbFile * 2 + cbExtraEdit + 16;
+    rc = DosAllocMem(&pvAlloc, cbAlloc, PAG_COMMIT | PAG_WRITE | PAG_READ);
+    if (rc == NO_ERROR)
+        return ApiError("DosAllocMem", rc);
+
+    memset(pvAlloc, 0, cbAlloc);
+    pEditor->cbOrg      = FileSts.cbFile;
+    pEditor->pszOrg     = (char *)pvAlloc;
+    pEditor->pszNew     = (char *)pvAlloc + FileSts.cbFile + 1;
+    pEditor->cbNew      = 0;
+    pEditor->cbNewAlloc = cbAlloc - FileSts.cbFile - 2;
+
+    /*
+     * Read in the file content.
+     */
+    if (hFile != MY_NIL_HFILE)
+    {
+        ULONG cbRead = 0;
+        rc = DosRead(hFile, pEditor->pszOrg, FileSts.cbFile, &cbRead);
+        if (rc != NO_ERROR)
+            return ApiErrorN(rc, 3, "DosRead(\"", pszFilename, "\")");
+        if (cbRead != FileSts.cbFile)
+            return ApiErrorN(cbRead < FileSts.cbFile ? ERROR_MORE_DATA : ERROR_BUFFER_OVERFLOW,
+                             3, "DosRead(\"", pszFilename, "\")");
+        DosClose(hFile);
+    }
+
+    return RTEXITCODE_SUCCESS;
+}
+
+
+/**
+ * Writes out a modified file, backing up the original.
+ */
+static RTEXITCODE EditorWriteOutFile(FILEEDITOR *pEditor, const char *pszFilename)
+{
+    if (g_fVerbose)
+        WriteStrings(g_hStdOut, "info: Writing out \"", pszFilename, "\" modifications...\r\n", NULL);
+
+    /*
+     * Skip if no change was made.
+     */
+    if (   pEditor->cbNew == 0
+        || (   pEditor->cbNew == pEditor->cbOrg
+            && memcmp(pEditor->pszNew, pEditor->pszOrg, pEditor->cbNew) == 0))
+    {
+        WriteStrings(g_hStdOut, "info: No changes to \"", pszFilename, "\".\r\n", NULL);
+        return RTEXITCODE_SUCCESS;
+    }
+
+    /*
+     * Back up the original.
+     * ASSUMES that the input is CCHMAXPATH or less.
+     */
+    if (pEditor->cbOrg != 0)
+    {
+        CHAR         szBackup[CCHMAXPATH + 16];
+        size_t const cchFilename = strlen(pszFilename);
+        memcpy(szBackup, pszFilename, cchFilename + 1);
+        char *pszExt = (char *)memrchr(szBackup, '.', cchFilename);
+        if (!pszExt || strchr(pszExt, '\\') || strchr(pszExt, '/'))
+            pszExt = &szBackup[cchFilename];
+        strcpy(pszExt, ".BAK");
+        for (unsigned short i = 0; ; i++)
+        {
+            HFILE  hFile   = MY_NIL_HFILE;
+            ULONG  uAction = ~0U;
+            APIRET rc = DosOpen(szBackup, &hFile, &uAction, 0, FILE_NORMAL,
+                                OPEN_ACTION_FAIL_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW,
+                                OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYWRITE | OPEN_FLAGS_SEQUENTIAL | OPEN_FLAGS_NOINHERIT,
+                                NULL /*pEaOp2*/);
+            if (rc == NO_ERROR)
+            {
+                ULONG cbWritten = 0;
+                do
+                    rc = DosWrite(hFile, pEditor->pszOrg, pEditor->cbOrg, &cbWritten);
+                while (rc == ERROR_INTERRUPT);
+                DosClose(hFile);
+                if (rc != NO_ERROR)
+                    return ApiErrorN(rc, 5, "Failed backing up \"", pszFilename, "\" as \"", szBackup, "\"");
+                break;
+            }
+
+            /* try next extension variation */
+            if (i >= 1000)
+                return ApiErrorN(rc, 5, "Failed backing up \"", pszFilename, "\" as \"", szBackup, "\"");
+            if (i >= 100)
+                pszExt[1] = '0' + (i / 100);
+            if (i >= 10)
+                pszExt[2] = '0' + (i / 100 % 10);
+            pszExt[3] = '0' + (i % 10);
+        }
+    }
+
+    /*
+     * Write out the new copy.
+     */
+    HFILE  hFile   = MY_NIL_HFILE;
+    ULONG  uAction = ~0U;
+    APIRET rc = DosOpen(pszFilename, &hFile, &uAction, 0, FILE_NORMAL,
+                        OPEN_ACTION_REPLACE_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW,
+                        OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYWRITE | OPEN_FLAGS_SEQUENTIAL | OPEN_FLAGS_NOINHERIT,
+                        NULL /*pEaOp2*/);
+    if (rc != NO_ERROR)
+        return ApiErrorN(rc, 3, "Opening \"", pszFilename, "\" for writing");
+
+    ULONG cbWritten = 0;
+    do
+        rc = DosWrite(hFile, pEditor->pszNew, pEditor->cbNew, &cbWritten);
+    while (rc == ERROR_INTERRUPT);
+
+    RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
+    if (rc != NO_ERROR)
+        rcExit = ApiErrorN(rc, 3, "Failed writing \"", pszFilename, "\"");
+    else if (cbWritten != pEditor->cbNew)
+        rcExit = ApiErrorN(ERROR_MORE_DATA, 3, "Failed writing \"", pszFilename, "\" - incomplete write");
+
+    rc = DosClose(hFile);
+    if (rc != NO_ERROR)
+        rcExit = ApiErrorN(rc, 3, "Failed closing \"", pszFilename, "\"");
+
+    return rcExit;
+}
+
+
+/**
+ * Gets the next line.
+ *
+ * @returns The offset to pass to the next EditorGetLine call.
+ * @retval  0 if no further lines in the input file.
+ *
+ * @param   pEditor     Pointer to the editor.
+ * @param   offSrc      The current source offset. Initialize to zero before
+ *                      first calls and pass return value for subsequent calls
+ * @param   ppchLine    Where to return the pointer to the start of the line.
+ * @param   pcchLine    Where to return the length of the line (sans EOL).
+ */
+static size_t EditorGetLine(FILEEDITOR *pEditor, size_t offSrc, const char **ppchLine, size_t *pcchLine)
+{
+    if (offSrc < pEditor->cbOrg)
+    {
+        const char *pchLine = &pEditor->pszOrg[offSrc];
+        *ppchLine = pchLine;
+
+        size_t      cchMax  = pEditor->cbOrg - offSrc;
+        const char *pchCr   = (const char *)memchr(pchLine, '\r', cchMax);
+        const char *pchNl   = (const char *)memchr(pchLine, '\n', pchCr ? pchCr - pchLine : cchMax);
+        size_t      cchLine;
+        size_t      cchEol;
+        if (pchCr && !pchNl)
+        {
+            cchLine = pchCr - pchLine;
+            cchEol  = 1 + (pchCr[1] == '\n');
+        }
+        else if (pchNl)
+        {
+            cchLine = pchNl - pchLine;
+            cchEol  = 1;
+        }
+        else
+        {
+            cchLine = cchMax;
+            cchEol  = 0;
+        }
+        *pcchLine = cchLine;
+        return offSrc + cchLine + cchEol;
+    }
+
+    *ppchLine = "";
+    *pcchLine = 0;
+    return 0;
+}
+
+
+/**
+ * Adds a line to the output buffer.
+ *
+ * A CRLF is appended automatically.
+ *
+ * @returns true on success, false on overflow (error displayed and sets
+ *          fOverflowed on the editor).
+ *
+ * @param   pEditor     Pointer to the editor.
+ * @param   pchLine     Pointer to the line string.
+ * @param   cchLine     The length of the line (sans newline).
+ */
+static bool EditorPutLine(FILEEDITOR *pEditor, const char *pchLine, size_t cchLine)
+{
+    size_t offNew = pEditor->cbNew;
+    if (offNew + cchLine + 2 < pEditor->cbNewAlloc)
+    {
+        char *pszNew = pEditor->pszNew;
+        memcpy(&pszNew[offNew], pchLine, cchLine);
+        offNew += cchLine;
+        pszNew[offNew++] = '\r';
+        pszNew[offNew++] = '\n';
+        pszNew[offNew]   = '\0';
+        pEditor->cbNew   = offNew;
+        return true;
+    }
+    pEditor->fOverflowed = true;
+    return false;
+}
+
+
+/**
+ * Writes a string to the output buffer.
+ *
+ * @returns true on success, false on overflow (error displayed and sets
+ *          fOverflowed on the editor).
+ *
+ * @param   pEditor     Pointer to the editor.
+ * @param   pchString   Pointer to the string.
+ * @param   cchString   The length of the string.
+ */
+static bool EditorPutStringN(FILEEDITOR *pEditor, const char *pchString, size_t cchString)
+{
+    size_t offNew = pEditor->cbNew;
+    if (offNew + cchString < pEditor->cbNewAlloc)
+    {
+        char *pszNew = pEditor->pszNew;
+        memcpy(&pszNew[offNew], pchString, cchString);
+        offNew += cchString;
+        pszNew[offNew]   = '\0';
+        pEditor->cbNew   = offNew;
+        return true;
+    }
+    pEditor->fOverflowed = true;
+    return false;
+}
+
+
+/*********************************************************************************************************************************
+*   Installation Steps.                                                                                                          *
+*********************************************************************************************************************************/
 
 /**
@@ -131 +471 @@
 static RTEXITCODE CheckForGradd(void)
 {
+    strcpy(&g_szBootDrivePath[g_cchBootDrivePath], "OS2\\DLL\\GENGRADD.DLL");
+    FILESTATUS3 FileSts;
+    APIRET rc = DosQueryPathInfo(g_szBootDrivePath, FIL_STANDARD, &FileSts, sizeof(FileSts));
+    if (rc != NO_ERROR)
+        return ApiErrorN(rc, 3, "DosQueryPathInfo(\"", g_szBootDrivePath, "\",,,) - installed gengradd?");
     return RTEXITCODE_SUCCESS;
+}
+
+
+/**
+ * Checks if the path @a pchString ends with @a pszFilename, ignoring case.
+ *
+ * @returns true if filename found, false if not.
+ * @param   pchString           The image PATH of a DEVICE or IFS statement.
+ * @param   cchString           The length of valid string.
+ * @param   pszFilename         The filename (no path) to match with, all upper
+ *                              cased.
+ * @param   cchFilename         The length of the filename to match with.
+ */
+static bool MatchOnlyFilename(const char *pchString, size_t cchString, const char *pszFilename, size_t cchFilename)
+{
+    /*
+     * Skip ahead in pchString till we get to the filename.
+     */
+    size_t offFilename = 0;
+    size_t offCur      = 0;
+    if (   cchString > 2
+        && pchString[1] == ':'
+        && RT_C_IS_ALPHA(pchString[0]))
+        offCur += 2;
+    while (offCur < cchString)
+    {
+        char ch = pchString[offCur];
+        if (RTPATH_IS_SLASH(pchString[offCur]))
+            offFilename = offCur + 1;
+        else if (RT_C_IS_BLANK(ch))
+            break;
+        offCur++;
+    }
+    size_t const cchLeftFilename = offCur - offFilename;
+
+    /*
+     * Check if the length matches.
+     */
+    if (cchLeftFilename != cchFilename)
+        return false;
+
+    /*
+     * Check if the filenames matches (ASSUMES right side is uppercased).
+     */
+    pchString += offFilename;
+    while (cchFilename-- > 0)
+    {
+        if (RT_C_TO_UPPER(*pchString) != *pszFilename)
+            return false;
+        pchString++;
+        pszFilename++;
+    }
+    return true;
+}
+
+
+/** Adds DEVICE=[path]\VBoxGuest.sys to the modified Config.sys. */
+static bool ConfigSysAddVBoxGuest(void)
+{
+    EditorPutStringN(&g_ConfigSys, RT_STR_TUPLE("DEVICE="));
+    EditorPutStringN(&g_ConfigSys, g_szDstPath, g_cchDstPath);
+    EditorPutLine(&g_ConfigSys, RT_STR_TUPLE("VBoxGuest.sys"));
+    return true;
+}
+
+
+/** Adds IFS=[path]\VBoxFS.IFS to the modified Config.sys. */
+static bool ConfigSysAddVBoxSF(void)
+{
+    EditorPutStringN(&g_ConfigSys, RT_STR_TUPLE("IFS="));
+    EditorPutStringN(&g_ConfigSys, g_szDstPath, g_cchDstPath);
+    EditorPutLine(&g_ConfigSys, RT_STR_TUPLE("VBoxSF.ifs"));
+    return true;
+}
+
+
+/** Adds DEVICE=[path]\VBoxMouse.sys to the modified Config.sys. */
+static bool ConfigSysAddVBoxMouse(void)
+{
+    EditorPutStringN(&g_ConfigSys, RT_STR_TUPLE("DEVICE="));
+    EditorPutStringN(&g_ConfigSys, g_szDstPath, g_cchDstPath);
+    EditorPutLine(&g_ConfigSys, RT_STR_TUPLE("VBoxMouse.sys"));
+    return true;
 }
 
@@ -140 +568 @@
 static RTEXITCODE PrepareConfigSys(void)
 {
+    if (g_fSkipMask & SKIP_CONFIG_SYS)
+        return RTEXITCODE_SUCCESS;
+
+    strcpy(&g_szBootDrivePath[g_cchBootDrivePath], "CONFIG.SYS");
+    RTEXITCODE rcExit = EditorReadInFile(&g_ConfigSys, g_szBootDrivePath, 2048, true /*fMustExist*/);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;
+
+    /*
+     * Figure out which IFS we should place ourselves after by examining the
+     * destination path's file system, assuming HPFS if we cannot figure it out.
+     */
+    const char *pszAfterIfs =        "HPFS.IFS";
+    size_t      cchAfterIfs = sizeof("HPFS.IFS") - 1;
+
+    union
+    {
+        FSQBUFFER2 FsQBuf;
+        uint8_t abPadding[1024];
+    } u;
+    memset(&u, 0, sizeof(u));
+    ULONG cbBuf = sizeof(u) - 8 /* for adding .IFS */;
+
+    char szDrv[4];
+    szDrv[0] = g_szDstPath[0];
+    szDrv[1] = g_szDstPath[1];
+    szDrv[2] = '\0';
+
+    APIRET rc = DosQueryFSAttach(szDrv, 0 /*iOrdinal*/, FSAIL_QUERYNAME, &u.FsQBuf, &cbBuf);
+    if (   rc == NO_ERROR
+        || (rc == ERROR_BUFFER_OVERFLOW && u.FsQBuf.cbFSDName > 2 && u.FsQBuf.cbFSDName <= 7))
+    {
+        char *pszFsdName = (char *)&u.FsQBuf.szName[u.FsQBuf.cbName + 1];
+        if (   RT_C_IS_ALNUM(pszFsdName[0])
+            && RT_C_IS_ALNUM(pszFsdName[1])
+            && pszFsdName[u.FsQBuf.cbFSDName] == '\0')
+        {
+            /* MatchOnlyFilename requires it to be all uppercase (should be the case already). */
+            size_t off = u.FsQBuf.cbFSDName;
+            while (off-- > 0)
+                pszFsdName[off] = RT_C_TO_UPPER(pszFsdName[off]);
+
+            /* Add the IFS suffix. */
+            strcpy(&pszFsdName[u.FsQBuf.cbFSDName], ".IFS");
+            pszAfterIfs = pszFsdName;
+            cchAfterIfs = u.FsQBuf.cbFSDName + sizeof(".IFS") - 1;
+
+            if (g_fVerbose)
+                WriteStrings(g_hStdOut, "info: Found \"IFS=", pszFsdName, "\" for ", pszFsdName, "\r\n", NULL);
+        }
+        else
+        {
+            pszFsdName[10] = '\0';
+            ApiErrorN(ERROR_INVALID_NAME, 5, "Bogus FSD name \"", pszFsdName, "\" for ", szDrv, " - assuming HPFS");
+        }
+    }
+    else
+        ApiErrorN(rc, 3, "DosQueryFSAttach(", szDrv, ") - assuming HPFS");
+
+    /*
+     * Do a scan to locate where to insert ourselves and such.
+     */
+    char        szLineNo[32];
+    bool        fInsertedGuest = false;
+    bool        fInsertedMouse = RT_BOOL(g_fSkipMask & SKIP_MOUSE);
+    bool        fPendingMouse  = false;
+    bool        fInsertedIfs   = RT_BOOL(g_fSkipMask & SKIP_SHARED_FOLDERS);
+    unsigned    cPathsFound    = 0;
+    unsigned    iLine  = 0;
+    size_t      offSrc = 0;
+    const char *pchLine;
+    size_t      cchLine;
+    while ((offSrc = EditorGetLine(&g_ConfigSys, offSrc, &pchLine, &cchLine)) != 0)
+    {
+        iLine++;
+
+        size_t off = 0;
+#define SKIP_BLANKS() \
+            while (off < cchLine && RT_C_IS_BLANK(pchLine[off])) \
+                off++
+
+        bool fDone = false;
+        SKIP_BLANKS();
+
+        /*
+         * Add the destination directory to the PATH.
+         * If there are multiple SET PATH statements, we add ourselves to all of them.
+         */
+        if (   cchLine - off >= sizeof("SET PATH=") - 1
+            && (pchLine[off + 0] == 'S' || pchLine[off + 0] == 's')
+            && (pchLine[off + 1] == 'E' || pchLine[off + 1] == 'e')
+            && (pchLine[off + 2] == 'T' || pchLine[off + 2] == 't')
+            && RT_C_IS_BLANK(pchLine[off + 3]))
+        {
+            off += 4;
+            SKIP_BLANKS();
+            if (   cchLine - off >= sizeof("PATH=") - 1
+                && (pchLine[off + 0] == 'P' || pchLine[off + 0] == 'p')
+                && (pchLine[off + 1] == 'A' || pchLine[off + 1] == 'a')
+                && (pchLine[off + 2] == 'T' || pchLine[off + 2] == 't')
+                && (pchLine[off + 3] == 'H' || pchLine[off + 3] == 'h'))
+            {
+                off += 4;
+                SKIP_BLANKS();
+                if (cchLine > off && pchLine[off] == '=')
+                {
+                    off++;
+                    SKIP_BLANKS();
+
+                    if (g_fVerbose)
+                        WriteStrings(g_hStdOut, "info: Config.sys line ", MyNumToString(szLineNo, iLine), ": SET PATH\r\n", NULL);
+
+                    /* check if already part of the string */
+                    bool fNeeded = true;
+                    /** @todo look for destination directory in PATH. */
+
+                    if (fNeeded)
+                    {
+                        while (cchLine > off && RT_C_IS_BLANK(pchLine[cchLine - 1]))
+                            cchLine--;
+                        EditorPutStringN(&g_ConfigSys, pchLine, cchLine);
+                        if (pchLine[cchLine - 1] != ';')
+                            EditorPutStringN(&g_ConfigSys, RT_STR_TUPLE(";"));
+                        EditorPutStringN(&g_ConfigSys, g_szDstPath, g_cchDstPath - (g_cchDstPath > 3 ? 1 : 0));
+                        EditorPutLine(&g_ConfigSys, RT_STR_TUPLE(";"));
+                        fDone = true;
+                    }
+                    cPathsFound += 1;
+                }
+            }
+        }
+        /*
+         * Look for that IFS that should be loaded before we can load our drivers.
+         */
+        else if (   cchLine - off >= sizeof("IFS=XX.IFS") - 1
+                 && (pchLine[off + 0] == 'I' || pchLine[off + 0] == 'i')
+                 && (pchLine[off + 1] == 'F' || pchLine[off + 1] == 'f')
+                 && (pchLine[off + 2] == 'S' || pchLine[off + 2] == 's')
+                 && (pchLine[off + 3] == '=' || RT_C_IS_BLANK(pchLine[off + 3])) )
+        {
+            off += 3;
+            SKIP_BLANKS();
+            if (cchLine > off && pchLine[off] == '=')
+            {
+                off++;
+                SKIP_BLANKS();
+                if (MatchOnlyFilename(&pchLine[off], cchLine - off, pszAfterIfs, cchAfterIfs))
+                {
+                    if (g_fVerbose)
+                        WriteStrings(g_hStdOut, "info: Config.sys line ", MyNumToString(szLineNo, iLine),
+                                     ": Found IFS=", pszAfterIfs, "\r\n", NULL);
+                    EditorPutLine(&g_ConfigSys, pchLine, cchLine);
+                    fDone = true;
+
+                    if (!fInsertedGuest)
+                        fInsertedGuest = ConfigSysAddVBoxGuest();
+                    if (!fInsertedIfs)
+                        fInsertedIfs   = ConfigSysAddVBoxSF();
+                    if (fPendingMouse && !fInsertedMouse)
+                        fInsertedMouse = ConfigSysAddVBoxMouse();
+                }
+                /* Remove old VBoxSF.IFS lines */
+                else if (   !(g_fSkipMask & SKIP_SHARED_FOLDERS)
+                         && MatchOnlyFilename(&pchLine[off], cchLine, RT_STR_TUPLE("VBOXSF.IFS")))
+                {
+                    if (g_fVerbose)
+                        WriteStrings(g_hStdOut, "info: Config.sys line ", MyNumToString(szLineNo, iLine),
+                                     ": Removing old VBoxSF.ifs statement\r\n", NULL);
+                    fDone = true;
+                }
+            }
+        }
+        /*
+         * Look for the mouse driver we need to comment out / existing VBoxMouse.sys,
+         * as well as older VBoxGuest.sys statements we should remove.
+         */
+        else if (   cchLine - off >= sizeof("DEVICE=XX.SYS") - 1
+                 && (pchLine[off + 0] == 'D' || pchLine[off + 0] == 'd')
+                 && (pchLine[off + 1] == 'E' || pchLine[off + 1] == 'e')
+                 && (pchLine[off + 2] == 'V' || pchLine[off + 2] == 'v')
+                 && (pchLine[off + 3] == 'I' || pchLine[off + 3] == 'i')
+                 && (pchLine[off + 4] == 'C' || pchLine[off + 4] == 'c')
+                 && (pchLine[off + 5] == 'E' || pchLine[off + 5] == 'e')
+                 && (pchLine[off + 6] == '=' || RT_C_IS_BLANK(pchLine[off + 6])) )
+        {
+            off += 6;
+            SKIP_BLANKS();
+            if (cchLine > off && pchLine[off] == '=')
+            {
+                off++;
+                SKIP_BLANKS();
+                if (   !(g_fSkipMask & SKIP_MOUSE)
+                    && MatchOnlyFilename(&pchLine[off], cchLine - off, RT_STR_TUPLE("MOUSE.SYS")))
+                {
+                    if (g_fVerbose)
+                        WriteStrings(g_hStdOut, "info: Config.sys line ", MyNumToString(szLineNo, iLine),
+                                     ": Found DEVICE=<path>\\MOUSE.SYS\r\n", NULL);
+                    EditorPutStringN(&g_ConfigSys, RT_STR_TUPLE("REM "));
+                    EditorPutLine(&g_ConfigSys, pchLine, cchLine);
+                    fDone = true;
+
+                    if (!fInsertedMouse)
+                    {
+                        if (fInsertedGuest) /* means we've found the IFS and can access the destination dir */
+                            fInsertedMouse = ConfigSysAddVBoxMouse();
+                        else
+                            fPendingMouse = true;
+                    }
+                }
+                /* Remove or replace old VBoxMouse.IFS lines */
+                else if (   !(g_fSkipMask & SKIP_MOUSE)
+                         && MatchOnlyFilename(&pchLine[off], cchLine, RT_STR_TUPLE("VBOXMOUSE.SYS")))
+                {
+                    if (g_fVerbose)
+                        WriteStrings(g_hStdOut, "info: Config.sys line ", MyNumToString(szLineNo, iLine), ": ",
+                                     fInsertedMouse || !fInsertedGuest ? "Removing" : "Replacing",
+                                     " old VBoxMouse.sys statement\r\n", NULL);
+                    if (!fInsertedMouse)
+                    {
+                        if (fInsertedGuest) /* means we've found the IFS and can access the destination dir */
+                            fInsertedMouse = ConfigSysAddVBoxMouse();
+                        else
+                            fPendingMouse = true;
+                    }
+                    fDone = true;
+                }
+                /* Remove old VBoxGuest.sys lines. */
+                else if (MatchOnlyFilename(&pchLine[off], cchLine, RT_STR_TUPLE("VBOXGUEST.SYS")))
+                {
+                    if (g_fVerbose)
+                        WriteStrings(g_hStdOut, "info: Config.sys line ", MyNumToString(szLineNo, iLine),
+                                     ": Removing old VBoxGuest.sys statement\r\n", NULL);
+                    fDone = true;
+                }
+            }
+        }
+#undef SKIP_BLANKS
+
+        /*
+         * Output the current line if we didn't already do so above.
+         */
+        if (!fDone)
+            EditorPutLine(&g_ConfigSys, pchLine, cchLine);
+    }
+
+    /*
+     * If we've still got pending stuff, add it now at the end.
+     */
+    if (!fInsertedGuest)
+        fInsertedGuest = ConfigSysAddVBoxGuest();
+    if (!fInsertedIfs)
+        fInsertedIfs   = ConfigSysAddVBoxSF();
+    if (!fInsertedMouse)
+        fInsertedMouse = ConfigSysAddVBoxMouse();
+
+    if (!cPathsFound)
+        WriteStrings(g_hStdErr, "warning: Found no SET PATH statement in Config.sys.\r\n", NULL);
+
     return RTEXITCODE_SUCCESS;
 }
@@ -149 +835 @@
 static RTEXITCODE PrepareStartupCmd(void)
 {
+    if (g_fSkipMask & SKIP_STARTUP_CMD)
+        return RTEXITCODE_SUCCESS;
+
+    strcpy(&g_szBootDrivePath[g_cchBootDrivePath], "STARTUP.CMD");
+    RTEXITCODE rcExit = EditorReadInFile(&g_StartupCmd, g_szBootDrivePath, 1024, false /*fMustExist*/);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;
+
     return RTEXITCODE_SUCCESS;
+}
+
+
+/**
+ * Worker for CopyFiles that handles one copying operation.
+ */
+static RTEXITCODE CopyOneFile(const char *pszSrc, const char *pszDst)
+{
+    if (g_fVerbose)
+        WriteStrings(g_hStdOut, "info: Copying \"", pszSrc, "\" to \"", pszDst, "\"...\r\n", NULL);
+
+    /* Make sure the destination file isn't read-only before attempting to copying it. */
+    FILESTATUS3 FileSts;
+    APIRET rc = DosQueryPathInfo(pszDst, FIL_STANDARD, &FileSts, sizeof(FileSts));
+    if (rc != NO_ERROR && (FileSts.attrFile & FILE_READONLY))
+    {
+        rc = DosQueryPathInfo(pszDst, FIL_STANDARD, &FileSts, sizeof(FileSts));
+
+        FileSts.attrFile &= ~FILE_READONLY;
+
+        /* Don't update the timestamps: */
+        *(USHORT *)&FileSts.fdateCreation   = 0;
+        *(USHORT *)&FileSts.ftimeCreation   = 0;
+        *(USHORT *)&FileSts.fdateLastAccess = 0;
+        *(USHORT *)&FileSts.ftimeLastAccess = 0;
+        *(USHORT *)&FileSts.fdateLastWrite  = 0;
+        *(USHORT *)&FileSts.ftimeLastWrite  = 0;
+
+        rc = DosSetPathInfo(pszDst, FIL_STANDARD, &FileSts, sizeof(FileSts), 0 /*fOptions*/);
+        if (rc != NO_ERROR)
+            ApiErrorN(rc, 3, "DosSetPathInfo(\"", pszDst, "\",~READONLY,)");
+    }
+
+    /* Do the copying. */
+    rc = DosCopy(pszSrc, pszDst, DCPY_EXISTING);
+    if (rc == NO_ERROR)
+        return RTEXITCODE_SUCCESS;
+    if (rc != ERROR_SHARING_VIOLATION)
+        return ApiErrorN(rc, 3, "Failed copying to \"", pszDst, "\"");
+
+    if (g_fVerbose)
+        DoWriteNStr(g_hStdOut, RT_STR_TUPLE("info: Sharing violation - applying DosReplaceModule...\r\n"));
+    rc = DosReplaceModule(pszDst, NULL, NULL);
+    if (rc != NO_ERROR)
+        ApiErrorN(rc, 3, "DosReplaceModule(\"", pszDst, "\",,)");
+
+    rc = DosCopy(pszSrc, pszDst, DCPY_EXISTING);
+    if (rc == NO_ERROR)
+        return RTEXITCODE_SUCCESS;
+    return ApiErrorN(rc, 3, "Failed copying to \"", pszDst, "\"");
 }
 
@@ -158 +902 @@
 static RTEXITCODE CopyFiles(void)
 {
-    return RTEXITCODE_SUCCESS;
+    /*
+     * Create the install directory.  We do this from the root up as that is
+     * a nice feature and saves us dealing with trailing slash troubles.
+     */
+    char *psz = g_szDstPath;
+    if (psz[1] == ':' && RTPATH_IS_SLASH(psz[2]))
+        psz += 3;
+    else if (psz[1] == ':')
+        psz += 2;
+    else
+        return ApiError("Unexpected condition", __LINE__);
+
+    for (;;)
+    {
+        char ch;
+        while ((ch = *psz) != '\0' && !RTPATH_IS_SLASH(ch))
+            psz++;
+        if (ch != '\0')
+            *psz = '\0';
+        APIRET rc = DosMkDir(g_szDstPath, 0);
+        if (rc != NO_ERROR && rc != ERROR_ALREADY_EXISTS)
+            return ApiErrorN(rc, 3, "DosMkDir(\"", g_szDstPath, "\")");
+        if (ch == '\0')
+            break;
+        *psz++ = ch;
+        while ((ch = *psz) != '\0' && RTPATH_IS_SLASH(ch))
+            psz++;
+        if (ch == '\0')
+            break;
+    }
+
+    /*
+     * Start copying files.  We copy all files into the directory regardless
+     * of whether they will be referenced by config.sys, startup.cmd or whatever.
+     */
+    static struct
+    {
+        const char *pszFile;
+        const char *pszAltDst;
+        uint8_t     fSkipMask;
+    } const s_aFiles[] =
+    {
+        { "VBoxService.exe",    NULL, 0 }, /* first as likely to be running */
+        { "VBoxControl.exe",    NULL, 0 },
+        { "VBoxReplaceDll.exe", NULL, 0 },
+        { "gengradd.dll",       "\\OS2\\DLL\\gengradd.dll", SKIP_GRAPHICS },
+        { "libc06.dll",         "\\OS2\\DLL\\libc06.dll",  SKIP_LIBC_DLLS },
+        { "libc061.dll",        "\\OS2\\DLL\\libc061.dll", SKIP_LIBC_DLLS },
+        { "libc062.dll",        "\\OS2\\DLL\\libc062.dll", SKIP_LIBC_DLLS },
+        { "libc063.dll",        "\\OS2\\DLL\\libc063.dll", SKIP_LIBC_DLLS },
+        { "libc064.dll",        "\\OS2\\DLL\\libc064.dll", SKIP_LIBC_DLLS },
+        { "libc065.dll",        "\\OS2\\DLL\\libc065.dll", SKIP_LIBC_DLLS },
+        { "libc066.dll",        "\\OS2\\DLL\\libc066.dll", SKIP_LIBC_DLLS },
+        { "VBoxGuest.sys",      NULL, 0 },
+        { "VBoxSF.ifs",         NULL, 0 },
+        { "vboxmouse.sys",      NULL, 0 },
+        { "readme.txt",         NULL, 0 },
+    };
+
+    RTEXITCODE rcExit;
+    for (size_t i = 0; i < RT_ELEMENTS(s_aFiles); i++)
+    {
+        /* Always copy files to the destination folder. */
+        strcpy(&g_szSrcPath[g_cchSrcPath], s_aFiles[i].pszFile);
+        strcpy(&g_szDstPath[g_cchDstPath], s_aFiles[i].pszFile);
+        RTEXITCODE rcExit2 = CopyOneFile(g_szSrcPath, g_szDstPath);
+        if (rcExit2 != RTEXITCODE_SUCCESS)
+            rcExit = rcExit2;
+
+        /* Additional install location and this not being skipped? */
+        if (   s_aFiles[i].pszAltDst
+            && !(s_aFiles[i].fSkipMask & g_fSkipMask) /* ASSUMES one skip bit per file */)
+        {
+            strcpy(&g_szBootDrivePath[g_cchBootDrivePath], s_aFiles[i].pszFile);
+
+            rcExit2 = CopyOneFile(g_szSrcPath, g_szBootDrivePath);
+            if (rcExit2 != RTEXITCODE_SUCCESS)
+                rcExit = rcExit2;
+        }
+    }
+
+    return rcExit;
 }
 
@@ -167 +992 @@
 static RTEXITCODE WriteConfigSys(void)
 {
-    return RTEXITCODE_SUCCESS;
+    if (g_fSkipMask & SKIP_CONFIG_SYS)
+        return RTEXITCODE_SUCCESS;
+    strcpy(&g_szBootDrivePath[g_cchBootDrivePath], "CONFIG.SYS");
+    return EditorWriteOutFile(&g_ConfigSys, g_szBootDrivePath);
 }
 
@@ -176 +1004 @@
 static RTEXITCODE WriteStartupCmd(void)
 {
-    return RTEXITCODE_SUCCESS;
-}
-
+    if (g_fSkipMask & SKIP_CONFIG_SYS)
+        return RTEXITCODE_SUCCESS;
+    strcpy(&g_szBootDrivePath[g_cchBootDrivePath], "STARTUP.CMD");
+    return EditorWriteOutFile(&g_ConfigSys, g_szBootDrivePath);
+}
+
+
+/*********************************************************************************************************************************
+*   Option parsing and such.                                                                                                     *
+*********************************************************************************************************************************/
 
 static RTEXITCODE ShowUsage(void)
 {
-    static const char g_szUsage[] = "Usage:\r\n";
+    static const char g_szUsage[] =
+        VBOX_PRODUCT " OS/2 Additions Installer " VBOX_VERSION_STRING "\r\n"
+        "(C) 2005-" VBOX_C_YEAR " " VBOX_VENDOR "\r\n"
+        "\r\n"
+        "This is a very barebone OS/2 guest additions installer which main purpose is\r\n"
+        "to help with unattended installation.  Do not expect it to handle complicated\r\n"
+        "situations like upgrades and similar.  It also does not understand arguments\r\n"
+        "that are placed in double quotes.\r\n"
+        "\r\n"
+        "Usage: VBoxIs2AdditionsInstall.exe [options]\r\n"
+        "   or  VBoxIs2AdditionsInstall.exe <-h|-?|--help>\r\n"
+        "   or  VBoxIs2AdditionsInstall.exe <-v|--version>\r\n"
+        "\r\n"
+        "Options\r\n:"
+        "  -s<path>, --source[=]<path>\r\n"
+        "      Specifies where the files to install are.  Default: Same as installer\r\n"
+        "  -d<path>, --destination[=]<path>\r\n"
+        "      Specifies where to install all the VBox OS/2 additions files.\r\n"
+        "      Default: C:\VBoxGA  (C is replaced by actual boot drive)\r\n"
+        "  -b<path>, --boot-drive[=]<path>\r\n"
+        "      Specifies the boot drive.  Default: C: (C is replaced by the actual one)\r\n"
+        "  -F, --no-shared-folders  /  -f, --shared-folders (default)\r\n"
+        "      Controls whether to put the shared folders IFS in Config.sys.\r\n"
+        "  -G, --no-graphics        /  -g, --graphics (default)\r\n"
+        "      Controls whether to replace OS2\\DLL\\GENGRADD.DLL with the VBox version.\r\n"
+        "  -M, --no-mouse           /  -m, --mouse (default)\r\n"
+        "      Controls whether to add the VBox mouse driver to Config.sys and disable\r\n"
+        "      the regular OS/2 one.\r\n"
+        "  -S, --no-service         /  -s, --service (default)\r\n"
+        "      Controls whether to add starting VBoxService from Startup.cmd.\r\n"
+        "  -T, --no-startup-cmd     /  -t, --startup-cmd (default)\r\n"
+        "      Controls whether to modify Startup.cmd.\r\n"
+        "  -C, --no-config-sys      /  -c, --config-sys (default)\r\n"
+        "      Controls whether to modify Config.sys.\r\n"
+        "  -L, --no-libc-dlls       /  -l, --libc-dlls (default)\r\n"
+        "      Controls whether copy the kLibC DLLs to OS2\\DLLS.\r\n"
+        "  -q, --quiet              /  -V, --verbose (default)\r\n"
+        "      Controls the installer noise level.\r\n"
+        "\r\n"
+        "Exit Codes:\r\n"
+        "   0 - Success. Reboot required.\r\n"
+        "   1 - Failure.\r\n"
+        "   2 - Syntax error.\r\n"
+        ;
     DoWriteNStr(g_hStdOut, RT_STR_TUPLE(g_szUsage));
     return RTEXITCODE_SUCCESS;
@@ -190 +1068 @@
 static RTEXITCODE ShowVersion(void)
 {
-    static const char g_szRev[] = "$Rev$\r\n";
-    DoWriteNStr(g_hStdOut, RT_STR_TUPLE(g_szRev));
+    DoWriteNStr(g_hStdOut, RT_STR_TUPLE(VBOX_VERSION_STRING " r"));
+
+    const char *pszRev = "$Rev$";
+    while (!RT_C_IS_DIGIT(*pszRev))
+        pszRev++;
+    size_t cchRev = 1;
+    while (RT_C_IS_DIGIT(pszRev[cchRev]))
+        cchRev++;
+    DoWriteNStr(g_hStdOut, pszRev, cchRev);
+
+    DoWriteNStr(g_hStdOut, RT_STR_TUPLE("\r\n"));
     return RTEXITCODE_SUCCESS;
-
 }
 
@@ -334 +1220 @@
             else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("no-service")))
                 ch = 'S';
-            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("modify-startup-cmd")))
+            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("startup-cmd")))
                 ch = 't';
-            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("no-modify-startup-cmd")))
+            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("no-startup-cmd")))
                 ch = 'T';
+            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("config-sys")))
+                ch = 'c';
+            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("no-config-sys")))
+                ch = 'C';
             else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("libc-dlls")))
                 ch = 'l';
             else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("no-libc-dlls")))
                 ch = 'L';
+            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("quiet")))
+                ch = 'q';
+            else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("verbose")))
+                ch = 'V';
             else if (MatchOptWord(&pszArgs, RT_STR_TUPLE("help")))
                 ch = 'h';
@@ -380 +1274 @@
                     break;
 
-                case 'f':
-                    g_fSharedFolders = true;
+#define SKIP_OPT_CASES(a_chSkip, a_chDontSkip, a_fFlag) \
+                case a_chDontSkip: g_fSkipMask &= ~(a_fFlag); break; \
+                case a_chSkip:     g_fSkipMask |=  (a_fFlag); break
+                SKIP_OPT_CASES('F', 'f', SKIP_SHARED_FOLDERS);
+                SKIP_OPT_CASES('G', 'g', SKIP_GRAPHICS);
+                SKIP_OPT_CASES('M', 'm', SKIP_MOUSE);
+                SKIP_OPT_CASES('E', 'e', SKIP_SERVICE);
+                SKIP_OPT_CASES('U', 'u', SKIP_STARTUP_CMD);
+                SKIP_OPT_CASES('C', 'c', SKIP_CONFIG_SYS);
+                SKIP_OPT_CASES('L', 'l', SKIP_LIBC_DLLS);
+#undef SKIP_OPT_CASES
+
+                case 'q':
+                    g_fVerbose = false;
                     break;
-                case 'F':
-                    g_fSharedFolders = false;
-                    break;
-
-                case 'g':
-                    g_fGraphics = true;
-                    break;
-                case 'G':
-                    g_fGraphics = false;
-                    break;
-
-                case 'm':
-                    g_fMouse = true;
-                    break;
-                case 'M':
-                    g_fMouse = false;
-                    break;
-
-                case 'e':
-                    g_fService = true;
-                    break;
-                case 'E':
-                    g_fService = false;
-                    break;
-
-                case 'u':
-                    g_fModifyStartupCmd = true;
-                    break;
-                case 'U':
-                    g_fModifyStartupCmd = false;
-                    break;
-
-                case 'l':
-                    g_fLibcDlls = true;
-                    break;
-                case 'L':
-                    g_fLibcDlls = false;
+
+                case 'V':
+                    g_fVerbose = true;
                     break;