Changeset 93144 in vbox for trunk/src/VBox

Timestamp:

Jan 8, 2022 2:43:00 AM (3 years ago)

Author:

vboxsync

Message:

Add/os2: Debugged the installer code and implemented removal of old PATH elements. Config.sys and Startup.cmd often contains an EOF character (0x1a) at the end, so remove it during editing and re-add it when writing it to disk.

File:

• trunk/src/VBox/Additions/os2/VBoxOs2AdditionsInstall.cpp (modified) (51 diffs)

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

@@ -43 +43 @@
 #define MY_NIL_HFILE        (~(HFILE)0)
 
+#if defined(DOXYGEN_RUNNING)
+/** Enabled extra debug output in the matching functions. */
+# define DEBUG_MATCHING
+#endif
+
 
 /*********************************************************************************************************************************
@@ -54 +59 @@
     size_t          cbNewAlloc;
     char           *pszNew;
+    bool            fAppendEof;
     bool            fOverflowed;
+    size_t          cBogusChars;
 } FILEEDITOR;
 
@@ -70 +77 @@
 static size_t       g_cchBootDrivePath              = sizeof("C:\\") - 1;
 /** Where to install the guest additions files.  */
-static CHAR         g_szDstPath[CCHMAXPATH]         = "C:\\VBoxGA\\";
+static CHAR         g_szDstPath[CCHMAXPATH]         = "C:\\VBoxAdd\\";
 /** The length of g_szDstPath, including a trailing slash. */
-static size_t       g_cchDstPath                    = sizeof("C:\\VBoxGA\\") - 1;
+static size_t       g_cchDstPath                    = sizeof("C:\\VBoxAdd\\") - 1;
 /** Mask of SKIP_XXX flags of components/tasks to skip. */
 static uint8_t      g_fSkipMask                     = 0;
@@ -171 +178 @@
 static char *MyNumToString(char *pszBuf, unsigned uNum)
 {
+    char *pszRet = pszBuf;
+
     /* Convert to decimal and inverted digit order:  */
     char     szTmp[32];
@@ -184 +193 @@
         *pszBuf++ = szTmp[off];
     *pszBuf = '\0';
-    return pszBuf;
+
+    return pszRet;
 }
 
@@ -238 +248 @@
 static RTEXITCODE EditorReadInFile(FILEEDITOR *pEditor, const char *pszFilename, size_t cbExtraEdit, bool fMustExist)
 {
+    FILESTATUS3 FileSts;
+
     if (g_fVerbose)
         WriteStrings(g_hStdOut, "info: Preparing \"", pszFilename, "\" modifications...\r\n", NULL);
@@ -250 +262 @@
                         OPEN_ACCESS_READONLY | OPEN_SHARE_DENYWRITE | OPEN_FLAGS_SEQUENTIAL | OPEN_FLAGS_NOINHERIT,
                         NULL /*pEaOp2*/);
+    if (rc == ERROR_OPEN_FAILED)
+        rc = DosQueryPathInfo(pszFilename, FIL_STANDARD, &FileSts, sizeof(FileSts));
     if (rc == ERROR_FILE_NOT_FOUND)
         hFile = MY_NIL_HFILE;
@@ -258 +272 @@
      * Get it's size and check that it's sane.
      */
