Changeset 76551 in vbox for trunk/src/bldprogs/scmrw.cpp

Timestamp:

Dec 31, 2018 5:09:06 AM (6 years ago)

Author:

vboxsync

Message:

scm: More work on header guard massaging (not active yet).

File:

• trunk/src/bldprogs/scmrw.cpp (modified) (9 diffs)

trunk/src/bldprogs/scmrw.cpp

@@ -2862 +2862 @@
         return false;
 
-    int rc;
-    bool fRet = false;
     RTERRINFOSTATIC ErrInfo;
+    char            szNormalized[168];
+    size_t          cchNormalized;
+    int             rc;
+    bool            fRet = false;
+
+    /*
+     * Calculate the expected guard for this file, if so tasked.
+     * ASSUMES pState->pszFilename is absolute as is pSettings->pszGuardRelativeToDir.
+     */
+    szNormalized[0] = '\0';
+    if (pSettings->pszGuardRelativeToDir)
+    {
+        rc = RTStrCopy(szNormalized, sizeof(szNormalized), pSettings->pszGuardPrefix);
+        if (RT_FAILURE(rc))
+            return ScmError(pState, rc, "Guard prefix too long (or something): %s\n", pSettings->pszGuardPrefix);
+        cchNormalized = strlen(szNormalized);
+        rc = RTPathCalcRelative(&szNormalized[cchNormalized], sizeof(szNormalized) - cchNormalized,
+                                pSettings->pszGuardRelativeToDir, pState->pszFilename);
+        if (RT_FAILURE(rc))
+            return ScmError(pState, rc, "Error calculating guard prefix (RTPathCalcRelative): %Rrc\n", rc);
+        char ch;
+        while ((ch = szNormalized[cchNormalized]) != '\0')
+        {
+            if (!ScmIsCIdentifierChar(ch))
+                szNormalized[cchNormalized] = '_';
+            cchNormalized++;
+        }
+    }
 
     /*
@@ -2872 +2898 @@
      * and will be upset if this isn't the case.
      */
+    RTSTRTUPLE  Guard       = { NULL, 0 };
     uint32_t    cBlankLines = 0;
     SCMEOL      enmEol;
@@ -2895 +2922 @@
                     { RT_STR_TUPLE(""),                 0, true, false },
                 };
-                RTSTRTUPLE Guard;
                 rc = ScmMatchWords(pchLine, cchLine, s_aIfndefGuard, RT_ELEMENTS(s_aIfndefGuard),
                                    NULL /*poffNext*/, &Guard, RTErrInfoInitStatic(&ErrInfo));
@@ -2902 +2928 @@
                                     ScmStreamTellLine(pIn) - 1, ErrInfo.Core.pszMsg, cchLine, pchLine);
                 fRet |= rc != VINF_SUCCESS;
-                ScmVerbose(pState, 2, "line %u: #ifndef %.*s\n", ScmStreamTellLine(pIn) - 1, Guard.cch, Guard.psz);
+                ScmVerbose(pState, 3, "line %u in %s: #ifndef %.*s\n",
+                           ScmStreamTellLine(pIn) - 1, pState->pszFilename, Guard.cch, Guard.psz);
 
                 /* #define xxxx */
@@ -2924 +2951 @@
                 fRet |= rc != VINF_SUCCESS;
 
+                if (Guard.cch >= sizeof(szNormalized))
+                    return ScmError(pState, VERR_BUFFER_OVERFLOW, "%u: Guard macro too long! %.*s\n",
+                                    ScmStreamTellLine(pIn) - 2, Guard.cch, Guard.psz);
+
+                if (szNormalized[0] != '\0')
+                {
+                    fRet = Guard.cch != cchNormalized || memcmp(Guard.psz, szNormalized, cchNormalized) != 0;
+                    Guard.psz = szNormalized;
+                    Guard.cch = cchNormalized;
+                }
+
                 /*
                  * Write guard, making sure we've got a single blank line preceeding it.
@@ -3046 +3084 @@
      * looking for the last #endif in the file.
      */
-    size_t iEndIf = 0;
+    size_t iEndIfIn = 0;
+    size_t iEndIfOut = 0;
     while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
     {
@@ -3059 +3098 @@
                     off++;
                 /* #pragma once */
-                if (off + sizeof("pragma") < cchLine && !memcmp(&pchLine[off], RT_STR_TUPLE("pragma")))
+                if (   off + sizeof("pragma") - 1 <= cchLine
+                    && !memcmp(&pchLine[off], RT_STR_TUPLE("pragma")))
                 {
                     rc = ScmMatchWords(pchLine, cchLine, s_aPragmaOnce, RT_ELEMENTS(s_aPragmaOnce),
@@ -3070 +3110 @@
                 }
                 /* #endif */
-                else if (off + sizeof("endif") < cchLine && !memcmp(&pchLine[off], RT_STR_TUPLE("endif")))
-                    iEndIf = ScmStreamTellLine(pOut);
+                else if (   off + sizeof("endif") - 1 <= cchLine
+                         && !memcmp(&pchLine[off], RT_STR_TUPLE("endif")))
+                {
+                    iEndIfIn  = ScmStreamTellLine(pIn) - 1;
+                    iEndIfOut = ScmStreamTellLine(pOut);
+                }
             }
         }
@@ -3084 +3128 @@
      * right kind of comment following it.
      */
-    /** @todo \#endif */
+#if 0
+    if (iEndIfOut == 0)
+        return ScmError(pState, VERR_PARSE_ERROR, "Expected '#endif' at the end of the file...\n");
+    rc = ScmStreamSeekByLine(pIn, iEndIfIn);
+    if (RT_FAILURE(rc))
+        return false;
+    rc = ScmStreamSeekByLine(pOut, iEndIfOut);
+    if (RT_FAILURE(rc))
+        return false;
+
+    pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol);
+    if (!pchLine)
+        return ScmError(pState, VERR_INTERNAL_ERROR, "ScmStreamGetLine failed re-reading #endif!\n");
+
+    char   szTmp[64 + sizeof(szNormalized)];
+    size_t cchTmp;
+    if (pSettings->fEndifGuardComment)
+        cchTmp = RTStrPrintf(szTmp, sizeof(szTmp), "#endif /* !%.*s */", Guard.cch, Guard.psz);
+    else
+        cchTmp = RTStrPrintf(szTmp, sizeof(szTmp), "#endif"); /* lazy bird */
+    fRet |= cchTmp != cchLine || memcmp(szTmp, pchLine, cchTmp) != 0;
+    rc = ScmStreamPutLine(pOut, szTmp, cchTmp, enmEol);
+    if (RT_FAILURE(rc))
+        return false;
+
+    /* Copy out the remaining lines (assumes no #pragma once here). */
+    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
+        rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
+        if (RT_FAILURE(rc))
+            return false;
+    }
+#else
+    RT_NOREF(iEndIfOut, iEndIfIn);
+#endif
 
     return fRet;