Removed libb64's behavior of automatically appending a newline to everything

[citadel.git] / libcitadel / lib / tools.c

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index bc0cb767b3cbaa613723452761453117f0cf84f2..ad541ddf1a0ca08726a2dca123c52182395a0864 100644 (file)
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -292,7 +292,6 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li
        int breaklength = 68;
        int readlength = 3 * breaklength / 4;
 
-       int t;
        int destoffset;
        int sourceoffset;
        int sourceremaining;
@@ -318,17 +317,12 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li
                        dest[destoffset++] = '\n';
                }
 
-               t = destoffset;
-               destoffset += base64_encode_blockend(&(dest[destoffset]), &_state);
-               if (t < destoffset) {
-                       dest[destoffset++] = '\r';
-                       dest[destoffset++] = '\n';
-               }
+               destoffset += base64_encode_blockend(&(dest[destoffset]), &_state, 0);
        }
        else {
                destoffset = base64_encode_block(source, sourcelen, dest, &_state);
 
-               destoffset += base64_encode_blockend(&(dest[destoffset]), &_state);
+               destoffset += base64_encode_blockend(&(dest[destoffset]), &_state, 0);
        }
        dest[destoffset] = 0;
        return destoffset;