-    FILESTATUS3 FileSts;
     if (hFile != MY_NIL_HFILE)
     {
@@ -277 +290 @@
     size_t cbAlloc = FileSts.cbFile * 2 + cbExtraEdit + 16;
     rc = DosAllocMem(&pvAlloc, cbAlloc, PAG_COMMIT | PAG_WRITE | PAG_READ);
-    if (rc == NO_ERROR)
+    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;
+    pEditor->cbOrg          = FileSts.cbFile;
+    pEditor->pszOrg         = (char *)pvAlloc;
+    pEditor->pszNew         = (char *)pvAlloc + FileSts.cbFile + 1;
+    pEditor->cbNew          = 0;
+    pEditor->cbNewAlloc     = cbAlloc - FileSts.cbFile - 2;
+    pEditor->fAppendEof     = false;
+    pEditor->fOverflowed    = false;
+    pEditor->cBogusChars    = 0;
 
     /*
@@ -300 +316 @@
                              3, "DosRead(\"", pszFilename, "\")");
         DosClose(hFile);
+
+        /*
+         * Check for EOF/SUB character.
+         */
+        char *pchEof = (char *)memchr(pEditor->pszOrg, 0x1a, FileSts.cbFile);
+        if (pchEof)
+        {
+            size_t offEof = pchEof - pEditor->pszOrg;
+            for (size_t off = offEof + 1; off < FileSts.cbFile; off++)
+                if (!RT_C_IS_SPACE(pEditor->pszOrg[off]))
+                    return ErrorNStrings(RT_STR_TUPLE("Refusing to modify \""), pszFilename, -1,
+                                         RT_STR_TUPLE("\" because of EOF character followed by text!"));
+            pEditor->cbOrg      = offEof;
+            pEditor->fAppendEof = true;
+        }
     }
 
@@ -350 +381 @@
                 ULONG cbWritten = 0;
                 do
-                    rc = DosWrite(hFile, pEditor->pszOrg, pEditor->cbOrg, &cbWritten);
+                    rc = DosWrite(hFile, pEditor->pszOrg, pEditor->cbOrg + (pEditor->fAppendEof ? 1 : 0), &cbWritten);
                 while (rc == ERROR_INTERRUPT);
                 DosClose(hFile);
@@ -381 +412 @@
         return ApiErrorN(rc, 3, "Opening \"", pszFilename, "\" for writing");
 
+    ULONG cbToWrite = pEditor->cbNew;
+    if (pEditor->fAppendEof)
+    {
+        pEditor->pszNew[cbToWrite] = 0x1a; /* replacing terminator */
+        cbToWrite++;
+    }
+
     ULONG cbWritten = 0;
     do
