Changeset 69253 in vbox for trunk/src/bldprogs

Timestamp:

Oct 24, 2017 7:32:58 PM (8 years ago)

Author:

vboxsync

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

118568

Message:

scm: Fixed bad abspath assumption in scmSettingsLoadFile.

File:

• trunk/src/bldprogs/scm.cpp (modified) (3 diffs)

trunk/src/bldprogs/scm.cpp

@@ -943 +943 @@
  * @returns IPRT status code.
  * @param   pSettings           Where to load the settings file.
- * @param   pszFilename         The file to load.  ASSUMED to be absolute.
- * @param   offName             The offset of the name part in pszFilename.
- */
-static int scmSettingsLoadFile(PSCMSETTINGS pSettings, const char *pszFilename, size_t offName)
+ * @param   pszFilename         The file to load.
+ */
+static int scmSettingsLoadFile(PSCMSETTINGS pSettings, const char *pszFilename)
 {
     ScmVerbose(NULL, 3, "Loading settings file '%s'...\n", pszFilename);
 
-#ifdef RT_STRICT
-    /* Check absolute path assumption. */
-    char szTmp[RTPATH_MAX];
-    int rcTmp = RTPathAbs(pszFilename, szTmp, sizeof(szTmp));
-    AssertMsg(RT_SUCCESS(rcTmp) && RTPathCompare(szTmp, pszFilename) == 0, ("rcTmp=%Rrc pszFilename='%s'\n", rcTmp, pszFilename));
-#endif
-
+    /* Turn filename into an absolute path and drop the filename. */
+    char szAbsPath[RTPATH_MAX];
+    int rc = RTPathAbs(pszFilename, szAbsPath, sizeof(szAbsPath));
+    if (RT_FAILURE(rc))
+    {
+        RTMsgError("%s: RTPathAbs -> %Rrc\n", pszFilename, rc);
+        return rc;
+    }
+    RTPathChangeToUnixSlashes(szAbsPath, true);
+    size_t cchDir = RTPathFilename(szAbsPath) - &szAbsPath[0];
+
+    /* Try open it.*/
     SCMSTREAM Stream;
-    int rc = ScmStreamInitForReading(&Stream, pszFilename);
-    if (RT_FAILURE(rc))
-    {
+    rc = ScmStreamInitForReading(&Stream, pszFilename);
+    if (RT_SUCCESS(rc))
+    {
+        SCMEOL      enmEol;
+        const char *pchLine;
+        size_t      cchLine;
+        while ((pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol)) != NULL)
+        {
+            /* Ignore leading spaces. */
+            while (cchLine > 0 && RT_C_IS_SPACE(*pchLine))
+                pchLine++, cchLine--;
+
+            /* Ignore empty lines and comment lines. */
+            if (cchLine < 1 || *pchLine == '#')
+                continue;
+
+            /* What kind of line is it? */
+            const char *pchColon = (const char *)memchr(pchLine, ':', cchLine);
+            if (pchColon)
+                rc = scmSettingsAddPair(pSettings, pchLine, cchLine, pchColon - pchLine, szAbsPath, cchDir);
+            else
+                rc = scmSettingsBaseParseStringN(&pSettings->Base, pchLine, cchLine, szAbsPath, cchDir);
+            if (RT_FAILURE(rc))
+            {
+                RTMsgError("%s:%d: %Rrc\n", pszFilename, ScmStreamTellLine(&Stream), rc);
+                break;
+            }
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            rc = ScmStreamGetStatus(&Stream);
+            if (RT_FAILURE(rc))
+                RTMsgError("%s: ScmStreamGetStatus- > %Rrc\n", pszFilename, rc);
+        }
+        ScmStreamDelete(&Stream);
+    }
+    else
         RTMsgError("%s: ScmStreamInitForReading -> %Rrc\n", pszFilename, rc);
-        return rc;
-    }
-
-    SCMEOL      enmEol;
-    const char *pchLine;
-    size_t      cchLine;
-    while ((pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol)) != NULL)
-    {
-        /* Ignore leading spaces. */
-        while (cchLine > 0 && RT_C_IS_SPACE(*pchLine))
-            pchLine++, cchLine--;
-
-        /* Ignore empty lines and comment lines. */
-        if (cchLine < 1 || *pchLine == '#')
-            continue;
-
-        /* What kind of line is it? */
-        const char *pchColon = (const char *)memchr(pchLine, ':', cchLine);
-        if (pchColon)
-            rc = scmSettingsAddPair(pSettings, pchLine, cchLine, pchColon - pchLine, pszFilename, offName);
-        else
-            rc = scmSettingsBaseParseStringN(&pSettings->Base, pchLine, cchLine, pszFilename, offName);
-        if (RT_FAILURE(rc))
-        {
-            RTMsgError("%s:%d: %Rrc\n", pszFilename, ScmStreamTellLine(&Stream), rc);
-            break;
-        }
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        rc = ScmStreamGetStatus(&Stream);
-        if (RT_FAILURE(rc))
-            RTMsgError("%s: ScmStreamGetStatus- > %Rrc\n", pszFilename, rc);
-    }
-
-    ScmStreamDelete(&Stream);
     return rc;
 }
@@ -1082 +1084 @@
         if (RTFileExists(szFile))
         {
-            rc = scmSettingsLoadFile(pSettings, szFile, RTPathFilename(szFile) - &szFile[0]);
+            rc = scmSettingsLoadFile(pSettings, szFile);
             if (RT_FAILURE(rc))
                 break;
@@ -1136 +1138 @@
         {
             if (RTFileExists(szFile))
-                rc = scmSettingsLoadFile(pSettings, szFile, RTPathFilename(szFile) - &szFile[0]);
+                rc = scmSettingsLoadFile(pSettings, szFile);
             if (RT_SUCCESS(rc))
             {