Bunch of maintenence type things. Minor tweaks and the like. The file class

has a lot more helper functions and the like, the filters give more info back
to the caller, minor updates to taf.

12 files changed, 105 insertions, 17 deletions

diff --git a/src/bzip2.cpp b/src/bzip2.cpp
index 433fc91..5423a10 100644
--- a/src/bzip2.cpp
+++ b/src/bzip2.cpp
@@ -26,16 +26,18 @@ void Bu::BZip2::start()
         pBuf = new char[nBufSize];
 }
 
-void Bu::BZip2::stop()
+size_t Bu::BZip2::stop()
 {
         if( bzState.state )
         {
                 if( bReading )
                 {
                         BZ2_bzDecompressEnd( &bzState );
+                        return 0;
                 }
                 else
                 {
+                        size_t sTotal = 0;
                         for(;;)
                         {
                                 bzState.next_in = NULL;
@@ -45,14 +47,16 @@ void Bu::BZip2::stop()
                                 int res = BZ2_bzCompress( &bzState, BZ_FINISH );
                                 if( bzState.avail_out < nBufSize )
                                 {
-                                        rNext.write( pBuf, nBufSize-bzState.avail_out );
+                                        sTotal += rNext.write( pBuf, nBufSize-bzState.avail_out );
                                 }
                                 if( res == BZ_STREAM_END )
                                         break;
                         }
                         BZ2_bzCompressEnd( &bzState );
+                        return sTotal;
                 }
         }
+        return 0;
 }
 
 void Bu::BZip2::bzError( int code )
@@ -63,13 +67,35 @@ void Bu::BZip2::bzError( int code )
                         return;
 
                 case BZ_CONFIG_ERROR:
-                        throw ExceptionBase("The bzip2 library has been miscompiled.");
+                        throw ExceptionBase("BZip2: Library configured improperly, reinstall.");
+
+                case BZ_SEQUENCE_ERROR:
+                        throw ExceptionBase("BZip2: Functions were called in an invalid sequence.");
 
                 case BZ_PARAM_ERROR:
-                        throw ExceptionBase("bzip2 parameter error.");
+                        throw ExceptionBase("BZip2: Invalid parameter was passed into a function.");
 
                 case BZ_MEM_ERROR:
-                        throw ExceptionBase("Not enough memory available for bzip2.");
+                        throw ExceptionBase("BZip2: Couldn't allocate sufficient memory.");
+
+                case BZ_DATA_ERROR:
+                        throw ExceptionBase("BZip2: Data was corrupted before decompression.");
+
+                case BZ_DATA_ERROR_MAGIC:
+                        throw ExceptionBase("BZip2: Stream does not appear to be bzip2 data.");
+
+                case BZ_IO_ERROR:
+                        throw ExceptionBase("BZip2: File couldn't be read from / written to.");
+
+                case BZ_UNEXPECTED_EOF:
+                        throw ExceptionBase("BZip2: End of file encountered before end of stream.");
+
+                case BZ_OUTBUFF_FULL:
+                        throw ExceptionBase("BZip2: Buffer not large enough to accomidate data.");
+
+                default:
+                        throw ExceptionBase("BZip2: Unknown error encountered.");
+        
         }
 }
 
@@ -124,6 +150,7 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes )
         if( bReading == true )
                 throw ExceptionBase("This bzip2 filter is in reading mode, you can't write.");
 
+        size_t sTotalOut = 0;
         bzState.next_in = (char *)pData;
         bzState.avail_in = nBytes;
         for(;;)
@@ -135,12 +162,12 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes )
 
                 if( bzState.avail_out < nBufSize )
                 {
-                        rNext.write( pBuf, nBufSize-bzState.avail_out );
+                        sTotalOut += rNext.write( pBuf, nBufSize-bzState.avail_out );
                 }
                 if( bzState.avail_in == 0 )
                         break;
         }
 
-        return 0;
+        return sTotalOut;
 }
 