-        rc = DosWrite(hFile, pEditor->pszNew, pEditor->cbNew, &cbWritten);
+        rc = DosWrite(hFile, pEditor->pszNew, cbToWrite, &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");
+    else if (cbWritten != cbToWrite)
+    {
+        char szNum1[32], szNum2[32];
+        rcExit = ErrorNStrings(RT_STR_TUPLE("Failed writing \""), pszFilename, -1, RT_STR_TUPLE("\" - incomplete write: "),
+                               MyNumToString(szNum1, cbWritten), -1, RT_STR_TUPLE(" written, requested "),
+                               MyNumToString(szNum2, cbToWrite), NULL, 0);
+    }
 
     rc = DosClose(hFile);
     if (rc != NO_ERROR)
         rcExit = ApiErrorN(rc, 3, "Failed closing \"", pszFilename, "\"");
+
+    pEditor->pszNew[pEditor->cbNew - 1] = '\0'; /* replacing EOF */
 
     return rcExit;
@@ -450 +494 @@
 
 /**
+ * Checks that a string doesn't contain any funny control characters.
+ *
+ * These bogus characters are counted and EditorCheckState should be called to
+ * check these after editing has completed.
+ */
+static void EditorCheckString(FILEEDITOR *pEditor, const char *pchString, size_t cchString, const char *pszCaller)
+{
+    for (size_t off = 0; off < cchString; off++)
+    {
+        if (   RT_C_IS_CNTRL(pchString[off])
+            && pchString[off] != '\t')
+        {
+            static char s_szHex[] = "0123456789abcdef";
+            char szDigits[3] = { s_szHex[pchString[off] >> 4],  s_szHex[pchString[off] & 0xf], '\0' };
+            ErrorNStrings(pszCaller, -1, RT_STR_TUPLE(": Bogus control character in "),
+                          pEditor == &g_ConfigSys ? "Config.sys: " : "Startup.cmd: ", -1, szDigits, 2, NULL, 0);
+            pEditor->cBogusChars++;
+        }
+    }
+}
+
+
+/**
  * Adds a line to the output buffer.
  *
@@ -463 +530 @@
 static bool EditorPutLine(FILEEDITOR *pEditor, const char *pchLine, size_t cchLine)
 {
+    EditorCheckString(pEditor, pchLine, cchLine, "EditorPutLine");
+
     size_t offNew = pEditor->cbNew;
     if (offNew + cchLine + 2 < pEditor->cbNewAlloc)
@@ -492 +561 @@
 static bool EditorPutStringN(FILEEDITOR *pEditor, const char *pchString, size_t cchString)
 {
+    EditorCheckString(pEditor, pchString, cchString, "EditorPutStringN");
+
     size_t offNew = pEditor->cbNew;
     if (offNew + cchString < pEditor->cbNewAlloc)
@@ -508 +579 @@
 
 /**
+ * Checks the editor state and makes the editing was successful.
+ */
+static RTEXITCODE EditorCheckState(FILEEDITOR *pEditor, const char *pszFilename)
+{
+    if (pEditor->fOverflowed)
+        return ErrorNStrings(RT_STR_TUPLE("Editor overflowed while modifying \""), pszFilename, -1, RT_STR_TUPLE("\""));
+    if (pEditor->cBogusChars > 0)
+        return ErrorNStrings(RT_STR_TUPLE("Editing failed because \""), pszFilename, -1,
+                             RT_STR_TUPLE("\" contains bogus control characters (see above)"));
+    return RTEXITCODE_SUCCESS;
+}
+
+
+/**
  * Simplistic case-insensitive memory compare function.
  */
@@ -531 +616 @@
  * @returns true if matched, false if not.
  * @param   pchLine     The line we're working on.
- * @param   off         The current line offset.
+ * @param   poff        The current line offset.  Updated on match.
  * @param   cchLine     The current line length.
  * @param   pszWord     The word to match with.
@@ -537 +622 @@
  * @param   chAltSep    Alternative word separator, optional.
  */
-static bool MatchWord(const char *pchLine, size_t off, size_t cchLine, const char *pszWord, size_t cchWord, char chAltSep = ' ')
-{
+static bool MatchWord(const char *pchLine, size_t *poff, size_t cchLine, const char *pszWord, size_t cchWord, char chAltSep = ' ')
+{
+    size_t off = *poff;
     pchLine += off;
     cchLine -= off;
@@ -546 +632 @@
                 || RT_C_IS_BLANK(pchLine[cchWord])
                 || pchLine[cchWord] == chAltSep)
+            {
+                *poff += cchWord;
                 return true;
+            }
     return false;
 }
@@ -552 +641 @@
 
 /**
- * Checks if the path @a pchString ends with @a pszFilename, ignoring case.
+ * Checks if the path @a pchLine[@a off] 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   pchLine             The line we're working on.
+ * @param   off                 The current line offset where the image path of
+ *                              a DEVICE or IFS statement starts.
+ * @param   cchLine             The current line length.
  * @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)
-{
+static bool MatchOnlyFilename(const char *pchLine, size_t off, size_t cchLine, const char *pszFilename, size_t cchFilename)
+{
+    pchLine += off;
+    cchLine -= off;
+
     /*
      * Skip ahead in pchString till we get to the filename.
@@ -568 +662 @@
     size_t offFilename = 0;
     size_t offCur      = 0;
-    if (   cchString > 2
-        && pchString[1] == ':'
-        && RT_C_IS_ALPHA(pchString[0]))
+    if (   cchLine > 2
+        && pchLine[1] == ':'
+        && RT_C_IS_ALPHA(pchLine[0]))
         offCur += 2;
-    while (offCur < cchString)
-    {
-        char ch = pchString[offCur];
-        if (RTPATH_IS_SLASH(pchString[offCur]))
+    while (offCur < cchLine)
+    {
+        char ch = pchLine[offCur];
+        if (RTPATH_IS_SLASH(pchLine[offCur]))
             offFilename = offCur + 1;
         else if (RT_C_IS_BLANK(ch))
@@ -582 +676 @@
     }
     size_t const cchLeftFilename = offCur - offFilename;
+#ifdef DEBUG_MATCHING
+    WriteNStrings(g_hStdOut, RT_STR_TUPLE("debug: MatchOnlyFilename: '"), &pchLine[offFilename], cchLeftFilename,
+                  RT_STR_TUPLE("' vs '"), pszFilename, cchFilename, RT_STR_TUPLE("'\r\n"), NULL, 0);
+#endif
 
     /*
@@ -592 +690 @@
      * Check if the filenames matches (ASSUMES right side is uppercased).
      */
-    pchString += offFilename;
+    pchLine += offFilename;
     while (cchFilename-- > 0)
     {
-        if (RT_C_TO_UPPER(*pchString) != *pszFilename)
+        if (RT_C_TO_UPPER(*pchLine) != *pszFilename)
             return false;
-        pchString++;
+        pchLine++;
         pszFilename++;
     }
+#ifdef DEBUG_MATCHING
+    WriteStrings(g_hStdOut, "debug: MatchOnlyFilename: -> true\r\n", NULL);
+#endif
     return true;
+}
+
+
+static bool MatchPath(const char *pchPath1, size_t cchPath1, const char *pchPath2, size_t cchPath2)
+{
+#ifdef DEBUG_MATCHING
+    WriteNStrings(g_hStdOut, RT_STR_TUPLE("debug: MatchPath: '"), pchPath1, cchPath1,
+                  RT_STR_TUPLE("' vs '"), pchPath2, cchPath2, RT_STR_TUPLE("'\r\n"), NULL, 0);
+#endif
+
+    while (cchPath1 > 0 && cchPath2 > 0)
+    {
+        char const ch1 = *pchPath1++;
+        cchPath1--;
+        char const ch2 = *pchPath2++;
+        cchPath2--;
+
+        /* Slashes are special as it generally doesn't matter how many are in
+           a row, at least no on decent systems. */
+        if (RTPATH_IS_SLASH(ch1))
+        {
+            if (!RTPATH_IS_SLASH(ch2))
+                return false;
+            while (cchPath1 > 0 && RTPATH_IS_SLASH(*pchPath1))
+                pchPath1++, cchPath1--;
+            while (cchPath2 > 0 && RTPATH_IS_SLASH(*pchPath2))
+                pchPath2++, cchPath2--;
+        }
+        /* Just uppercase before comparing to save space. */
+        else if (RT_C_TO_UPPER(ch1) != RT_C_TO_UPPER(ch2))
+            return false;
+    }
+
+    /* Ignore trailing slashes before reaching a conclusion. */
+    while (cchPath1 > 0 && RTPATH_IS_SLASH(*pchPath1))
+        pchPath1++, cchPath1--;
+    while (cchPath2 > 0 && RTPATH_IS_SLASH(*pchPath2))
+        pchPath2++, cchPath2--;
+
+#ifdef DEBUG_MATCHING
+    if (cchPath1 == 0 && cchPath2 == 0)
+        WriteStrings(g_hStdOut, "debug: MatchPath: -> true\r\n", NULL);
+#endif
+    return cchPath1 == 0 && cchPath2 == 0;
 }
 
