Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

ignored the last bytes of bzip2 stream

Browse Source
This commit is contained in:
Dennis Luxen 2010-08-11 12:32:06 +00:00
parent a96f932016
commit 52d1c1abfc
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
DataStructures/InputReaderFactory.h
View File

@ -27,7 +27,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
struct BZ2Context { struct BZ2Context {
FILE* file; FILE* file;
BZFILE* bz2; BZFILE* bz2;
bool error; int error;
int nUnused; int nUnused;
char unused[BZ_MAX_UNUSED]; char unused[BZ_MAX_UNUSED];
}; };
@ -37,28 +37,30 @@ int readFromBz2Stream( void* pointer, char* buffer, int len )
void *unusedTmpVoid=NULL; void *unusedTmpVoid=NULL;
char *unusedTmp=NULL; char *unusedTmp=NULL;
BZ2Context* context = (BZ2Context*) pointer; BZ2Context* context = (BZ2Context*) pointer;
if ( len == 0 || context->error || feof(context->file) ) int read = 0;
return -1; while(0 == read && !(BZ_STREAM_END == context->error && 0 == context->nUnused && feof(context->file))) {
int error = 0; read = BZ2_bzRead(&context->error, context->bz2, buffer, len);
int read = BZ2_bzRead( &error, context->bz2, buffer, len ); if(BZ_OK == context->error) {
if ( error == BZ_OK ) return read;
return read; } else if(BZ_STREAM_END == context->error) {
BZ2_bzReadGetUnused(&context->error, context->bz2, &unusedTmpVoid, &context->nUnused);
if ( error == BZ_STREAM_END ) if(BZ_OK != context->error) { cerr << "Could not BZ2_bzReadGetUnused" << endl; exit(-1);};
{ unusedTmp = (char*)unusedTmpVoid;
BZ2_bzReadGetUnused(&error, context->bz2, &unusedTmpVoid, &context->nUnused); for(int i=0;i<context->nUnused;i++) {
unusedTmp = (char*)unusedTmpVoid; context->unused[i] = unusedTmp[i];
for(int i=0;i<context->nUnused;i++) { }
context->unused[i] = unusedTmp[i]; BZ2_bzReadClose(&context->error, context->bz2);
} if(BZ_OK != context->error) { cerr << "Could not BZ2_bzReadClose" << endl; exit(-1);};
BZ2_bzReadClose(&error, context->bz2); context->error = BZ_STREAM_END; // set to the stream end for next call to this function
if(BZ_OK != error) { context->error = true; return 0;}; if(0 == context->nUnused && feof(context->file)) {
context->bz2 = BZ2_bzReadOpen(&error, context->file, 0, 0, context->unused, context->nUnused); return read;
if(NULL == context->bz2) { context->error = true; return 0;}; } else {
return read; context->bz2 = BZ2_bzReadOpen(&context->error, context->file, 0, 0, context->unused, context->nUnused);
if(NULL == context->bz2){ cerr << "Could not open file" << endl; exit(-1);};
}
} else { cerr << "Could not read bz2 file" << endl; exit(-1); }
} }
context->error = true; return read;
return 0;
} }
int closeBz2Stream( void *pointer ) int closeBz2Stream( void *pointer )