diff --git a/src/bzip2.h b/src/bzip2.h
index 056f336..a23f07a 100644
--- a/src/bzip2.h
+++ b/src/bzip2.h
@@ -18,7 +18,7 @@ namespace Bu
                 virtual ~BZip2();
 
                 virtual void start();
-                virtual void stop();
+                virtual size_t stop();
                 virtual size_t read( void *pBuf, size_t nBytes );
                 virtual size_t write( const void *pBuf, size_t nBytes );
 
diff --git a/src/file.cpp b/src/file.cpp
index 26986a5..14b6e54 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1,6 +1,8 @@
 #include "file.h"
 #include "exceptions.h"
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 Bu::File::File( const char *sName, const char *sFlags )
 {
@@ -11,6 +13,20 @@ Bu::File::File( const char *sName, const char *sFlags )
         }
 }
 
+Bu::File::File( const Bu::FString &sName, const char *sFlags )
+{
+        fh = fopen( sName.getStr(), sFlags );
+        if( fh == NULL )
+        {
+                throw Bu::FileException( errno, strerror(errno) );
+        }
+}
+
+Bu::File::File( int fd, const char *sFlags )
+{
+        fh = fdopen( fd, sFlags );
+}
+
 Bu::File::~File()
 {
         close();
@@ -108,3 +124,18 @@ void Bu::File::setBlocking( bool bBlocking )
         return;
 }
 
+void Bu::File::truncate( long nSize )
+{
+        ftruncate( fileno( fh ), nSize );
+}
+
+void Bu::File::flush()
+{
+        fflush( fh );
+}
+
+void Bu::File::chmod( mode_t t )
+{
+        fchmod( fileno( fh ), t );
+}
+
diff --git a/src/file.h b/src/file.h
index ee3fdb3..8107a1b 100644
--- a/src/file.h
+++ b/src/file.h
@@ -3,7 +3,8 @@
 
 #include <stdint.h>
 