@@ -617 +762 @@
     APIRET rc = DosQueryPathInfo(g_szBootDrivePath, FIL_STANDARD, &FileSts, sizeof(FileSts));
     if (rc != NO_ERROR)
-        return ApiErrorN(rc, 3, "DosQueryPathInfo(\"", g_szBootDrivePath, "\",,,) - installed gengradd?");
+        return ApiErrorN(rc, 3, "DosQueryPathInfo(\"", g_szBootDrivePath, "\",,,) [installed gengradd?] ");
 
     /* Note! GRADD precense in Config.sys is checked below while modifying it. */
@@ -685 +830 @@
 
     strcpy(&g_szBootDrivePath[g_cchBootDrivePath], "CONFIG.SYS");
-    RTEXITCODE rcExit = EditorReadInFile(&g_ConfigSys, g_szBootDrivePath, 2048, true /*fMustExist*/);
+    RTEXITCODE rcExit = EditorReadInFile(&g_ConfigSys, g_szBootDrivePath, 4096, true /*fMustExist*/);
     if (rcExit != RTEXITCODE_SUCCESS)
         return rcExit;
@@ -744 +889 @@
      */
     char        szLineNo[32];
+    char        szNumBuf[32];
     bool        fInsertedGuest = false;
     bool        fInsertedMouse = RT_BOOL(g_fSkipMask & SKIP_MOUSE);
