drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-04-19 21:42:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

tpws : better gzip checking. fixing missing fclose

Browse Source
This commit is contained in:
bolvan 2019-05-10 08:47:23 +03:00
parent f8dd9f3d23
commit 5dd7834314
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/aarch64/tpws
View File

Binary file not shown.

BIN
binaries/armhf/tpws
View File

Binary file not shown.

BIN
binaries/mips32r1-lsb/tpws
View File

Binary file not shown.

BIN
binaries/mips32r1-msb/tpws
View File

Binary file not shown.

BIN
binaries/mips64r2-msb/tpws
View File

Binary file not shown.

BIN
binaries/ppc/tpws
View File

Binary file not shown.

BIN
binaries/x86/tpws
View File

Binary file not shown.

BIN
binaries/x86_64/tpws
View File

Binary file not shown.

4
tpws/gzip.c
View File

@ -77,5 +77,7 @@ zerr:
bool is_gzip(FILE* F) bool is_gzip(FILE* F)
{ {
unsigned char magic[2]; unsigned char magic[2];
return !fseek(F,0,SEEK_SET) && fread(magic, 1, 2, F)==2 && magic[0]==0x1F && magic[1]==0x8B; bool b = !fseek(F,0,SEEK_SET) && fread(magic, 1, 2, F)==2 && magic[0]==0x1F && magic[1]==0x8B;
fseek(F,0,SEEK_SET);
return b;
} }

20
tpws/hostlist.c
View File

@ -41,11 +41,14 @@ bool LoadHostList(strpool **hostlist, char *filename)
fprintf(stderr, "Could not open %s\n", filename); fprintf(stderr, "Could not open %s\n", filename);
return false; return false;
} }
if ((r=z_readfile(F,&zbuf,&zsize))==Z_OK)
{
printf("zlib compression detected. uncompressed size : %zu\n", zsize); if (is_gzip(F))
{
r = z_readfile(F,&zbuf,&zsize);
fclose(F); fclose(F);
if (r==Z_OK)
{
printf("zlib compression detected. uncompressed size : %zu\n", zsize);
p = zbuf; p = zbuf;
e = zbuf + zsize; e = zbuf + zsize;
@ -61,20 +64,14 @@ bool LoadHostList(strpool **hostlist, char *filename)
} }
free(zbuf); free(zbuf);
} }
else if (r!=Z_DATA_ERROR) else
{ {
fprintf(stderr, "zlib decompression failed : result %d\n",r); fprintf(stderr, "zlib decompression failed : result %d\n",r);
return false; return false;
} }
}
else else
{ {
if (is_gzip(F))
{
fprintf(stderr, "hostlist is gzip but is broken : %s\n",filename);
return false;
}
fseek(F,0,SEEK_SET);
printf("loading plain text list\n",r); printf("loading plain text list\n",r);
while (fgets(s, 256, F)) while (fgets(s, 256, F))
@ -90,6 +87,7 @@ bool LoadHostList(strpool **hostlist, char *filename)
} }
fclose(F); fclose(F);
} }
printf("Loaded %d hosts from %s\n", ct, filename); printf("Loaded %d hosts from %s\n", ct, filename);
return true; return true;
} }