...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index b5496c7cb40a38ad4f2d0416eace362203235de6..af0a206eb6c73ea126b392395ad1472f0b4d882a 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -105,13 +105,23 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {
 
       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;

 
          inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
          inFiles.pop_back();
 
          if( !inFile.is_open() ) continue;
 
 
          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);
          inBuffer = new boost::iostreams::filtering_istreambuf;
          inBuffer->push( boost::iostreams::bzip2_decompressor() );
          inBuffer->push(inFile);


@@ -122,7 +132,7 @@ bool configcache::readConfig()
          int readturn = -1;
          try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
          catch (std::exception const& ex) {
          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();
          }
          
            inFile.close();
          }