Changeset 60880 in vbox for trunk/src

Timestamp:

May 8, 2016 3:22:45 PM (9 years ago)

Author:

vboxsync

Message:

RTLogDestinations: Don't require ';' for separating values and more directives, space+valid_directive+space should suffice.

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -344 +344 @@
     size_t      cchInstr;               /**< The size of the name. */
     uint32_t    fFlag;                  /**< The corresponding destination flag. */
-} const s_aLogDst[] =
+} const g_aLogDst[] =
 {
     { RT_STR_TUPLE("file"),         RTLOGDEST_FILE },       /* Must be 1st! */
@@ -2202 +2202 @@
 
 /**
+ * Finds the end of a destination value.
+ *
+ * The value ends when we counter a ';' or a free standing word (space on both
+ * from the g_aLogDst table.  (If this is problematic for someone, we could
+ * always do quoting and escaping.)
+ *
+ * @returns Value length in chars.
+ * @param   pszValue            The first char after '=' or ':'.
+ */
+static size_t rtLogDestFindValueLength(const char *pszValue)
+{
+    size_t off = 0;
+    char   ch;
+    while ((ch = pszValue[off]) != '\0' && ch != ';')
+    {
+        if (!RT_C_IS_SPACE(ch))
+            off++;
+        else
+        {
+            size_t cchThusFar = off;
+            do
+                off++;
+            while ((ch = pszValue[off]) != '\0' && RT_C_IS_SPACE(ch));
+            if (ch == ';')
+                return cchThusFar;
+
+            if (ch == 'n' && pszValue[off + 1] == 'o')
+                off += 2;
+            for (unsigned i = 0; i < RT_ELEMENTS(g_aLogDst); i++)
+                if (!strncmp(&pszValue[off], g_aLogDst[i].pszInstr, g_aLogDst[i].cchInstr))
+                {
+                    ch = pszValue[off + g_aLogDst[i].cchInstr];
+                    if (ch == '\0' || RT_C_IS_SPACE(ch) || ch == '=' || ch == ':' || ch == ';')
+                        return cchThusFar;
+                }
+        }
+    }
+    return off;
+}
+
+
+/**
  * Updates the logger destination using the specified string.
  *
@@ -2243 +2285 @@
 
         /* instruction. */
-        for (i = 0; i < RT_ELEMENTS(s_aLogDst); i++)
-        {
-            size_t cchInstr = strlen(s_aLogDst[i].pszInstr);
-            if (!strncmp(pszValue, s_aLogDst[i].pszInstr, cchInstr))
+        for (i = 0; i < RT_ELEMENTS(g_aLogDst); i++)
+        {
+            size_t cchInstr = strlen(g_aLogDst[i].pszInstr);
+            if (!strncmp(pszValue, g_aLogDst[i].pszInstr, cchInstr))
             {
                 if (!fNo)
-                    pLogger->fDestFlags |= s_aLogDst[i].fFlag;
+                    pLogger->fDestFlags |= g_aLogDst[i].fFlag;
                 else
-                    pLogger->fDestFlags &= ~s_aLogDst[i].fFlag;
+                    pLogger->fDestFlags &= ~g_aLogDst[i].fFlag;
                 pszValue += cchInstr;
 
@@ -2259 +2301 @@
                 if (*pszValue == '=' || *pszValue == ':')
                 {
-                    const char *pszEnd;
-
                     pszValue++;
-                    pszEnd = strchr(pszValue, ';');
-                    if (!pszEnd)
-                        pszEnd = strchr(pszValue, '\0');
-                    size_t cch = pszEnd - pszValue;
+                    size_t cch = rtLogDestFindValueLength(pszValue);
+                    const char *pszEnd = pszValue + cch;
+
 # ifdef IN_RING3
                     char szTmp[sizeof(pLogger->pInt->szFilename)];
@@ -2366 +2405 @@
                     else
                         AssertMsgFailedReturn(("Invalid destination value! %s%s doesn't take a value!\n",
-                                               fNo ? "no" : "", s_aLogDst[i].pszInstr),
+                                               fNo ? "no" : "", g_aLogDst[i].pszInstr),
                                               VERR_INVALID_PARAMETER);
 
@@ -2382 +2421 @@
 
         /* assert known instruction */
-        AssertMsgReturn(i < RT_ELEMENTS(s_aLogDst),
+        AssertMsgReturn(i < RT_ELEMENTS(g_aLogDst),
                         ("Invalid destination value! unknown instruction %.20s\n", pszValue),
                         VERR_INVALID_PARAMETER);
@@ -2429 +2468 @@
      */
     fDestFlags = pLogger->fDestFlags;
-    for (i = 6; i < RT_ELEMENTS(s_aLogDst); i++)
-        if (s_aLogDst[i].fFlag & fDestFlags)
+    for (i = 6; i < RT_ELEMENTS(g_aLogDst); i++)
+        if (g_aLogDst[i].fFlag & fDestFlags)
         {
             if (fNotFirst)
@@ -2438 +2477 @@
                     return rc;
             }
-            rc = RTStrCopyP(&pszBuf, &cchBuf, s_aLogDst[i].pszInstr);
+            rc = RTStrCopyP(&pszBuf, &cchBuf, g_aLogDst[i].pszInstr);
             if (RT_FAILURE(rc))
                 return rc;