Changeset 69316 in vbox for trunk

Timestamp:

Oct 25, 2017 3:02:31 PM (7 years ago)

Author:

vboxsync

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

118640

Message:

scm: added --treat-as option

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (9 diffs)
• scm.h (modified) (1 diff)

trunk/src/bldprogs/scm.cpp

@@ -102 +102 @@
     SCMOPT_TAB_SIZE,
     SCMOPT_WIDTH,
+    SCMOPT_TREAT_AS,
     SCMOPT_FILTER_OUT_DIRS,
     SCMOPT_FILTER_FILES,
@@ -176 +177 @@
     /* .cchTab = */                                 8,
     /* .cchWidth = */                               130,
+    /* .pszTreatAsName = */                         NULL,
     /* .pszFilterFiles = */                         (char *)"",
     /* .pszFilterOutFiles = */                      (char *)"*.exe|*.com|20*-*-*.log",
@@ -225 +227 @@
     { "--tab-size",                         SCMOPT_TAB_SIZE,                        RTGETOPT_REQ_UINT8   },
     { "--width",                            SCMOPT_WIDTH,                           RTGETOPT_REQ_UINT8   },
+    { "--treat-as",                         SCMOPT_TREAT_AS,                        RTGETOPT_REQ_STRING  },
     { "--filter-out-dirs",                  SCMOPT_FILTER_OUT_DIRS,                 RTGETOPT_REQ_STRING  },
     { "--filter-files",                     SCMOPT_FILTER_FILES,                    RTGETOPT_REQ_STRING  },
@@ -518 +521 @@
             rc = RTStrDupEx(&pSettings->pszFilterOutDirs, pSrc->pszFilterOutDirs);
             if (RT_SUCCESS(rc))
-                return VINF_SUCCESS;
-
+            {
+                if (pSrc->pszTreatAsName)
+                    rc = RTStrDupEx(&pSettings->pszTreatAsName, pSrc->pszTreatAsName);
+                if (RT_SUCCESS(rc))
+                    return VINF_SUCCESS;
+
+                RTStrFree(pSettings->pszFilterOutDirs);
+            }
             RTStrFree(pSettings->pszFilterOutFiles);
         }
@@ -528 +537 @@
     pSettings->pszFilterOutFiles = NULL;
     pSettings->pszFilterOutDirs = NULL;
+    pSettings->pszTreatAsName = NULL;
     return rc;
 }
@@ -562 +572 @@
         RTStrFree(pSettings->pszFilterOutDirs);
         pSettings->pszFilterOutDirs = NULL;
+
+        RTStrFree(pSettings->pszTreatAsName);
+        pSettings->pszTreatAsName = NULL;
     }
 }
@@ -735 +748 @@
             }
             pSettings->cchWidth = pValueUnion->u8;
+            return VINF_SUCCESS;
+
+        case SCMOPT_TREAT_AS:
+            if (pSettings->pszTreatAsName)
+            {
+                RTStrFree(pSettings->pszTreatAsName);
+                pSettings->pszTreatAsName = NULL;
+            }
+            if (*pValueUnion->psz)
+            {
+                pSettings->pszTreatAsName = RTStrDup(pValueUnion->psz);
+                if (!pSettings->pszTreatAsName)
+                    return VERR_NO_MEMORY;
+            }
             return VINF_SUCCESS;
 
@@ -1510 +1537 @@
      */
     PCSCMCFGENTRY pCfg = NULL;
-    for (size_t iCfg = 0; iCfg < RT_ELEMENTS(g_aConfigs); iCfg++)
-        if (RTStrSimplePatternMultiMatch(g_aConfigs[iCfg].pszFilePattern, RTSTR_MAX, pszBasename, cchBasename, NULL))
-        {
-            pCfg = &g_aConfigs[iCfg];
-            break;
-        }
+    if (!pBaseSettings->pszTreatAsName)
+    {
+        for (size_t iCfg = 0; iCfg < RT_ELEMENTS(g_aConfigs); iCfg++)
+            if (RTStrSimplePatternMultiMatch(g_aConfigs[iCfg].pszFilePattern, RTSTR_MAX, pszBasename, cchBasename, NULL))
+            {
+                pCfg = &g_aConfigs[iCfg];
+                break;
+            }
+    }
+    else
+    {
+        size_t cchTreatAsName = strlen(pBaseSettings->pszTreatAsName);
+        for (size_t iCfg = 0; iCfg < RT_ELEMENTS(g_aConfigs); iCfg++)
+            if (RTStrSimplePatternMultiMatch(g_aConfigs[iCfg].pszFilePattern, RTSTR_MAX,
+                                             pBaseSettings->pszTreatAsName, cchTreatAsName, NULL))
+            {
+                pCfg = &g_aConfigs[iCfg];
+                break;
+            }
+    }
     if (!pCfg)
     {
@@ -2032 +2073 @@
             case SCMOPT_TAB_SIZE:               RTPrintf("      Default: %u\n", g_Defaults.cchTab); break;
             case SCMOPT_WIDTH:                  RTPrintf("      Default: %u\n", g_Defaults.cchWidth); break;
+
+            case SCMOPT_TREAT_AS:
+                RTPrintf("      For files not using the default extension.\n");
+                break;
+
             case SCMOPT_FILTER_OUT_DIRS:        RTPrintf("      Default: %s\n", g_Defaults.pszFilterOutDirs); break;
             case SCMOPT_FILTER_FILES:           RTPrintf("      Default: %s\n", g_Defaults.pszFilterFiles); break;

trunk/src/bldprogs/scm.h

@@ -287 +287 @@
     /** Optimal source code width. */
     uint8_t         cchWidth;
+    /** Treat the file as if it had the given name (for finding SCMCFGENTRY). */
+    char           *pszTreatAsName;
     /** Only consider files matching these patterns.  This is only applied to the
      *  base names. */