Changeset 84210 in vbox

Timestamp:

May 8, 2020 1:05:56 PM (4 years ago)

Author:

vboxsync

Message:

IPRT/Base64: Allow the end-of-line style to be specified via the fFlags parameter when encoding. bugref:9699

Location:

trunk

Files:

• include/iprt/base64.h (modified) (1 diff)
• src/VBox/Runtime/common/string/base64.cpp (modified) (6 diffs)

trunk/include/iprt/base64.h

@@ -53 +53 @@
  * The size of the end-of-line marker is that that of the host platform.
  */
-#define RTBASE64_FLAGS_NO_LINE_BREAKS RT_BIT_32(0)
+#define RTBASE64_FLAGS_EOL_NATIVE       UINT32_C(0) /**< Use native newlines. */
+#define RTBASE64_FLAGS_NO_LINE_BREAKS   UINT32_C(1) /**< No newlines.  */
+#define RTBASE64_FLAGS_EOL_LF           UINT32_C(2) /**< Use UNIX-style newlines. */
+#define RTBASE64_FLAGS_EOL_CRLF         UINT32_C(3) /**< Use DOS-style newlines. */
+#define RTBASE64_FLAGS_EOL_STYLE_MASK   UINT32_C(3) /**< End-of-line style mask. */
 /** @} */
 

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

@@ -83 +83 @@
 static const char       g_szValToChar[64+1] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
+/** The end-of-line lengths (indexed by style flag value). */
+static const size_t     g_acchEolStyles[RTBASE64_FLAGS_EOL_STYLE_MASK + 1] =
+{
+    /*[RTBASE64_FLAGS_EOL_NATIVE    ]:*/ RTBASE64_EOL_SIZE,
+    /*[RTBASE64_FLAGS_NO_LINE_BREAKS]:*/ 0,
+    /*[RTBASE64_FLAGS_EOL_LF        ]:*/ 1,
+    /*[RTBASE64_FLAGS_EOL_CRLF      ]:*/ 2
+};
+
+/** The end-of-line characters (zero, one or two). */
+static const char       g_aachEolStyles[RTBASE64_FLAGS_EOL_STYLE_MASK + 1][2] =
+{
+    /*[RTBASE64_FLAGS_EOL_NATIVE    ]:*/ { RTBASE64_EOL_SIZE == 1 ? '\n' : '\n', RTBASE64_EOL_SIZE == 1 ? '\n' : '\0', },
+    /*[RTBASE64_FLAGS_NO_LINE_BREAKS]:*/ { '\0', '\0' },
+    /*[RTBASE64_FLAGS_EOL_LF        ]:*/ { '\n', '\0' },
+    /*[RTBASE64_FLAGS_EOL_CRLF      ]:*/ { '\r', '\n' },
+};
+
+
 
 #ifdef RT_STRICT
@@ -421 +440 @@
 RTDECL(size_t) RTBase64EncodedLengthEx(size_t cbData, uint32_t fFlags)
 {
+    size_t const cchEol = g_acchEolStyles[fFlags & RTBASE64_FLAGS_EOL_STYLE_MASK];
+
     if (cbData * 8 / 8 != cbData)
     {
@@ -428 +449 @@
             cch += 8;
         cch /= 6;
-
-        if ((fFlags & RTBASE64_FLAGS_NO_LINE_BREAKS) == 0) /* add EOLs? */
-            cch += ((cch - 1) / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
+        cch += ((cch - 1) / RTBASE64_LINE_LEN) * cchEol;
         return cch;
     }
@@ -438 +457 @@
         cch += 8;
     cch /= 6;
-
-    if ((fFlags & RTBASE64_FLAGS_NO_LINE_BREAKS) == 0) /* add EOLs? */
-        cch += ((cch - 1) / RTBASE64_LINE_LEN) * RTBASE64_EOL_SIZE;
+    cch += ((cch - 1) / RTBASE64_LINE_LEN) * cchEol;
     return cch;
 }
@@ -486 +503 @@
                              char *pszBuf, size_t cbBuf, size_t *pcchActual)
 {
+    /* Expand the EOL style flags: */
+    size_t const    cchEol = g_acchEolStyles[fFlags & RTBASE64_FLAGS_EOL_STYLE_MASK];
+    char const      chEol0 = g_aachEolStyles[fFlags & RTBASE64_FLAGS_EOL_STYLE_MASK][0];
+    char const      chEol1 = g_aachEolStyles[fFlags & RTBASE64_FLAGS_EOL_STYLE_MASK][1];
+
     /*
      * Process whole "trios" of input data.
@@ -515 +537 @@
         pbSrc  += 3;
 
-        if ((fFlags & RTBASE64_FLAGS_NO_LINE_BREAKS) == 0) /* add EOLs? */
+        if (cchEol > 0)
         {
             /* deal out end-of-line */
             if (cbBuf == cbLineFeed && cbData)
             {
-                if (cbBuf < RTBASE64_EOL_SIZE + 1)
+                if (cbBuf < cchEol + 1)
                     return VERR_BUFFER_OVERFLOW;
-                cbBuf -= RTBASE64_EOL_SIZE;
-                if (RTBASE64_EOL_SIZE == 2)
-                    *pchDst++ = '\r';
-                *pchDst++ = '\n';
+                cbBuf -= cchEol;
+                *pchDst++ = chEol0;
+                if (chEol1)
+                    *pchDst++ = chEol1;
                 cbLineFeed = cbBuf - RTBASE64_LINE_LEN;
             }