Changeset 64814 in vbox

Timestamp:

Dec 8, 2016 9:37:21 PM (8 years ago)

Author:

vboxsync

Message:

bldprog-strtab-template.cpp.h: Fix bug in the compressor where it omits spaces and separators between words.

File:

• trunk/include/iprt/bldprog-strtab-template.cpp.h (modified) (9 diffs)

trunk/include/iprt/bldprog-strtab-template.cpp.h

@@ -116 +116 @@
 
 
-
 /** String table data. */
 typedef struct BLDPROGSTRTAB
@@ -227 +226 @@
 #endif
 
-
-#ifdef BLDPROG_STRTAB_WITH_COMPRESSION
+#ifdef BLDPROG_STRTAB_WITH_COMPRESSION
+
 DECLINLINE(size_t) bldProgStrTab_compressorFindNextWord(const char *pszSrc, char ch, const char **ppszSrc)
 {
@@ -275 +274 @@
 }
 
+
 /**
  * Analyzes a string.
@@ -342 +342 @@
     }
 }
+
 #endif /* BLDPROG_STRTAB_WITH_COMPRESSION */
-
 
 /**
@@ -392 +392 @@
     pThis->cchUniqueStrings += pStr->cchString;
 }
-
 
 
@@ -414 +413 @@
 }
 
-
-
-#ifdef BLDPROG_STRTAB_WITH_COMPRESSION
+#ifdef BLDPROG_STRTAB_WITH_COMPRESSION
+
+/**
+ * Copies @a cchSrc chars from @a pchSrc to @a pszDst, escaping special
+ * sequences.
+ *
+ * @returns New @a pszDst position, NULL if invalid source encoding.
+ * @param   pszDst              The destination buffer.
+ * @param   pszSrc              The source buffer.
+ * @param   cchSrc              How much to copy.
+ */
+static char *bldProgStrTab_compressorCopyAndEscape(char *pszDst, const char *pszSrc, size_t cchSrc)
+{
+    while (cchSrc-- > 0)
+    {
+        char ch = *pszSrc;
+        if (!((unsigned char)ch & 0x80))
+        {
+            *pszDst++ = ch;
+            pszSrc++;
+        }
+        else
+        {
+# ifdef BLDPROG_STRTAB_PURE_ASCII
+            fprintf(stderr, "error: unexpected char value %#x\n", ch);
+            return NULL;
+# else
+            RTUNICP uc;
+            int rc = RTStrGetCpEx(&pszSrc, &uc);
+            if (RT_SUCCESS(rc))
+            {
+                *pszDst++ = (unsigned char)0xff; /* escape single code point. */
+                pszDst = RTStrPutCp(pszDst, uc);
+            }
+            else
+            {
+                fprintf(stderr, "Error: RTStrGetCpEx failed with rc=%d\n", rc);
+                return NULL;
+            }
+# endif
+        }
+    }
+    return pszDst;
+}
+
 
 /**
@@ -434 +475 @@
     while ((ch = *pszSrc) != '\0')
     {
+        const char * const pszSrcUncompressed = pszSrc;
         size_t cchWord = bldProgStrTab_compressorFindNextWord(pszSrc, ch, &pszSrc);
+        size_t cchSrcUncompressed = pszSrc - pszSrcUncompressed;
+        if (cchSrcUncompressed > 0)
+        {
+            pszDst = bldProgStrTab_compressorCopyAndEscape(pszDst, pszSrcUncompressed, cchSrcUncompressed);
+            if (!pszDst)
+                return false;
+        }
         if (!cchWord)
             break;
@@ -457 +506 @@
         {
             /* Copy the current word. */
-            ch = *pszSrc;
-            do
-            {
-                if (!((unsigned char)ch & 0x80))
-                {
-                    *pszDst++ = ch;
-                    pszSrc++;
-                }
-                else
-                {
-#ifdef BLDPROG_STRTAB_PURE_ASCII
-                    fprintf(stderr, "error: unexpected char value %#x\n", ch);
-                    return false;
-#else
-                    RTUNICP uc;
-                    int rc = RTStrGetCpEx(&pszSrc, &uc);
-                    if (RT_SUCCESS(rc))
-                    {
-                        *pszDst++ = (unsigned char)0xff; /* escape single code point. */
-                        pszDst = RTStrPutCp(pszDst, uc);
-                    }
-                    else
-                    {
-                        fprintf(stderr, "Error: RTStrGetCpEx failed with rc=%d\n", rc);
-                        return false;
-                    }
-#endif
-                }
-            } while ((ch = *pszSrc) != '\0' && ch != ' ');
+            pszDst = bldProgStrTab_compressorCopyAndEscape(pszDst, pszSrc, cchWord);
+            if (!pszDst)
+                return false;
+            pszSrc += cchWord;
         }
     }
@@ -630 +654 @@
 
 #endif /* BLDPROG_STRTAB_WITH_COMPRESSION */
-
 
 /**