commit 4ce0bcf3f653c2727ca5608bf804dcd5fe4ea506
author Junxiao Shi <git@mail1.yoursunny.com> Sat Sep 03 07:09:03 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sat Sep 03 07:09:03 2016 +0000
tree 272a9a2e0197a562997d8a9fe0c4d622a3c38b07
parent 5a67310e89e02f1f5290901b57637e86b7d00104

util: io::load accepts base64 encoding without newlines

This commit also renames io::BASE_64 to io::BASE64.

refs #3741

Change-Id: I46286c72d12e685902a72ce8dab4a1385dc0fceb

src/util/io.cpp

diff --git a/src/util/io.cpp b/src/util/io.cpp
index 84db1e4..76fe18c 100644
--- a/src/util/io.cpp
+++ b/src/util/io.cpp
@@ -37,8 +37,8 @@
       case NO_ENCODING:
         t::streamSource(is) >> t::streamSink(os);
         break;
-      case BASE_64:
-        t::streamSource(is) >> t::base64Decode() >> t::streamSink(os);
+      case BASE64:
+        t::streamSource(is) >> t::stripSpace("\n") >> t::base64Decode(false) >> t::streamSink(os);
         break;
       case HEX:
         t::streamSource(is) >> t::hexDecode() >> t::streamSink(os);
@@ -69,7 +69,7 @@
       case NO_ENCODING:
         t::bufferSource(block.wire(), block.size()) >> t::streamSink(os);
         break;
-      case BASE_64:
+      case BASE64:
         t::bufferSource(block.wire(), block.size()) >> t::base64Encode() >> t::streamSink(os);
         break;
       case HEX: