Changeset 16766 in vbox

Timestamp:

Feb 14, 2009 9:32:04 AM (16 years ago)

Author:

vboxsync

Message:

Wrote RTBase64Encode while at it.

Location:

trunk/src/VBox/Runtime

Files:

• common/string/base64.cpp (modified) (5 diffs)
• testcase/tstBase64.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/string/base64.cpp

@@ -44 +44 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+/** The line length used for encoding. */
+#define RTBASE64_LINE_LEN   64
+
 /** @name Special g_au8CharToVal values
  * @{ */
-#define BASE64_SPACE    0xc0
-#define BASE64_PAD      0xe0
-#define BASE64_INVALID  0xff
+#define BASE64_SPACE        0xc0
+#define BASE64_PAD          0xe0
+#define BASE64_INVALID      0xff
 /** @} */
 
@@ -252 +255 @@
     AssertCompile(sizeof(char) == sizeof(uint8_t));
 
-const char *pszCurStart;
     for (;;)
     {
-pszCurStart = pszString;
         /* The first 6-bit group. */
         while ((u8 = g_au8CharToVal[ch = *pszString]) == BASE64_SPACE)
@@ -421 +422 @@
         cch /= 6;
 
-        cch += (cch / 64) * RTBASE64_EOL_SIZE;
+        cch += (cch / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
         return cch;
     }
@@ -430 +431 @@
     cch /= 6;
 
-    cch += (cch / 64) * RTBASE64_EOL_SIZE;
+    cch += (cch / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
     return cch;
 }
@@ -455 +456 @@
 RTDECL(int) RTBase64Encode(const void *pvData, size_t cbData, char *pszBuf, size_t cbBuf, size_t *pcchActual)
 {
-    /** @todo implement RTBase64Encode. */
-    return VERR_NOT_IMPLEMENTED;
+    /*
+     * Process whole "trios" of input data.
+     */
+    uint8_t         u8A;
+    uint8_t         u8B;
+    uint8_t         u8C;
+    size_t          cbLineFeed = cbBuf - RTBASE64_LINE_LEN;
+    const uint8_t  *pbSrc      = (const uint8_t *)pvData;
+    char           *pchDst     = pszBuf;
+    while (cbData >= 3)
+    {
+        if (cbBuf < 4 + 1)
+            return VERR_BUFFER_OVERFLOW;
+
+        /* encode */
+        u8A = pbSrc[0];
+        pchDst[0] = g_szValToChar[u8A >> 2];
+        u8B = pbSrc[1];
+        pchDst[1] = g_szValToChar[((u8A << 4) & 0x3f) | (u8B >> 4)];
+        u8C = pbSrc[2];
+        pchDst[2] = g_szValToChar[((u8B << 2) & 0x3f) | (u8C >> 6)];
+        pchDst[3] = g_szValToChar[u8C & 0x3f];
+
+        /* advance */
+        cbBuf  -= 4;
+        pchDst += 4;
+        cbData -= 3;
+        pbSrc  += 3;
+
+        if (cbBuf == cbLineFeed)
+        {
+            if (cbBuf < RTBASE64_EOL_SIZE + 1)
+                return VERR_BUFFER_OVERFLOW;
+            cbBuf -= RTBASE64_EOL_SIZE;
+            if (RTBASE64_EOL_SIZE == 2)
+                *pchDst++ = '\r';
+            *pchDst++ = '\n';
+            cbLineFeed = cbBuf - RTBASE64_LINE_LEN;
+        }
+    }
+
+    /*
+     * Deal with the odd bytes and string termination.
+     */
+    if (cbData)
+    {
+        if (cbBuf < 4 + 1)
+            return VERR_BUFFER_OVERFLOW;
+        switch (cbData)
+        {
+            case 1:
+                u8A = pbSrc[0];
+                pchDst[0] = g_szValToChar[u8A >> 2];
+                pchDst[1] = g_szValToChar[(u8A << 4) & 0x3f];
+                pchDst[2] = '=';
+                pchDst[3] = '=';
+                break;
+            case 2:
+                u8A = pbSrc[0];
+                pchDst[0] = g_szValToChar[u8A >> 2];
+                u8B = pbSrc[1];
+                pchDst[1] = g_szValToChar[((u8A << 4) & 0x3f) | (u8B >> 4)];
+                pchDst[2] = g_szValToChar[(u8B << 2) & 0x3f];
+                pchDst[3] = '=';
+                break;
+        }
+        pchDst += 4;
+    }
+
+    *pchDst = '\0';
+
+    if (pcchActual)
+        *pcchActual = pchDst - pszBuf;
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Runtime/testcase/tstBase64.cpp

@@ -38 +38 @@
 #include <iprt/initterm.h>
 
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)
+# define MY_NL "\r\n"
+#else
+# define MY_NL "\n"
+#endif
+
 
 int main()
@@ -61 +70 @@
         TEST_ENTRY("Hey", "SGV5"),
         TEST_ENTRY("Base64", "QmFzZTY0"),
-        TEST_ENTRY("Call me Ishmael.", "Q2FsbCBtZSBJc2htYWVsLg==")
+        TEST_ENTRY("Call me Ishmael.", "Q2FsbCBtZSBJc2htYWVsLg=="),
+        TEST_ENTRY(
+        "Man is distinguished, not only by his reason, but by this singular passion "
+        "from other animals, which is a lust of the mind, that by a perseverance of "
+        "delight in the continued and indefatigable generation of knowledge, exceeds "
+        "the short vehemence of any carnal pleasure." /* Thomas Hobbes's Leviathan */,
+        "TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1" MY_NL
+        "dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3" MY_NL
+        "aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJzZXZlcmFu" MY_NL
+        "Y2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIGFuZCBpbmRlZmF0aWdhYmxl" MY_NL
+        "IGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhl" MY_NL
+        "bWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4="
+        )
 #undef TEST_ENTRY
     };
@@ -94 +115 @@
         }
 
-        rc = RTBase64Encode(g_aTests[i].pszText, g_aTests[i].cchText, szOut, g_aTests[i].cchEnc + 1, &cchOut);
+        rc = RTBase64Encode(g_aTests[i].pszText, g_aTests[i].cchText, szOut, g_aTests[i].cchEnc*2 + 1, &cchOut);
         if (RT_FAILURE(rc))
         {
@@ -124 +145 @@
 
     /*
-     * Bigger Test.
+     * Try with some more junk in the encoding and different line length.
      */
     static const char s_szText2[] =
@@ -133 +154 @@
 
     static const char s_szEnc2[] =
-        " TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz\n"
-        " IHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2Yg\n\r"
-        " dGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu\n"
-        " dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRo\n\r"
-        " ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=\n \n";
+        "  TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz\r\n"
+        "  IHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2Yg\n\r\t\t\t\v"
+          "dGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu\n"
+        "\tdWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRo\n\r"
+        "  ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=\n \n   \r   \n \t";
 
     int rc = RTBase64Decode(&s_szEnc2[0], szOut, sizeof(s_szText2), &cchOut, NULL);