Changeset 76572 in vbox for trunk/src/bldprogs

Timestamp:

Jan 1, 2019 4:55:08 AM (6 years ago)

Author:

vboxsync

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

127874

Message:

scm: Added header relative dir specs.

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (2 diffs)
• scmrw.cpp (modified) (1 diff)

trunk/src/bldprogs/scm.cpp

@@ -1091 +1091 @@
             if (*pValueUnion->psz != '\0')
             {
+                if (   strcmp(pValueUnion->psz, "{dir}") == 0
+                    || strcmp(pValueUnion->psz, "{parent}") == 0)
+                    return RTStrDupEx(&pSettings->pszGuardRelativeToDir, pValueUnion->psz);
                 if (cchDir == 1 && *pchDir == '/')
                 {
@@ -2795 +2798 @@
             case SCMOPT_GUARD_RELATIVE_TO_DIR:
                 RTPrintf("      Header guard should be normalized relative to given dir.\n"
+                         "      When relative to settings files, no preceeding slash.\n"
+                         "      Header relative directory specification: {dir} and {parent}\n"
                          "      If empty no normalization takes place.  Default: '%s'\n", g_Defaults.pszGuardRelativeToDir);
                 break;

trunk/src/bldprogs/scmrw.cpp

@@ -2879 +2879 @@
             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 (strcmp(pSettings->pszGuardRelativeToDir, "{dir}") == 0)
+            rc = RTStrCopy(&szNormalized[cchNormalized], sizeof(szNormalized) - cchNormalized,
+                           RTPathFilename(pState->pszFilename));
+        else if (strcmp(pSettings->pszGuardRelativeToDir, "{parent}") == 0)
+        {
+            const char *pszSrc = RTPathFilename(pState->pszFilename);
+            if (!pszSrc || (uintptr_t)&pszSrc[-2] < (uintptr_t)pState->pszFilename || !RTPATH_IS_SLASH(pszSrc[-1]))
+                return ScmError(pState, VERR_INTERNAL_ERROR, "Error calculating {parent} header guard!\n");
+            pszSrc -= 2;
+            while (   (uintptr_t)pszSrc > (uintptr_t)pState->pszFilename
+                   && !RTPATH_IS_SLASH(pszSrc[-1])
+                   && !RTPATH_IS_VOLSEP(pszSrc[-1]))
+                pszSrc--;
+            rc = RTStrCopy(&szNormalized[cchNormalized], sizeof(szNormalized) - cchNormalized, pszSrc);
+        }
+        else
+            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);