X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/d39c90a61334fa4c953842483bb79f3a86d319d0..b5bb9df73bd92a33ce4e350a94829ff67e3afca8:/configcache.cpp?ds=sidebyside

diff --git a/configcache.cpp b/configcache.cpp
index b5496c7..556dba7 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -105,13 +105,24 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
 	{
-	  if(out) *out->log << "Opening dat-file: " << inFiles.back() << endl;
+	  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( (int)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);
@@ -122,7 +133,7 @@ bool configcache::readConfig()
 	  int readturn = -1;
 	  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
 	  catch (std::exception const& ex) {
-	    if(out) *out->log << "Caught exception: " << ex.what() << endl;
+	    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
 	    inFile.close();
 	  }
 	  
@@ -131,7 +142,10 @@ bool configcache::readConfig()
 	      memcpy(configMem, tmpConfig, configSize);
 	      return true;
 	    }
-	  else inFile.close(); 
+	  else {
+	    *out->log << "CCACHE: Closing dat-file: " << openFileName << endl << flush;
+	    inFile.close();
+	  }
 	}
     }
 }