@@ -773 +919 @@
          * If there are multiple SET PATH statements, we add ourselves to all of them.
          */
-        if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("SET")))
-        {
-            off += sizeof("SET") - 1;
+        if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("SET")))
+        {
             SKIP_BLANKS();
-            if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("PATH"), '='))
+            if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("PATH"), '='))
             {
-                off += sizeof("PATH") - 1;
                 SKIP_BLANKS();
                 if (cchLine > off && pchLine[off] == '=')
@@ -789 +933 @@
                         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)
+                    /* Strip trailing spaces and semicolons. */
+                    while (cchLine > off && (RT_C_IS_BLANK(pchLine[cchLine - 1]) || pchLine[cchLine - 1] == ';'))
+                        cchLine--;
+
+                    /* Remove any previous entries of the destination directory. */
+                    unsigned iElement   = 0;
+                    char     chLast     = 0;
+                    uint32_t cchWritten = 0;
+                    while (off < cchLine)
                     {
-                        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;
+                        iElement++;
+                        const char *pszElement   = &pchLine[off];
+                        const char *pszSemiColon = (const char *)memchr(&pchLine[off], ';', cchLine - off);
+                        size_t      cchElement   = (pszSemiColon ? pszSemiColon : &pchLine[cchLine]) - pszElement;
+                        if (MatchPath(pszElement, cchElement, g_szDstPath, g_cchDstPath - (g_cchDstPath > 3 ? 1 : 0)))
+                        {
+                            if (g_fVerbose)
+                                WriteNStrings(g_hStdOut, RT_STR_TUPLE("info: Config.sys line "),
+                                              MyNumToString(szLineNo, iLine), -1, RT_STR_TUPLE(": Removing PATH element #"),
+                                              MyNumToString(szNumBuf, iElement), -1, RT_STR_TUPLE(" \""), pszElement, cchElement,
+                                              RT_STR_TUPLE("\"\r\n"), NULL, 0);
+                            EditorPutStringN(&g_ConfigSys, &pchLine[cchWritten], off - cchWritten);
+                            chLast = pchLine[off - 1];
+                            cchWritten = off + cchElement + (chLast == ';');
+                        }
+                        off += cchElement + 1;
                     }
+
+                    /* Write out the rest of the line and append the destination directory to it. */
+                    if (cchLine > cchWritten)
+                    {
+                        EditorPutStringN(&g_ConfigSys, &pchLine[cchWritten], cchLine - cchWritten);
+                        chLast = pchLine[cchLine - 1];
+                    }
+                    if (chLast != ';')
+                        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;
                 }
@@ -815 +984 @@
              * other values can only be done by users or special drivers.
              */
