From 5f39066a4f561e9a94a6cc9293ab9b978ebf1f81 Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Sun, 10 Jun 2007 21:28:14 +0000
Subject: 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.

---
 src/bzip2.cpp | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'src/bzip2.cpp')

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;
 }
 
-- 
cgit v1.2.3