X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/974356cea3f71fcefd5a970cb6441e158e39b3ed..d52c5bf5d9fcc8c3decb9af47428cbab7ef18052:/configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index af0a206..3a76a55 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -107,21 +107,12 @@ bool configcache::readConfig()
 	{
 	  if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;
 
+	  openFileName = inFiles.back();
 	  inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
 	  inFiles.pop_back();
 
 	  if( !inFile.is_open() ) continue;
 
-	  std::streampos fsize = inFile.tellg();
-          inFile.seekg( 0, std::ios::end );
-          fsize = inFile.tellg() - fsize;
-	  if( fsize == 0 ) {
-	    *out->log << "CCACHE: dat-file has zero length! Skipping." << endl << flush;
-	    inFile.close();
-	    continue;
-	  }
-	  inFile.seekg(0);
-
 	  inBuffer = new boost::iostreams::filtering_istreambuf;
 	  inBuffer->push( boost::iostreams::bzip2_decompressor() );
 	  inBuffer->push(inFile);
@@ -131,17 +122,28 @@ bool configcache::readConfig()
 	{
 	  int readturn = -1;
 	  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+	  catch(boost::iostreams::bzip2_error& error) { 
+	    if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
+	    inFile.close();
+	  } 
 	  catch (std::exception const& ex) {
 	    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
 	    inFile.close();
 	  }
+	  catch( ... ) {
+	    if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
+	    inFile.close();
+	  }
 	  
 	  if( readturn == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
 	      return true;
 	    }
-	  else inFile.close(); 
+	  else {
+	    *out->log << "CCACHE: Closing dat-file: " << openFileName << endl << flush;
+	    inFile.close();
+	  }
 	}
     }
 }