-#include "stream.h"
+#include "bu/stream.h"
+#include "bu/fstring.h"
 
 namespace Bu
 {
@@ -11,6 +12,8 @@ namespace Bu
         {
         public:
                 File( const char *sName, const char *sFlags );
+                File( const Bu::FString &sName, const char *sFlags );
+                File( int fd, const char *sFlags );
                 virtual ~File();
 
                 virtual void close();
@@ -23,6 +26,8 @@ namespace Bu
                 virtual void setPosEnd( long pos );
                 virtual bool isEOS();
 
+                virtual void flush();
+
                 virtual bool canRead();
                 virtual bool canWrite();
                 virtual bool canSeek();
@@ -30,6 +35,16 @@ namespace Bu
                 virtual bool isBlocking();
                 virtual void setBlocking( bool bBlocking=true );
 
+                inline static Bu::File tempFile( Bu::FString &sName, const char *sFlags )
+                {
+                        int afh_d = mkstemp( sName.getStr() );
+
+                        return Bu::File( afh_d, sFlags );
+                }
+
+                void truncate( long nSize );
+                void chmod( mode_t t );
+
         private:
                 FILE *fh;
 
diff --git a/src/filter.cpp b/src/filter.cpp
index d3faa00..693fb9f 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -7,7 +7,7 @@ Bu::Filter::Filter( Bu::Stream &rNext ) :
 
 Bu::Filter::~Filter()
 {
-        printf("-> Bu::Filter::~Filter()\n");           
+        //printf("-> Bu::Filter::~Filter()\n");         
 }
 /*
 void Bu::Filter::start()
@@ -75,3 +75,8 @@ void Bu::Filter::setBlocking( bool bBlocking )
         rNext.setBlocking( bBlocking );
 }
 
+void Bu::Filter::flush()
+{
+        rNext.flush();
+}
+
diff --git a/src/filter.h b/src/filter.h
index b068206..088d46e 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -33,7 +33,7 @@ namespace Bu
                 virtual ~Filter();
 
                 virtual void start()=0;
-                virtual void stop()=0;
+                virtual size_t stop()=0;
                 virtual void close();
                 virtual long tell();
                 virtual void seek( long offset );
@@ -41,6 +41,8 @@ namespace Bu
                 virtual void setPosEnd( long pos );
                 virtual bool isEOS();
 
+                virtual void flush();
+
                 virtual bool canRead();
                 virtual bool canWrite();
                 virtual bool canSeek();
diff --git a/src/socket.cpp b/src/socket.cpp
index 441678a..1832898 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -240,3 +240,7 @@ void Bu::Socket::setBlocking( bool bBlocking )
 {
 }
 
+void Bu::Socket::flush()
+{
+}
+
diff --git a/src/socket.h b/src/socket.h
index e65eb74..30a43fb 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -29,6 +29,8 @@ namespace Bu
                 virtual void setPosEnd( long pos );
                 virtual bool isEOS();
 
+                virtual void flush();
+
                 virtual bool canRead();
                 virtual bool canWrite();
                 virtual bool canSeek();
diff --git a/src/stream.h b/src/stream.h
index fa0a606..a80586b 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -32,6 +32,8 @@ namespace Bu
                 virtual void setPosEnd( long pos ) = 0;
                 virtual bool isEOS() = 0;
 
+                virtual void flush() = 0;
+
                 virtual bool canRead() = 0;
                 virtual bool canWrite() = 0;
                 virtual bool canSeek() = 0;
diff --git a/src/tafnode.cpp b/src/tafnode.cpp
index 3060606..b9a4a24 100644
--- a/src/tafnode.cpp
+++ b/src/tafnode.cpp
@@ -45,7 +45,7 @@ const Bu::TafNode::PropList &Bu::TafNode::getProperties( const Bu::FString &sNam
         return hProp.get( sName );
 }
 
-const Bu::TafNode::NodeList &Bu::TafNode::getNodes( const Bu::FString &sName ) const
+const Bu::TafNode::NodeList &Bu::TafNode::getChildren( const Bu::FString &sName ) const
 {
         return hChildren.get( sName );
 }
@@ -55,9 +55,9 @@ const Bu::FString &Bu::TafNode::getProperty( const Bu::FString &sName ) const
         return getProperties( sName ).first();
 }
 
-const Bu::TafNode *Bu::TafNode::getNode( const Bu::FString &sName ) const
+const Bu::TafNode *Bu::TafNode::getChild( const Bu::FString &sName ) const
 {
-        return getNodes( sName ).first();
+        return getChildren( sName ).first();
 }
 
 void Bu::TafNode::setName( const Bu::FString &sName )
diff --git a/src/tafnode.h b/src/tafnode.h
index 10232d2..08f78e8 100644
--- a/src/tafnode.h
+++ b/src/tafnode.h
@@ -28,9 +28,9 @@ namespace Bu
 
                 void setProperty( Bu::FString sName, Bu::FString sValue );
                 const Bu::FString &getProperty( const Bu::FString &sName ) const;
-                const TafNode *getNode( const Bu::FString &sName ) const;
                 const PropList &getProperties( const Bu::FString &sName ) const;
-                const NodeList &getNodes( const Bu::FString &sName ) const;
+                const TafNode *getChild( const Bu::FString &sName ) const;
+                const NodeList &getChildren( const Bu::FString &sName ) const;
                 void addChild( TafNode *pNode );
 
         private:
diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp
index e7bad52..d135e78 100644
--- a/src/tests/taf.cpp
+++ b/src/tests/taf.cpp
@@ -8,7 +8,7 @@ int main()
 
         Bu::TafNode *pNode = tr.getNode();
 
-        const Bu::TafNode *pStats = pNode->getNode("stats");
+        const Bu::TafNode *pStats = pNode->getChild("stats");
         printf("%s\n", pStats->getName().getStr() );
         printf("  str = %s\n", pStats->getProperty("str").getStr() );