luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.COMPRESS.ZLIB]

Browse source 
* BUG: Fix file compression routine when the file size is a multiple of the 
  internal buffer size.


git-svn-id: svn://localhost/gambas/trunk@6151 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2014-02-12 16:27:35 +00:00
parent d4ec08a74c
commit a3286b55eb
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gb.compress.zlib/src/main.c
View file

@ -235,21 +235,26 @@ level = compression level
You will never receive a erroneus 'level' value
*********************************************************************************/
static void c_File(char *source,char *target,int level)
{
FILE *src;
gzFile dst;
unsigned int len;
size_t len;
char buf[GB_Z_BUFFER];
char bufmode[4]={'w','b',0,0};
if (level != Z_DEFAULT_COMPRESSION ) bufmode[2]=(char)(level+48);
if (level != Z_DEFAULT_COMPRESSION )
bufmode[2] = (char)(level + 48);
if ( (src=fopen(source,"r"))==NULL) {
GB.Error ("Unable to open file for reading"); return;
if ((src = fopen(source,"r")) == NULL)
{
GB.Error ("Unable to open file for reading");
return;
}
if ( (dst=gzopen(target,bufmode))==NULL) {
if ((dst = gzopen(target,bufmode)) == NULL)
{
fclose(src);
GB.Error ("Unable to open file for writing");
return;
@ -258,6 +263,7 @@ static void c_File(char *source,char *target,int level)
while (!feof(src))
{
len = fread((void*)buf,sizeof(char),GB_Z_BUFFER,src);
if (len < GB_Z_BUFFER)
{
if (ferror(src))
@ -268,20 +274,22 @@ static void c_File(char *source,char *target,int level)
return;
}
}
if (!gzwrite(dst,buf,len))
if (len > 0)
{
if (gzwrite(dst, buf, len) == 0)
{
fclose(src);
gzclose(dst);
GB.Error("Error while writing data");
return;
}
gzflush(dst,Z_SYNC_FLUSH);
}
}
fclose(src);
gzflush(dst, Z_SYNC_FLUSH);
gzclose(dst);
}
/*********************************************************************************