-            else if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("GRADD_CHAINS"), '='))
+            else if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("GRADD_CHAINS"), '='))
             {
-                off += sizeof("GRADD_CHAINS") - 1;
                 SKIP_BLANKS();
                 if (cchLine > off && pchLine[off] == '=')
@@ -856 +1024 @@
              * Look for the chains listed by GRADD_CHAINS.
              */
-            else if (MatchWord(pchLine, off, cchLine, pchGraddChains, cchGraddChains, '='))
+            else if (MatchWord(pchLine, &off, cchLine, pchGraddChains, cchGraddChains, '='))
             {
-                off += cchGraddChains;
                 SKIP_BLANKS();
                 if (cchLine > off && pchLine[off] == '=')
@@ -880 +1047 @@
          * Look for that IFS that should be loaded before we can load our drivers.
          */
-        else if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("IFS"), '='))
-        {
-            off += sizeof("IFS") - 1;
+        else if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("IFS"), '='))
+        {
             SKIP_BLANKS();
             if (cchLine > off && pchLine[off] == '=')
@@ -888 +1054 @@
                 off++;
                 SKIP_BLANKS();
-                if (MatchOnlyFilename(&pchLine[off], cchLine - off, pszAfterIfs, cchAfterIfs))
+                if (MatchOnlyFilename(pchLine, off, cchLine, pszAfterIfs, cchAfterIfs))
                 {
                     if (g_fVerbose)
@@ -905 +1071 @@
                 /* Remove old VBoxSF.IFS lines */
                 else if (   !(g_fSkipMask & SKIP_SHARED_FOLDERS)
-                         && MatchOnlyFilename(&pchLine[off], cchLine, RT_STR_TUPLE("VBOXSF.IFS")))
+                         && (   MatchOnlyFilename(pchLine, off, cchLine, RT_STR_TUPLE("VBOXFS.IFS"))
+                             || MatchOnlyFilename(pchLine, off, cchLine, RT_STR_TUPLE("VBOXSF.IFS")) ) )
                 {
                     if (g_fVerbose)
@@ -918 +1085 @@
          * as well as older VBoxGuest.sys statements we should remove.
          */
-        else if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("DEVICE"), '='))
-        {
-            off += sizeof("DEVICE") - 1;
+        else if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("DEVICE"), '='))
+        {
             SKIP_BLANKS();
             if (cchLine > off && pchLine[off] == '=')
@@ -927 +1093 @@
                 SKIP_BLANKS();
                 if (   !(g_fSkipMask & SKIP_MOUSE)
-                    && MatchOnlyFilename(&pchLine[off], cchLine - off, RT_STR_TUPLE("MOUSE.SYS")))
+                    && MatchOnlyFilename(pchLine, off, cchLine, RT_STR_TUPLE("MOUSE.SYS")))
                 {
                     if (g_fVerbose)
@@ -946 +1112 @@
                 /* Remove or replace old VBoxMouse.IFS lines */
                 else if (   !(g_fSkipMask & SKIP_MOUSE)
-                         && MatchOnlyFilename(&pchLine[off], cchLine, RT_STR_TUPLE("VBOXMOUSE.SYS")))
+                         && MatchOnlyFilename(pchLine, off, cchLine, RT_STR_TUPLE("VBOXMOUSE.SYS")))
                 {
                     if (g_fVerbose)
@@ -962 +1128 @@
                 }
                 /* Remove old VBoxGuest.sys lines. */
-                else if (MatchOnlyFilename(&pchLine[off], cchLine, RT_STR_TUPLE("VBOXGUEST.SYS")))
+                else if (MatchOnlyFilename(pchLine, off, cchLine, RT_STR_TUPLE("VBOXGUEST.SYS")))
                 {
                     if (g_fVerbose)
@@ -1041 +1207 @@
     }
 
-    return RTEXITCODE_SUCCESS;
+    return EditorCheckState(&g_ConfigSys, g_szBootDrivePath);
 }
 
@@ -1049 +1215 @@
 {
     if (g_fVerbose)
-        WriteStrings(g_hStdOut, "info: Starting VBoxService at line ", pszLineNo, " in Startup.cmd\r\n", NULL);
+        WriteStrings(g_hStdOut, "info: Starting VBoxService at line ", pszLineNo, " of Startup.cmd\r\n", NULL);
     EditorPutStringN(&g_StartupCmd, g_szDstPath, g_cchDstPath);
     EditorPutLine(&g_StartupCmd, RT_STR_TUPLE("VBoxService.exe"));
@@ -1092 +1258 @@
             SKIP_BLANKS();
         }
-        if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("ECHO")))
-        {
-            off += sizeof("ECHO") - 1;
+        if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("ECHO")))
+        {
             SKIP_BLANKS();
 
-            if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("OFF")))
+            if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("OFF")))
             {
                 iInsertBeforeLine = iLine + 1;
@@ -1103 +1268 @@
             }
         }
-        else if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("REM")))
+        else if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("REM")))
         { /* skip */ }
         else
@@ -1135 +1300 @@
         }
 
-        if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("DETACH")))
-        {
-            off += sizeof("DEATCH") - 1;
+        if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("DETACH")))
             SKIP_BLANKS();
