3 files changed, 126 insertions, 2 deletions

diff --git a/default.bld b/default.bld
index 6666fe2..1b6eb4d 100644
--- a/default.bld
+++ b/default.bld
@@ -162,7 +162,7 @@ target files("src/tests/*.cpp").replace("src/","").replace(".cpp","")
 
 // Some tests need extra libs and whatnot, that goes here.
 
-target ["tests/bzip2", "tests/streamstack"]
+target ["tests/bzip2", "tests/streamstack", "tests/enc"]
 {
         LDFLAGS += "-lbz2";
 }
diff --git a/src/strfilter.h b/src/strfilter.h
new file mode 100644
index 0000000..8da0a3f
--- /dev/null
+++ b/src/strfilter.h
@@ -0,0 +1,124 @@
+#ifndef STR_FILTER_H
+#define STR_FILTER_H
+
+#include "bu/string.h"
+#include "bu/membuf.h"
+
+namespace Bu
+{
+        //
+        // Encoders
+        //
+        template<typename tFilter>
+        Bu::String encodeStr( const Bu::String &sIn )
+        {
+                Bu::MemBuf mb;
+                {
+                        tFilter fEnc( mb );
+                        fEnc.write( sIn.getStr(), sIn.getSize() );
+                }
+                return mb.getString();
+        }
+
+        template<typename tFilter, typename p1t>
+        Bu::String encodeStr( const Bu::String &sIn, p1t p1 )
+        {
+                Bu::MemBuf mb;
+                {
+                        tFilter fEnc( mb, p1 );
+                        fEnc.write( sIn.getStr(), sIn.getSize() );
+                }
+                return mb.getString();
+        }
+
+        template<typename tFilter, typename p1t, typename p2t>
+        Bu::String encodeStr( const Bu::String &sIn, p1t p1, p2t p2 )
+        {
+                Bu::MemBuf mb;
+                {
+                        tFilter fEnc( mb, p1, p2 );
+                        fEnc.write( sIn.getStr(), sIn.getSize() );
+                }
+                return mb.getString();
+        }
+
+        template<typename tFilter, typename p1t, typename p2t, typename p3t>
+        Bu::String encodeStr( const Bu::String &sIn, p1t p1, p2t p2, p3t p3 )
+        {
+                Bu::MemBuf mb;
+                {
+                        tFilter fEnc( mb, p1, p2 );
+                        fEnc.write( sIn.getStr(), sIn.getSize() );
+                }
+                return mb.getString();
+        }
+
+        //
+        // Decoders
+        //
+        template<typename tFilter>
+        Bu::String decodeStr( const Bu::String &sIn )
+        {
+                Bu::MemBuf mb( sIn );
+                tFilter fDec( mb );
+                char buf[1024];
+                String sRet;
+                for(;;)
+                {
+                        int iRead = fDec.read( buf, 1024 );
+                        if( iRead == 0 )
+                                return sRet;
+                        sRet.append( buf, iRead );
+                }
+        }
+        
+        template<typename tFilter, typename p1t>
+        Bu::String decodeStr( const Bu::String &sIn, p1t p1 )
+        {
+                Bu::MemBuf mb( sIn );
+                tFilter fDec( mb, p1 );
+                char buf[1024];
+                String sRet;
+                for(;;)
+                {
+                        int iRead = fDec.read( buf, 1024 );
+                        if( iRead == 0 )
+                                return sRet;
+                        sRet.append( buf, iRead );
+                }
+        }
+        
+        template<typename tFilter, typename p1t, typename p2t>
+        Bu::String decodeStr( const Bu::String &sIn, p1t p1, p2t p2 )
+        {
+                Bu::MemBuf mb( sIn );
+                tFilter fDec( mb, p1, p2 );
+                char buf[1024];
+                String sRet;
+                for(;;)
+                {
+                        int iRead = fDec.read( buf, 1024 );
+                        if( iRead == 0 )
+                                return sRet;
+                        sRet.append( buf, iRead );
+                }
+        }
+        
+        template<typename tFilter, typename p1t, typename p2t, typename p3t>
+        Bu::String decodeStr( const Bu::String &sIn, p1t p1, p2t p2, p3t p3 )
+        {
+                Bu::MemBuf mb( sIn );
+                tFilter fDec( mb, p1, p2, p3 );
+                char buf[1024];
+                String sRet;
+                for(;;)
+                {
+                        int iRead = fDec.read( buf, 1024 );
+                        if( iRead == 0 )
+                                return sRet;
+                        sRet.append( buf, iRead );
+                }
+        }
+};
+
+#endif
diff --git a/src/string.h b/src/string.h
index 2874e37..a9006d1 100644
--- a/src/string.h
+++ b/src/string.h
@@ -18,12 +18,12 @@
 #include "bu/list.h"
 #include "bu/fmt.h"
 #include "bu/variant.h"
-
 #include <string.h>
 
 namespace Bu
 {
         class String;
+        class MemBuf;
 
         /** @cond DEVEL */
         class StringCore