-        }
-
-        if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("CALL")))
-        {
-            off += sizeof("CALL") - 1;
+
+        if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("CALL")))
             SKIP_BLANKS();
-        }
-
-        if (MatchWord(pchLine, off, cchLine, RT_STR_TUPLE("START")))
-        {
-            off += sizeof("START") - 1;
+
+        if (MatchWord(pchLine, &off, cchLine, RT_STR_TUPLE("START")))
             SKIP_BLANKS();
-        }
-
-        if (   cchLine - off < sizeof("VBOXSERVICE") - 1 /* (Should be harmless to go past end of buffer due to missing .EXE) */
-            && (   MatchOnlyFilename(&pchLine[off], cchLine - off, RT_STR_TUPLE("VBOXSERVICE.EXE")) == 0
-                || MatchOnlyFilename(&pchLine[off], cchLine - off, RT_STR_TUPLE("VBOXSERVICE")) == 0))
+
+        if (   MatchOnlyFilename(pchLine, off, cchLine, RT_STR_TUPLE("VBOXSERVICE.EXE"))
+            || MatchOnlyFilename(pchLine, off, cchLine, RT_STR_TUPLE("VBOXSERVICE")) )
         {
             if (g_fVerbose)
@@ -1167 +1322 @@
     }
 
-
-    return RTEXITCODE_SUCCESS;
+    return EditorCheckState(&g_StartupCmd, g_szBootDrivePath);
 }
 
@@ -1183 +1337 @@
     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));
-
+    if (rc == NO_ERROR && (FileSts.attrFile & FILE_READONLY))
+    {
         FileSts.attrFile &= ~FILE_READONLY;
 
@@ -1247 +1399 @@
             *psz = '\0';
         APIRET rc = DosMkDir(g_szDstPath, 0);
-        if (rc != NO_ERROR && rc != ERROR_ALREADY_EXISTS)
+        if (rc != NO_ERROR && rc != ERROR_ACCESS_DENIED /*HPFS*/ && rc != ERROR_ALREADY_EXISTS /*what one would expect*/)
             return ApiErrorN(rc, 3, "DosMkDir(\"", g_szDstPath, "\")");
         if (ch == '\0')
@@ -1272 +1424 @@
         { "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 },
+        { "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 },
@@ -1300 +1452 @@
             && !(s_aFiles[i].fSkipMask & g_fSkipMask) /* ASSUMES one skip bit per file */)
         {
-            strcpy(&g_szBootDrivePath[g_cchBootDrivePath], s_aFiles[i].pszFile);
+            strcpy(&g_szBootDrivePath[g_cchBootDrivePath], s_aFiles[i].pszAltDst);
 
             rcExit2 = CopyOneFile(g_szSrcPath, g_szBootDrivePath);
@@ -1332 +1484 @@
         return RTEXITCODE_SUCCESS;
     strcpy(&g_szBootDrivePath[g_cchBootDrivePath], "STARTUP.CMD");
-    return EditorWriteOutFile(&g_ConfigSys, g_szBootDrivePath);
+    return EditorWriteOutFile(&g_StartupCmd, g_szBootDrivePath);
 }
 
@@ -1355 +1507 @@
         "   or  VBoxIs2AdditionsInstall.exe <-v|--version>\r\n"
         "\r\n"
-        "Options\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"
+        "      Default: C:\VBoxAdd  (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"
@@ -1502 +1654 @@
     ULONG ulBootDrv = 0x80;
     DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, &ulBootDrv, sizeof(ulBootDrv));
-    g_szBootDrivePath[0] = g_szDstPath[0] = 'A' + ulBootDrv;
+    g_szBootDrivePath[0] = g_szDstPath[0] = 'A' + ulBootDrv - 1;
 
     /*
@@ -1643 +1795 @@
         RTPathStripFilename(g_szSrcPath);
         g_cchSrcPath = RTPathEnsureTrailingSeparator(g_szSrcPath, sizeof(g_szSrcPath));
-        if (g_cchSrcPath)
+        if (g_cchSrcPath == 0)
             return ApiError("RTPathEnsureTrailingSeparator", ERROR_BUFFER_OVERFLOW);
     }