mirror of https://github.com/libAthena/athena.git
Update zlib from 1.2.7 to 1.2.11
This commit is contained in:
parent
0a81594056
commit
b690d4d7da
|
|
@ -1,4 +1,4 @@
|
||||||
if(NOT WIN32)
|
if(NOT WIN32 AND NOT NX)
|
||||||
find_package(ZLIB)
|
find_package(ZLIB)
|
||||||
endif()
|
endif()
|
||||||
if(WIN32 OR NOT ZLIB_FOUND)
|
if(WIN32 OR NOT ZLIB_FOUND)
|
||||||
|
|
@ -29,6 +29,8 @@ add_library(z
|
||||||
if(WIN32 AND NOT UNIX)
|
if(WIN32 AND NOT UNIX)
|
||||||
install(FILES zconf.h zlib.h DESTINATION include COMPONENT zlib)
|
install(FILES zconf.h zlib.h DESTINATION include COMPONENT zlib)
|
||||||
install(TARGETS z DESTINATION lib COMPONENT zlib)
|
install(TARGETS z DESTINATION lib COMPONENT zlib)
|
||||||
|
else()
|
||||||
|
target_compile_options(z PRIVATE -Wno-implicit-fallthrough)
|
||||||
endif()
|
endif()
|
||||||
set(ZLIB_LIBRARIES z CACHE PATH "Zlib libraries" FORCE)
|
set(ZLIB_LIBRARIES z CACHE PATH "Zlib libraries" FORCE)
|
||||||
set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Zlib include path" FORCE)
|
set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Zlib include path" FORCE)
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,111 @@
|
||||||
|
|
||||||
ChangeLog file for zlib
|
ChangeLog file for zlib
|
||||||
!!!!
|
|
||||||
!!!! Please e-mail mailto://hanbaj@gmail.com for help with this altered source
|
Changes in 1.2.11 (15 Jan 2017)
|
||||||
!!!! distribution. This altered source distribution is NOT supported by the
|
- Fix deflate stored bug when pulling last block from window
|
||||||
!!!! original creators Jean-loup Gailly and Mark Adler.
|
- Permit immediate deflateParams changes before any deflate input
|
||||||
!!!!
|
|
||||||
!!!! zlib 1.2.7.f-hanba-win64 is an altered source distribution of zlib 1.2.7.
|
Changes in 1.2.10 (2 Jan 2017)
|
||||||
!!!! The purpose of the changes made herein were to specifically address
|
- Avoid warnings on snprintf() return value
|
||||||
!!!! compiler errors and warnings in a Microsoft Windows build environment.
|
- Fix bug in deflate_stored() for zero-length input
|
||||||
!!!!
|
- Fix bug in gzwrite.c that produced corrupt gzip files
|
||||||
!!!! Changes in 1.2.7.f-hanba-win64-v3 (31 May 2014)
|
- Remove files to be installed before copying them in Makefile.in
|
||||||
!!!! - Corrected infinite loop errors in inflate.c and infback.c
|
- Add warnings when compiling with assembler code
|
||||||
!!!! - Added ZLibTest project to MSVS 2013 solution.
|
|
||||||
!!!!
|
Changes in 1.2.9 (31 Dec 2016)
|
||||||
!!!! Changes in 1.2.7.f-hanba-win64-v2 (17 November 2013)
|
- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
|
||||||
!!!! - Reverted function definitions and added preprocessor WIN32 check.
|
- Improve contrib/blast to return unused bytes
|
||||||
!!!! - Created Microsoft Visual Studio 2012 & 2013 solution & project files.
|
- Assure that gzoffset() is correct when appending
|
||||||
!!!!
|
- Improve compress() and uncompress() to support large lengths
|
||||||
!!!! Changes in 1.2.7.f-hanba-win64-v1 (23 May 2012)
|
- Fix bug in test/example.c where error code not saved
|
||||||
!!!! - Adjusted version numbers to reflect the altered source distribution
|
- Remedy Coverity warning [Randers-Pehrson]
|
||||||
!!!! - Adjusted function old-declarators to new style.
|
- Improve speed of gzprintf() in transparent mode
|
||||||
!!!! - Modified constant conditional expressions to non-conditional.
|
- Fix inflateInit2() bug when windowBits is 16 or 32
|
||||||
!!!! - Renamed/redefined deprecated functions to their ANSI equivalents.
|
- Change DEBUG macro to ZLIB_DEBUG
|
||||||
!!!! - Adjusted (carefully) data types to reduce risk of data loss.
|
- Avoid uninitialized access by gzclose_w()
|
||||||
!!!! - Created Microsoft Visual Studio 2008 solution & project files.
|
- Allow building zlib outside of the source directory
|
||||||
!!!!
|
- Fix bug that accepted invalid zlib header when windowBits is zero
|
||||||
|
- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
|
||||||
|
- Loop on write() calls in gzwrite.c in case of non-blocking I/O
|
||||||
|
- Add --warn (-w) option to ./configure for more compiler warnings
|
||||||
|
- Reject a window size of 256 bytes if not using the zlib wrapper
|
||||||
|
- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
|
||||||
|
- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
|
||||||
|
- Fix bugs in creating a very large gzip header
|
||||||
|
- Add uncompress2() function, which returns the input size used
|
||||||
|
- Assure that deflateParams() will not switch functions mid-block
|
||||||
|
- Dramatically speed up deflation for level 0 (storing)
|
||||||
|
- Add gzfread(), duplicating the interface of fread()
|
||||||
|
- Add gzfwrite(), duplicating the interface of fwrite()
|
||||||
|
- Add deflateGetDictionary() function
|
||||||
|
- Use snprintf() for later versions of Microsoft C
|
||||||
|
- Fix *Init macros to use z_ prefix when requested
|
||||||
|
- Replace as400 with os400 for OS/400 support [Monnerat]
|
||||||
|
- Add crc32_z() and adler32_z() functions with size_t lengths
|
||||||
|
- Update Visual Studio project files [AraHaan]
|
||||||
|
|
||||||
|
Changes in 1.2.8 (28 Apr 2013)
|
||||||
|
- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
|
||||||
|
- Do not force Z_CONST for C++
|
||||||
|
- Clean up contrib/vstudio [Roß]
|
||||||
|
- Correct spelling error in zlib.h
|
||||||
|
- Fix mixed line endings in contrib/vstudio
|
||||||
|
|
||||||
|
Changes in 1.2.7.3 (13 Apr 2013)
|
||||||
|
- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
|
||||||
|
|
||||||
|
Changes in 1.2.7.2 (13 Apr 2013)
|
||||||
|
- Change check for a four-byte type back to hexadecimal
|
||||||
|
- Fix typo in win32/Makefile.msc
|
||||||
|
- Add casts in gzwrite.c for pointer differences
|
||||||
|
|
||||||
|
Changes in 1.2.7.1 (24 Mar 2013)
|
||||||
|
- Replace use of unsafe string functions with snprintf if available
|
||||||
|
- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
|
||||||
|
- Fix gzgetc undefine when Z_PREFIX set [Turk]
|
||||||
|
- Eliminate use of mktemp in Makefile (not always available)
|
||||||
|
- Fix bug in 'F' mode for gzopen()
|
||||||
|
- Add inflateGetDictionary() function
|
||||||
|
- Correct comment in deflate.h
|
||||||
|
- Use _snprintf for snprintf in Microsoft C
|
||||||
|
- On Darwin, only use /usr/bin/libtool if libtool is not Apple
|
||||||
|
- Delete "--version" file if created by "ar --version" [Richard G.]
|
||||||
|
- Fix configure check for veracity of compiler error return codes
|
||||||
|
- Fix CMake compilation of static lib for MSVC2010 x64
|
||||||
|
- Remove unused variable in infback9.c
|
||||||
|
- Fix argument checks in gzlog_compress() and gzlog_write()
|
||||||
|
- Clean up the usage of z_const and respect const usage within zlib
|
||||||
|
- Clean up examples/gzlog.[ch] comparisons of different types
|
||||||
|
- Avoid shift equal to bits in type (caused endless loop)
|
||||||
|
- Fix uninitialized value bug in gzputc() introduced by const patches
|
||||||
|
- Fix memory allocation error in examples/zran.c [Nor]
|
||||||
|
- Fix bug where gzopen(), gzclose() would write an empty file
|
||||||
|
- Fix bug in gzclose() when gzwrite() runs out of memory
|
||||||
|
- Check for input buffer malloc failure in examples/gzappend.c
|
||||||
|
- Add note to contrib/blast to use binary mode in stdio
|
||||||
|
- Fix comparisons of differently signed integers in contrib/blast
|
||||||
|
- Check for invalid code length codes in contrib/puff
|
||||||
|
- Fix serious but very rare decompression bug in inftrees.c
|
||||||
|
- Update inflateBack() comments, since inflate() can be faster
|
||||||
|
- Use underscored I/O function names for WINAPI_FAMILY
|
||||||
|
- Add _tr_flush_bits to the external symbols prefixed by --zprefix
|
||||||
|
- Add contrib/vstudio/vc10 pre-build step for static only
|
||||||
|
- Quote --version-script argument in CMakeLists.txt
|
||||||
|
- Don't specify --version-script on Apple platforms in CMakeLists.txt
|
||||||
|
- Fix casting error in contrib/testzlib/testzlib.c
|
||||||
|
- Fix types in contrib/minizip to match result of get_crc_table()
|
||||||
|
- Simplify contrib/vstudio/vc10 with 'd' suffix
|
||||||
|
- Add TOP support to win32/Makefile.msc
|
||||||
|
- Suport i686 and amd64 assembler builds in CMakeLists.txt
|
||||||
|
- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
|
||||||
|
- Add vc11 and vc12 build files to contrib/vstudio
|
||||||
|
- Add gzvprintf() as an undocumented function in zlib
|
||||||
|
- Fix configure for Sun shell
|
||||||
|
- Remove runtime check in configure for four-byte integer type
|
||||||
|
- Add casts and consts to ease user conversion to C++
|
||||||
|
- Add man pages for minizip and miniunzip
|
||||||
|
- In Makefile uninstall, don't rm if preceding cd fails
|
||||||
|
- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
|
||||||
|
|
||||||
Changes in 1.2.7 (2 May 2012)
|
Changes in 1.2.7 (2 May 2012)
|
||||||
- Replace use of memmove() with a simple copy for portability
|
- Replace use of memmove() with a simple copy for portability
|
||||||
|
|
@ -156,7 +237,7 @@ Changes in 1.2.5.2 (17 Dec 2011)
|
||||||
- Add a transparent write mode to gzopen() when 'T' is in the mode
|
- Add a transparent write mode to gzopen() when 'T' is in the mode
|
||||||
- Update python link in zlib man page
|
- Update python link in zlib man page
|
||||||
- Get inffixed.h and MAKEFIXED result to match
|
- Get inffixed.h and MAKEFIXED result to match
|
||||||
- Add a ./config --solo option to make zlib subset with no libary use
|
- Add a ./config --solo option to make zlib subset with no library use
|
||||||
- Add undocumented inflateResetKeep() function for CAB file decoding
|
- Add undocumented inflateResetKeep() function for CAB file decoding
|
||||||
- Add --cover option to ./configure for gcc coverage testing
|
- Add --cover option to ./configure for gcc coverage testing
|
||||||
- Add #define ZLIB_CONST option to use const in the z_stream interface
|
- Add #define ZLIB_CONST option to use const in the z_stream interface
|
||||||
|
|
@ -526,7 +607,7 @@ Changes in 1.2.3.1 (16 August 2006)
|
||||||
- Update make_vms.com [Zinser]
|
- Update make_vms.com [Zinser]
|
||||||
- Use -fPIC for shared build in configure [Teredesai, Nicholson]
|
- Use -fPIC for shared build in configure [Teredesai, Nicholson]
|
||||||
- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
|
- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
|
||||||
- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]
|
- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
|
||||||
- Add some FAQ entries about the contrib directory
|
- Add some FAQ entries about the contrib directory
|
||||||
- Update the MVS question in the FAQ
|
- Update the MVS question in the FAQ
|
||||||
- Avoid extraneous reads after EOF in gzio.c [Brown]
|
- Avoid extraneous reads after EOF in gzio.c [Brown]
|
||||||
|
|
@ -1140,7 +1221,7 @@ Changes in 1.0.6 (19 Jan 1998)
|
||||||
386 asm code replacing longest_match().
|
386 asm code replacing longest_match().
|
||||||
contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
|
contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
|
||||||
A C++ I/O streams interface to the zlib gz* functions
|
A C++ I/O streams interface to the zlib gz* functions
|
||||||
contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
|
contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
|
||||||
Another C++ I/O streams interface
|
Another C++ I/O streams interface
|
||||||
contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
|
contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
|
||||||
A very simple tar.gz file extractor using zlib
|
A very simple tar.gz file extractor using zlib
|
||||||
|
|
@ -1229,7 +1310,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
|
||||||
- fix array overlay in deflate.c which sometimes caused bad compressed data
|
- fix array overlay in deflate.c which sometimes caused bad compressed data
|
||||||
- fix inflate bug with empty stored block
|
- fix inflate bug with empty stored block
|
||||||
- fix MSDOS medium model which was broken in 0.99
|
- fix MSDOS medium model which was broken in 0.99
|
||||||
- fix deflateParams() which could generated bad compressed data.
|
- fix deflateParams() which could generate bad compressed data.
|
||||||
- Bytef is define'd instead of typedef'ed (work around Borland bug)
|
- Bytef is define'd instead of typedef'ed (work around Borland bug)
|
||||||
- added an INDEX file
|
- added an INDEX file
|
||||||
- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
|
- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,6 @@
|
||||||
ZLIB DATA COMPRESSION LIBRARY
|
ZLIB DATA COMPRESSION LIBRARY
|
||||||
|
|
||||||
!!!!
|
zlib 1.2.11 is a general purpose data compression library. All the code is
|
||||||
!!!! Please e-mail mailto://hanbaj@gmail.com for help with this altered source
|
|
||||||
!!!! distribution. This altered source distribution is NOT supported by the
|
|
||||||
!!!! original creators Jean-loup Gailly and Mark Adler.
|
|
||||||
!!!!
|
|
||||||
!!!! zlib 1.2.7.f-hanba-win64 is an altered source distribution of zlib 1.2.7.
|
|
||||||
!!!! The purpose of the changes made herein were to specifically address
|
|
||||||
!!!! compiler errors and warnings in a Microsoft Windows build environment.
|
|
||||||
!!!!
|
|
||||||
|
|
||||||
zlib 1.2.7 is a general purpose data compression library. All the code is
|
|
||||||
thread safe. The data format used by the zlib library is described by RFCs
|
thread safe. The data format used by the zlib library is described by RFCs
|
||||||
(Request for Comments) 1950 to 1952 in the files
|
(Request for Comments) 1950 to 1952 in the files
|
||||||
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
|
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
|
||||||
|
|
@ -41,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
|
||||||
issue of Dr. Dobb's Journal; a copy of the article is available at
|
issue of Dr. Dobb's Journal; a copy of the article is available at
|
||||||
http://marknelson.us/1997/01/01/zlib-engine/ .
|
http://marknelson.us/1997/01/01/zlib-engine/ .
|
||||||
|
|
||||||
The changes made in version 1.2.7 are documented in the file ChangeLog.
|
The changes made in version 1.2.11 are documented in the file ChangeLog.
|
||||||
|
|
||||||
Unsupported third party contributions are provided in directory contrib/ .
|
Unsupported third party contributions are provided in directory contrib/ .
|
||||||
|
|
||||||
|
|
@ -94,7 +84,7 @@ Acknowledgments:
|
||||||
|
|
||||||
Copyright notice:
|
Copyright notice:
|
||||||
|
|
||||||
(C) 1995-2012 Jean-loup Gailly and Mark Adler
|
(C) 1995-2017 Jean-loup Gailly and Mark Adler
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* adler32.c -- compute the Adler-32 checksum of a data stream
|
/* adler32.c -- compute the Adler-32 checksum of a data stream
|
||||||
* Copyright (C) 1995-2011 Mark Adler
|
* Copyright (C) 1995-2011, 2016 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -7,11 +7,9 @@
|
||||||
|
|
||||||
#include "zutil.h"
|
#include "zutil.h"
|
||||||
|
|
||||||
#define local static
|
|
||||||
|
|
||||||
local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
|
local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
|
||||||
|
|
||||||
#define BASE 65521 /* largest prime smaller than 65536 */
|
#define BASE 65521U /* largest prime smaller than 65536 */
|
||||||
#define NMAX 5552
|
#define NMAX 5552
|
||||||
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
|
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
|
||||||
|
|
||||||
|
|
@ -62,14 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
uLong ZEXPORT adler32_z(adler, buf, len)
|
||||||
uLong ZEXPORT adler32(uLong adler, const Bytef* buf, uInt len)
|
uLong adler;
|
||||||
#else
|
const Bytef *buf;
|
||||||
uLong ZEXPORT adler32(adler, buf, len)
|
z_size_t len;
|
||||||
uLong adler;
|
|
||||||
const Bytef* buf;
|
|
||||||
uInt len;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned long sum2;
|
unsigned long sum2;
|
||||||
unsigned n;
|
unsigned n;
|
||||||
|
|
@ -79,18 +73,13 @@ uInt len;
|
||||||
adler &= 0xffff;
|
adler &= 0xffff;
|
||||||
|
|
||||||
/* in case user likes doing a byte at a time, keep it fast */
|
/* in case user likes doing a byte at a time, keep it fast */
|
||||||
if (len == 1)
|
if (len == 1) {
|
||||||
{
|
|
||||||
adler += buf[0];
|
adler += buf[0];
|
||||||
|
|
||||||
if (adler >= BASE)
|
if (adler >= BASE)
|
||||||
adler -= BASE;
|
adler -= BASE;
|
||||||
|
|
||||||
sum2 += adler;
|
sum2 += adler;
|
||||||
|
|
||||||
if (sum2 >= BASE)
|
if (sum2 >= BASE)
|
||||||
sum2 -= BASE;
|
sum2 -= BASE;
|
||||||
|
|
||||||
return adler | (sum2 << 16);
|
return adler | (sum2 << 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -99,54 +88,40 @@ uInt len;
|
||||||
return 1L;
|
return 1L;
|
||||||
|
|
||||||
/* in case short lengths are provided, keep it somewhat fast */
|
/* in case short lengths are provided, keep it somewhat fast */
|
||||||
if (len < 16)
|
if (len < 16) {
|
||||||
{
|
while (len--) {
|
||||||
while (len--)
|
|
||||||
{
|
|
||||||
adler += *buf++;
|
adler += *buf++;
|
||||||
sum2 += adler;
|
sum2 += adler;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (adler >= BASE)
|
if (adler >= BASE)
|
||||||
adler -= BASE;
|
adler -= BASE;
|
||||||
|
|
||||||
MOD28(sum2); /* only added so many BASE's */
|
MOD28(sum2); /* only added so many BASE's */
|
||||||
return adler | (sum2 << 16);
|
return adler | (sum2 << 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* do length NMAX blocks -- requires just one modulo operation */
|
/* do length NMAX blocks -- requires just one modulo operation */
|
||||||
while (len >= NMAX)
|
while (len >= NMAX) {
|
||||||
{
|
|
||||||
len -= NMAX;
|
len -= NMAX;
|
||||||
n = NMAX / 16; /* NMAX is divisible by 16 */
|
n = NMAX / 16; /* NMAX is divisible by 16 */
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
DO16(buf); /* 16 sums unrolled */
|
DO16(buf); /* 16 sums unrolled */
|
||||||
buf += 16;
|
buf += 16;
|
||||||
}
|
} while (--n);
|
||||||
while (--n);
|
|
||||||
|
|
||||||
MOD(adler);
|
MOD(adler);
|
||||||
MOD(sum2);
|
MOD(sum2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* do remaining bytes (less than NMAX, still just one modulo) */
|
/* do remaining bytes (less than NMAX, still just one modulo) */
|
||||||
if (len) /* avoid modulos if none remaining */
|
if (len) { /* avoid modulos if none remaining */
|
||||||
{
|
while (len >= 16) {
|
||||||
while (len >= 16)
|
|
||||||
{
|
|
||||||
len -= 16;
|
len -= 16;
|
||||||
DO16(buf);
|
DO16(buf);
|
||||||
buf += 16;
|
buf += 16;
|
||||||
}
|
}
|
||||||
|
while (len--) {
|
||||||
while (len--)
|
|
||||||
{
|
|
||||||
adler += *buf++;
|
adler += *buf++;
|
||||||
sum2 += adler;
|
sum2 += adler;
|
||||||
}
|
}
|
||||||
|
|
||||||
MOD(adler);
|
MOD(adler);
|
||||||
MOD(sum2);
|
MOD(sum2);
|
||||||
}
|
}
|
||||||
|
|
@ -156,14 +131,19 @@ uInt len;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
uLong ZEXPORT adler32(adler, buf, len)
|
||||||
local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2)
|
uLong adler;
|
||||||
#else
|
const Bytef *buf;
|
||||||
|
uInt len;
|
||||||
|
{
|
||||||
|
return adler32_z(adler, buf, len);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ========================================================================= */
|
||||||
local uLong adler32_combine_(adler1, adler2, len2)
|
local uLong adler32_combine_(adler1, adler2, len2)
|
||||||
uLong adler1;
|
uLong adler1;
|
||||||
uLong adler2;
|
uLong adler2;
|
||||||
z_off64_t len2;
|
z_off64_t len2;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned long sum1;
|
unsigned long sum1;
|
||||||
unsigned long sum2;
|
unsigned long sum2;
|
||||||
|
|
@ -181,39 +161,26 @@ z_off64_t len2;
|
||||||
MOD(sum2);
|
MOD(sum2);
|
||||||
sum1 += (adler2 & 0xffff) + BASE - 1;
|
sum1 += (adler2 & 0xffff) + BASE - 1;
|
||||||
sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
|
sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
|
||||||
|
|
||||||
if (sum1 >= BASE) sum1 -= BASE;
|
if (sum1 >= BASE) sum1 -= BASE;
|
||||||
|
|
||||||
if (sum1 >= BASE) sum1 -= BASE;
|
if (sum1 >= BASE) sum1 -= BASE;
|
||||||
|
if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
|
||||||
if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
|
|
||||||
|
|
||||||
if (sum2 >= BASE) sum2 -= BASE;
|
if (sum2 >= BASE) sum2 -= BASE;
|
||||||
|
|
||||||
return sum1 | (sum2 << 16);
|
return sum1 | (sum2 << 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
|
||||||
uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2)
|
|
||||||
#else
|
|
||||||
uLong ZEXPORT adler32_combine(adler1, adler2, len2)
|
uLong ZEXPORT adler32_combine(adler1, adler2, len2)
|
||||||
uLong adler1;
|
uLong adler1;
|
||||||
uLong adler2;
|
uLong adler2;
|
||||||
z_off_t len2;
|
z_off_t len2;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return adler32_combine_(adler1, adler2, len2);
|
return adler32_combine_(adler1, adler2, len2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2)
|
|
||||||
#else
|
|
||||||
uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
|
uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
|
||||||
uLong adler1;
|
uLong adler1;
|
||||||
uLong adler2;
|
uLong adler2;
|
||||||
z_off64_t len2;
|
z_off64_t len2;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return adler32_combine_(adler1, adler2, len2);
|
return adler32_combine_(adler1, adler2, len2);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* compress.c -- compress a memory buffer
|
/* compress.c -- compress a memory buffer
|
||||||
* Copyright (C) 1995-2005 Jean-loup Gailly.
|
* Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -19,66 +19,57 @@
|
||||||
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
|
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
|
||||||
Z_STREAM_ERROR if the level parameter is invalid.
|
Z_STREAM_ERROR if the level parameter is invalid.
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
|
||||||
int ZEXPORT compress2(Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen, int level)
|
Bytef *dest;
|
||||||
#else
|
uLongf *destLen;
|
||||||
int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
|
const Bytef *source;
|
||||||
Bytef* dest;
|
uLong sourceLen;
|
||||||
uLongf* destLen;
|
int level;
|
||||||
const Bytef* source;
|
|
||||||
uLong sourceLen;
|
|
||||||
int level;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_stream stream;
|
z_stream stream;
|
||||||
int err;
|
int err;
|
||||||
|
const uInt max = (uInt)-1;
|
||||||
|
uLong left;
|
||||||
|
|
||||||
stream.next_in = (Bytef*)source;
|
left = *destLen;
|
||||||
stream.avail_in = (uInt)sourceLen;
|
*destLen = 0;
|
||||||
#ifdef MAXSEG_64K
|
|
||||||
|
|
||||||
/* Check for source > 64K on 16-bit machine: */
|
|
||||||
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
stream.next_out = dest;
|
|
||||||
stream.avail_out = (uInt) * destLen;
|
|
||||||
|
|
||||||
if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
|
|
||||||
|
|
||||||
stream.zalloc = (alloc_func)0;
|
stream.zalloc = (alloc_func)0;
|
||||||
stream.zfree = (free_func)0;
|
stream.zfree = (free_func)0;
|
||||||
stream.opaque = (voidpf)0;
|
stream.opaque = (voidpf)0;
|
||||||
|
|
||||||
err = deflateInit(&stream, level);
|
err = deflateInit(&stream, level);
|
||||||
|
|
||||||
if (err != Z_OK) return err;
|
if (err != Z_OK) return err;
|
||||||
|
|
||||||
err = deflate(&stream, Z_FINISH);
|
stream.next_out = dest;
|
||||||
|
stream.avail_out = 0;
|
||||||
|
stream.next_in = (z_const Bytef *)source;
|
||||||
|
stream.avail_in = 0;
|
||||||
|
|
||||||
if (err != Z_STREAM_END)
|
do {
|
||||||
{
|
if (stream.avail_out == 0) {
|
||||||
deflateEnd(&stream);
|
stream.avail_out = left > (uLong)max ? max : (uInt)left;
|
||||||
return err == Z_OK ? Z_BUF_ERROR : err;
|
left -= stream.avail_out;
|
||||||
}
|
}
|
||||||
|
if (stream.avail_in == 0) {
|
||||||
|
stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
|
||||||
|
sourceLen -= stream.avail_in;
|
||||||
|
}
|
||||||
|
err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
|
||||||
|
} while (err == Z_OK);
|
||||||
|
|
||||||
*destLen = stream.total_out;
|
*destLen = stream.total_out;
|
||||||
|
deflateEnd(&stream);
|
||||||
err = deflateEnd(&stream);
|
return err == Z_STREAM_END ? Z_OK : err;
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
int ZEXPORT compress (dest, destLen, source, sourceLen)
|
||||||
int ZEXPORT compress(Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
|
Bytef *dest;
|
||||||
#else
|
uLongf *destLen;
|
||||||
int ZEXPORT compress(dest, destLen, source, sourceLen)
|
const Bytef *source;
|
||||||
Bytef* dest;
|
uLong sourceLen;
|
||||||
uLongf* destLen;
|
|
||||||
const Bytef* source;
|
|
||||||
uLong sourceLen;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
|
return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
|
||||||
}
|
}
|
||||||
|
|
@ -87,12 +78,8 @@ uLong sourceLen;
|
||||||
If the default memLevel or windowBits for deflateInit() is changed, then
|
If the default memLevel or windowBits for deflateInit() is changed, then
|
||||||
this function needs to be updated.
|
this function needs to be updated.
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
uLong ZEXPORT compressBound (sourceLen)
|
||||||
uLong ZEXPORT compressBound(uLong sourceLen)
|
uLong sourceLen;
|
||||||
#else
|
|
||||||
uLong ZEXPORT compressBound(sourceLen)
|
|
||||||
uLong sourceLen;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
|
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
|
||||||
(sourceLen >> 25) + 13;
|
(sourceLen >> 25) + 13;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* crc32.c -- compute the CRC-32 of a data stream
|
/* crc32.c -- compute the CRC-32 of a data stream
|
||||||
* Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
|
* Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*
|
*
|
||||||
* Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
|
* Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
|
||||||
|
|
@ -30,26 +30,24 @@
|
||||||
|
|
||||||
#include "zutil.h" /* for STDC and FAR definitions */
|
#include "zutil.h" /* for STDC and FAR definitions */
|
||||||
|
|
||||||
#define local static
|
|
||||||
|
|
||||||
/* Definitions for doing the crc four data bytes at a time. */
|
/* Definitions for doing the crc four data bytes at a time. */
|
||||||
#if !defined(NOBYFOUR) && defined(Z_U4)
|
#if !defined(NOBYFOUR) && defined(Z_U4)
|
||||||
# define BYFOUR
|
# define BYFOUR
|
||||||
#endif
|
#endif
|
||||||
#ifdef BYFOUR
|
#ifdef BYFOUR
|
||||||
local unsigned long crc32_little OF((unsigned long,
|
local unsigned long crc32_little OF((unsigned long,
|
||||||
const unsigned char FAR*, unsigned));
|
const unsigned char FAR *, z_size_t));
|
||||||
local unsigned long crc32_big OF((unsigned long,
|
local unsigned long crc32_big OF((unsigned long,
|
||||||
const unsigned char FAR*, unsigned));
|
const unsigned char FAR *, z_size_t));
|
||||||
# define TBLS 8
|
# define TBLS 8
|
||||||
#else
|
#else
|
||||||
# define TBLS 1
|
# define TBLS 1
|
||||||
#endif /* BYFOUR */
|
#endif /* BYFOUR */
|
||||||
|
|
||||||
/* Local functions for crc concatenation */
|
/* Local functions for crc concatenation */
|
||||||
local unsigned long gf2_matrix_times OF((unsigned long* mat,
|
local unsigned long gf2_matrix_times OF((unsigned long *mat,
|
||||||
unsigned long vec));
|
unsigned long vec));
|
||||||
local void gf2_matrix_square OF((unsigned long* square, unsigned long* mat));
|
local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
|
||||||
local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
|
local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -59,7 +57,7 @@ local volatile int crc_table_empty = 1;
|
||||||
local z_crc_t FAR crc_table[TBLS][256];
|
local z_crc_t FAR crc_table[TBLS][256];
|
||||||
local void make_crc_table OF((void));
|
local void make_crc_table OF((void));
|
||||||
#ifdef MAKECRCH
|
#ifdef MAKECRCH
|
||||||
local void write_table OF((FILE*, const z_crc_t FAR*));
|
local void write_table OF((FILE *, const z_crc_t FAR *));
|
||||||
#endif /* MAKECRCH */
|
#endif /* MAKECRCH */
|
||||||
/*
|
/*
|
||||||
Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
|
Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
|
||||||
|
|
@ -94,55 +92,44 @@ local void make_crc_table()
|
||||||
z_crc_t poly; /* polynomial exclusive-or pattern */
|
z_crc_t poly; /* polynomial exclusive-or pattern */
|
||||||
/* terms of polynomial defining this crc (except x^32): */
|
/* terms of polynomial defining this crc (except x^32): */
|
||||||
static volatile int first = 1; /* flag to limit concurrent making */
|
static volatile int first = 1; /* flag to limit concurrent making */
|
||||||
static const unsigned char p[] = {0, 1, 2, 4, 5, 7, 8, 10, 11, 12, 16, 22, 23, 26};
|
static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
|
||||||
|
|
||||||
/* See if another task is already doing this (not thread-safe, but better
|
/* See if another task is already doing this (not thread-safe, but better
|
||||||
than nothing -- significantly reduces duration of vulnerability in
|
than nothing -- significantly reduces duration of vulnerability in
|
||||||
case the advice about DYNAMIC_CRC_TABLE is ignored) */
|
case the advice about DYNAMIC_CRC_TABLE is ignored) */
|
||||||
if (first)
|
if (first) {
|
||||||
{
|
|
||||||
first = 0;
|
first = 0;
|
||||||
|
|
||||||
/* make exclusive-or pattern from polynomial (0xedb88320UL) */
|
/* make exclusive-or pattern from polynomial (0xedb88320UL) */
|
||||||
poly = 0;
|
poly = 0;
|
||||||
|
for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
|
||||||
for (n = 0; n < (int)(sizeof(p) / sizeof(unsigned char)); n++)
|
|
||||||
poly |= (z_crc_t)1 << (31 - p[n]);
|
poly |= (z_crc_t)1 << (31 - p[n]);
|
||||||
|
|
||||||
/* generate a crc for every 8-bit value */
|
/* generate a crc for every 8-bit value */
|
||||||
for (n = 0; n < 256; n++)
|
for (n = 0; n < 256; n++) {
|
||||||
{
|
|
||||||
c = (z_crc_t)n;
|
c = (z_crc_t)n;
|
||||||
|
|
||||||
for (k = 0; k < 8; k++)
|
for (k = 0; k < 8; k++)
|
||||||
c = c & 1 ? poly ^ (c >> 1) : c >> 1;
|
c = c & 1 ? poly ^ (c >> 1) : c >> 1;
|
||||||
|
|
||||||
crc_table[0][n] = c;
|
crc_table[0][n] = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BYFOUR
|
#ifdef BYFOUR
|
||||||
|
|
||||||
/* generate crc for each value followed by one, two, and three zeros,
|
/* generate crc for each value followed by one, two, and three zeros,
|
||||||
and then the byte reversal of those as well as the first table */
|
and then the byte reversal of those as well as the first table */
|
||||||
for (n = 0; n < 256; n++)
|
for (n = 0; n < 256; n++) {
|
||||||
{
|
|
||||||
c = crc_table[0][n];
|
c = crc_table[0][n];
|
||||||
crc_table[4][n] = ZSWAP32(c);
|
crc_table[4][n] = ZSWAP32(c);
|
||||||
|
for (k = 1; k < 4; k++) {
|
||||||
for (k = 1; k < 4; k++)
|
|
||||||
{
|
|
||||||
c = crc_table[0][c & 0xff] ^ (c >> 8);
|
c = crc_table[0][c & 0xff] ^ (c >> 8);
|
||||||
crc_table[k][n] = c;
|
crc_table[k][n] = c;
|
||||||
crc_table[k + 4][n] = ZSWAP32(c);
|
crc_table[k + 4][n] = ZSWAP32(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* BYFOUR */
|
#endif /* BYFOUR */
|
||||||
|
|
||||||
crc_table_empty = 0;
|
crc_table_empty = 0;
|
||||||
}
|
}
|
||||||
else /* not first */
|
else { /* not first */
|
||||||
{
|
|
||||||
/* wait for the other guy to finish (not efficient, but rare) */
|
/* wait for the other guy to finish (not efficient, but rare) */
|
||||||
while (crc_table_empty)
|
while (crc_table_empty)
|
||||||
;
|
;
|
||||||
|
|
@ -151,12 +138,10 @@ local void make_crc_table()
|
||||||
#ifdef MAKECRCH
|
#ifdef MAKECRCH
|
||||||
/* write out CRC tables to crc32.h */
|
/* write out CRC tables to crc32.h */
|
||||||
{
|
{
|
||||||
FILE* out;
|
FILE *out;
|
||||||
|
|
||||||
out = fopen("crc32.h", "w");
|
out = fopen("crc32.h", "w");
|
||||||
|
|
||||||
if (out == NULL) return;
|
if (out == NULL) return;
|
||||||
|
|
||||||
fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
|
fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
|
||||||
fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
|
fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
|
||||||
fprintf(out, "local const z_crc_t FAR ");
|
fprintf(out, "local const z_crc_t FAR ");
|
||||||
|
|
@ -164,13 +149,10 @@ local void make_crc_table()
|
||||||
write_table(out, crc_table[0]);
|
write_table(out, crc_table[0]);
|
||||||
# ifdef BYFOUR
|
# ifdef BYFOUR
|
||||||
fprintf(out, "#ifdef BYFOUR\n");
|
fprintf(out, "#ifdef BYFOUR\n");
|
||||||
|
for (k = 1; k < 8; k++) {
|
||||||
for (k = 1; k < 8; k++)
|
|
||||||
{
|
|
||||||
fprintf(out, " },\n {\n");
|
fprintf(out, " },\n {\n");
|
||||||
write_table(out, crc_table[k]);
|
write_table(out, crc_table[k]);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(out, "#endif\n");
|
fprintf(out, "#endif\n");
|
||||||
# endif /* BYFOUR */
|
# endif /* BYFOUR */
|
||||||
fprintf(out, " }\n};\n");
|
fprintf(out, " }\n};\n");
|
||||||
|
|
@ -181,8 +163,8 @@ local void make_crc_table()
|
||||||
|
|
||||||
#ifdef MAKECRCH
|
#ifdef MAKECRCH
|
||||||
local void write_table(out, table)
|
local void write_table(out, table)
|
||||||
FILE* out;
|
FILE *out;
|
||||||
const z_crc_t FAR* table;
|
const z_crc_t FAR *table;
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
|
|
@ -203,15 +185,13 @@ const z_crc_t FAR* table;
|
||||||
/* =========================================================================
|
/* =========================================================================
|
||||||
* This function can be used by asm versions of crc32()
|
* This function can be used by asm versions of crc32()
|
||||||
*/
|
*/
|
||||||
const z_crc_t FAR* ZEXPORT get_crc_table()
|
const z_crc_t FAR * ZEXPORT get_crc_table()
|
||||||
{
|
{
|
||||||
#ifdef DYNAMIC_CRC_TABLE
|
#ifdef DYNAMIC_CRC_TABLE
|
||||||
|
|
||||||
if (crc_table_empty)
|
if (crc_table_empty)
|
||||||
make_crc_table();
|
make_crc_table();
|
||||||
|
|
||||||
#endif /* DYNAMIC_CRC_TABLE */
|
#endif /* DYNAMIC_CRC_TABLE */
|
||||||
return (const z_crc_t FAR*)crc_table;
|
return (const z_crc_t FAR *)crc_table;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
|
|
@ -219,65 +199,63 @@ const z_crc_t FAR* ZEXPORT get_crc_table()
|
||||||
#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
|
#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
unsigned long ZEXPORT crc32_z(crc, buf, len)
|
||||||
unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR* buf, uInt len)
|
unsigned long crc;
|
||||||
#else
|
const unsigned char FAR *buf;
|
||||||
unsigned long ZEXPORT crc32(crc, buf, len)
|
z_size_t len;
|
||||||
unsigned long crc;
|
|
||||||
const unsigned char FAR* buf;
|
|
||||||
uInt len;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
if (buf == Z_NULL) return 0UL;
|
if (buf == Z_NULL) return 0UL;
|
||||||
|
|
||||||
#ifdef DYNAMIC_CRC_TABLE
|
#ifdef DYNAMIC_CRC_TABLE
|
||||||
|
|
||||||
if (crc_table_empty)
|
if (crc_table_empty)
|
||||||
make_crc_table();
|
make_crc_table();
|
||||||
|
|
||||||
#endif /* DYNAMIC_CRC_TABLE */
|
#endif /* DYNAMIC_CRC_TABLE */
|
||||||
|
|
||||||
#ifdef BYFOUR
|
#ifdef BYFOUR
|
||||||
#ifdef WIN32
|
if (sizeof(void *) == sizeof(ptrdiff_t)) {
|
||||||
int size_match = (sizeof(void*) == sizeof(ptrdiff_t));
|
|
||||||
|
|
||||||
if (size_match)
|
|
||||||
{
|
|
||||||
#else
|
|
||||||
|
|
||||||
if (sizeof(void*) == sizeof(ptrdiff_t))
|
|
||||||
{
|
|
||||||
#endif /* WIN32 */
|
|
||||||
z_crc_t endian;
|
z_crc_t endian;
|
||||||
|
|
||||||
endian = 1;
|
endian = 1;
|
||||||
|
if (*((unsigned char *)(&endian)))
|
||||||
if (*((unsigned char*)(&endian)))
|
|
||||||
return crc32_little(crc, buf, len);
|
return crc32_little(crc, buf, len);
|
||||||
else
|
else
|
||||||
return crc32_big(crc, buf, len);
|
return crc32_big(crc, buf, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* BYFOUR */
|
#endif /* BYFOUR */
|
||||||
crc = crc ^ 0xffffffffUL;
|
crc = crc ^ 0xffffffffUL;
|
||||||
|
while (len >= 8) {
|
||||||
while (len >= 8)
|
|
||||||
{
|
|
||||||
DO8;
|
DO8;
|
||||||
len -= 8;
|
len -= 8;
|
||||||
}
|
}
|
||||||
|
if (len) do {
|
||||||
if (len) do
|
DO1;
|
||||||
{
|
} while (--len);
|
||||||
DO1;
|
|
||||||
}
|
|
||||||
while (--len);
|
|
||||||
|
|
||||||
return crc ^ 0xffffffffUL;
|
return crc ^ 0xffffffffUL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ========================================================================= */
|
||||||
|
unsigned long ZEXPORT crc32(crc, buf, len)
|
||||||
|
unsigned long crc;
|
||||||
|
const unsigned char FAR *buf;
|
||||||
|
uInt len;
|
||||||
|
{
|
||||||
|
return crc32_z(crc, buf, len);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef BYFOUR
|
#ifdef BYFOUR
|
||||||
|
|
||||||
|
/*
|
||||||
|
This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
|
||||||
|
integer pointer type. This violates the strict aliasing rule, where a
|
||||||
|
compiler can assume, for optimization purposes, that two pointers to
|
||||||
|
fundamentally different types won't ever point to the same memory. This can
|
||||||
|
manifest as a problem only if one of the pointers is written to. This code
|
||||||
|
only reads from those pointers. So long as this code remains isolated in
|
||||||
|
this compilation unit, there won't be a problem. For this reason, this code
|
||||||
|
should not be copied and pasted into a compilation unit in which other code
|
||||||
|
writes to the buffer that is passed to these routines.
|
||||||
|
*/
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#define DOLIT4 c ^= *buf4++; \
|
#define DOLIT4 c ^= *buf4++; \
|
||||||
c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
|
c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
|
||||||
|
|
@ -285,105 +263,75 @@ uInt len;
|
||||||
#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
|
#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
|
||||||
local unsigned long crc32_little(unsigned long crc, const unsigned char FAR* buf, unsigned len)
|
|
||||||
#else
|
|
||||||
local unsigned long crc32_little(crc, buf, len)
|
local unsigned long crc32_little(crc, buf, len)
|
||||||
unsigned long crc;
|
unsigned long crc;
|
||||||
const unsigned char FAR* buf;
|
const unsigned char FAR *buf;
|
||||||
unsigned len;
|
z_size_t len;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
register z_crc_t c;
|
register z_crc_t c;
|
||||||
register const z_crc_t FAR* buf4;
|
register const z_crc_t FAR *buf4;
|
||||||
|
|
||||||
c = (z_crc_t)crc;
|
c = (z_crc_t)crc;
|
||||||
c = ~c;
|
c = ~c;
|
||||||
|
while (len && ((ptrdiff_t)buf & 3)) {
|
||||||
while (len && ((ptrdiff_t)buf & 3))
|
|
||||||
{
|
|
||||||
c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
|
c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
|
||||||
len--;
|
len--;
|
||||||
}
|
}
|
||||||
|
|
||||||
buf4 = (const z_crc_t FAR*)(const void FAR*)buf;
|
buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
|
||||||
|
while (len >= 32) {
|
||||||
while (len >= 32)
|
|
||||||
{
|
|
||||||
DOLIT32;
|
DOLIT32;
|
||||||
len -= 32;
|
len -= 32;
|
||||||
}
|
}
|
||||||
|
while (len >= 4) {
|
||||||
while (len >= 4)
|
|
||||||
{
|
|
||||||
DOLIT4;
|
DOLIT4;
|
||||||
len -= 4;
|
len -= 4;
|
||||||
}
|
}
|
||||||
|
buf = (const unsigned char FAR *)buf4;
|
||||||
|
|
||||||
buf = (const unsigned char FAR*)buf4;
|
if (len) do {
|
||||||
|
c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
|
||||||
if (len) do
|
} while (--len);
|
||||||
{
|
|
||||||
c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
|
|
||||||
}
|
|
||||||
while (--len);
|
|
||||||
|
|
||||||
c = ~c;
|
c = ~c;
|
||||||
return (unsigned long)c;
|
return (unsigned long)c;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#define DOBIG4 c ^= *++buf4; \
|
#define DOBIG4 c ^= *buf4++; \
|
||||||
c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
|
c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
|
||||||
crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
|
crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
|
||||||
#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
|
#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
|
||||||
local unsigned long crc32_big(unsigned long crc, const unsigned char FAR* buf, unsigned len)
|
|
||||||
#else
|
|
||||||
local unsigned long crc32_big(crc, buf, len)
|
local unsigned long crc32_big(crc, buf, len)
|
||||||
unsigned long crc;
|
unsigned long crc;
|
||||||
const unsigned char FAR* buf;
|
const unsigned char FAR *buf;
|
||||||
unsigned len;
|
z_size_t len;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
register z_crc_t c;
|
register z_crc_t c;
|
||||||
register const z_crc_t FAR* buf4;
|
register const z_crc_t FAR *buf4;
|
||||||
|
|
||||||
c = ZSWAP32((z_crc_t)crc);
|
c = ZSWAP32((z_crc_t)crc);
|
||||||
c = ~c;
|
c = ~c;
|
||||||
|
while (len && ((ptrdiff_t)buf & 3)) {
|
||||||
while (len && ((ptrdiff_t)buf & 3))
|
|
||||||
{
|
|
||||||
c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
|
c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
|
||||||
len--;
|
len--;
|
||||||
}
|
}
|
||||||
|
|
||||||
buf4 = (const z_crc_t FAR*)(const void FAR*)buf;
|
buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
|
||||||
buf4--;
|
while (len >= 32) {
|
||||||
|
|
||||||
while (len >= 32)
|
|
||||||
{
|
|
||||||
DOBIG32;
|
DOBIG32;
|
||||||
len -= 32;
|
len -= 32;
|
||||||
}
|
}
|
||||||
|
while (len >= 4) {
|
||||||
while (len >= 4)
|
|
||||||
{
|
|
||||||
DOBIG4;
|
DOBIG4;
|
||||||
len -= 4;
|
len -= 4;
|
||||||
}
|
}
|
||||||
|
buf = (const unsigned char FAR *)buf4;
|
||||||
|
|
||||||
buf4++;
|
if (len) do {
|
||||||
buf = (const unsigned char FAR*)buf4;
|
c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
|
||||||
|
} while (--len);
|
||||||
if (len) do
|
|
||||||
{
|
|
||||||
c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
|
|
||||||
}
|
|
||||||
while (--len);
|
|
||||||
|
|
||||||
c = ~c;
|
c = ~c;
|
||||||
return (unsigned long)(ZSWAP32(c));
|
return (unsigned long)(ZSWAP32(c));
|
||||||
}
|
}
|
||||||
|
|
@ -393,38 +341,26 @@ unsigned len;
|
||||||
#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
|
#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
|
||||||
local unsigned long gf2_matrix_times(unsigned long* mat, unsigned long vec)
|
|
||||||
#else
|
|
||||||
local unsigned long gf2_matrix_times(mat, vec)
|
local unsigned long gf2_matrix_times(mat, vec)
|
||||||
unsigned long* mat;
|
unsigned long *mat;
|
||||||
unsigned long vec;
|
unsigned long vec;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned long sum;
|
unsigned long sum;
|
||||||
|
|
||||||
sum = 0;
|
sum = 0;
|
||||||
|
while (vec) {
|
||||||
while (vec)
|
|
||||||
{
|
|
||||||
if (vec & 1)
|
if (vec & 1)
|
||||||
sum ^= *mat;
|
sum ^= *mat;
|
||||||
|
|
||||||
vec >>= 1;
|
vec >>= 1;
|
||||||
mat++;
|
mat++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
|
||||||
local void gf2_matrix_square(unsigned long* square, unsigned long* mat)
|
|
||||||
#else
|
|
||||||
local void gf2_matrix_square(square, mat)
|
local void gf2_matrix_square(square, mat)
|
||||||
unsigned long* square;
|
unsigned long *square;
|
||||||
unsigned long* mat;
|
unsigned long *mat;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
|
|
@ -433,14 +369,10 @@ unsigned long* mat;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
|
||||||
local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2)
|
|
||||||
#else
|
|
||||||
local uLong crc32_combine_(crc1, crc2, len2)
|
local uLong crc32_combine_(crc1, crc2, len2)
|
||||||
uLong crc1;
|
uLong crc1;
|
||||||
uLong crc2;
|
uLong crc2;
|
||||||
z_off64_t len2;
|
z_off64_t len2;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
unsigned long row;
|
unsigned long row;
|
||||||
|
|
@ -454,9 +386,7 @@ z_off64_t len2;
|
||||||
/* put operator for one zero bit in odd */
|
/* put operator for one zero bit in odd */
|
||||||
odd[0] = 0xedb88320UL; /* CRC-32 polynomial */
|
odd[0] = 0xedb88320UL; /* CRC-32 polynomial */
|
||||||
row = 1;
|
row = 1;
|
||||||
|
for (n = 1; n < GF2_DIM; n++) {
|
||||||
for (n = 1; n < GF2_DIM; n++)
|
|
||||||
{
|
|
||||||
odd[n] = row;
|
odd[n] = row;
|
||||||
row <<= 1;
|
row <<= 1;
|
||||||
}
|
}
|
||||||
|
|
@ -469,14 +399,11 @@ z_off64_t len2;
|
||||||
|
|
||||||
/* apply len2 zeros to crc1 (first square will put the operator for one
|
/* apply len2 zeros to crc1 (first square will put the operator for one
|
||||||
zero byte, eight zero bits, in even) */
|
zero byte, eight zero bits, in even) */
|
||||||
do
|
do {
|
||||||
{
|
|
||||||
/* apply zeros operator for this bit of len2 */
|
/* apply zeros operator for this bit of len2 */
|
||||||
gf2_matrix_square(even, odd);
|
gf2_matrix_square(even, odd);
|
||||||
|
|
||||||
if (len2 & 1)
|
if (len2 & 1)
|
||||||
crc1 = gf2_matrix_times(even, crc1);
|
crc1 = gf2_matrix_times(even, crc1);
|
||||||
|
|
||||||
len2 >>= 1;
|
len2 >>= 1;
|
||||||
|
|
||||||
/* if no more bits set, then done */
|
/* if no more bits set, then done */
|
||||||
|
|
@ -485,15 +412,12 @@ z_off64_t len2;
|
||||||
|
|
||||||
/* another iteration of the loop with odd and even swapped */
|
/* another iteration of the loop with odd and even swapped */
|
||||||
gf2_matrix_square(odd, even);
|
gf2_matrix_square(odd, even);
|
||||||
|
|
||||||
if (len2 & 1)
|
if (len2 & 1)
|
||||||
crc1 = gf2_matrix_times(odd, crc1);
|
crc1 = gf2_matrix_times(odd, crc1);
|
||||||
|
|
||||||
len2 >>= 1;
|
len2 >>= 1;
|
||||||
|
|
||||||
/* if no more bits set, then done */
|
/* if no more bits set, then done */
|
||||||
}
|
} while (len2 != 0);
|
||||||
while (len2 != 0);
|
|
||||||
|
|
||||||
/* return combined crc */
|
/* return combined crc */
|
||||||
crc1 ^= crc2;
|
crc1 ^= crc2;
|
||||||
|
|
@ -501,26 +425,18 @@ z_off64_t len2;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
#ifdef WIN32
|
|
||||||
uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2)
|
|
||||||
#else
|
|
||||||
uLong ZEXPORT crc32_combine(crc1, crc2, len2)
|
uLong ZEXPORT crc32_combine(crc1, crc2, len2)
|
||||||
uLong crc1;
|
uLong crc1;
|
||||||
uLong crc2;
|
uLong crc2;
|
||||||
z_off_t len2;
|
z_off_t len2;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return crc32_combine_(crc1, crc2, len2);
|
return crc32_combine_(crc1, crc2, len2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2)
|
|
||||||
#else
|
|
||||||
uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
|
uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
|
||||||
uLong crc1;
|
uLong crc1;
|
||||||
uLong crc2;
|
uLong crc2;
|
||||||
z_off64_t len2;
|
z_off64_t len2;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return crc32_combine_(crc1, crc2, len2);
|
return crc32_combine_(crc1, crc2, len2);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,438 +4,438 @@
|
||||||
|
|
||||||
local const z_crc_t FAR crc_table[TBLS][256] =
|
local const z_crc_t FAR crc_table[TBLS][256] =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
|
0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
|
||||||
0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
|
0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
|
||||||
0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
|
0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
|
||||||
0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
|
0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
|
||||||
0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
|
0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
|
||||||
0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
|
0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
|
||||||
0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
|
0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
|
||||||
0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
|
0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
|
||||||
0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
|
0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
|
||||||
0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
|
0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
|
||||||
0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
|
0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
|
||||||
0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
|
0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
|
||||||
0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
|
0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
|
||||||
0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
|
0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
|
||||||
0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
|
0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
|
||||||
0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
|
0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
|
||||||
0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
|
0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
|
||||||
0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
|
0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
|
||||||
0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
|
0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
|
||||||
0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
|
0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
|
||||||
0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
|
0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
|
||||||
0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
|
0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
|
||||||
0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
|
0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
|
||||||
0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
|
0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
|
||||||
0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
|
0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
|
||||||
0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
|
0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
|
||||||
0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
|
0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
|
||||||
0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
|
0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
|
||||||
0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
|
0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
|
||||||
0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
|
0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
|
||||||
0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
|
0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
|
||||||
0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
|
0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
|
||||||
0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
|
0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
|
||||||
0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
|
0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
|
||||||
0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
|
0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
|
||||||
0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
|
0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
|
||||||
0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
|
0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
|
||||||
0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
|
0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
|
||||||
0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
|
0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
|
||||||
0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
|
0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
|
||||||
0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
|
0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
|
||||||
0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
|
0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
|
||||||
0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
|
0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
|
||||||
0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
|
0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
|
||||||
0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
|
0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
|
||||||
0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
|
0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
|
||||||
0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
|
0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
|
||||||
0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
|
0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
|
||||||
0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
|
0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
|
||||||
0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
|
0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
|
||||||
0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
|
0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
|
||||||
0x2d02ef8dUL
|
0x2d02ef8dUL
|
||||||
#ifdef BYFOUR
|
#ifdef BYFOUR
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
|
0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
|
||||||
0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
|
0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
|
||||||
0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
|
0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
|
||||||
0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
|
0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
|
||||||
0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
|
0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
|
||||||
0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
|
0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
|
||||||
0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
|
0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
|
||||||
0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
|
0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
|
||||||
0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
|
0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
|
||||||
0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
|
0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
|
||||||
0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
|
0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
|
||||||
0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
|
0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
|
||||||
0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
|
0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
|
||||||
0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
|
0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
|
||||||
0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
|
0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
|
||||||
0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
|
0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
|
||||||
0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
|
0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
|
||||||
0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
|
0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
|
||||||
0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
|
0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
|
||||||
0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
|
0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
|
||||||
0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
|
0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
|
||||||
0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
|
0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
|
||||||
0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
|
0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
|
||||||
0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
|
0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
|
||||||
0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
|
0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
|
||||||
0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
|
0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
|
||||||
0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
|
0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
|
||||||
0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
|
0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
|
||||||
0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
|
0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
|
||||||
0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
|
0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
|
||||||
0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
|
0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
|
||||||
0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
|
0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
|
||||||
0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
|
0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
|
||||||
0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
|
0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
|
||||||
0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
|
0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
|
||||||
0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
|
0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
|
||||||
0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
|
0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
|
||||||
0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
|
0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
|
||||||
0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
|
0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
|
||||||
0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
|
0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
|
||||||
0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
|
0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
|
||||||
0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
|
0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
|
||||||
0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
|
0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
|
||||||
0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
|
0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
|
||||||
0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
|
0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
|
||||||
0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
|
0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
|
||||||
0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
|
0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
|
||||||
0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
|
0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
|
||||||
0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
|
0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
|
||||||
0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
|
0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
|
||||||
0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
|
0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
|
||||||
0x9324fd72UL
|
0x9324fd72UL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
|
0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
|
||||||
0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
|
0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
|
||||||
0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
|
0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
|
||||||
0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
|
0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
|
||||||
0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
|
0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
|
||||||
0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
|
0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
|
||||||
0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
|
0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
|
||||||
0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
|
0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
|
||||||
0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
|
0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
|
||||||
0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
|
0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
|
||||||
0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
|
0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
|
||||||
0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
|
0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
|
||||||
0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
|
0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
|
||||||
0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
|
0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
|
||||||
0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
|
0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
|
||||||
0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
|
0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
|
||||||
0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
|
0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
|
||||||
0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
|
0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
|
||||||
0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
|
0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
|
||||||
0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
|
0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
|
||||||
0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
|
0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
|
||||||
0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
|
0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
|
||||||
0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
|
0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
|
||||||
0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
|
0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
|
||||||
0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
|
0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
|
||||||
0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
|
0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
|
||||||
0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
|
0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
|
||||||
0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
|
0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
|
||||||
0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
|
0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
|
||||||
0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
|
0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
|
||||||
0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
|
0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
|
||||||
0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
|
0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
|
||||||
0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
|
0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
|
||||||
0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
|
0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
|
||||||
0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
|
0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
|
||||||
0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
|
0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
|
||||||
0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
|
0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
|
||||||
0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
|
0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
|
||||||
0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
|
0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
|
||||||
0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
|
0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
|
||||||
0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
|
0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
|
||||||
0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
|
0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
|
||||||
0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
|
0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
|
||||||
0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
|
0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
|
||||||
0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
|
0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
|
||||||
0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
|
0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
|
||||||
0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
|
0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
|
||||||
0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
|
0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
|
||||||
0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
|
0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
|
||||||
0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
|
0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
|
||||||
0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
|
0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
|
||||||
0xbe9834edUL
|
0xbe9834edUL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
|
0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
|
||||||
0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
|
0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
|
||||||
0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
|
0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
|
||||||
0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
|
0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
|
||||||
0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
|
0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
|
||||||
0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
|
0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
|
||||||
0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
|
0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
|
||||||
0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
|
0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
|
||||||
0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
|
0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
|
||||||
0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
|
0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
|
||||||
0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
|
0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
|
||||||
0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
|
0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
|
||||||
0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
|
0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
|
||||||
0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
|
0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
|
||||||
0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
|
0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
|
||||||
0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
|
0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
|
||||||
0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
|
0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
|
||||||
0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
|
0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
|
||||||
0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
|
0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
|
||||||
0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
|
0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
|
||||||
0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
|
0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
|
||||||
0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
|
0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
|
||||||
0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
|
0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
|
||||||
0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
|
0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
|
||||||
0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
|
0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
|
||||||
0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
|
0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
|
||||||
0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
|
0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
|
||||||
0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
|
0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
|
||||||
0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
|
0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
|
||||||
0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
|
0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
|
||||||
0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
|
0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
|
||||||
0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
|
0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
|
||||||
0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
|
0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
|
||||||
0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
|
0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
|
||||||
0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
|
0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
|
||||||
0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
|
0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
|
||||||
0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
|
0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
|
||||||
0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
|
0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
|
||||||
0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
|
0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
|
||||||
0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
|
0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
|
||||||
0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
|
0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
|
||||||
0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
|
0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
|
||||||
0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
|
0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
|
||||||
0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
|
0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
|
||||||
0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
|
0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
|
||||||
0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
|
0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
|
||||||
0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
|
0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
|
||||||
0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
|
0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
|
||||||
0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
|
0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
|
||||||
0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
|
0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
|
||||||
0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
|
0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
|
||||||
0xde0506f1UL
|
0xde0506f1UL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
|
0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
|
||||||
0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
|
0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
|
||||||
0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
|
0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
|
||||||
0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
|
0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
|
||||||
0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
|
0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
|
||||||
0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
|
0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
|
||||||
0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
|
0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
|
||||||
0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
|
0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
|
||||||
0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
|
0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
|
||||||
0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
|
0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
|
||||||
0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
|
0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
|
||||||
0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
|
0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
|
||||||
0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
|
0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
|
||||||
0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
|
0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
|
||||||
0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
|
0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
|
||||||
0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
|
0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
|
||||||
0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
|
0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
|
||||||
0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
|
0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
|
||||||
0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
|
0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
|
||||||
0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
|
0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
|
||||||
0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
|
0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
|
||||||
0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
|
0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
|
||||||
0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
|
0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
|
||||||
0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
|
0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
|
||||||
0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
|
0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
|
||||||
0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
|
0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
|
||||||
0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
|
0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
|
||||||
0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
|
0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
|
||||||
0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
|
0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
|
||||||
0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
|
0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
|
||||||
0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
|
0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
|
||||||
0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
|
0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
|
||||||
0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
|
0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
|
||||||
0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
|
0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
|
||||||
0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
|
0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
|
||||||
0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
|
0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
|
||||||
0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
|
0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
|
||||||
0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
|
0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
|
||||||
0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
|
0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
|
||||||
0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
|
0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
|
||||||
0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
|
0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
|
||||||
0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
|
0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
|
||||||
0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
|
0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
|
||||||
0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
|
0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
|
||||||
0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
|
0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
|
||||||
0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
|
0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
|
||||||
0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
|
0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
|
||||||
0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
|
0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
|
||||||
0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
|
0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
|
||||||
0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
|
0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
|
||||||
0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
|
0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
|
||||||
0x8def022dUL
|
0x8def022dUL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
|
0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
|
||||||
0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
|
0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
|
||||||
0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
|
0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
|
||||||
0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
|
0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
|
||||||
0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
|
0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
|
||||||
0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
|
0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
|
||||||
0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
|
0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
|
||||||
0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
|
0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
|
||||||
0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
|
0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
|
||||||
0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
|
0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
|
||||||
0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
|
0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
|
||||||
0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
|
0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
|
||||||
0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
|
0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
|
||||||
0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
|
0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
|
||||||
0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
|
0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
|
||||||
0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
|
0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
|
||||||
0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
|
0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
|
||||||
0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
|
0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
|
||||||
0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
|
0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
|
||||||
0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
|
0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
|
||||||
0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
|
0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
|
||||||
0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
|
0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
|
||||||
0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
|
0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
|
||||||
0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
|
0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
|
||||||
0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
|
0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
|
||||||
0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
|
0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
|
||||||
0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
|
0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
|
||||||
0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
|
0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
|
||||||
0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
|
0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
|
||||||
0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
|
0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
|
||||||
0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
|
0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
|
||||||
0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
|
0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
|
||||||
0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
|
0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
|
||||||
0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
|
0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
|
||||||
0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
|
0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
|
||||||
0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
|
0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
|
||||||
0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
|
0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
|
||||||
0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
|
0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
|
||||||
0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
|
0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
|
||||||
0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
|
0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
|
||||||
0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
|
0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
|
||||||
0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
|
0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
|
||||||
0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
|
0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
|
||||||
0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
|
0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
|
||||||
0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
|
0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
|
||||||
0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
|
0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
|
||||||
0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
|
0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
|
||||||
0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
|
0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
|
||||||
0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
|
0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
|
||||||
0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
|
0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
|
||||||
0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
|
0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
|
||||||
0x72fd2493UL
|
0x72fd2493UL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
|
0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
|
||||||
0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
|
0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
|
||||||
0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
|
0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
|
||||||
0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
|
0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
|
||||||
0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
|
0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
|
||||||
0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
|
0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
|
||||||
0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
|
0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
|
||||||
0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
|
0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
|
||||||
0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
|
0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
|
||||||
0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
|
0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
|
||||||
0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
|
0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
|
||||||
0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
|
0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
|
||||||
0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
|
0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
|
||||||
0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
|
0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
|
||||||
0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
|
0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
|
||||||
0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
|
0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
|
||||||
0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
|
0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
|
||||||
0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
|
0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
|
||||||
0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
|
0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
|
||||||
0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
|
0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
|
||||||
0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
|
0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
|
||||||
0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
|
0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
|
||||||
0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
|
0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
|
||||||
0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
|
0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
|
||||||
0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
|
0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
|
||||||
0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
|
0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
|
||||||
0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
|
0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
|
||||||
0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
|
0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
|
||||||
0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
|
0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
|
||||||
0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
|
0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
|
||||||
0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
|
0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
|
||||||
0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
|
0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
|
||||||
0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
|
0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
|
||||||
0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
|
0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
|
||||||
0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
|
0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
|
||||||
0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
|
0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
|
||||||
0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
|
0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
|
||||||
0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
|
0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
|
||||||
0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
|
0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
|
||||||
0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
|
0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
|
||||||
0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
|
0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
|
||||||
0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
|
0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
|
||||||
0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
|
0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
|
||||||
0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
|
0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
|
||||||
0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
|
0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
|
||||||
0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
|
0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
|
||||||
0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
|
0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
|
||||||
0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
|
0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
|
||||||
0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
|
0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
|
||||||
0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
|
0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
|
||||||
0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
|
0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
|
||||||
0xed3498beUL
|
0xed3498beUL
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
|
0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
|
||||||
0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
|
0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
|
||||||
0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
|
0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
|
||||||
0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
|
0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
|
||||||
0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
|
0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
|
||||||
0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
|
0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
|
||||||
0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
|
0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
|
||||||
0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
|
0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
|
||||||
0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
|
0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
|
||||||
0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
|
0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
|
||||||
0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
|
0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
|
||||||
0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
|
0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
|
||||||
0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
|
0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
|
||||||
0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
|
0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
|
||||||
0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
|
0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
|
||||||
0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
|
0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
|
||||||
0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
|
0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
|
||||||
0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
|
0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
|
||||||
0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
|
0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
|
||||||
0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
|
0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
|
||||||
0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
|
0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
|
||||||
0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
|
0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
|
||||||
0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
|
0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
|
||||||
0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
|
0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
|
||||||
0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
|
0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
|
||||||
0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
|
0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
|
||||||
0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
|
0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
|
||||||
0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
|
0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
|
||||||
0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
|
0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
|
||||||
0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
|
0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
|
||||||
0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
|
0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
|
||||||
0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
|
0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
|
||||||
0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
|
0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
|
||||||
0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
|
0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
|
||||||
0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
|
0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
|
||||||
0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
|
0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
|
||||||
0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
|
0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
|
||||||
0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
|
0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
|
||||||
0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
|
0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
|
||||||
0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
|
0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
|
||||||
0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
|
0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
|
||||||
0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
|
0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
|
||||||
0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
|
0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
|
||||||
0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
|
0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
|
||||||
0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
|
0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
|
||||||
0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
|
0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
|
||||||
0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
|
0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
|
||||||
0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
|
0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
|
||||||
0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
|
0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
|
||||||
0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
|
0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
|
||||||
0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
|
0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
|
||||||
0xf10605deUL
|
0xf10605deUL
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
||||||
/* deflate.h -- internal compression state
|
/* deflate.h -- internal compression state
|
||||||
* Copyright (C) 1995-2012 Jean-loup Gailly
|
* Copyright (C) 1995-2016 Jean-loup Gailly
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -51,26 +51,26 @@
|
||||||
#define Buf_size 16
|
#define Buf_size 16
|
||||||
/* size of bit buffer in bi_buf */
|
/* size of bit buffer in bi_buf */
|
||||||
|
|
||||||
#define INIT_STATE 42
|
#define INIT_STATE 42 /* zlib header -> BUSY_STATE */
|
||||||
#define EXTRA_STATE 69
|
#ifdef GZIP
|
||||||
#define NAME_STATE 73
|
# define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */
|
||||||
#define COMMENT_STATE 91
|
#endif
|
||||||
#define HCRC_STATE 103
|
#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */
|
||||||
#define BUSY_STATE 113
|
#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */
|
||||||
#define FINISH_STATE 666
|
#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */
|
||||||
|
#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */
|
||||||
|
#define BUSY_STATE 113 /* deflate -> FINISH_STATE */
|
||||||
|
#define FINISH_STATE 666 /* stream complete */
|
||||||
/* Stream status */
|
/* Stream status */
|
||||||
|
|
||||||
|
|
||||||
/* Data structure describing a single value and its code string. */
|
/* Data structure describing a single value and its code string. */
|
||||||
typedef struct ct_data_s
|
typedef struct ct_data_s {
|
||||||
{
|
union {
|
||||||
union
|
|
||||||
{
|
|
||||||
ush freq; /* frequency count */
|
ush freq; /* frequency count */
|
||||||
ush code; /* bit string */
|
ush code; /* bit string */
|
||||||
} fc;
|
} fc;
|
||||||
union
|
union {
|
||||||
{
|
|
||||||
ush dad; /* father node in Huffman tree */
|
ush dad; /* father node in Huffman tree */
|
||||||
ush len; /* length of bit string */
|
ush len; /* length of bit string */
|
||||||
} dl;
|
} dl;
|
||||||
|
|
@ -83,11 +83,10 @@ typedef struct ct_data_s
|
||||||
|
|
||||||
typedef struct static_tree_desc_s static_tree_desc;
|
typedef struct static_tree_desc_s static_tree_desc;
|
||||||
|
|
||||||
typedef struct tree_desc_s
|
typedef struct tree_desc_s {
|
||||||
{
|
ct_data *dyn_tree; /* the dynamic tree */
|
||||||
ct_data* dyn_tree; /* the dynamic tree */
|
|
||||||
int max_code; /* largest code with non zero frequency */
|
int max_code; /* largest code with non zero frequency */
|
||||||
static_tree_desc* stat_desc; /* the corresponding static tree */
|
const static_tree_desc *stat_desc; /* the corresponding static tree */
|
||||||
} FAR tree_desc;
|
} FAR tree_desc;
|
||||||
|
|
||||||
typedef ush Pos;
|
typedef ush Pos;
|
||||||
|
|
@ -98,27 +97,26 @@ typedef unsigned IPos;
|
||||||
* save space in the various tables. IPos is used only for parameter passing.
|
* save space in the various tables. IPos is used only for parameter passing.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct internal_state
|
typedef struct internal_state {
|
||||||
{
|
|
||||||
z_streamp strm; /* pointer back to this zlib stream */
|
z_streamp strm; /* pointer back to this zlib stream */
|
||||||
int status; /* as the name implies */
|
int status; /* as the name implies */
|
||||||
Bytef* pending_buf; /* output still pending */
|
Bytef *pending_buf; /* output still pending */
|
||||||
ulg pending_buf_size; /* size of pending_buf */
|
ulg pending_buf_size; /* size of pending_buf */
|
||||||
Bytef* pending_out; /* next pending byte to output to the stream */
|
Bytef *pending_out; /* next pending byte to output to the stream */
|
||||||
uInt pending; /* nb of bytes in the pending buffer */
|
ulg pending; /* nb of bytes in the pending buffer */
|
||||||
int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
|
int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
|
||||||
gz_headerp gzhead; /* gzip header information to write */
|
gz_headerp gzhead; /* gzip header information to write */
|
||||||
uInt gzindex; /* where in extra, name, or comment */
|
ulg gzindex; /* where in extra, name, or comment */
|
||||||
Byte method; /* STORED (for zip only) or DEFLATED */
|
Byte method; /* can only be DEFLATED */
|
||||||
int last_flush; /* value of flush param for previous deflate call */
|
int last_flush; /* value of flush param for previous deflate call */
|
||||||
|
|
||||||
/* used by deflate.c: */
|
/* used by deflate.c: */
|
||||||
|
|
||||||
uInt w_size; /* LZ77 window size (32K by default) */
|
uInt w_size; /* LZ77 window size (32K by default) */
|
||||||
uInt w_bits; /* log2(w_size) (8..16) */
|
uInt w_bits; /* log2(w_size) (8..16) */
|
||||||
uInt w_mask; /* w_size - 1 */
|
uInt w_mask; /* w_size - 1 */
|
||||||
|
|
||||||
Bytef* window;
|
Bytef *window;
|
||||||
/* Sliding window. Input bytes are read into the second half of the window,
|
/* Sliding window. Input bytes are read into the second half of the window,
|
||||||
* and move to the first half later to keep a dictionary of at least wSize
|
* and move to the first half later to keep a dictionary of at least wSize
|
||||||
* bytes. With this organization, matches are limited to a distance of
|
* bytes. With this organization, matches are limited to a distance of
|
||||||
|
|
@ -133,13 +131,13 @@ typedef struct internal_state
|
||||||
* is directly used as sliding window.
|
* is directly used as sliding window.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Posf* prev;
|
Posf *prev;
|
||||||
/* Link to older string with same hash index. To limit the size of this
|
/* Link to older string with same hash index. To limit the size of this
|
||||||
* array to 64K, this link is maintained only for the last 32K strings.
|
* array to 64K, this link is maintained only for the last 32K strings.
|
||||||
* An index in this array is thus a window index modulo 32K.
|
* An index in this array is thus a window index modulo 32K.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Posf* head; /* Heads of the hash chains or NIL. */
|
Posf *head; /* Heads of the hash chains or NIL. */
|
||||||
|
|
||||||
uInt ins_h; /* hash index of string to be inserted */
|
uInt ins_h; /* hash index of string to be inserted */
|
||||||
uInt hash_size; /* number of elements in hash table */
|
uInt hash_size; /* number of elements in hash table */
|
||||||
|
|
@ -195,31 +193,31 @@ typedef struct internal_state
|
||||||
|
|
||||||
int nice_match; /* Stop searching when current match exceeds this */
|
int nice_match; /* Stop searching when current match exceeds this */
|
||||||
|
|
||||||
/* used by trees.c: */
|
/* used by trees.c: */
|
||||||
/* Didn't use ct_data typedef below to suppress compiler warning */
|
/* Didn't use ct_data typedef below to suppress compiler warning */
|
||||||
struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
|
struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
|
||||||
struct ct_data_s dyn_dtree[2 * D_CODES + 1]; /* distance tree */
|
struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
|
||||||
struct ct_data_s bl_tree[2 * BL_CODES + 1]; /* Huffman tree for bit lengths */
|
struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
|
||||||
|
|
||||||
struct tree_desc_s l_desc; /* desc. for literal tree */
|
struct tree_desc_s l_desc; /* desc. for literal tree */
|
||||||
struct tree_desc_s d_desc; /* desc. for distance tree */
|
struct tree_desc_s d_desc; /* desc. for distance tree */
|
||||||
struct tree_desc_s bl_desc; /* desc. for bit length tree */
|
struct tree_desc_s bl_desc; /* desc. for bit length tree */
|
||||||
|
|
||||||
ush bl_count[MAX_BITS + 1];
|
ush bl_count[MAX_BITS+1];
|
||||||
/* number of codes at each bit length for an optimal tree */
|
/* number of codes at each bit length for an optimal tree */
|
||||||
|
|
||||||
int heap[2 * L_CODES + 1]; /* heap used to build the Huffman trees */
|
int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */
|
||||||
int heap_len; /* number of elements in the heap */
|
int heap_len; /* number of elements in the heap */
|
||||||
int heap_max; /* element of largest frequency */
|
int heap_max; /* element of largest frequency */
|
||||||
/* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
|
/* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
|
||||||
* The same heap array is used to build all trees.
|
* The same heap array is used to build all trees.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
uch depth[2 * L_CODES + 1];
|
uch depth[2*L_CODES+1];
|
||||||
/* Depth of each subtree used as tie breaker for trees of equal frequency
|
/* Depth of each subtree used as tie breaker for trees of equal frequency
|
||||||
*/
|
*/
|
||||||
|
|
||||||
uchf* l_buf; /* buffer for literals or lengths */
|
uchf *l_buf; /* buffer for literals or lengths */
|
||||||
|
|
||||||
uInt lit_bufsize;
|
uInt lit_bufsize;
|
||||||
/* Size of match buffer for literals/lengths. There are 4 reasons for
|
/* Size of match buffer for literals/lengths. There are 4 reasons for
|
||||||
|
|
@ -243,7 +241,7 @@ typedef struct internal_state
|
||||||
|
|
||||||
uInt last_lit; /* running index in l_buf */
|
uInt last_lit; /* running index in l_buf */
|
||||||
|
|
||||||
ushf* d_buf;
|
ushf *d_buf;
|
||||||
/* Buffer for distances. To simplify the code, d_buf and l_buf have
|
/* Buffer for distances. To simplify the code, d_buf and l_buf have
|
||||||
* the same number of elements. To use different lengths, an extra flag
|
* the same number of elements. To use different lengths, an extra flag
|
||||||
* array would be necessary.
|
* array would be necessary.
|
||||||
|
|
@ -254,7 +252,7 @@ typedef struct internal_state
|
||||||
uInt matches; /* number of string matches in current block */
|
uInt matches; /* number of string matches in current block */
|
||||||
uInt insert; /* bytes at end of window left to insert */
|
uInt insert; /* bytes at end of window left to insert */
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef ZLIB_DEBUG
|
||||||
ulg compressed_len; /* total bit length of compressed file mod 2^32 */
|
ulg compressed_len; /* total bit length of compressed file mod 2^32 */
|
||||||
ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
|
ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -280,7 +278,7 @@ typedef struct internal_state
|
||||||
/* Output a byte on the stream.
|
/* Output a byte on the stream.
|
||||||
* IN assertion: there is enough room in pending_buf.
|
* IN assertion: there is enough room in pending_buf.
|
||||||
*/
|
*/
|
||||||
#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
|
#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
|
||||||
|
|
||||||
|
|
||||||
#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
|
#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
|
||||||
|
|
@ -297,15 +295,15 @@ typedef struct internal_state
|
||||||
/* Number of bytes after end of data in window to initialize in order to avoid
|
/* Number of bytes after end of data in window to initialize in order to avoid
|
||||||
memory checker errors from longest match routines */
|
memory checker errors from longest match routines */
|
||||||
|
|
||||||
/* in trees.c */
|
/* in trees.c */
|
||||||
void ZLIB_INTERNAL _tr_init OF((deflate_state* s));
|
void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
|
||||||
int ZLIB_INTERNAL _tr_tally OF((deflate_state* s, unsigned dist, unsigned lc));
|
int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
|
||||||
void ZLIB_INTERNAL _tr_flush_block OF((deflate_state* s, charf* buf,
|
void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
|
||||||
ulg stored_len, int last));
|
ulg stored_len, int last));
|
||||||
void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state* s));
|
void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
|
||||||
void ZLIB_INTERNAL _tr_align OF((deflate_state* s));
|
void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
|
||||||
void ZLIB_INTERNAL _tr_stored_block OF((deflate_state* s, charf* buf,
|
void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
|
||||||
ulg stored_len, int last));
|
ulg stored_len, int last));
|
||||||
|
|
||||||
#define d_code(dist) \
|
#define d_code(dist) \
|
||||||
((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
|
((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
|
||||||
|
|
@ -314,15 +312,15 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state* s, charf* buf,
|
||||||
* used.
|
* used.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DEBUG
|
#ifndef ZLIB_DEBUG
|
||||||
/* Inline versions of _tr_tally for speed: */
|
/* Inline versions of _tr_tally for speed: */
|
||||||
|
|
||||||
#if defined(GEN_TREES_H) || !defined(STDC)
|
#if defined(GEN_TREES_H) || !defined(STDC)
|
||||||
extern uch ZLIB_INTERNAL _length_code[];
|
extern uch ZLIB_INTERNAL _length_code[];
|
||||||
extern uch ZLIB_INTERNAL _dist_code[];
|
extern uch ZLIB_INTERNAL _dist_code[];
|
||||||
#else
|
#else
|
||||||
extern const uch ZLIB_INTERNAL _length_code[];
|
extern const uch ZLIB_INTERNAL _length_code[];
|
||||||
extern const uch ZLIB_INTERNAL _dist_code[];
|
extern const uch ZLIB_INTERNAL _dist_code[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# define _tr_tally_lit(s, c, flush) \
|
# define _tr_tally_lit(s, c, flush) \
|
||||||
|
|
@ -333,8 +331,8 @@ extern const uch ZLIB_INTERNAL _dist_code[];
|
||||||
flush = (s->last_lit == s->lit_bufsize-1); \
|
flush = (s->last_lit == s->lit_bufsize-1); \
|
||||||
}
|
}
|
||||||
# define _tr_tally_dist(s, distance, length, flush) \
|
# define _tr_tally_dist(s, distance, length, flush) \
|
||||||
{ uch len = (length); \
|
{ uch len = (uch)(length); \
|
||||||
ush dist = (distance); \
|
ush dist = (ush)(distance); \
|
||||||
s->d_buf[s->last_lit] = dist; \
|
s->d_buf[s->last_lit] = dist; \
|
||||||
s->l_buf[s->last_lit++] = len; \
|
s->l_buf[s->last_lit++] = len; \
|
||||||
dist--; \
|
dist--; \
|
||||||
|
|
|
||||||
|
|
@ -8,19 +8,14 @@
|
||||||
/* gzclose() is in a separate file so that it is linked in only if it is used.
|
/* gzclose() is in a separate file so that it is linked in only if it is used.
|
||||||
That way the other gzclose functions can be used instead to avoid linking in
|
That way the other gzclose functions can be used instead to avoid linking in
|
||||||
unneeded compression or decompression routines. */
|
unneeded compression or decompression routines. */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzclose(gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzclose(file)
|
int ZEXPORT gzclose(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
#ifndef NO_GZCOMPRESS
|
#ifndef NO_GZCOMPRESS
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
|
return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* gzguts.h -- zlib internal header definitions for gz* operations
|
/* gzguts.h -- zlib internal header definitions for gz* operations
|
||||||
* Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
|
* Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -25,6 +25,10 @@
|
||||||
# include <stdlib.h>
|
# include <stdlib.h>
|
||||||
# include <limits.h>
|
# include <limits.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef _POSIX_SOURCE
|
||||||
|
# define _POSIX_SOURCE
|
||||||
|
#endif
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
@ -35,6 +39,17 @@
|
||||||
# include <io.h>
|
# include <io.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||||
|
# define WIDECHAR
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef WINAPI_FAMILY
|
||||||
|
# define open _open
|
||||||
|
# define read _read
|
||||||
|
# define write _write
|
||||||
|
# define close _close
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef NO_DEFLATE /* for compatibility with old definition */
|
#ifdef NO_DEFLATE /* for compatibility with old definition */
|
||||||
# define NO_GZCOMPRESS
|
# define NO_GZCOMPRESS
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -60,18 +75,13 @@
|
||||||
#ifndef HAVE_VSNPRINTF
|
#ifndef HAVE_VSNPRINTF
|
||||||
# ifdef MSDOS
|
# ifdef MSDOS
|
||||||
/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
|
/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
|
||||||
but for now we just assume it doesn't. */
|
but for now we just assume it doesn't. */
|
||||||
# define NO_vsnprintf
|
# define NO_vsnprintf
|
||||||
# endif
|
# endif
|
||||||
# ifdef __TURBOC__
|
# ifdef __TURBOC__
|
||||||
# define NO_vsnprintf
|
# define NO_vsnprintf
|
||||||
# endif
|
# endif
|
||||||
# ifdef WIN32
|
# ifdef WIN32
|
||||||
/* In Win32, rename/redefine deprecated functions. */
|
|
||||||
# define close _close
|
|
||||||
# define open _open
|
|
||||||
# define read _read
|
|
||||||
# define write _write
|
|
||||||
/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
|
/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
|
||||||
# if !defined(vsnprintf) && !defined(NO_vsnprintf)
|
# if !defined(vsnprintf) && !defined(NO_vsnprintf)
|
||||||
# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
|
# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
|
||||||
|
|
@ -93,15 +103,24 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* unlike snprintf (which is required in C99), _snprintf does not guarantee
|
||||||
|
null termination of the result -- however this is only used in gzlib.c where
|
||||||
|
the result is assured to fit in the space provided */
|
||||||
|
#if defined(_MSC_VER) && _MSC_VER < 1900
|
||||||
|
# define snprintf _snprintf
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef local
|
#ifndef local
|
||||||
# define local static
|
# define local static
|
||||||
#endif
|
#endif
|
||||||
/* compile with -Dlocal if your debugger can't find static symbols */
|
/* since "static" is used to mean two completely different things in C, we
|
||||||
|
define "local" for the non-static meaning of "static", for readability
|
||||||
|
(compile with -Dlocal if your debugger can't find static symbols) */
|
||||||
|
|
||||||
/* gz* functions always use library allocation functions */
|
/* gz* functions always use library allocation functions */
|
||||||
#ifndef STDC
|
#ifndef STDC
|
||||||
extern voidp malloc OF((uInt size));
|
extern voidp malloc OF((uInt size));
|
||||||
extern void free OF((voidpf ptr));
|
extern void free OF((voidpf ptr));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* get errno and strerror definition */
|
/* get errno and strerror definition */
|
||||||
|
|
@ -119,10 +138,10 @@ extern void free OF((voidpf ptr));
|
||||||
|
|
||||||
/* provide prototypes for these when building zlib without LFS */
|
/* provide prototypes for these when building zlib without LFS */
|
||||||
#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
|
#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
|
||||||
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char*, const char*));
|
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
|
||||||
ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
|
ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
|
||||||
ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
|
ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
|
||||||
ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
|
ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* default memLevel */
|
/* default memLevel */
|
||||||
|
|
@ -132,7 +151,8 @@ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
|
||||||
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
|
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* default i/o buffer size -- double this for output when reading */
|
/* default i/o buffer size -- double this for output when reading (this and
|
||||||
|
twice this must be able to fit in an unsigned type) */
|
||||||
#define GZBUFSIZE 8192
|
#define GZBUFSIZE 8192
|
||||||
|
|
||||||
/* gzip modes, also provide a little integrity check on the passed structure */
|
/* gzip modes, also provide a little integrity check on the passed structure */
|
||||||
|
|
@ -147,45 +167,44 @@ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
|
||||||
#define GZIP 2 /* decompress a gzip stream */
|
#define GZIP 2 /* decompress a gzip stream */
|
||||||
|
|
||||||
/* internal gzip file state data structure */
|
/* internal gzip file state data structure */
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
/* exposed contents for gzgetc() macro */
|
||||||
/* exposed contents for gzgetc() macro */
|
|
||||||
struct gzFile_s x; /* "x" for exposed */
|
struct gzFile_s x; /* "x" for exposed */
|
||||||
/* x.have: number of bytes available at x.next */
|
/* x.have: number of bytes available at x.next */
|
||||||
/* x.next: next output data to deliver or write */
|
/* x.next: next output data to deliver or write */
|
||||||
/* x.pos: current position in uncompressed data */
|
/* x.pos: current position in uncompressed data */
|
||||||
/* used for both reading and writing */
|
/* used for both reading and writing */
|
||||||
int mode; /* see gzip modes above */
|
int mode; /* see gzip modes above */
|
||||||
int fd; /* file descriptor */
|
int fd; /* file descriptor */
|
||||||
char* path; /* path or fd for error messages */
|
char *path; /* path or fd for error messages */
|
||||||
unsigned size; /* buffer size, zero if not allocated yet */
|
unsigned size; /* buffer size, zero if not allocated yet */
|
||||||
unsigned want; /* requested buffer size, default is GZBUFSIZE */
|
unsigned want; /* requested buffer size, default is GZBUFSIZE */
|
||||||
unsigned char* in; /* input buffer */
|
unsigned char *in; /* input buffer (double-sized when writing) */
|
||||||
unsigned char* out; /* output buffer (double-sized when reading) */
|
unsigned char *out; /* output buffer (double-sized when reading) */
|
||||||
int direct; /* 0 if processing gzip, 1 if transparent */
|
int direct; /* 0 if processing gzip, 1 if transparent */
|
||||||
/* just for reading */
|
/* just for reading */
|
||||||
int how; /* 0: get header, 1: copy, 2: decompress */
|
int how; /* 0: get header, 1: copy, 2: decompress */
|
||||||
z_off64_t start; /* where the gzip data started, for rewinding */
|
z_off64_t start; /* where the gzip data started, for rewinding */
|
||||||
int eof; /* true if end of input file reached */
|
int eof; /* true if end of input file reached */
|
||||||
int past; /* true if read requested past end */
|
int past; /* true if read requested past end */
|
||||||
/* just for writing */
|
/* just for writing */
|
||||||
int level; /* compression level */
|
int level; /* compression level */
|
||||||
int strategy; /* compression strategy */
|
int strategy; /* compression strategy */
|
||||||
/* seek request */
|
/* seek request */
|
||||||
z_off64_t skip; /* amount to skip (already rewound if backwards) */
|
z_off64_t skip; /* amount to skip (already rewound if backwards) */
|
||||||
int seek; /* true if seek request pending */
|
int seek; /* true if seek request pending */
|
||||||
/* error information */
|
/* error information */
|
||||||
int err; /* error code */
|
int err; /* error code */
|
||||||
char* msg; /* error message */
|
char *msg; /* error message */
|
||||||
/* zlib inflate or deflate stream */
|
/* zlib inflate or deflate stream */
|
||||||
z_stream strm; /* stream structure in-place (not a pointer) */
|
z_stream strm; /* stream structure in-place (not a pointer) */
|
||||||
} gz_state;
|
} gz_state;
|
||||||
typedef gz_state FAR* gz_statep;
|
typedef gz_state FAR *gz_statep;
|
||||||
|
|
||||||
/* shared functions */
|
/* shared functions */
|
||||||
void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char*));
|
void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
|
||||||
#if defined UNDER_CE
|
#if defined UNDER_CE
|
||||||
char ZLIB_INTERNAL* gz_strwinerror OF((DWORD error));
|
char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
|
/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
/* gzlib.c -- zlib functions common to reading and writing gzip files
|
/* gzlib.c -- zlib functions common to reading and writing gzip files
|
||||||
* Copyright (C) 2004, 2010, 2011, 2012 Mark Adler
|
* Copyright (C) 2004-2017 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "gzguts.h"
|
#include "gzguts.h"
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__BORLANDC__)
|
#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
|
||||||
# define LSEEK _lseeki64
|
# define LSEEK _lseeki64
|
||||||
#else
|
#else
|
||||||
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
|
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
/* Local functions */
|
/* Local functions */
|
||||||
local void gz_reset OF((gz_statep));
|
local void gz_reset OF((gz_statep));
|
||||||
local gzFile gz_open OF((const void*, int, const char*));
|
local gzFile gz_open OF((const void *, int, const char *));
|
||||||
|
|
||||||
#if defined UNDER_CE
|
#if defined UNDER_CE
|
||||||
|
|
||||||
|
|
@ -30,43 +30,38 @@ local gzFile gz_open OF((const void*, int, const char*));
|
||||||
|
|
||||||
The gz_strwinerror function does not change the current setting of
|
The gz_strwinerror function does not change the current setting of
|
||||||
GetLastError. */
|
GetLastError. */
|
||||||
char ZLIB_INTERNAL* gz_strwinerror(error)
|
char ZLIB_INTERNAL *gz_strwinerror (error)
|
||||||
DWORD error;
|
DWORD error;
|
||||||
{
|
{
|
||||||
static char buf[1024];
|
static char buf[1024];
|
||||||
|
|
||||||
wchar_t* msgbuf;
|
wchar_t *msgbuf;
|
||||||
DWORD lasterr = GetLastError();
|
DWORD lasterr = GetLastError();
|
||||||
DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
|
DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
|
||||||
| FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
| FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
||||||
NULL,
|
NULL,
|
||||||
error,
|
error,
|
||||||
0, /* Default language */
|
0, /* Default language */
|
||||||
(LPVOID)&msgbuf,
|
(LPVOID)&msgbuf,
|
||||||
0,
|
0,
|
||||||
NULL);
|
NULL);
|
||||||
|
if (chars != 0) {
|
||||||
if (chars != 0)
|
|
||||||
{
|
|
||||||
/* If there is an \r\n appended, zap it. */
|
/* If there is an \r\n appended, zap it. */
|
||||||
if (chars >= 2
|
if (chars >= 2
|
||||||
&& msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n')
|
&& msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
|
||||||
{
|
|
||||||
chars -= 2;
|
chars -= 2;
|
||||||
msgbuf[chars] = 0;
|
msgbuf[chars] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chars > sizeof(buf) - 1)
|
if (chars > sizeof (buf) - 1) {
|
||||||
{
|
chars = sizeof (buf) - 1;
|
||||||
chars = sizeof(buf) - 1;
|
|
||||||
msgbuf[chars] = 0;
|
msgbuf[chars] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
wcstombs(buf, msgbuf, chars + 1);
|
wcstombs(buf, msgbuf, chars + 1);
|
||||||
LocalFree(msgbuf);
|
LocalFree(msgbuf);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
sprintf(buf, "unknown win32 error (%ld)", error);
|
sprintf(buf, "unknown win32 error (%ld)", error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -77,22 +72,15 @@ DWORD error;
|
||||||
#endif /* UNDER_CE */
|
#endif /* UNDER_CE */
|
||||||
|
|
||||||
/* Reset gzip file state */
|
/* Reset gzip file state */
|
||||||
#ifdef WIN32
|
|
||||||
local void gz_reset(gz_statep state)
|
|
||||||
#else
|
|
||||||
local void gz_reset(state)
|
local void gz_reset(state)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
state->x.have = 0; /* no output data available */
|
state->x.have = 0; /* no output data available */
|
||||||
|
if (state->mode == GZ_READ) { /* for reading ... */
|
||||||
if (state->mode == GZ_READ) /* for reading ... */
|
|
||||||
{
|
|
||||||
state->eof = 0; /* not at end of file */
|
state->eof = 0; /* not at end of file */
|
||||||
state->past = 0; /* have not read past end yet */
|
state->past = 0; /* have not read past end yet */
|
||||||
state->how = LOOK; /* look for gzip header */
|
state->how = LOOK; /* look for gzip header */
|
||||||
}
|
}
|
||||||
|
|
||||||
state->seek = 0; /* no seek request pending */
|
state->seek = 0; /* no seek request pending */
|
||||||
gz_error(state, Z_OK, NULL); /* clear error */
|
gz_error(state, Z_OK, NULL); /* clear error */
|
||||||
state->x.pos = 0; /* no uncompressed data yet */
|
state->x.pos = 0; /* no uncompressed data yet */
|
||||||
|
|
@ -100,17 +88,13 @@ gz_statep state;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Open a gzip file either by name or file descriptor. */
|
/* Open a gzip file either by name or file descriptor. */
|
||||||
#ifdef WIN32
|
|
||||||
local gzFile gz_open(const void* path, int fd, const char* mode)
|
|
||||||
#else
|
|
||||||
local gzFile gz_open(path, fd, mode)
|
local gzFile gz_open(path, fd, mode)
|
||||||
const void* path;
|
const void *path;
|
||||||
int fd;
|
int fd;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
size_t len;
|
z_size_t len;
|
||||||
int oflag;
|
int oflag;
|
||||||
#ifdef O_CLOEXEC
|
#ifdef O_CLOEXEC
|
||||||
int cloexec = 0;
|
int cloexec = 0;
|
||||||
|
|
@ -124,11 +108,9 @@ const char* mode;
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* allocate gzFile structure to return */
|
/* allocate gzFile structure to return */
|
||||||
state = malloc(sizeof(gz_state));
|
state = (gz_statep)malloc(sizeof(gz_state));
|
||||||
|
|
||||||
if (state == NULL)
|
if (state == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
state->size = 0; /* no buffers allocated yet */
|
state->size = 0; /* no buffers allocated yet */
|
||||||
state->want = GZBUFSIZE; /* requested buffer size */
|
state->want = GZBUFSIZE; /* requested buffer size */
|
||||||
state->msg = NULL; /* no error message yet */
|
state->msg = NULL; /* no error message yet */
|
||||||
|
|
@ -138,115 +120,89 @@ const char* mode;
|
||||||
state->level = Z_DEFAULT_COMPRESSION;
|
state->level = Z_DEFAULT_COMPRESSION;
|
||||||
state->strategy = Z_DEFAULT_STRATEGY;
|
state->strategy = Z_DEFAULT_STRATEGY;
|
||||||
state->direct = 0;
|
state->direct = 0;
|
||||||
|
while (*mode) {
|
||||||
while (*mode)
|
|
||||||
{
|
|
||||||
if (*mode >= '0' && *mode <= '9')
|
if (*mode >= '0' && *mode <= '9')
|
||||||
state->level = *mode - '0';
|
state->level = *mode - '0';
|
||||||
else
|
else
|
||||||
switch (*mode)
|
switch (*mode) {
|
||||||
{
|
case 'r':
|
||||||
case 'r':
|
state->mode = GZ_READ;
|
||||||
state->mode = GZ_READ;
|
break;
|
||||||
break;
|
|
||||||
#ifndef NO_GZCOMPRESS
|
#ifndef NO_GZCOMPRESS
|
||||||
|
case 'w':
|
||||||
case 'w':
|
state->mode = GZ_WRITE;
|
||||||
state->mode = GZ_WRITE;
|
break;
|
||||||
break;
|
case 'a':
|
||||||
|
state->mode = GZ_APPEND;
|
||||||
case 'a':
|
break;
|
||||||
state->mode = GZ_APPEND;
|
|
||||||
break;
|
|
||||||
#endif
|
#endif
|
||||||
|
case '+': /* can't read and write at the same time */
|
||||||
case '+': /* can't read and write at the same time */
|
free(state);
|
||||||
free(state);
|
return NULL;
|
||||||
return NULL;
|
case 'b': /* ignore -- will request binary anyway */
|
||||||
|
break;
|
||||||
case 'b': /* ignore -- will request binary anyway */
|
|
||||||
break;
|
|
||||||
#ifdef O_CLOEXEC
|
#ifdef O_CLOEXEC
|
||||||
|
case 'e':
|
||||||
case 'e':
|
cloexec = 1;
|
||||||
cloexec = 1;
|
break;
|
||||||
break;
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef O_EXCL
|
#ifdef O_EXCL
|
||||||
|
case 'x':
|
||||||
case 'x':
|
exclusive = 1;
|
||||||
exclusive = 1;
|
break;
|
||||||
break;
|
|
||||||
#endif
|
#endif
|
||||||
|
case 'f':
|
||||||
case 'f':
|
state->strategy = Z_FILTERED;
|
||||||
state->strategy = Z_FILTERED;
|
break;
|
||||||
break;
|
case 'h':
|
||||||
|
state->strategy = Z_HUFFMAN_ONLY;
|
||||||
case 'h':
|
break;
|
||||||
state->strategy = Z_HUFFMAN_ONLY;
|
case 'R':
|
||||||
break;
|
state->strategy = Z_RLE;
|
||||||
|
break;
|
||||||
case 'R':
|
case 'F':
|
||||||
state->strategy = Z_RLE;
|
state->strategy = Z_FIXED;
|
||||||
break;
|
break;
|
||||||
|
case 'T':
|
||||||
case 'F':
|
state->direct = 1;
|
||||||
state->strategy = Z_FIXED;
|
break;
|
||||||
|
default: /* could consider as an error, but just ignore */
|
||||||
case 'T':
|
;
|
||||||
state->direct = 1;
|
|
||||||
|
|
||||||
default: /* could consider as an error, but just ignore */
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mode++;
|
mode++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* must provide an "r", "w", or "a" */
|
/* must provide an "r", "w", or "a" */
|
||||||
if (state->mode == GZ_NONE)
|
if (state->mode == GZ_NONE) {
|
||||||
{
|
|
||||||
free(state);
|
free(state);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* can't force transparent read */
|
/* can't force transparent read */
|
||||||
if (state->mode == GZ_READ)
|
if (state->mode == GZ_READ) {
|
||||||
{
|
if (state->direct) {
|
||||||
if (state->direct)
|
|
||||||
{
|
|
||||||
free(state);
|
free(state);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
state->direct = 1; /* for empty file */
|
state->direct = 1; /* for empty file */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* save the path name for error messages */
|
/* save the path name for error messages */
|
||||||
#ifdef _WIN32
|
#ifdef WIDECHAR
|
||||||
|
if (fd == -2) {
|
||||||
if (fd == -2)
|
|
||||||
{
|
|
||||||
len = wcstombs(NULL, path, 0);
|
len = wcstombs(NULL, path, 0);
|
||||||
|
if (len == (z_size_t)-1)
|
||||||
if (len == (size_t) - 1)
|
|
||||||
len = 0;
|
len = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
len = strlen(path);
|
len = strlen((const char *)path);
|
||||||
|
state->path = (char *)malloc(len + 1);
|
||||||
state->path = malloc(len + 1);
|
if (state->path == NULL) {
|
||||||
|
|
||||||
if (state->path == NULL)
|
|
||||||
{
|
|
||||||
free(state);
|
free(state);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
#ifdef WIDECHAR
|
||||||
#ifdef _WIN32
|
|
||||||
|
|
||||||
if (fd == -2)
|
if (fd == -2)
|
||||||
if (len)
|
if (len)
|
||||||
wcstombs(state->path, path, len + 1);
|
wcstombs(state->path, path, len + 1);
|
||||||
|
|
@ -254,7 +210,11 @@ const char* mode;
|
||||||
*(state->path) = 0;
|
*(state->path) = 0;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
|
||||||
|
(void)snprintf(state->path, len + 1, "%s", (const char *)path);
|
||||||
|
#else
|
||||||
strcpy(state->path, path);
|
strcpy(state->path, path);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* compute the flags for open() */
|
/* compute the flags for open() */
|
||||||
oflag =
|
oflag =
|
||||||
|
|
@ -279,26 +239,23 @@ const char* mode;
|
||||||
|
|
||||||
/* open the file with the appropriate flags (or just use fd) */
|
/* open the file with the appropriate flags (or just use fd) */
|
||||||
state->fd = fd > -1 ? fd : (
|
state->fd = fd > -1 ? fd : (
|
||||||
#ifdef _WIN32
|
#ifdef WIDECHAR
|
||||||
fd == -2 ? _wopen(path, oflag, 0666) :
|
fd == -2 ? _wopen(path, oflag, 0666) :
|
||||||
#endif
|
#endif
|
||||||
open(path, oflag, 0666));
|
open((const char *)path, oflag, 0666));
|
||||||
|
if (state->fd == -1) {
|
||||||
if (state->fd == -1)
|
|
||||||
{
|
|
||||||
free(state->path);
|
free(state->path);
|
||||||
free(state);
|
free(state);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
if (state->mode == GZ_APPEND) {
|
||||||
if (state->mode == GZ_APPEND)
|
LSEEK(state->fd, 0, SEEK_END); /* so gzoffset() is correct */
|
||||||
state->mode = GZ_WRITE; /* simplify later checks */
|
state->mode = GZ_WRITE; /* simplify later checks */
|
||||||
|
}
|
||||||
|
|
||||||
/* save the current position for rewinding (only if reading) */
|
/* save the current position for rewinding (only if reading) */
|
||||||
if (state->mode == GZ_READ)
|
if (state->mode == GZ_READ) {
|
||||||
{
|
|
||||||
state->start = LSEEK(state->fd, 0, SEEK_CUR);
|
state->start = LSEEK(state->fd, 0, SEEK_CUR);
|
||||||
|
|
||||||
if (state->start == -1) state->start = 0;
|
if (state->start == -1) state->start = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -310,79 +267,62 @@ const char* mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
gzFile ZEXPORT gzopen(const char* path, const char* mode)
|
|
||||||
#else
|
|
||||||
gzFile ZEXPORT gzopen(path, mode)
|
gzFile ZEXPORT gzopen(path, mode)
|
||||||
const char* path;
|
const char *path;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return gz_open(path, -1, mode);
|
return gz_open(path, -1, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
gzFile ZEXPORT gzopen64(const char* path, const char* mode)
|
|
||||||
#else
|
|
||||||
gzFile ZEXPORT gzopen64(path, mode)
|
gzFile ZEXPORT gzopen64(path, mode)
|
||||||
const char* path;
|
const char *path;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return gz_open(path, -1, mode);
|
return gz_open(path, -1, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
gzFile ZEXPORT gzdopen(int fd, const char* mode)
|
|
||||||
#else
|
|
||||||
gzFile ZEXPORT gzdopen(fd, mode)
|
gzFile ZEXPORT gzdopen(fd, mode)
|
||||||
int fd;
|
int fd;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
char* path; /* identifier for error messages */
|
char *path; /* identifier for error messages */
|
||||||
gzFile gz;
|
gzFile gz;
|
||||||
|
|
||||||
if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
|
if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
|
||||||
|
(void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
|
||||||
|
#else
|
||||||
sprintf(path, "<fd:%d>", fd); /* for debugging */
|
sprintf(path, "<fd:%d>", fd); /* for debugging */
|
||||||
|
#endif
|
||||||
gz = gz_open(path, fd, mode);
|
gz = gz_open(path, fd, mode);
|
||||||
free(path);
|
free(path);
|
||||||
return gz;
|
return gz;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef _WIN32
|
#ifdef WIDECHAR
|
||||||
gzFile ZEXPORT gzopen_w(const wchar_t* path, const char* mode)
|
|
||||||
#else
|
|
||||||
gzFile ZEXPORT gzopen_w(path, mode)
|
gzFile ZEXPORT gzopen_w(path, mode)
|
||||||
const wchar_t* path;
|
const wchar_t *path;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return gz_open(path, -2, mode);
|
return gz_open(path, -2, mode);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzbuffer(gzFile file, unsigned size)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzbuffer(file, size)
|
int ZEXPORT gzbuffer(file, size)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
unsigned size;
|
unsigned size;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure and check integrity */
|
/* get internal structure and check integrity */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
@ -391,27 +331,23 @@ unsigned size;
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* check and set requested size */
|
/* check and set requested size */
|
||||||
|
if ((size << 1) < size)
|
||||||
|
return -1; /* need to be able to double it */
|
||||||
if (size < 2)
|
if (size < 2)
|
||||||
size = 2; /* need two bytes to check magic header */
|
size = 2; /* need two bytes to check magic header */
|
||||||
|
|
||||||
state->want = size;
|
state->want = size;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzrewind(gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzrewind(file)
|
int ZEXPORT gzrewind(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* check that we're reading and that there's no error */
|
/* check that we're reading and that there's no error */
|
||||||
|
|
@ -422,20 +358,15 @@ gzFile file;
|
||||||
/* back up and start over */
|
/* back up and start over */
|
||||||
if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
|
if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
gz_reset(state);
|
gz_reset(state);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
z_off64_t ZEXPORT gzseek64(gzFile file, z_off64_t offset, int whence)
|
|
||||||
#else
|
|
||||||
z_off64_t ZEXPORT gzseek64(file, offset, whence)
|
z_off64_t ZEXPORT gzseek64(file, offset, whence)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
z_off64_t offset;
|
z_off64_t offset;
|
||||||
int whence;
|
int whence;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned n;
|
unsigned n;
|
||||||
z_off64_t ret;
|
z_off64_t ret;
|
||||||
|
|
@ -444,9 +375,7 @@ int whence;
|
||||||
/* get internal structure and check integrity */
|
/* get internal structure and check integrity */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
@ -463,18 +392,14 @@ int whence;
|
||||||
offset -= state->x.pos;
|
offset -= state->x.pos;
|
||||||
else if (state->seek)
|
else if (state->seek)
|
||||||
offset += state->skip;
|
offset += state->skip;
|
||||||
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
/* if within raw area while reading, just go there */
|
/* if within raw area while reading, just go there */
|
||||||
if (state->mode == GZ_READ && state->how == COPY &&
|
if (state->mode == GZ_READ && state->how == COPY &&
|
||||||
state->x.pos + offset >= 0)
|
state->x.pos + offset >= 0) {
|
||||||
{
|
|
||||||
ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
|
ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
|
||||||
|
|
||||||
if (ret == -1)
|
if (ret == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state->x.have = 0;
|
state->x.have = 0;
|
||||||
state->eof = 0;
|
state->eof = 0;
|
||||||
state->past = 0;
|
state->past = 0;
|
||||||
|
|
@ -486,23 +411,18 @@ int whence;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* calculate skip amount, rewinding if needed for back seek when reading */
|
/* calculate skip amount, rewinding if needed for back seek when reading */
|
||||||
if (offset < 0)
|
if (offset < 0) {
|
||||||
{
|
|
||||||
if (state->mode != GZ_READ) /* writing -- can't go backwards */
|
if (state->mode != GZ_READ) /* writing -- can't go backwards */
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
offset += state->x.pos;
|
offset += state->x.pos;
|
||||||
|
|
||||||
if (offset < 0) /* before start of file! */
|
if (offset < 0) /* before start of file! */
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (gzrewind(file) == -1) /* rewind, then skip to offset */
|
if (gzrewind(file) == -1) /* rewind, then skip to offset */
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if reading, skip what's in output buffer (one less gzgetc() check) */
|
/* if reading, skip what's in output buffer (one less gzgetc() check) */
|
||||||
if (state->mode == GZ_READ)
|
if (state->mode == GZ_READ) {
|
||||||
{
|
|
||||||
n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
|
n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
|
||||||
(unsigned)offset : state->x.have;
|
(unsigned)offset : state->x.have;
|
||||||
state->x.have -= n;
|
state->x.have -= n;
|
||||||
|
|
@ -512,24 +432,18 @@ int whence;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* request skip (if not zero) */
|
/* request skip (if not zero) */
|
||||||
if (offset)
|
if (offset) {
|
||||||
{
|
|
||||||
state->seek = 1;
|
state->seek = 1;
|
||||||
state->skip = offset;
|
state->skip = offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
return state->x.pos + offset;
|
return state->x.pos + offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
z_off_t ZEXPORT gzseek(gzFile file, z_off_t offset, int whence)
|
|
||||||
#else
|
|
||||||
z_off_t ZEXPORT gzseek(file, offset, whence)
|
z_off_t ZEXPORT gzseek(file, offset, whence)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
z_off_t offset;
|
z_off_t offset;
|
||||||
int whence;
|
int whence;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_off64_t ret;
|
z_off64_t ret;
|
||||||
|
|
||||||
|
|
@ -538,21 +452,15 @@ int whence;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
z_off64_t ZEXPORT gztell64(gzFile file)
|
|
||||||
#else
|
|
||||||
z_off64_t ZEXPORT gztell64(file)
|
z_off64_t ZEXPORT gztell64(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure and check integrity */
|
/* get internal structure and check integrity */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
@ -561,12 +469,8 @@ gzFile file;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
z_off_t ZEXPORT gztell(gzFile file)
|
|
||||||
#else
|
|
||||||
z_off_t ZEXPORT gztell(file)
|
z_off_t ZEXPORT gztell(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_off64_t ret;
|
z_off64_t ret;
|
||||||
|
|
||||||
|
|
@ -575,12 +479,8 @@ gzFile file;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
z_off64_t ZEXPORT gzoffset64(gzFile file)
|
|
||||||
#else
|
|
||||||
z_off64_t ZEXPORT gzoffset64(file)
|
z_off64_t ZEXPORT gzoffset64(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_off64_t offset;
|
z_off64_t offset;
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
@ -588,31 +488,22 @@ gzFile file;
|
||||||
/* get internal structure and check integrity */
|
/* get internal structure and check integrity */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* compute and return effective offset in file */
|
/* compute and return effective offset in file */
|
||||||
offset = LSEEK(state->fd, 0, SEEK_CUR);
|
offset = LSEEK(state->fd, 0, SEEK_CUR);
|
||||||
|
|
||||||
if (offset == -1)
|
if (offset == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (state->mode == GZ_READ) /* reading */
|
if (state->mode == GZ_READ) /* reading */
|
||||||
offset -= state->strm.avail_in; /* don't count buffered input */
|
offset -= state->strm.avail_in; /* don't count buffered input */
|
||||||
|
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
z_off_t ZEXPORT gzoffset(gzFile file)
|
|
||||||
#else
|
|
||||||
z_off_t ZEXPORT gzoffset(file)
|
z_off_t ZEXPORT gzoffset(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_off64_t ret;
|
z_off64_t ret;
|
||||||
|
|
||||||
|
|
@ -621,21 +512,15 @@ gzFile file;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzeof(gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzeof(file)
|
int ZEXPORT gzeof(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure and check integrity */
|
/* get internal structure and check integrity */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
@ -644,58 +529,44 @@ gzFile file;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
const char * ZEXPORT gzerror(file, errnum)
|
||||||
const char* ZEXPORT gzerror(gzFile file, int* errnum)
|
gzFile file;
|
||||||
#else
|
int *errnum;
|
||||||
const char* ZEXPORT gzerror(file, errnum)
|
|
||||||
gzFile file;
|
|
||||||
int* errnum;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure and check integrity */
|
/* get internal structure and check integrity */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* return error information */
|
/* return error information */
|
||||||
if (errnum != NULL)
|
if (errnum != NULL)
|
||||||
*errnum = state->err;
|
*errnum = state->err;
|
||||||
|
return state->err == Z_MEM_ERROR ? "out of memory" :
|
||||||
return state->msg == NULL ? "" : state->msg;
|
(state->msg == NULL ? "" : state->msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
void ZEXPORT gzclearerr(gzFile file)
|
|
||||||
#else
|
|
||||||
void ZEXPORT gzclearerr(file)
|
void ZEXPORT gzclearerr(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure and check integrity */
|
/* get internal structure and check integrity */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
if (state->mode != GZ_READ && state->mode != GZ_WRITE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* clear error and end-of-file */
|
/* clear error and end-of-file */
|
||||||
if (state->mode == GZ_READ)
|
if (state->mode == GZ_READ) {
|
||||||
{
|
|
||||||
state->eof = 0;
|
state->eof = 0;
|
||||||
state->past = 0;
|
state->past = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
gz_error(state, Z_OK, NULL);
|
gz_error(state, Z_OK, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -705,21 +576,15 @@ gzFile file;
|
||||||
memory). Simply save the error message as a static string. If there is an
|
memory). Simply save the error message as a static string. If there is an
|
||||||
allocation failure constructing the error message, then convert the error to
|
allocation failure constructing the error message, then convert the error to
|
||||||
out of memory. */
|
out of memory. */
|
||||||
#ifdef WIN32
|
|
||||||
void ZLIB_INTERNAL gz_error(gz_statep state, int err, const char* msg)
|
|
||||||
#else
|
|
||||||
void ZLIB_INTERNAL gz_error(state, err, msg)
|
void ZLIB_INTERNAL gz_error(state, err, msg)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
int err;
|
int err;
|
||||||
const char* msg;
|
const char *msg;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
/* free previously allocated message and clear */
|
/* free previously allocated message and clear */
|
||||||
if (state->msg != NULL)
|
if (state->msg != NULL) {
|
||||||
{
|
|
||||||
if (state->err != Z_MEM_ERROR)
|
if (state->err != Z_MEM_ERROR)
|
||||||
free(state->msg);
|
free(state->msg);
|
||||||
|
|
||||||
state->msg = NULL;
|
state->msg = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -729,29 +594,27 @@ const char* msg;
|
||||||
|
|
||||||
/* set error code, and if no message, then done */
|
/* set error code, and if no message, then done */
|
||||||
state->err = err;
|
state->err = err;
|
||||||
|
|
||||||
if (msg == NULL)
|
if (msg == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* for an out of memory error, save as static string */
|
/* for an out of memory error, return literal string when requested */
|
||||||
if (err == Z_MEM_ERROR)
|
if (err == Z_MEM_ERROR)
|
||||||
{
|
|
||||||
state->msg = (char*)msg;
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
/* construct error message with path */
|
/* construct error message with path */
|
||||||
if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL)
|
if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
|
||||||
{
|
NULL) {
|
||||||
state->err = Z_MEM_ERROR;
|
state->err = Z_MEM_ERROR;
|
||||||
state->msg = (char*)"out of memory";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
|
||||||
|
(void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
|
||||||
|
"%s%s%s", state->path, ": ", msg);
|
||||||
|
#else
|
||||||
strcpy(state->msg, state->path);
|
strcpy(state->msg, state->path);
|
||||||
strcat(state->msg, ": ");
|
strcat(state->msg, ": ");
|
||||||
strcat(state->msg, msg);
|
strcat(state->msg, msg);
|
||||||
return;
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef INT_MAX
|
#ifndef INT_MAX
|
||||||
|
|
@ -764,15 +627,11 @@ unsigned ZLIB_INTERNAL gz_intmax()
|
||||||
unsigned p, q;
|
unsigned p, q;
|
||||||
|
|
||||||
p = 1;
|
p = 1;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
q = p;
|
q = p;
|
||||||
p <<= 1;
|
p <<= 1;
|
||||||
p++;
|
p++;
|
||||||
}
|
} while (p > q);
|
||||||
while (p > q);
|
|
||||||
|
|
||||||
return q >> 1;
|
return q >> 1;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -1,56 +1,48 @@
|
||||||
/* gzread.c -- zlib functions for reading gzip files
|
/* gzread.c -- zlib functions for reading gzip files
|
||||||
* Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
|
* Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "gzguts.h"
|
#include "gzguts.h"
|
||||||
|
|
||||||
/* Local functions */
|
/* Local functions */
|
||||||
local int gz_load OF((gz_statep, unsigned char*, unsigned, unsigned*));
|
local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
|
||||||
local int gz_avail OF((gz_statep));
|
local int gz_avail OF((gz_statep));
|
||||||
local int gz_look OF((gz_statep));
|
local int gz_look OF((gz_statep));
|
||||||
local int gz_decomp OF((gz_statep));
|
local int gz_decomp OF((gz_statep));
|
||||||
local int gz_fetch OF((gz_statep));
|
local int gz_fetch OF((gz_statep));
|
||||||
local int gz_skip OF((gz_statep, z_off64_t));
|
local int gz_skip OF((gz_statep, z_off64_t));
|
||||||
|
local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
|
||||||
|
|
||||||
/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from
|
/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from
|
||||||
state->fd, and update state->eof, state->err, and state->msg as appropriate.
|
state->fd, and update state->eof, state->err, and state->msg as appropriate.
|
||||||
This function needs to loop on read(), since read() is not guaranteed to
|
This function needs to loop on read(), since read() is not guaranteed to
|
||||||
read the number of bytes requested, depending on the type of descriptor. */
|
read the number of bytes requested, depending on the type of descriptor. */
|
||||||
#ifdef WIN32
|
|
||||||
local int gz_load(gz_statep state, unsigned char* buf, unsigned len, unsigned* have)
|
|
||||||
#else
|
|
||||||
local int gz_load(state, buf, len, have)
|
local int gz_load(state, buf, len, have)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
unsigned char* buf;
|
unsigned char *buf;
|
||||||
unsigned len;
|
unsigned len;
|
||||||
unsigned* have;
|
unsigned *have;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
unsigned get, max = ((unsigned)-1 >> 2) + 1;
|
||||||
|
|
||||||
*have = 0;
|
*have = 0;
|
||||||
|
do {
|
||||||
do
|
get = len - *have;
|
||||||
{
|
if (get > max)
|
||||||
ret = read(state->fd, buf + *have, len - *have);
|
get = max;
|
||||||
|
ret = read(state->fd, buf + *have, get);
|
||||||
if (ret <= 0)
|
if (ret <= 0)
|
||||||
break;
|
break;
|
||||||
|
*have += (unsigned)ret;
|
||||||
*have += ret;
|
} while (*have < len);
|
||||||
}
|
if (ret < 0) {
|
||||||
while (*have < len);
|
|
||||||
|
|
||||||
if (ret < 0)
|
|
||||||
{
|
|
||||||
gz_error(state, Z_ERRNO, zstrerror());
|
gz_error(state, Z_ERRNO, zstrerror());
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
state->eof = 1;
|
state->eof = 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -61,41 +53,29 @@ unsigned* have;
|
||||||
If strm->avail_in != 0, then the current data is moved to the beginning of
|
If strm->avail_in != 0, then the current data is moved to the beginning of
|
||||||
the input buffer, and then the remainder of the buffer is loaded with the
|
the input buffer, and then the remainder of the buffer is loaded with the
|
||||||
available data from the input file. */
|
available data from the input file. */
|
||||||
#ifdef WIN32
|
|
||||||
local int gz_avail(gz_statep state)
|
|
||||||
#else
|
|
||||||
local int gz_avail(state)
|
local int gz_avail(state)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned got;
|
unsigned got;
|
||||||
z_streamp strm = &(state->strm);
|
z_streamp strm = &(state->strm);
|
||||||
|
|
||||||
if (state->err != Z_OK && state->err != Z_BUF_ERROR)
|
if (state->err != Z_OK && state->err != Z_BUF_ERROR)
|
||||||
return -1;
|
return -1;
|
||||||
|
if (state->eof == 0) {
|
||||||
if (state->eof == 0)
|
if (strm->avail_in) { /* copy what's there to the start */
|
||||||
{
|
unsigned char *p = state->in;
|
||||||
if (strm->avail_in) /* copy what's there to the start */
|
unsigned const char *q = strm->next_in;
|
||||||
{
|
|
||||||
unsigned char* p = state->in, *q = strm->next_in;
|
|
||||||
unsigned n = strm->avail_in;
|
unsigned n = strm->avail_in;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
*p++ = *q++;
|
*p++ = *q++;
|
||||||
}
|
} while (--n);
|
||||||
while (--n);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gz_load(state, state->in + strm->avail_in,
|
if (gz_load(state, state->in + strm->avail_in,
|
||||||
state->size - strm->avail_in, &got) == -1)
|
state->size - strm->avail_in, &got) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
strm->avail_in += got;
|
strm->avail_in += got;
|
||||||
strm->next_in = state->in;
|
strm->next_in = state->in;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -108,34 +88,22 @@ gz_statep state;
|
||||||
case, all further file reads will be directly to either the output buffer or
|
case, all further file reads will be directly to either the output buffer or
|
||||||
a user buffer. If decompressing, the inflate state will be initialized.
|
a user buffer. If decompressing, the inflate state will be initialized.
|
||||||
gz_look() will return 0 on success or -1 on failure. */
|
gz_look() will return 0 on success or -1 on failure. */
|
||||||
#ifdef WIN32
|
|
||||||
local int gz_look(gz_statep state)
|
|
||||||
#else
|
|
||||||
local int gz_look(state)
|
local int gz_look(state)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_streamp strm = &(state->strm);
|
z_streamp strm = &(state->strm);
|
||||||
|
|
||||||
/* allocate read buffers and inflate memory */
|
/* allocate read buffers and inflate memory */
|
||||||
if (state->size == 0)
|
if (state->size == 0) {
|
||||||
{
|
|
||||||
/* allocate buffers */
|
/* allocate buffers */
|
||||||
state->in = malloc(state->want);
|
state->in = (unsigned char *)malloc(state->want);
|
||||||
state->out = malloc(state->want << 1);
|
state->out = (unsigned char *)malloc(state->want << 1);
|
||||||
|
if (state->in == NULL || state->out == NULL) {
|
||||||
if (state->in == NULL || state->out == NULL)
|
free(state->out);
|
||||||
{
|
free(state->in);
|
||||||
if (state->out != NULL)
|
|
||||||
free(state->out);
|
|
||||||
|
|
||||||
if (state->in != NULL)
|
|
||||||
free(state->in);
|
|
||||||
|
|
||||||
gz_error(state, Z_MEM_ERROR, "out of memory");
|
gz_error(state, Z_MEM_ERROR, "out of memory");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
state->size = state->want;
|
state->size = state->want;
|
||||||
|
|
||||||
/* allocate inflate memory */
|
/* allocate inflate memory */
|
||||||
|
|
@ -144,9 +112,7 @@ gz_statep state;
|
||||||
state->strm.opaque = Z_NULL;
|
state->strm.opaque = Z_NULL;
|
||||||
state->strm.avail_in = 0;
|
state->strm.avail_in = 0;
|
||||||
state->strm.next_in = Z_NULL;
|
state->strm.next_in = Z_NULL;
|
||||||
|
if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) { /* gunzip */
|
||||||
if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) /* gunzip */
|
|
||||||
{
|
|
||||||
free(state->out);
|
free(state->out);
|
||||||
free(state->in);
|
free(state->in);
|
||||||
state->size = 0;
|
state->size = 0;
|
||||||
|
|
@ -156,11 +122,9 @@ gz_statep state;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* get at least the magic bytes in the input buffer */
|
/* get at least the magic bytes in the input buffer */
|
||||||
if (strm->avail_in < 2)
|
if (strm->avail_in < 2) {
|
||||||
{
|
|
||||||
if (gz_avail(state) == -1)
|
if (gz_avail(state) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (strm->avail_in == 0)
|
if (strm->avail_in == 0)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -173,8 +137,7 @@ gz_statep state;
|
||||||
the header will be written in a single operation, so that reading a
|
the header will be written in a single operation, so that reading a
|
||||||
single byte is sufficient indication that it is not a gzip file) */
|
single byte is sufficient indication that it is not a gzip file) */
|
||||||
if (strm->avail_in > 1 &&
|
if (strm->avail_in > 1 &&
|
||||||
strm->next_in[0] == 31 && strm->next_in[1] == 139)
|
strm->next_in[0] == 31 && strm->next_in[1] == 139) {
|
||||||
{
|
|
||||||
inflateReset(strm);
|
inflateReset(strm);
|
||||||
state->how = GZIP;
|
state->how = GZIP;
|
||||||
state->direct = 0;
|
state->direct = 0;
|
||||||
|
|
@ -183,8 +146,7 @@ gz_statep state;
|
||||||
|
|
||||||
/* no gzip header -- if we were decoding gzip before, then this is trailing
|
/* no gzip header -- if we were decoding gzip before, then this is trailing
|
||||||
garbage. Ignore the trailing garbage and finish. */
|
garbage. Ignore the trailing garbage and finish. */
|
||||||
if (state->direct == 0)
|
if (state->direct == 0) {
|
||||||
{
|
|
||||||
strm->avail_in = 0;
|
strm->avail_in = 0;
|
||||||
state->eof = 1;
|
state->eof = 1;
|
||||||
state->x.have = 0;
|
state->x.have = 0;
|
||||||
|
|
@ -195,14 +157,11 @@ gz_statep state;
|
||||||
the output buffer is larger than the input buffer, which also assures
|
the output buffer is larger than the input buffer, which also assures
|
||||||
space for gzungetc() */
|
space for gzungetc() */
|
||||||
state->x.next = state->out;
|
state->x.next = state->out;
|
||||||
|
if (strm->avail_in) {
|
||||||
if (strm->avail_in)
|
|
||||||
{
|
|
||||||
memcpy(state->x.next, strm->next_in, strm->avail_in);
|
memcpy(state->x.next, strm->next_in, strm->avail_in);
|
||||||
state->x.have = strm->avail_in;
|
state->x.have = strm->avail_in;
|
||||||
strm->avail_in = 0;
|
strm->avail_in = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
state->how = COPY;
|
state->how = COPY;
|
||||||
state->direct = 1;
|
state->direct = 1;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
@ -213,12 +172,8 @@ gz_statep state;
|
||||||
data. If the gzip stream completes, state->how is reset to LOOK to look for
|
data. If the gzip stream completes, state->how is reset to LOOK to look for
|
||||||
the next gzip stream or raw data, once state->x.have is depleted. Returns 0
|
the next gzip stream or raw data, once state->x.have is depleted. Returns 0
|
||||||
on success, -1 on failure. */
|
on success, -1 on failure. */
|
||||||
#ifdef WIN32
|
|
||||||
local int gz_decomp(gz_statep state)
|
|
||||||
#else
|
|
||||||
local int gz_decomp(state)
|
local int gz_decomp(state)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int ret = Z_OK;
|
int ret = Z_OK;
|
||||||
unsigned had;
|
unsigned had;
|
||||||
|
|
@ -226,43 +181,32 @@ gz_statep state;
|
||||||
|
|
||||||
/* fill output buffer up to end of deflate stream */
|
/* fill output buffer up to end of deflate stream */
|
||||||
had = strm->avail_out;
|
had = strm->avail_out;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
/* get more input for inflate() */
|
/* get more input for inflate() */
|
||||||
if (strm->avail_in == 0 && gz_avail(state) == -1)
|
if (strm->avail_in == 0 && gz_avail(state) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
if (strm->avail_in == 0) {
|
||||||
if (strm->avail_in == 0)
|
|
||||||
{
|
|
||||||
gz_error(state, Z_BUF_ERROR, "unexpected end of file");
|
gz_error(state, Z_BUF_ERROR, "unexpected end of file");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* decompress and handle errors */
|
/* decompress and handle errors */
|
||||||
ret = inflate(strm, Z_NO_FLUSH);
|
ret = inflate(strm, Z_NO_FLUSH);
|
||||||
|
if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
|
||||||
if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT)
|
|
||||||
{
|
|
||||||
gz_error(state, Z_STREAM_ERROR,
|
gz_error(state, Z_STREAM_ERROR,
|
||||||
"internal error: inflate stream corrupt");
|
"internal error: inflate stream corrupt");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
if (ret == Z_MEM_ERROR) {
|
||||||
if (ret == Z_MEM_ERROR)
|
|
||||||
{
|
|
||||||
gz_error(state, Z_MEM_ERROR, "out of memory");
|
gz_error(state, Z_MEM_ERROR, "out of memory");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
if (ret == Z_DATA_ERROR) { /* deflate stream invalid */
|
||||||
if (ret == Z_DATA_ERROR) /* deflate stream invalid */
|
|
||||||
{
|
|
||||||
gz_error(state, Z_DATA_ERROR,
|
gz_error(state, Z_DATA_ERROR,
|
||||||
strm->msg == NULL ? "compressed data error" : strm->msg);
|
strm->msg == NULL ? "compressed data error" : strm->msg);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
} while (strm->avail_out && ret != Z_STREAM_END);
|
||||||
while (strm->avail_out && ret != Z_STREAM_END);
|
|
||||||
|
|
||||||
/* update available output */
|
/* update available output */
|
||||||
state->x.have = had - strm->avail_out;
|
state->x.have = had - strm->avail_out;
|
||||||
|
|
@ -282,66 +226,46 @@ gz_statep state;
|
||||||
looked for to determine whether to copy or decompress. Returns -1 on error,
|
looked for to determine whether to copy or decompress. Returns -1 on error,
|
||||||
otherwise 0. gz_fetch() will leave state->how as COPY or GZIP unless the
|
otherwise 0. gz_fetch() will leave state->how as COPY or GZIP unless the
|
||||||
end of the input file has been reached and all data has been processed. */
|
end of the input file has been reached and all data has been processed. */
|
||||||
#ifdef WIN32
|
|
||||||
local int gz_fetch(gz_statep state)
|
|
||||||
#else
|
|
||||||
local int gz_fetch(state)
|
local int gz_fetch(state)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_streamp strm = &(state->strm);
|
z_streamp strm = &(state->strm);
|
||||||
|
|
||||||
do
|
do {
|
||||||
{
|
switch(state->how) {
|
||||||
switch (state->how)
|
case LOOK: /* -> LOOK, COPY (only if never GZIP), or GZIP */
|
||||||
{
|
if (gz_look(state) == -1)
|
||||||
case LOOK: /* -> LOOK, COPY (only if never GZIP), or GZIP */
|
return -1;
|
||||||
if (gz_look(state) == -1)
|
if (state->how == LOOK)
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (state->how == LOOK)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case COPY: /* -> COPY */
|
|
||||||
if (gz_load(state, state->out, state->size << 1, &(state->x.have))
|
|
||||||
== -1)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
state->x.next = state->out;
|
|
||||||
return 0;
|
return 0;
|
||||||
|
break;
|
||||||
case GZIP: /* -> GZIP or LOOK (if end of gzip stream) */
|
case COPY: /* -> COPY */
|
||||||
strm->avail_out = state->size << 1;
|
if (gz_load(state, state->out, state->size << 1, &(state->x.have))
|
||||||
strm->next_out = state->out;
|
== -1)
|
||||||
|
return -1;
|
||||||
if (gz_decomp(state) == -1)
|
state->x.next = state->out;
|
||||||
return -1;
|
return 0;
|
||||||
|
case GZIP: /* -> GZIP or LOOK (if end of gzip stream) */
|
||||||
|
strm->avail_out = state->size << 1;
|
||||||
|
strm->next_out = state->out;
|
||||||
|
if (gz_decomp(state) == -1)
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
} while (state->x.have == 0 && (!state->eof || strm->avail_in));
|
||||||
while (state->x.have == 0 && (!state->eof || strm->avail_in));
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */
|
/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */
|
||||||
#ifdef WIN32
|
|
||||||
local int gz_skip(gz_statep state, z_off64_t len)
|
|
||||||
#else
|
|
||||||
local int gz_skip(state, len)
|
local int gz_skip(state, len)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_off64_t len;
|
z_off64_t len;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned n;
|
unsigned n;
|
||||||
|
|
||||||
/* skip over len bytes or reach end-of-file, whichever comes first */
|
/* skip over len bytes or reach end-of-file, whichever comes first */
|
||||||
while (len)
|
while (len)
|
||||||
|
|
||||||
/* skip over whatever is in output buffer */
|
/* skip over whatever is in output buffer */
|
||||||
if (state->x.have)
|
if (state->x.have) {
|
||||||
{
|
|
||||||
n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
|
n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
|
||||||
(unsigned)len : state->x.have;
|
(unsigned)len : state->x.have;
|
||||||
state->x.have -= n;
|
state->x.have -= n;
|
||||||
|
|
@ -350,41 +274,115 @@ z_off64_t len;
|
||||||
len -= n;
|
len -= n;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* output buffer empty -- return if we're at the end of the input */
|
/* output buffer empty -- return if we're at the end of the input */
|
||||||
else if (state->eof && state->strm.avail_in == 0)
|
else if (state->eof && state->strm.avail_in == 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* need more data to skip -- load up output buffer */
|
/* need more data to skip -- load up output buffer */
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
/* get more output, looking for header if required */
|
/* get more output, looking for header if required */
|
||||||
if (gz_fetch(state) == -1)
|
if (gz_fetch(state) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* Read len bytes into buf from file, or less than len up to the end of the
|
||||||
#ifdef WIN32
|
input. Return the number of bytes read. If zero is returned, either the
|
||||||
int ZEXPORT gzread(gzFile file, voidp buf, unsigned len)
|
end of file was reached, or there was an error. state->err must be
|
||||||
#else
|
consulted in that case to determine which. */
|
||||||
int ZEXPORT gzread(file, buf, len)
|
local z_size_t gz_read(state, buf, len)
|
||||||
gzFile file;
|
gz_statep state;
|
||||||
voidp buf;
|
voidp buf;
|
||||||
unsigned len;
|
z_size_t len;
|
||||||
#endif
|
{
|
||||||
{
|
z_size_t got;
|
||||||
unsigned got, n;
|
unsigned n;
|
||||||
|
|
||||||
|
/* if len is zero, avoid unnecessary operations */
|
||||||
|
if (len == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* process a skip request */
|
||||||
|
if (state->seek) {
|
||||||
|
state->seek = 0;
|
||||||
|
if (gz_skip(state, state->skip) == -1)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* get len bytes to buf, or less than len if at the end */
|
||||||
|
got = 0;
|
||||||
|
do {
|
||||||
|
/* set n to the maximum amount of len that fits in an unsigned int */
|
||||||
|
n = -1;
|
||||||
|
if (n > len)
|
||||||
|
n = len;
|
||||||
|
|
||||||
|
/* first just try copying data from the output buffer */
|
||||||
|
if (state->x.have) {
|
||||||
|
if (state->x.have < n)
|
||||||
|
n = state->x.have;
|
||||||
|
memcpy(buf, state->x.next, n);
|
||||||
|
state->x.next += n;
|
||||||
|
state->x.have -= n;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* output buffer empty -- return if we're at the end of the input */
|
||||||
|
else if (state->eof && state->strm.avail_in == 0) {
|
||||||
|
state->past = 1; /* tried to read past end */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* need output data -- for small len or new stream load up our output
|
||||||
|
buffer */
|
||||||
|
else if (state->how == LOOK || n < (state->size << 1)) {
|
||||||
|
/* get more output, looking for header if required */
|
||||||
|
if (gz_fetch(state) == -1)
|
||||||
|
return 0;
|
||||||
|
continue; /* no progress yet -- go back to copy above */
|
||||||
|
/* the copy above assures that we will leave with space in the
|
||||||
|
output buffer, allowing at least one gzungetc() to succeed */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* large len -- read directly into user buffer */
|
||||||
|
else if (state->how == COPY) { /* read directly */
|
||||||
|
if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* large len -- decompress directly into user buffer */
|
||||||
|
else { /* state->how == GZIP */
|
||||||
|
state->strm.avail_out = n;
|
||||||
|
state->strm.next_out = (unsigned char *)buf;
|
||||||
|
if (gz_decomp(state) == -1)
|
||||||
|
return 0;
|
||||||
|
n = state->x.have;
|
||||||
|
state->x.have = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* update progress */
|
||||||
|
len -= n;
|
||||||
|
buf = (char *)buf + n;
|
||||||
|
got += n;
|
||||||
|
state->x.pos += n;
|
||||||
|
} while (len);
|
||||||
|
|
||||||
|
/* return number of bytes read into user buffer */
|
||||||
|
return got;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -- see zlib.h -- */
|
||||||
|
int ZEXPORT gzread(file, buf, len)
|
||||||
|
gzFile file;
|
||||||
|
voidp buf;
|
||||||
|
unsigned len;
|
||||||
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_streamp strm;
|
|
||||||
|
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
strm = &(state->strm);
|
|
||||||
|
|
||||||
/* check that we're reading and that there's no (serious) error */
|
/* check that we're reading and that there's no (serious) error */
|
||||||
if (state->mode != GZ_READ ||
|
if (state->mode != GZ_READ ||
|
||||||
|
|
@ -392,100 +390,62 @@ unsigned len;
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* since an int is returned, make sure len fits in one, otherwise return
|
/* since an int is returned, make sure len fits in one, otherwise return
|
||||||
with an error (this avoids the flaw in the interface) */
|
with an error (this avoids a flaw in the interface) */
|
||||||
if ((int)len < 0)
|
if ((int)len < 0) {
|
||||||
{
|
gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
|
||||||
gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if len is zero, avoid unnecessary operations */
|
/* read len or fewer bytes to buf */
|
||||||
if (len == 0)
|
len = gz_read(state, buf, len);
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* process a skip request */
|
/* check for an error */
|
||||||
if (state->seek)
|
if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
|
||||||
{
|
return -1;
|
||||||
state->seek = 0;
|
|
||||||
|
|
||||||
if (gz_skip(state, state->skip) == -1)
|
/* return the number of bytes read (this is assured to fit in an int) */
|
||||||
return -1;
|
return (int)len;
|
||||||
}
|
|
||||||
|
|
||||||
/* get len bytes to buf, or less than len if at the end */
|
|
||||||
got = 0;
|
|
||||||
|
|
||||||
do
|
|
||||||
{
|
|
||||||
/* first just try copying data from the output buffer */
|
|
||||||
if (state->x.have)
|
|
||||||
{
|
|
||||||
n = state->x.have > len ? len : state->x.have;
|
|
||||||
memcpy(buf, state->x.next, n);
|
|
||||||
state->x.next += n;
|
|
||||||
state->x.have -= n;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* output buffer empty -- return if we're at the end of the input */
|
|
||||||
else if (state->eof && strm->avail_in == 0)
|
|
||||||
{
|
|
||||||
state->past = 1; /* tried to read past end */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* need output data -- for small len or new stream load up our output
|
|
||||||
buffer */
|
|
||||||
else if (state->how == LOOK || len < (state->size << 1))
|
|
||||||
{
|
|
||||||
/* get more output, looking for header if required */
|
|
||||||
if (gz_fetch(state) == -1)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
continue; /* no progress yet -- go back to copy above */
|
|
||||||
/* the copy above assures that we will leave with space in the
|
|
||||||
output buffer, allowing at least one gzungetc() to succeed */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* large len -- read directly into user buffer */
|
|
||||||
else if (state->how == COPY) /* read directly */
|
|
||||||
{
|
|
||||||
if (gz_load(state, buf, len, &n) == -1)
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* large len -- decompress directly into user buffer */
|
|
||||||
else /* state->how == GZIP */
|
|
||||||
{
|
|
||||||
strm->avail_out = len;
|
|
||||||
strm->next_out = buf;
|
|
||||||
|
|
||||||
if (gz_decomp(state) == -1)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
n = state->x.have;
|
|
||||||
state->x.have = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* update progress */
|
|
||||||
len -= n;
|
|
||||||
buf = (char*)buf + n;
|
|
||||||
got += n;
|
|
||||||
state->x.pos += n;
|
|
||||||
}
|
|
||||||
while (len);
|
|
||||||
|
|
||||||
/* return number of bytes read into user buffer (will fit in int) */
|
|
||||||
return (int)got;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#undef gzgetc
|
z_size_t ZEXPORT gzfread(buf, size, nitems, file)
|
||||||
#ifdef WIN32
|
voidp buf;
|
||||||
int ZEXPORT gzgetc(gzFile file)
|
z_size_t size;
|
||||||
|
z_size_t nitems;
|
||||||
|
gzFile file;
|
||||||
|
{
|
||||||
|
z_size_t len;
|
||||||
|
gz_statep state;
|
||||||
|
|
||||||
|
/* get internal structure */
|
||||||
|
if (file == NULL)
|
||||||
|
return 0;
|
||||||
|
state = (gz_statep)file;
|
||||||
|
|
||||||
|
/* check that we're reading and that there's no (serious) error */
|
||||||
|
if (state->mode != GZ_READ ||
|
||||||
|
(state->err != Z_OK && state->err != Z_BUF_ERROR))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* compute bytes to read -- error on overflow */
|
||||||
|
len = nitems * size;
|
||||||
|
if (size && len / size != nitems) {
|
||||||
|
gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* read len or fewer bytes to buf, return the number of full items read */
|
||||||
|
return len ? gz_read(state, buf, len) / size : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -- see zlib.h -- */
|
||||||
|
#ifdef Z_PREFIX_SET
|
||||||
|
# undef z_gzgetc
|
||||||
#else
|
#else
|
||||||
int ZEXPORT gzgetc(file)
|
# undef gzgetc
|
||||||
gzFile file;
|
|
||||||
#endif
|
#endif
|
||||||
|
int ZEXPORT gzgetc(file)
|
||||||
|
gzFile file;
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned char buf[1];
|
unsigned char buf[1];
|
||||||
|
|
@ -494,64 +454,51 @@ gzFile file;
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* check that we're reading and that there's no (serious) error */
|
/* check that we're reading and that there's no (serious) error */
|
||||||
if (state->mode != GZ_READ ||
|
if (state->mode != GZ_READ ||
|
||||||
(state->err != Z_OK && state->err != Z_BUF_ERROR))
|
(state->err != Z_OK && state->err != Z_BUF_ERROR))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* try output buffer (no need to check for skip request) */
|
/* try output buffer (no need to check for skip request) */
|
||||||
if (state->x.have)
|
if (state->x.have) {
|
||||||
{
|
|
||||||
state->x.have--;
|
state->x.have--;
|
||||||
state->x.pos++;
|
state->x.pos++;
|
||||||
return *(state->x.next)++;
|
return *(state->x.next)++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* nothing there -- try gzread() */
|
/* nothing there -- try gz_read() */
|
||||||
ret = gzread(file, buf, 1);
|
ret = gz_read(state, buf, 1);
|
||||||
return ret < 1 ? -1 : buf[0];
|
return ret < 1 ? -1 : buf[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzgetc_(gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzgetc_(file)
|
int ZEXPORT gzgetc_(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return gzgetc(file);
|
return gzgetc(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzungetc(signed char c, gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzungetc(c, file)
|
int ZEXPORT gzungetc(c, file)
|
||||||
int c;
|
int c;
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* check that we're reading and that there's no (serious) error */
|
/* check that we're reading and that there's no (serious) error */
|
||||||
if (state->mode != GZ_READ ||
|
if (state->mode != GZ_READ ||
|
||||||
(state->err != Z_OK && state->err != Z_BUF_ERROR))
|
(state->err != Z_OK && state->err != Z_BUF_ERROR))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* process a skip request */
|
/* process a skip request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_skip(state, state->skip) == -1)
|
if (gz_skip(state, state->skip) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -561,74 +508,61 @@ gzFile file;
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* if output buffer empty, put byte at end (allows more pushing) */
|
/* if output buffer empty, put byte at end (allows more pushing) */
|
||||||
if (state->x.have == 0)
|
if (state->x.have == 0) {
|
||||||
{
|
|
||||||
state->x.have = 1;
|
state->x.have = 1;
|
||||||
state->x.next = state->out + (state->size << 1) - 1;
|
state->x.next = state->out + (state->size << 1) - 1;
|
||||||
state->x.next[0] = c;
|
state->x.next[0] = (unsigned char)c;
|
||||||
state->x.pos--;
|
state->x.pos--;
|
||||||
state->past = 0;
|
state->past = 0;
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if no room, give up (must have already done a gzungetc()) */
|
/* if no room, give up (must have already done a gzungetc()) */
|
||||||
if (state->x.have == (state->size << 1))
|
if (state->x.have == (state->size << 1)) {
|
||||||
{
|
|
||||||
gz_error(state, Z_DATA_ERROR, "out of room to push characters");
|
gz_error(state, Z_DATA_ERROR, "out of room to push characters");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* slide output data if needed and insert byte before existing data */
|
/* slide output data if needed and insert byte before existing data */
|
||||||
if (state->x.next == state->out)
|
if (state->x.next == state->out) {
|
||||||
{
|
unsigned char *src = state->out + state->x.have;
|
||||||
unsigned char* src = state->out + state->x.have;
|
unsigned char *dest = state->out + (state->size << 1);
|
||||||
unsigned char* dest = state->out + (state->size << 1);
|
|
||||||
|
|
||||||
while (src > state->out)
|
while (src > state->out)
|
||||||
*--dest = *--src;
|
*--dest = *--src;
|
||||||
|
|
||||||
state->x.next = dest;
|
state->x.next = dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
state->x.have++;
|
state->x.have++;
|
||||||
state->x.next--;
|
state->x.next--;
|
||||||
state->x.next[0] = c;
|
state->x.next[0] = (unsigned char)c;
|
||||||
state->x.pos--;
|
state->x.pos--;
|
||||||
state->past = 0;
|
state->past = 0;
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
char * ZEXPORT gzgets(file, buf, len)
|
||||||
char* ZEXPORT gzgets(gzFile file, char* buf, int len)
|
gzFile file;
|
||||||
#else
|
char *buf;
|
||||||
char* ZEXPORT gzgets(file, buf, len)
|
int len;
|
||||||
gzFile file;
|
|
||||||
char* buf;
|
|
||||||
int len;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned left, n;
|
unsigned left, n;
|
||||||
char* str;
|
char *str;
|
||||||
unsigned char* eol;
|
unsigned char *eol;
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* check parameters and get internal structure */
|
/* check parameters and get internal structure */
|
||||||
if (file == NULL || buf == NULL || len < 1)
|
if (file == NULL || buf == NULL || len < 1)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* check that we're reading and that there's no (serious) error */
|
/* check that we're reading and that there's no (serious) error */
|
||||||
if (state->mode != GZ_READ ||
|
if (state->mode != GZ_READ ||
|
||||||
(state->err != Z_OK && state->err != Z_BUF_ERROR))
|
(state->err != Z_OK && state->err != Z_BUF_ERROR))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* process a skip request */
|
/* process a skip request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_skip(state, state->skip) == -1)
|
if (gz_skip(state, state->skip) == -1)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -638,58 +572,46 @@ int len;
|
||||||
the contents, let the user worry about that) */
|
the contents, let the user worry about that) */
|
||||||
str = buf;
|
str = buf;
|
||||||
left = (unsigned)len - 1;
|
left = (unsigned)len - 1;
|
||||||
|
if (left) do {
|
||||||
if (left) do
|
/* assure that something is in the output buffer */
|
||||||
{
|
if (state->x.have == 0 && gz_fetch(state) == -1)
|
||||||
/* assure that something is in the output buffer */
|
return NULL; /* error */
|
||||||
if (state->x.have == 0 && gz_fetch(state) == -1)
|
if (state->x.have == 0) { /* end of file */
|
||||||
return NULL; /* error */
|
state->past = 1; /* read past end */
|
||||||
|
break; /* return what we have */
|
||||||
if (state->x.have == 0) /* end of file */
|
|
||||||
{
|
|
||||||
state->past = 1; /* read past end */
|
|
||||||
break; /* return what we have */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* look for end-of-line in current output buffer */
|
|
||||||
n = state->x.have > left ? left : state->x.have;
|
|
||||||
eol = memchr(state->x.next, '\n', n);
|
|
||||||
|
|
||||||
if (eol != NULL)
|
|
||||||
n = (unsigned)(eol - state->x.next) + 1;
|
|
||||||
|
|
||||||
/* copy through end-of-line, or remainder if not found */
|
|
||||||
memcpy(buf, state->x.next, n);
|
|
||||||
state->x.have -= n;
|
|
||||||
state->x.next += n;
|
|
||||||
state->x.pos += n;
|
|
||||||
left -= n;
|
|
||||||
buf += n;
|
|
||||||
}
|
}
|
||||||
while (left && eol == NULL);
|
|
||||||
|
/* look for end-of-line in current output buffer */
|
||||||
|
n = state->x.have > left ? left : state->x.have;
|
||||||
|
eol = (unsigned char *)memchr(state->x.next, '\n', n);
|
||||||
|
if (eol != NULL)
|
||||||
|
n = (unsigned)(eol - state->x.next) + 1;
|
||||||
|
|
||||||
|
/* copy through end-of-line, or remainder if not found */
|
||||||
|
memcpy(buf, state->x.next, n);
|
||||||
|
state->x.have -= n;
|
||||||
|
state->x.next += n;
|
||||||
|
state->x.pos += n;
|
||||||
|
left -= n;
|
||||||
|
buf += n;
|
||||||
|
} while (left && eol == NULL);
|
||||||
|
|
||||||
/* return terminated string, or if nothing, end of file */
|
/* return terminated string, or if nothing, end of file */
|
||||||
if (buf == str)
|
if (buf == str)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzdirect(gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzdirect(file)
|
int ZEXPORT gzdirect(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* if the state is not known, but we can find out, then do so (this is
|
/* if the state is not known, but we can find out, then do so (this is
|
||||||
|
|
@ -702,12 +624,8 @@ gzFile file;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzclose_r(gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzclose_r(file)
|
int ZEXPORT gzclose_r(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int ret, err;
|
int ret, err;
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
@ -715,7 +633,6 @@ gzFile file;
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* check that we're reading */
|
/* check that we're reading */
|
||||||
|
|
@ -723,13 +640,11 @@ gzFile file;
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
/* free memory and close file */
|
/* free memory and close file */
|
||||||
if (state->size)
|
if (state->size) {
|
||||||
{
|
|
||||||
inflateEnd(&(state->strm));
|
inflateEnd(&(state->strm));
|
||||||
free(state->out);
|
free(state->out);
|
||||||
free(state->in);
|
free(state->in);
|
||||||
}
|
}
|
||||||
|
|
||||||
err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
|
err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
|
||||||
gz_error(state, Z_OK, NULL);
|
gz_error(state, Z_OK, NULL);
|
||||||
free(state->path);
|
free(state->path);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* gzwrite.c -- zlib functions for writing gzip files
|
/* gzwrite.c -- zlib functions for writing gzip files
|
||||||
* Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
|
* Copyright (C) 2004-2017 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -9,36 +9,29 @@
|
||||||
local int gz_init OF((gz_statep));
|
local int gz_init OF((gz_statep));
|
||||||
local int gz_comp OF((gz_statep, int));
|
local int gz_comp OF((gz_statep, int));
|
||||||
local int gz_zero OF((gz_statep, z_off64_t));
|
local int gz_zero OF((gz_statep, z_off64_t));
|
||||||
|
local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
|
||||||
|
|
||||||
/* Initialize state for writing a gzip file. Mark initialization by setting
|
/* Initialize state for writing a gzip file. Mark initialization by setting
|
||||||
state->size to non-zero. Return -1 on failure or 0 on success. */
|
state->size to non-zero. Return -1 on a memory allocation failure, or 0 on
|
||||||
#ifdef WIN32
|
success. */
|
||||||
local int gz_init(gz_statep state)
|
|
||||||
#else
|
|
||||||
local int gz_init(state)
|
local int gz_init(state)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
z_streamp strm = &(state->strm);
|
z_streamp strm = &(state->strm);
|
||||||
|
|
||||||
/* allocate input buffer */
|
/* allocate input buffer (double size for gzprintf) */
|
||||||
state->in = malloc(state->want);
|
state->in = (unsigned char *)malloc(state->want << 1);
|
||||||
|
if (state->in == NULL) {
|
||||||
if (state->in == NULL)
|
|
||||||
{
|
|
||||||
gz_error(state, Z_MEM_ERROR, "out of memory");
|
gz_error(state, Z_MEM_ERROR, "out of memory");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* only need output buffer and deflate state if compressing */
|
/* only need output buffer and deflate state if compressing */
|
||||||
if (!state->direct)
|
if (!state->direct) {
|
||||||
{
|
|
||||||
/* allocate output buffer */
|
/* allocate output buffer */
|
||||||
state->out = malloc(state->want);
|
state->out = (unsigned char *)malloc(state->want);
|
||||||
|
if (state->out == NULL) {
|
||||||
if (state->out == NULL)
|
|
||||||
{
|
|
||||||
free(state->in);
|
free(state->in);
|
||||||
gz_error(state, Z_MEM_ERROR, "out of memory");
|
gz_error(state, Z_MEM_ERROR, "out of memory");
|
||||||
return -1;
|
return -1;
|
||||||
|
|
@ -50,46 +43,39 @@ gz_statep state;
|
||||||
strm->opaque = Z_NULL;
|
strm->opaque = Z_NULL;
|
||||||
ret = deflateInit2(strm, state->level, Z_DEFLATED,
|
ret = deflateInit2(strm, state->level, Z_DEFLATED,
|
||||||
MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
|
MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
|
||||||
|
if (ret != Z_OK) {
|
||||||
if (ret != Z_OK)
|
|
||||||
{
|
|
||||||
free(state->out);
|
free(state->out);
|
||||||
free(state->in);
|
free(state->in);
|
||||||
gz_error(state, Z_MEM_ERROR, "out of memory");
|
gz_error(state, Z_MEM_ERROR, "out of memory");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
strm->next_in = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* mark state as initialized */
|
/* mark state as initialized */
|
||||||
state->size = state->want;
|
state->size = state->want;
|
||||||
|
|
||||||
/* initialize write buffer if compressing */
|
/* initialize write buffer if compressing */
|
||||||
if (!state->direct)
|
if (!state->direct) {
|
||||||
{
|
|
||||||
strm->avail_out = state->size;
|
strm->avail_out = state->size;
|
||||||
strm->next_out = state->out;
|
strm->next_out = state->out;
|
||||||
state->x.next = strm->next_out;
|
state->x.next = strm->next_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compress whatever is at avail_in and next_in and write to the output file.
|
/* Compress whatever is at avail_in and next_in and write to the output file.
|
||||||
Return -1 if there is an error writing to the output file, otherwise 0.
|
Return -1 if there is an error writing to the output file or if gz_init()
|
||||||
flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH,
|
fails to allocate memory, otherwise 0. flush is assumed to be a valid
|
||||||
then the deflate() state is reset to start a new gzip stream. If gz->direct
|
deflate() flush value. If flush is Z_FINISH, then the deflate() state is
|
||||||
is true, then simply write to the output file without compressing, and
|
reset to start a new gzip stream. If gz->direct is true, then simply write
|
||||||
ignore flush. */
|
to the output file without compressing, and ignore flush. */
|
||||||
#ifdef WIN32
|
|
||||||
local int gz_comp(gz_statep state, int flush)
|
|
||||||
#else
|
|
||||||
local int gz_comp(state, flush)
|
local int gz_comp(state, flush)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
int flush;
|
int flush;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int ret, got;
|
int ret, writ;
|
||||||
unsigned have;
|
unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
|
||||||
z_streamp strm = &(state->strm);
|
z_streamp strm = &(state->strm);
|
||||||
|
|
||||||
/* allocate memory if this is the first time through */
|
/* allocate memory if this is the first time through */
|
||||||
|
|
@ -97,62 +83,54 @@ int flush;
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* write directly if requested */
|
/* write directly if requested */
|
||||||
if (state->direct)
|
if (state->direct) {
|
||||||
{
|
while (strm->avail_in) {
|
||||||
got = write(state->fd, strm->next_in, strm->avail_in);
|
put = strm->avail_in > max ? max : strm->avail_in;
|
||||||
|
writ = write(state->fd, strm->next_in, put);
|
||||||
if (got < 0 || (unsigned)got != strm->avail_in)
|
if (writ < 0) {
|
||||||
{
|
gz_error(state, Z_ERRNO, zstrerror());
|
||||||
gz_error(state, Z_ERRNO, zstrerror());
|
return -1;
|
||||||
return -1;
|
}
|
||||||
|
strm->avail_in -= (unsigned)writ;
|
||||||
|
strm->next_in += writ;
|
||||||
}
|
}
|
||||||
|
|
||||||
strm->avail_in = 0;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* run deflate() on provided input until it produces no more output */
|
/* run deflate() on provided input until it produces no more output */
|
||||||
ret = Z_OK;
|
ret = Z_OK;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
/* write out current buffer contents if full, or if flushing, but if
|
/* write out current buffer contents if full, or if flushing, but if
|
||||||
doing Z_FINISH then don't write until we get to Z_STREAM_END */
|
doing Z_FINISH then don't write until we get to Z_STREAM_END */
|
||||||
if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
|
if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
|
||||||
(flush != Z_FINISH || ret == Z_STREAM_END)))
|
(flush != Z_FINISH || ret == Z_STREAM_END))) {
|
||||||
{
|
while (strm->next_out > state->x.next) {
|
||||||
have = (unsigned)(strm->next_out - state->x.next);
|
put = strm->next_out - state->x.next > (int)max ? max :
|
||||||
|
(unsigned)(strm->next_out - state->x.next);
|
||||||
if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
|
writ = write(state->fd, state->x.next, put);
|
||||||
(unsigned)got != have))
|
if (writ < 0) {
|
||||||
{
|
gz_error(state, Z_ERRNO, zstrerror());
|
||||||
gz_error(state, Z_ERRNO, zstrerror());
|
return -1;
|
||||||
return -1;
|
}
|
||||||
|
state->x.next += writ;
|
||||||
}
|
}
|
||||||
|
if (strm->avail_out == 0) {
|
||||||
if (strm->avail_out == 0)
|
|
||||||
{
|
|
||||||
strm->avail_out = state->size;
|
strm->avail_out = state->size;
|
||||||
strm->next_out = state->out;
|
strm->next_out = state->out;
|
||||||
|
state->x.next = state->out;
|
||||||
}
|
}
|
||||||
|
|
||||||
state->x.next = strm->next_out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* compress */
|
/* compress */
|
||||||
have = strm->avail_out;
|
have = strm->avail_out;
|
||||||
ret = deflate(strm, flush);
|
ret = deflate(strm, flush);
|
||||||
|
if (ret == Z_STREAM_ERROR) {
|
||||||
if (ret == Z_STREAM_ERROR)
|
|
||||||
{
|
|
||||||
gz_error(state, Z_STREAM_ERROR,
|
gz_error(state, Z_STREAM_ERROR,
|
||||||
"internal error: deflate stream corrupt");
|
"internal error: deflate stream corrupt");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
have -= strm->avail_out;
|
have -= strm->avail_out;
|
||||||
}
|
} while (have);
|
||||||
while (have);
|
|
||||||
|
|
||||||
/* if that completed a deflate stream, allow another to start */
|
/* if that completed a deflate stream, allow another to start */
|
||||||
if (flush == Z_FINISH)
|
if (flush == Z_FINISH)
|
||||||
|
|
@ -162,14 +140,11 @@ int flush;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compress len zeros to output. Return -1 on error, 0 on success. */
|
/* Compress len zeros to output. Return -1 on a write error or memory
|
||||||
#ifdef WIN32
|
allocation failure by gz_comp(), or 0 on success. */
|
||||||
local int gz_zero(gz_statep state, z_off64_t len)
|
|
||||||
#else
|
|
||||||
local int gz_zero(state, len)
|
local int gz_zero(state, len)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_off64_t len;
|
z_off64_t len;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int first;
|
int first;
|
||||||
unsigned n;
|
unsigned n;
|
||||||
|
|
@ -181,64 +156,31 @@ z_off64_t len;
|
||||||
|
|
||||||
/* compress len zeros (len guaranteed > 0) */
|
/* compress len zeros (len guaranteed > 0) */
|
||||||
first = 1;
|
first = 1;
|
||||||
|
while (len) {
|
||||||
while (len)
|
|
||||||
{
|
|
||||||
n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
|
n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
|
||||||
(unsigned)len : state->size;
|
(unsigned)len : state->size;
|
||||||
|
if (first) {
|
||||||
if (first)
|
|
||||||
{
|
|
||||||
memset(state->in, 0, n);
|
memset(state->in, 0, n);
|
||||||
first = 0;
|
first = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
strm->avail_in = n;
|
strm->avail_in = n;
|
||||||
strm->next_in = state->in;
|
strm->next_in = state->in;
|
||||||
state->x.pos += n;
|
state->x.pos += n;
|
||||||
|
|
||||||
if (gz_comp(state, Z_NO_FLUSH) == -1)
|
if (gz_comp(state, Z_NO_FLUSH) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
len -= n;
|
len -= n;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* Write len bytes from buf to file. Return the number of bytes written. If
|
||||||
#ifdef WIN32
|
the returned value is less than len, then there was an error. */
|
||||||
int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len)
|
local z_size_t gz_write(state, buf, len)
|
||||||
#else
|
|
||||||
int ZEXPORT gzwrite(file, buf, len)
|
|
||||||
gzFile file;
|
|
||||||
voidpc buf;
|
|
||||||
unsigned len;
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
unsigned put = len;
|
|
||||||
unsigned n;
|
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_streamp strm;
|
voidpc buf;
|
||||||
|
z_size_t len;
|
||||||
/* get internal structure */
|
{
|
||||||
if (file == NULL)
|
z_size_t put = len;
|
||||||
return 0;
|
|
||||||
|
|
||||||
state = (gz_statep)file;
|
|
||||||
strm = &(state->strm);
|
|
||||||
|
|
||||||
/* check that we're writing and that there's no error */
|
|
||||||
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* since an int is returned, make sure len fits in one, otherwise return
|
|
||||||
with an error (this avoids the flaw in the interface) */
|
|
||||||
if ((int)len < 0)
|
|
||||||
{
|
|
||||||
gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if len is zero, avoid unnecessary operations */
|
/* if len is zero, avoid unnecessary operations */
|
||||||
if (len == 0)
|
if (len == 0)
|
||||||
|
|
@ -249,67 +191,121 @@ unsigned len;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* check for seek request */
|
/* check for seek request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_zero(state, state->skip) == -1)
|
if (gz_zero(state, state->skip) == -1)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* for small len, copy to input buffer, otherwise compress directly */
|
/* for small len, copy to input buffer, otherwise compress directly */
|
||||||
if (len < state->size)
|
if (len < state->size) {
|
||||||
{
|
|
||||||
/* copy to input buffer, compress when full */
|
/* copy to input buffer, compress when full */
|
||||||
do
|
do {
|
||||||
{
|
unsigned have, copy;
|
||||||
if (strm->avail_in == 0)
|
|
||||||
strm->next_in = state->in;
|
|
||||||
|
|
||||||
n = state->size - strm->avail_in;
|
|
||||||
|
|
||||||
if (n > len)
|
|
||||||
n = len;
|
|
||||||
|
|
||||||
memcpy(strm->next_in + strm->avail_in, buf, n);
|
|
||||||
strm->avail_in += n;
|
|
||||||
state->x.pos += n;
|
|
||||||
buf = (char*)buf + n;
|
|
||||||
len -= n;
|
|
||||||
|
|
||||||
|
if (state->strm.avail_in == 0)
|
||||||
|
state->strm.next_in = state->in;
|
||||||
|
have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
|
||||||
|
state->in);
|
||||||
|
copy = state->size - have;
|
||||||
|
if (copy > len)
|
||||||
|
copy = len;
|
||||||
|
memcpy(state->in + have, buf, copy);
|
||||||
|
state->strm.avail_in += copy;
|
||||||
|
state->x.pos += copy;
|
||||||
|
buf = (const char *)buf + copy;
|
||||||
|
len -= copy;
|
||||||
if (len && gz_comp(state, Z_NO_FLUSH) == -1)
|
if (len && gz_comp(state, Z_NO_FLUSH) == -1)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
} while (len);
|
||||||
while (len);
|
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
/* consume whatever's left in the input buffer */
|
/* consume whatever's left in the input buffer */
|
||||||
if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
|
if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* directly compress user buffer to file */
|
/* directly compress user buffer to file */
|
||||||
strm->avail_in = len;
|
state->strm.next_in = (z_const Bytef *)buf;
|
||||||
strm->next_in = (voidp)buf;
|
do {
|
||||||
state->x.pos += len;
|
unsigned n = (unsigned)-1;
|
||||||
|
if (n > len)
|
||||||
if (gz_comp(state, Z_NO_FLUSH) == -1)
|
n = len;
|
||||||
return 0;
|
state->strm.avail_in = n;
|
||||||
|
state->x.pos += n;
|
||||||
|
if (gz_comp(state, Z_NO_FLUSH) == -1)
|
||||||
|
return 0;
|
||||||
|
len -= n;
|
||||||
|
} while (len);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* input was all buffered or compressed (put will fit in int) */
|
/* input was all buffered or compressed */
|
||||||
return (int)put;
|
return put;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
int ZEXPORT gzwrite(file, buf, len)
|
||||||
int ZEXPORT gzputc(gzFile file, unsigned char c)
|
gzFile file;
|
||||||
#else
|
voidpc buf;
|
||||||
int ZEXPORT gzputc(file, c)
|
unsigned len;
|
||||||
gzFile file;
|
|
||||||
int c;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
|
gz_statep state;
|
||||||
|
|
||||||
|
/* get internal structure */
|
||||||
|
if (file == NULL)
|
||||||
|
return 0;
|
||||||
|
state = (gz_statep)file;
|
||||||
|
|
||||||
|
/* check that we're writing and that there's no error */
|
||||||
|
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* since an int is returned, make sure len fits in one, otherwise return
|
||||||
|
with an error (this avoids a flaw in the interface) */
|
||||||
|
if ((int)len < 0) {
|
||||||
|
gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* write len bytes from buf (the return value will fit in an int) */
|
||||||
|
return (int)gz_write(state, buf, len);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -- see zlib.h -- */
|
||||||
|
z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
|
||||||
|
voidpc buf;
|
||||||
|
z_size_t size;
|
||||||
|
z_size_t nitems;
|
||||||
|
gzFile file;
|
||||||
|
{
|
||||||
|
z_size_t len;
|
||||||
|
gz_statep state;
|
||||||
|
|
||||||
|
/* get internal structure */
|
||||||
|
if (file == NULL)
|
||||||
|
return 0;
|
||||||
|
state = (gz_statep)file;
|
||||||
|
|
||||||
|
/* check that we're writing and that there's no error */
|
||||||
|
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* compute bytes to read -- error on overflow */
|
||||||
|
len = nitems * size;
|
||||||
|
if (size && len / size != nitems) {
|
||||||
|
gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* write len bytes to buf, return the number of full items written */
|
||||||
|
return len ? gz_write(state, buf, len) / size : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -- see zlib.h -- */
|
||||||
|
int ZEXPORT gzputc(file, c)
|
||||||
|
gzFile file;
|
||||||
|
int c;
|
||||||
|
{
|
||||||
|
unsigned have;
|
||||||
unsigned char buf[1];
|
unsigned char buf[1];
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_streamp strm;
|
z_streamp strm;
|
||||||
|
|
@ -317,7 +313,6 @@ int c;
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
strm = &(state->strm);
|
strm = &(state->strm);
|
||||||
|
|
||||||
|
|
@ -326,50 +321,54 @@ int c;
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* check for seek request */
|
/* check for seek request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_zero(state, state->skip) == -1)
|
if (gz_zero(state, state->skip) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* try writing to input buffer for speed (state->size == 0 if buffer not
|
/* try writing to input buffer for speed (state->size == 0 if buffer not
|
||||||
initialized) */
|
initialized) */
|
||||||
if (strm->avail_in < state->size)
|
if (state->size) {
|
||||||
{
|
|
||||||
if (strm->avail_in == 0)
|
if (strm->avail_in == 0)
|
||||||
strm->next_in = state->in;
|
strm->next_in = state->in;
|
||||||
|
have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
|
||||||
strm->next_in[strm->avail_in++] = c;
|
if (have < state->size) {
|
||||||
state->x.pos++;
|
state->in[have] = (unsigned char)c;
|
||||||
return c & 0xff;
|
strm->avail_in++;
|
||||||
|
state->x.pos++;
|
||||||
|
return c & 0xff;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* no room in buffer or not initialized, use gz_write() */
|
/* no room in buffer or not initialized, use gz_write() */
|
||||||
buf[0] = c;
|
buf[0] = (unsigned char)c;
|
||||||
|
if (gz_write(state, buf, 1) != 1)
|
||||||
if (gzwrite(file, buf, 1) != 1)
|
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
return c & 0xff;
|
return c & 0xff;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzputs(gzFile file, const char* str)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzputs(file, str)
|
int ZEXPORT gzputs(file, str)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
const char* str;
|
const char *str;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned len;
|
z_size_t len;
|
||||||
|
gz_statep state;
|
||||||
|
|
||||||
|
/* get internal structure */
|
||||||
|
if (file == NULL)
|
||||||
|
return -1;
|
||||||
|
state = (gz_statep)file;
|
||||||
|
|
||||||
|
/* check that we're writing and that there's no error */
|
||||||
|
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
||||||
|
return -1;
|
||||||
|
|
||||||
/* write string */
|
/* write string */
|
||||||
len = (unsigned)strlen(str);
|
len = strlen(str);
|
||||||
ret = gzwrite(file, str, len);
|
ret = gz_write(state, str, len);
|
||||||
return ret == 0 && len != 0 ? -1 : ret;
|
return ret == 0 && len != 0 ? -1 : ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -377,180 +376,189 @@ const char* str;
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
int ZEXPORTVA gzprintf(gzFile file, const char* format, ...)
|
int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
|
||||||
{
|
{
|
||||||
int size, len;
|
int len;
|
||||||
|
unsigned left;
|
||||||
|
char *next;
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_streamp strm;
|
z_streamp strm;
|
||||||
va_list va;
|
|
||||||
|
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
strm = &(state->strm);
|
strm = &(state->strm);
|
||||||
|
|
||||||
/* check that we're writing and that there's no error */
|
/* check that we're writing and that there's no error */
|
||||||
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
||||||
return 0;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
/* make sure we have some buffer space */
|
/* make sure we have some buffer space */
|
||||||
if (state->size == 0 && gz_init(state) == -1)
|
if (state->size == 0 && gz_init(state) == -1)
|
||||||
return 0;
|
return state->err;
|
||||||
|
|
||||||
/* check for seek request */
|
/* check for seek request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_zero(state, state->skip) == -1)
|
if (gz_zero(state, state->skip) == -1)
|
||||||
return 0;
|
return state->err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* consume whatever's left in the input buffer */
|
/* do the printf() into the input buffer, put length in len -- the input
|
||||||
if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
|
buffer is double-sized just for this function, so there is guaranteed to
|
||||||
return 0;
|
be state->size bytes available after the current contents */
|
||||||
|
if (strm->avail_in == 0)
|
||||||
/* do the printf() into the input buffer, put length in len */
|
strm->next_in = state->in;
|
||||||
size = (int)(state->size);
|
next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
|
||||||
state->in[size - 1] = 0;
|
next[state->size - 1] = 0;
|
||||||
va_start(va, format);
|
|
||||||
#ifdef NO_vsnprintf
|
#ifdef NO_vsnprintf
|
||||||
# ifdef HAS_vsprintf_void
|
# ifdef HAS_vsprintf_void
|
||||||
(void)vsprintf((char*)(state->in), format, va);
|
(void)vsprintf(next, format, va);
|
||||||
va_end(va);
|
for (len = 0; len < state->size; len++)
|
||||||
|
if (next[len] == 0) break;
|
||||||
for (len = 0; len < size; len++)
|
|
||||||
if (state->in[len] == 0) break;
|
|
||||||
|
|
||||||
# else
|
# else
|
||||||
len = vsprintf((char*)(state->in), format, va);
|
len = vsprintf(next, format, va);
|
||||||
va_end(va);
|
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef HAS_vsnprintf_void
|
# ifdef HAS_vsnprintf_void
|
||||||
(void)vsnprintf((char*)(state->in), size, format, va);
|
(void)vsnprintf(next, state->size, format, va);
|
||||||
va_end(va);
|
len = strlen(next);
|
||||||
len = strlen((char*)(state->in));
|
|
||||||
# else
|
# else
|
||||||
len = vsnprintf((char*)(state->in), size, format, va);
|
len = vsnprintf(next, state->size, format, va);
|
||||||
va_end(va);
|
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* check that printf() results fit in buffer */
|
/* check that printf() results fit in buffer */
|
||||||
if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
|
if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* update buffer and position, defer compression until needed */
|
/* update buffer and position, compress first half if past that */
|
||||||
strm->avail_in = (unsigned)len;
|
strm->avail_in += (unsigned)len;
|
||||||
strm->next_in = state->in;
|
|
||||||
state->x.pos += len;
|
state->x.pos += len;
|
||||||
|
if (strm->avail_in >= state->size) {
|
||||||
|
left = strm->avail_in - state->size;
|
||||||
|
strm->avail_in = state->size;
|
||||||
|
if (gz_comp(state, Z_NO_FLUSH) == -1)
|
||||||
|
return state->err;
|
||||||
|
memcpy(state->in, state->in + state->size, left);
|
||||||
|
strm->next_in = state->in;
|
||||||
|
strm->avail_in = left;
|
||||||
|
}
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list va;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
va_start(va, format);
|
||||||
|
ret = gzvprintf(file, format, va);
|
||||||
|
va_end(va);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
#else /* !STDC && !Z_HAVE_STDARG_H */
|
#else /* !STDC && !Z_HAVE_STDARG_H */
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
int ZEXPORTVA gzprintf(file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
|
int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
|
||||||
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
|
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
const char* format;
|
const char *format;
|
||||||
int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
|
int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
|
||||||
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
|
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
|
||||||
{
|
{
|
||||||
int size, len;
|
unsigned len, left;
|
||||||
|
char *next;
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_streamp strm;
|
z_streamp strm;
|
||||||
|
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
strm = &(state->strm);
|
strm = &(state->strm);
|
||||||
|
|
||||||
/* check that can really pass pointer in ints */
|
/* check that can really pass pointer in ints */
|
||||||
if (sizeof(int) != sizeof(void*))
|
if (sizeof(int) != sizeof(void *))
|
||||||
return 0;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
/* check that we're writing and that there's no error */
|
/* check that we're writing and that there's no error */
|
||||||
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
if (state->mode != GZ_WRITE || state->err != Z_OK)
|
||||||
return 0;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
/* make sure we have some buffer space */
|
/* make sure we have some buffer space */
|
||||||
if (state->size == 0 && gz_init(state) == -1)
|
if (state->size == 0 && gz_init(state) == -1)
|
||||||
return 0;
|
return state->error;
|
||||||
|
|
||||||
/* check for seek request */
|
/* check for seek request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_zero(state, state->skip) == -1)
|
if (gz_zero(state, state->skip) == -1)
|
||||||
return 0;
|
return state->error;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* consume whatever's left in the input buffer */
|
/* do the printf() into the input buffer, put length in len -- the input
|
||||||
if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
|
buffer is double-sized just for this function, so there is guaranteed to
|
||||||
return 0;
|
be state->size bytes available after the current contents */
|
||||||
|
if (strm->avail_in == 0)
|
||||||
/* do the printf() into the input buffer, put length in len */
|
strm->next_in = state->in;
|
||||||
size = (int)(state->size);
|
next = (char *)(strm->next_in + strm->avail_in);
|
||||||
state->in[size - 1] = 0;
|
next[state->size - 1] = 0;
|
||||||
#ifdef NO_snprintf
|
#ifdef NO_snprintf
|
||||||
# ifdef HAS_sprintf_void
|
# ifdef HAS_sprintf_void
|
||||||
sprintf((char*)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
|
sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
|
||||||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
a13, a14, a15, a16, a17, a18, a19, a20);
|
||||||
|
|
||||||
for (len = 0; len < size; len++)
|
for (len = 0; len < size; len++)
|
||||||
if (state->in[len] == 0) break;
|
if (next[len] == 0)
|
||||||
|
break;
|
||||||
# else
|
# else
|
||||||
len = sprintf((char*)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
|
len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
|
||||||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef HAS_snprintf_void
|
# ifdef HAS_snprintf_void
|
||||||
snprintf((char*)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
|
snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
|
||||||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
||||||
len = strlen((char*)(state->in));
|
len = strlen(next);
|
||||||
# else
|
# else
|
||||||
len = snprintf((char*)(state->in), size, format, a1, a2, a3, a4, a5, a6,
|
len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8,
|
||||||
a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
|
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
||||||
a19, a20);
|
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* check that printf() results fit in buffer */
|
/* check that printf() results fit in buffer */
|
||||||
if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
|
if (len == 0 || len >= state->size || next[state->size - 1] != 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* update buffer and position, defer compression until needed */
|
/* update buffer and position, compress first half if past that */
|
||||||
strm->avail_in = (unsigned)len;
|
strm->avail_in += len;
|
||||||
strm->next_in = state->in;
|
|
||||||
state->x.pos += len;
|
state->x.pos += len;
|
||||||
return len;
|
if (strm->avail_in >= state->size) {
|
||||||
|
left = strm->avail_in - state->size;
|
||||||
|
strm->avail_in = state->size;
|
||||||
|
if (gz_comp(state, Z_NO_FLUSH) == -1)
|
||||||
|
return state->err;
|
||||||
|
memcpy(state->in, state->in + state->size, left);
|
||||||
|
strm->next_in = state->in;
|
||||||
|
strm->avail_in = left;
|
||||||
|
}
|
||||||
|
return (int)len;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzflush(gzFile file, int flush)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzflush(file, flush)
|
int ZEXPORT gzflush(file, flush)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
int flush;
|
int flush;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return -1;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* check that we're writing and that there's no error */
|
/* check that we're writing and that there's no error */
|
||||||
|
|
@ -562,28 +570,22 @@ int flush;
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
/* check for seek request */
|
/* check for seek request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_zero(state, state->skip) == -1)
|
if (gz_zero(state, state->skip) == -1)
|
||||||
return -1;
|
return state->err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* compress remaining data with requested flush */
|
/* compress remaining data with requested flush */
|
||||||
gz_comp(state, flush);
|
(void)gz_comp(state, flush);
|
||||||
return state->err;
|
return state->err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzsetparams(gzFile file, int level, int strategy)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzsetparams(file, level, strategy)
|
int ZEXPORT gzsetparams(file, level, strategy)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
int level;
|
int level;
|
||||||
int strategy;
|
int strategy;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
z_streamp strm;
|
z_streamp strm;
|
||||||
|
|
@ -591,7 +593,6 @@ int strategy;
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
strm = &(state->strm);
|
strm = &(state->strm);
|
||||||
|
|
||||||
|
|
@ -604,36 +605,27 @@ int strategy;
|
||||||
return Z_OK;
|
return Z_OK;
|
||||||
|
|
||||||
/* check for seek request */
|
/* check for seek request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_zero(state, state->skip) == -1)
|
if (gz_zero(state, state->skip) == -1)
|
||||||
return -1;
|
return state->err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* change compression parameters for subsequent input */
|
/* change compression parameters for subsequent input */
|
||||||
if (state->size)
|
if (state->size) {
|
||||||
{
|
|
||||||
/* flush previous input with previous parameters before changing */
|
/* flush previous input with previous parameters before changing */
|
||||||
if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
|
if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
|
||||||
return state->err;
|
return state->err;
|
||||||
|
|
||||||
deflateParams(strm, level, strategy);
|
deflateParams(strm, level, strategy);
|
||||||
}
|
}
|
||||||
|
|
||||||
state->level = level;
|
state->level = level;
|
||||||
state->strategy = strategy;
|
state->strategy = strategy;
|
||||||
return Z_OK;
|
return Z_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
#ifdef WIN32
|
|
||||||
int ZEXPORT gzclose_w(gzFile file)
|
|
||||||
#else
|
|
||||||
int ZEXPORT gzclose_w(file)
|
int ZEXPORT gzclose_w(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
int ret = Z_OK;
|
int ret = Z_OK;
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
|
|
@ -641,7 +633,6 @@ gzFile file;
|
||||||
/* get internal structure */
|
/* get internal structure */
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
state = (gz_statep)file;
|
state = (gz_statep)file;
|
||||||
|
|
||||||
/* check that we're writing */
|
/* check that we're writing */
|
||||||
|
|
@ -649,35 +640,26 @@ gzFile file;
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
/* check for seek request */
|
/* check for seek request */
|
||||||
if (state->seek)
|
if (state->seek) {
|
||||||
{
|
|
||||||
state->seek = 0;
|
state->seek = 0;
|
||||||
|
|
||||||
if (gz_zero(state, state->skip) == -1)
|
if (gz_zero(state, state->skip) == -1)
|
||||||
ret = state->err;
|
ret = state->err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* flush, free memory, and close file */
|
/* flush, free memory, and close file */
|
||||||
if (state->size)
|
if (gz_comp(state, Z_FINISH) == -1)
|
||||||
{
|
ret = state->err;
|
||||||
if (gz_comp(state, Z_FINISH) == -1)
|
if (state->size) {
|
||||||
ret = state->err;
|
if (!state->direct) {
|
||||||
|
|
||||||
if (!state->direct)
|
|
||||||
{
|
|
||||||
(void)deflateEnd(&(state->strm));
|
(void)deflateEnd(&(state->strm));
|
||||||
free(state->out);
|
free(state->out);
|
||||||
}
|
}
|
||||||
|
|
||||||
free(state->in);
|
free(state->in);
|
||||||
}
|
}
|
||||||
|
|
||||||
gz_error(state, Z_OK, NULL);
|
gz_error(state, Z_OK, NULL);
|
||||||
free(state->path);
|
free(state->path);
|
||||||
|
|
||||||
if (close(state->fd) == -1)
|
if (close(state->fd) == -1)
|
||||||
ret = Z_ERRNO;
|
ret = Z_ERRNO;
|
||||||
|
|
||||||
free(state);
|
free(state);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
||||||
/* inffast.c -- fast decoding
|
/* inffast.c -- fast decoding
|
||||||
* Copyright (C) 1995-2008, 2010 Mark Adler
|
* Copyright (C) 1995-2017 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -8,26 +8,9 @@
|
||||||
#include "inflate.h"
|
#include "inflate.h"
|
||||||
#include "inffast.h"
|
#include "inffast.h"
|
||||||
|
|
||||||
#ifndef ASMINF
|
#ifdef ASMINF
|
||||||
|
# pragma message("Assembler code may have bugs -- use at your own risk")
|
||||||
/* Allow machine dependent optimization for post-increment or pre-increment.
|
|
||||||
Based on testing to date,
|
|
||||||
Pre-increment preferred for:
|
|
||||||
- PowerPC G3 (Adler)
|
|
||||||
- MIPS R5000 (Randers-Pehrson)
|
|
||||||
Post-increment preferred for:
|
|
||||||
- none
|
|
||||||
No measurable difference:
|
|
||||||
- Pentium III (Anderson)
|
|
||||||
- M68060 (Nikl)
|
|
||||||
*/
|
|
||||||
#ifdef POSTINC
|
|
||||||
# define OFF 0
|
|
||||||
# define PUP(a) *(a)++
|
|
||||||
#else
|
#else
|
||||||
# define OFF 1
|
|
||||||
# define PUP(a) *++(a)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Decode literal, length, and distance codes and write out the resulting
|
Decode literal, length, and distance codes and write out the resulting
|
||||||
|
|
@ -64,45 +47,41 @@
|
||||||
requires strm->avail_out >= 258 for each loop to avoid checking for
|
requires strm->avail_out >= 258 for each loop to avoid checking for
|
||||||
output space.
|
output space.
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
|
||||||
void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned int start)
|
|
||||||
#else
|
|
||||||
void ZLIB_INTERNAL inflate_fast(strm, start)
|
void ZLIB_INTERNAL inflate_fast(strm, start)
|
||||||
z_streamp strm;
|
z_streamp strm;
|
||||||
unsigned start; /* inflate()'s starting value for strm->avail_out */
|
unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
struct inflate_state FAR* state;
|
struct inflate_state FAR *state;
|
||||||
unsigned char FAR* in; /* local strm->next_in */
|
z_const unsigned char FAR *in; /* local strm->next_in */
|
||||||
unsigned char FAR* last; /* while in < last, enough input available */
|
z_const unsigned char FAR *last; /* have enough input while in < last */
|
||||||
unsigned char FAR* out; /* local strm->next_out */
|
unsigned char FAR *out; /* local strm->next_out */
|
||||||
unsigned char FAR* beg; /* inflate()'s initial strm->next_out */
|
unsigned char FAR *beg; /* inflate()'s initial strm->next_out */
|
||||||
unsigned char FAR* end; /* while out < end, enough space available */
|
unsigned char FAR *end; /* while out < end, enough space available */
|
||||||
#ifdef INFLATE_STRICT
|
#ifdef INFLATE_STRICT
|
||||||
unsigned dmax; /* maximum distance from zlib header */
|
unsigned dmax; /* maximum distance from zlib header */
|
||||||
#endif
|
#endif
|
||||||
unsigned wsize; /* window size or zero if not using window */
|
unsigned wsize; /* window size or zero if not using window */
|
||||||
unsigned whave; /* valid bytes in the window */
|
unsigned whave; /* valid bytes in the window */
|
||||||
unsigned wnext; /* window write index */
|
unsigned wnext; /* window write index */
|
||||||
unsigned char FAR* window; /* allocated sliding window, if wsize != 0 */
|
unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */
|
||||||
unsigned long hold; /* local strm->hold */
|
unsigned long hold; /* local strm->hold */
|
||||||
unsigned bits; /* local strm->bits */
|
unsigned bits; /* local strm->bits */
|
||||||
code const FAR* lcode; /* local strm->lencode */
|
code const FAR *lcode; /* local strm->lencode */
|
||||||
code const FAR* dcode; /* local strm->distcode */
|
code const FAR *dcode; /* local strm->distcode */
|
||||||
unsigned lmask; /* mask for first level of length codes */
|
unsigned lmask; /* mask for first level of length codes */
|
||||||
unsigned dmask; /* mask for first level of distance codes */
|
unsigned dmask; /* mask for first level of distance codes */
|
||||||
code here; /* retrieved table entry */
|
code here; /* retrieved table entry */
|
||||||
unsigned op; /* code bits, operation, extra bits, or */
|
unsigned op; /* code bits, operation, extra bits, or */
|
||||||
/* window position, window bytes to copy */
|
/* window position, window bytes to copy */
|
||||||
unsigned len; /* match length, unused bytes */
|
unsigned len; /* match length, unused bytes */
|
||||||
unsigned dist; /* match distance */
|
unsigned dist; /* match distance */
|
||||||
unsigned char FAR* from; /* where to copy match from */
|
unsigned char FAR *from; /* where to copy match from */
|
||||||
|
|
||||||
/* copy state to local variables */
|
/* copy state to local variables */
|
||||||
state = (struct inflate_state FAR*)strm->state;
|
state = (struct inflate_state FAR *)strm->state;
|
||||||
in = strm->next_in - OFF;
|
in = strm->next_in;
|
||||||
last = in + (strm->avail_in - 5);
|
last = in + (strm->avail_in - 5);
|
||||||
out = strm->next_out - OFF;
|
out = strm->next_out;
|
||||||
beg = out - (start - strm->avail_out);
|
beg = out - (start - strm->avail_out);
|
||||||
end = out + (strm->avail_out - 257);
|
end = out + (strm->avail_out - 257);
|
||||||
#ifdef INFLATE_STRICT
|
#ifdef INFLATE_STRICT
|
||||||
|
|
@ -121,287 +100,194 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||||
|
|
||||||
/* decode literals and length/distances until end-of-block or not enough
|
/* decode literals and length/distances until end-of-block or not enough
|
||||||
input data or output space */
|
input data or output space */
|
||||||
do
|
do {
|
||||||
{
|
if (bits < 15) {
|
||||||
if (bits < 15)
|
hold += (unsigned long)(*in++) << bits;
|
||||||
{
|
|
||||||
hold += (unsigned long)(PUP(in)) << bits;
|
|
||||||
bits += 8;
|
bits += 8;
|
||||||
hold += (unsigned long)(PUP(in)) << bits;
|
hold += (unsigned long)(*in++) << bits;
|
||||||
bits += 8;
|
bits += 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
here = lcode[hold & lmask];
|
here = lcode[hold & lmask];
|
||||||
dolen:
|
dolen:
|
||||||
op = (unsigned)(here.bits);
|
op = (unsigned)(here.bits);
|
||||||
hold >>= op;
|
hold >>= op;
|
||||||
bits -= op;
|
bits -= op;
|
||||||
op = (unsigned)(here.op);
|
op = (unsigned)(here.op);
|
||||||
|
if (op == 0) { /* literal */
|
||||||
if (op == 0) /* literal */
|
|
||||||
{
|
|
||||||
Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
|
Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
|
||||||
"inflate: literal '%c'\n" :
|
"inflate: literal '%c'\n" :
|
||||||
"inflate: literal 0x%02x\n", here.val));
|
"inflate: literal 0x%02x\n", here.val));
|
||||||
PUP(out) = (unsigned char)(here.val);
|
*out++ = (unsigned char)(here.val);
|
||||||
}
|
}
|
||||||
else if (op & 16) /* length base */
|
else if (op & 16) { /* length base */
|
||||||
{
|
|
||||||
len = (unsigned)(here.val);
|
len = (unsigned)(here.val);
|
||||||
op &= 15; /* number of extra bits */
|
op &= 15; /* number of extra bits */
|
||||||
|
if (op) {
|
||||||
if (op)
|
if (bits < op) {
|
||||||
{
|
hold += (unsigned long)(*in++) << bits;
|
||||||
if (bits < op)
|
|
||||||
{
|
|
||||||
hold += (unsigned long)(PUP(in)) << bits;
|
|
||||||
bits += 8;
|
bits += 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
len += (unsigned)hold & ((1U << op) - 1);
|
len += (unsigned)hold & ((1U << op) - 1);
|
||||||
hold >>= op;
|
hold >>= op;
|
||||||
bits -= op;
|
bits -= op;
|
||||||
}
|
}
|
||||||
|
|
||||||
Tracevv((stderr, "inflate: length %u\n", len));
|
Tracevv((stderr, "inflate: length %u\n", len));
|
||||||
|
if (bits < 15) {
|
||||||
if (bits < 15)
|
hold += (unsigned long)(*in++) << bits;
|
||||||
{
|
|
||||||
hold += (unsigned long)(PUP(in)) << bits;
|
|
||||||
bits += 8;
|
bits += 8;
|
||||||
hold += (unsigned long)(PUP(in)) << bits;
|
hold += (unsigned long)(*in++) << bits;
|
||||||
bits += 8;
|
bits += 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
here = dcode[hold & dmask];
|
here = dcode[hold & dmask];
|
||||||
dodist:
|
dodist:
|
||||||
op = (unsigned)(here.bits);
|
op = (unsigned)(here.bits);
|
||||||
hold >>= op;
|
hold >>= op;
|
||||||
bits -= op;
|
bits -= op;
|
||||||
op = (unsigned)(here.op);
|
op = (unsigned)(here.op);
|
||||||
|
if (op & 16) { /* distance base */
|
||||||
if (op & 16) /* distance base */
|
|
||||||
{
|
|
||||||
dist = (unsigned)(here.val);
|
dist = (unsigned)(here.val);
|
||||||
op &= 15; /* number of extra bits */
|
op &= 15; /* number of extra bits */
|
||||||
|
if (bits < op) {
|
||||||
if (bits < op)
|
hold += (unsigned long)(*in++) << bits;
|
||||||
{
|
|
||||||
hold += (unsigned long)(PUP(in)) << bits;
|
|
||||||
bits += 8;
|
bits += 8;
|
||||||
|
if (bits < op) {
|
||||||
if (bits < op)
|
hold += (unsigned long)(*in++) << bits;
|
||||||
{
|
|
||||||
hold += (unsigned long)(PUP(in)) << bits;
|
|
||||||
bits += 8;
|
bits += 8;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dist += (unsigned)hold & ((1U << op) - 1);
|
dist += (unsigned)hold & ((1U << op) - 1);
|
||||||
#ifdef INFLATE_STRICT
|
#ifdef INFLATE_STRICT
|
||||||
|
if (dist > dmax) {
|
||||||
if (dist > dmax)
|
strm->msg = (char *)"invalid distance too far back";
|
||||||
{
|
|
||||||
strm->msg = (char*)"invalid distance too far back";
|
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
hold >>= op;
|
hold >>= op;
|
||||||
bits -= op;
|
bits -= op;
|
||||||
Tracevv((stderr, "inflate: distance %u\n", dist));
|
Tracevv((stderr, "inflate: distance %u\n", dist));
|
||||||
op = (unsigned)(out - beg); /* max distance in output */
|
op = (unsigned)(out - beg); /* max distance in output */
|
||||||
|
if (dist > op) { /* see if copy from window */
|
||||||
if (dist > op) /* see if copy from window */
|
|
||||||
{
|
|
||||||
op = dist - op; /* distance back in window */
|
op = dist - op; /* distance back in window */
|
||||||
|
if (op > whave) {
|
||||||
if (op > whave)
|
if (state->sane) {
|
||||||
{
|
|
||||||
if (state->sane)
|
|
||||||
{
|
|
||||||
strm->msg =
|
strm->msg =
|
||||||
(char*)"invalid distance too far back";
|
(char *)"invalid distance too far back";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
|
#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
|
||||||
|
if (len <= op - whave) {
|
||||||
if (len <= op - whave)
|
do {
|
||||||
{
|
*out++ = 0;
|
||||||
do
|
} while (--len);
|
||||||
{
|
|
||||||
PUP(out) = 0;
|
|
||||||
}
|
|
||||||
while (--len);
|
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
len -= op - whave;
|
len -= op - whave;
|
||||||
|
do {
|
||||||
do
|
*out++ = 0;
|
||||||
{
|
} while (--op > whave);
|
||||||
PUP(out) = 0;
|
if (op == 0) {
|
||||||
}
|
|
||||||
while (--op > whave);
|
|
||||||
|
|
||||||
if (op == 0)
|
|
||||||
{
|
|
||||||
from = out - dist;
|
from = out - dist;
|
||||||
|
do {
|
||||||
do
|
*out++ = *from++;
|
||||||
{
|
} while (--len);
|
||||||
PUP(out) = PUP(from);
|
|
||||||
}
|
|
||||||
while (--len);
|
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
from = window;
|
||||||
from = window - OFF;
|
if (wnext == 0) { /* very common case */
|
||||||
|
|
||||||
if (wnext == 0) /* very common case */
|
|
||||||
{
|
|
||||||
from += wsize - op;
|
from += wsize - op;
|
||||||
|
if (op < len) { /* some from window */
|
||||||
if (op < len) /* some from window */
|
|
||||||
{
|
|
||||||
len -= op;
|
len -= op;
|
||||||
|
do {
|
||||||
do
|
*out++ = *from++;
|
||||||
{
|
} while (--op);
|
||||||
PUP(out) = PUP(from);
|
|
||||||
}
|
|
||||||
while (--op);
|
|
||||||
|
|
||||||
from = out - dist; /* rest from output */
|
from = out - dist; /* rest from output */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (wnext < op) /* wrap around window */
|
else if (wnext < op) { /* wrap around window */
|
||||||
{
|
|
||||||
from += wsize + wnext - op;
|
from += wsize + wnext - op;
|
||||||
op -= wnext;
|
op -= wnext;
|
||||||
|
if (op < len) { /* some from end of window */
|
||||||
if (op < len) /* some from end of window */
|
|
||||||
{
|
|
||||||
len -= op;
|
len -= op;
|
||||||
|
do {
|
||||||
do
|
*out++ = *from++;
|
||||||
{
|
} while (--op);
|
||||||
PUP(out) = PUP(from);
|
from = window;
|
||||||
}
|
if (wnext < len) { /* some from start of window */
|
||||||
while (--op);
|
|
||||||
|
|
||||||
from = window - OFF;
|
|
||||||
|
|
||||||
if (wnext < len) /* some from start of window */
|
|
||||||
{
|
|
||||||
op = wnext;
|
op = wnext;
|
||||||
len -= op;
|
len -= op;
|
||||||
|
do {
|
||||||
do
|
*out++ = *from++;
|
||||||
{
|
} while (--op);
|
||||||
PUP(out) = PUP(from);
|
|
||||||
}
|
|
||||||
while (--op);
|
|
||||||
|
|
||||||
from = out - dist; /* rest from output */
|
from = out - dist; /* rest from output */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else /* contiguous in window */
|
else { /* contiguous in window */
|
||||||
{
|
|
||||||
from += wnext - op;
|
from += wnext - op;
|
||||||
|
if (op < len) { /* some from window */
|
||||||
if (op < len) /* some from window */
|
|
||||||
{
|
|
||||||
len -= op;
|
len -= op;
|
||||||
|
do {
|
||||||
do
|
*out++ = *from++;
|
||||||
{
|
} while (--op);
|
||||||
PUP(out) = PUP(from);
|
|
||||||
}
|
|
||||||
while (--op);
|
|
||||||
|
|
||||||
from = out - dist; /* rest from output */
|
from = out - dist; /* rest from output */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
while (len > 2) {
|
||||||
while (len > 2)
|
*out++ = *from++;
|
||||||
{
|
*out++ = *from++;
|
||||||
PUP(out) = PUP(from);
|
*out++ = *from++;
|
||||||
PUP(out) = PUP(from);
|
|
||||||
PUP(out) = PUP(from);
|
|
||||||
len -= 3;
|
len -= 3;
|
||||||
}
|
}
|
||||||
|
if (len) {
|
||||||
if (len)
|
*out++ = *from++;
|
||||||
{
|
|
||||||
PUP(out) = PUP(from);
|
|
||||||
|
|
||||||
if (len > 1)
|
if (len > 1)
|
||||||
PUP(out) = PUP(from);
|
*out++ = *from++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
from = out - dist; /* copy direct from output */
|
from = out - dist; /* copy direct from output */
|
||||||
|
do { /* minimum length is three */
|
||||||
do /* minimum length is three */
|
*out++ = *from++;
|
||||||
{
|
*out++ = *from++;
|
||||||
PUP(out) = PUP(from);
|
*out++ = *from++;
|
||||||
PUP(out) = PUP(from);
|
|
||||||
PUP(out) = PUP(from);
|
|
||||||
len -= 3;
|
len -= 3;
|
||||||
}
|
} while (len > 2);
|
||||||
while (len > 2);
|
if (len) {
|
||||||
|
*out++ = *from++;
|
||||||
if (len)
|
|
||||||
{
|
|
||||||
PUP(out) = PUP(from);
|
|
||||||
|
|
||||||
if (len > 1)
|
if (len > 1)
|
||||||
PUP(out) = PUP(from);
|
*out++ = *from++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((op & 64) == 0) /* 2nd level distance code */
|
else if ((op & 64) == 0) { /* 2nd level distance code */
|
||||||
{
|
|
||||||
here = dcode[here.val + (hold & ((1U << op) - 1))];
|
here = dcode[here.val + (hold & ((1U << op) - 1))];
|
||||||
goto dodist;
|
goto dodist;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
strm->msg = (char *)"invalid distance code";
|
||||||
strm->msg = (char*)"invalid distance code";
|
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((op & 64) == 0) /* 2nd level length code */
|
else if ((op & 64) == 0) { /* 2nd level length code */
|
||||||
{
|
|
||||||
here = lcode[here.val + (hold & ((1U << op) - 1))];
|
here = lcode[here.val + (hold & ((1U << op) - 1))];
|
||||||
goto dolen;
|
goto dolen;
|
||||||
}
|
}
|
||||||
else if (op & 32) /* end-of-block */
|
else if (op & 32) { /* end-of-block */
|
||||||
{
|
|
||||||
Tracevv((stderr, "inflate: end of block\n"));
|
Tracevv((stderr, "inflate: end of block\n"));
|
||||||
state->mode = TYPE;
|
state->mode = TYPE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
strm->msg = (char *)"invalid literal/length code";
|
||||||
strm->msg = (char*)"invalid literal/length code";
|
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
} while (in < last && out < end);
|
||||||
while (in < last && out < end);
|
|
||||||
|
|
||||||
/* return unused bytes (on entry, bits < 8, so in won't go too far back) */
|
/* return unused bytes (on entry, bits < 8, so in won't go too far back) */
|
||||||
len = bits >> 3;
|
len = bits >> 3;
|
||||||
|
|
@ -410,8 +296,8 @@ dodist:
|
||||||
hold &= (1U << bits) - 1;
|
hold &= (1U << bits) - 1;
|
||||||
|
|
||||||
/* update state and return */
|
/* update state and return */
|
||||||
strm->next_in = in + OFF;
|
strm->next_in = in;
|
||||||
strm->next_out = out + OFF;
|
strm->next_out = out;
|
||||||
strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
|
strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
|
||||||
strm->avail_out = (unsigned)(out < end ?
|
strm->avail_out = (unsigned)(out < end ?
|
||||||
257 + (end - out) : 257 - (out - end));
|
257 + (end - out) : 257 - (out - end));
|
||||||
|
|
|
||||||
|
|
@ -1,96 +1,94 @@
|
||||||
/* inffixed.h -- table for decoding fixed codes
|
/* inffixed.h -- table for decoding fixed codes
|
||||||
* Generated automatically by makefixed().
|
* Generated automatically by makefixed().
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* WARNING: this file should *not* be used by applications.
|
/* WARNING: this file should *not* be used by applications.
|
||||||
It is part of the implementation of this library and is
|
It is part of the implementation of this library and is
|
||||||
subject to change. Applications should only use zlib.h.
|
subject to change. Applications should only use zlib.h.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static const code lenfix[512] =
|
static const code lenfix[512] = {
|
||||||
{
|
{96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
|
||||||
{96, 7, 0}, {0, 8, 80}, {0, 8, 16}, {20, 8, 115}, {18, 7, 31}, {0, 8, 112}, {0, 8, 48},
|
{0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
|
||||||
{0, 9, 192}, {16, 7, 10}, {0, 8, 96}, {0, 8, 32}, {0, 9, 160}, {0, 8, 0}, {0, 8, 128},
|
{0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
|
||||||
{0, 8, 64}, {0, 9, 224}, {16, 7, 6}, {0, 8, 88}, {0, 8, 24}, {0, 9, 144}, {19, 7, 59},
|
{0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
|
||||||
{0, 8, 120}, {0, 8, 56}, {0, 9, 208}, {17, 7, 17}, {0, 8, 104}, {0, 8, 40}, {0, 9, 176},
|
{0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
|
||||||
{0, 8, 8}, {0, 8, 136}, {0, 8, 72}, {0, 9, 240}, {16, 7, 4}, {0, 8, 84}, {0, 8, 20},
|
{21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
|
||||||
{21, 8, 227}, {19, 7, 43}, {0, 8, 116}, {0, 8, 52}, {0, 9, 200}, {17, 7, 13}, {0, 8, 100},
|
{0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
|
||||||
{0, 8, 36}, {0, 9, 168}, {0, 8, 4}, {0, 8, 132}, {0, 8, 68}, {0, 9, 232}, {16, 7, 8},
|
{0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
|
||||||
{0, 8, 92}, {0, 8, 28}, {0, 9, 152}, {20, 7, 83}, {0, 8, 124}, {0, 8, 60}, {0, 9, 216},
|
{18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
|
||||||
{18, 7, 23}, {0, 8, 108}, {0, 8, 44}, {0, 9, 184}, {0, 8, 12}, {0, 8, 140}, {0, 8, 76},
|
{0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
|
||||||
{0, 9, 248}, {16, 7, 3}, {0, 8, 82}, {0, 8, 18}, {21, 8, 163}, {19, 7, 35}, {0, 8, 114},
|
{0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
|
||||||
{0, 8, 50}, {0, 9, 196}, {17, 7, 11}, {0, 8, 98}, {0, 8, 34}, {0, 9, 164}, {0, 8, 2},
|
{0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
|
||||||
{0, 8, 130}, {0, 8, 66}, {0, 9, 228}, {16, 7, 7}, {0, 8, 90}, {0, 8, 26}, {0, 9, 148},
|
{20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
|
||||||
{20, 7, 67}, {0, 8, 122}, {0, 8, 58}, {0, 9, 212}, {18, 7, 19}, {0, 8, 106}, {0, 8, 42},
|
{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
|
||||||
{0, 9, 180}, {0, 8, 10}, {0, 8, 138}, {0, 8, 74}, {0, 9, 244}, {16, 7, 5}, {0, 8, 86},
|
{0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
|
||||||
{0, 8, 22}, {64, 8, 0}, {19, 7, 51}, {0, 8, 118}, {0, 8, 54}, {0, 9, 204}, {17, 7, 15},
|
{0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
|
||||||
{0, 8, 102}, {0, 8, 38}, {0, 9, 172}, {0, 8, 6}, {0, 8, 134}, {0, 8, 70}, {0, 9, 236},
|
{16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
|
||||||
{16, 7, 9}, {0, 8, 94}, {0, 8, 30}, {0, 9, 156}, {20, 7, 99}, {0, 8, 126}, {0, 8, 62},
|
{0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
|
||||||
{0, 9, 220}, {18, 7, 27}, {0, 8, 110}, {0, 8, 46}, {0, 9, 188}, {0, 8, 14}, {0, 8, 142},
|
{0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
|
||||||
{0, 8, 78}, {0, 9, 252}, {96, 7, 0}, {0, 8, 81}, {0, 8, 17}, {21, 8, 131}, {18, 7, 31},
|
{0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
|
||||||
{0, 8, 113}, {0, 8, 49}, {0, 9, 194}, {16, 7, 10}, {0, 8, 97}, {0, 8, 33}, {0, 9, 162},
|
{0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
|
||||||
{0, 8, 1}, {0, 8, 129}, {0, 8, 65}, {0, 9, 226}, {16, 7, 6}, {0, 8, 89}, {0, 8, 25},
|
{0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
|
||||||
{0, 9, 146}, {19, 7, 59}, {0, 8, 121}, {0, 8, 57}, {0, 9, 210}, {17, 7, 17}, {0, 8, 105},
|
{0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
|
||||||
{0, 8, 41}, {0, 9, 178}, {0, 8, 9}, {0, 8, 137}, {0, 8, 73}, {0, 9, 242}, {16, 7, 4},
|
{0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
|
||||||
{0, 8, 85}, {0, 8, 21}, {16, 8, 258}, {19, 7, 43}, {0, 8, 117}, {0, 8, 53}, {0, 9, 202},
|
{17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
|
||||||
{17, 7, 13}, {0, 8, 101}, {0, 8, 37}, {0, 9, 170}, {0, 8, 5}, {0, 8, 133}, {0, 8, 69},
|
{0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
|
||||||
{0, 9, 234}, {16, 7, 8}, {0, 8, 93}, {0, 8, 29}, {0, 9, 154}, {20, 7, 83}, {0, 8, 125},
|
{0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
|
||||||
{0, 8, 61}, {0, 9, 218}, {18, 7, 23}, {0, 8, 109}, {0, 8, 45}, {0, 9, 186}, {0, 8, 13},
|
{0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
|
||||||
{0, 8, 141}, {0, 8, 77}, {0, 9, 250}, {16, 7, 3}, {0, 8, 83}, {0, 8, 19}, {21, 8, 195},
|
{19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
|
||||||
{19, 7, 35}, {0, 8, 115}, {0, 8, 51}, {0, 9, 198}, {17, 7, 11}, {0, 8, 99}, {0, 8, 35},
|
{0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
|
||||||
{0, 9, 166}, {0, 8, 3}, {0, 8, 131}, {0, 8, 67}, {0, 9, 230}, {16, 7, 7}, {0, 8, 91},
|
{0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
|
||||||
{0, 8, 27}, {0, 9, 150}, {20, 7, 67}, {0, 8, 123}, {0, 8, 59}, {0, 9, 214}, {18, 7, 19},
|
{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
|
||||||
{0, 8, 107}, {0, 8, 43}, {0, 9, 182}, {0, 8, 11}, {0, 8, 139}, {0, 8, 75}, {0, 9, 246},
|
{16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
|
||||||
{16, 7, 5}, {0, 8, 87}, {0, 8, 23}, {64, 8, 0}, {19, 7, 51}, {0, 8, 119}, {0, 8, 55},
|
{0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
|
||||||
{0, 9, 206}, {17, 7, 15}, {0, 8, 103}, {0, 8, 39}, {0, 9, 174}, {0, 8, 7}, {0, 8, 135},
|
{0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
|
||||||
{0, 8, 71}, {0, 9, 238}, {16, 7, 9}, {0, 8, 95}, {0, 8, 31}, {0, 9, 158}, {20, 7, 99},
|
{0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
|
||||||
{0, 8, 127}, {0, 8, 63}, {0, 9, 222}, {18, 7, 27}, {0, 8, 111}, {0, 8, 47}, {0, 9, 190},
|
{0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
|
||||||
{0, 8, 15}, {0, 8, 143}, {0, 8, 79}, {0, 9, 254}, {96, 7, 0}, {0, 8, 80}, {0, 8, 16},
|
{20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
|
||||||
{20, 8, 115}, {18, 7, 31}, {0, 8, 112}, {0, 8, 48}, {0, 9, 193}, {16, 7, 10}, {0, 8, 96},
|
{0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
|
||||||
{0, 8, 32}, {0, 9, 161}, {0, 8, 0}, {0, 8, 128}, {0, 8, 64}, {0, 9, 225}, {16, 7, 6},
|
{0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
|
||||||
{0, 8, 88}, {0, 8, 24}, {0, 9, 145}, {19, 7, 59}, {0, 8, 120}, {0, 8, 56}, {0, 9, 209},
|
{17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
|
||||||
{17, 7, 17}, {0, 8, 104}, {0, 8, 40}, {0, 9, 177}, {0, 8, 8}, {0, 8, 136}, {0, 8, 72},
|
{0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
|
||||||
{0, 9, 241}, {16, 7, 4}, {0, 8, 84}, {0, 8, 20}, {21, 8, 227}, {19, 7, 43}, {0, 8, 116},
|
{0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
|
||||||
{0, 8, 52}, {0, 9, 201}, {17, 7, 13}, {0, 8, 100}, {0, 8, 36}, {0, 9, 169}, {0, 8, 4},
|
{0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
|
||||||
{0, 8, 132}, {0, 8, 68}, {0, 9, 233}, {16, 7, 8}, {0, 8, 92}, {0, 8, 28}, {0, 9, 153},
|
{20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
|
||||||
{20, 7, 83}, {0, 8, 124}, {0, 8, 60}, {0, 9, 217}, {18, 7, 23}, {0, 8, 108}, {0, 8, 44},
|
{0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
|
||||||
{0, 9, 185}, {0, 8, 12}, {0, 8, 140}, {0, 8, 76}, {0, 9, 249}, {16, 7, 3}, {0, 8, 82},
|
{0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
|
||||||
{0, 8, 18}, {21, 8, 163}, {19, 7, 35}, {0, 8, 114}, {0, 8, 50}, {0, 9, 197}, {17, 7, 11},
|
{0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
|
||||||
{0, 8, 98}, {0, 8, 34}, {0, 9, 165}, {0, 8, 2}, {0, 8, 130}, {0, 8, 66}, {0, 9, 229},
|
{16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
|
||||||
{16, 7, 7}, {0, 8, 90}, {0, 8, 26}, {0, 9, 149}, {20, 7, 67}, {0, 8, 122}, {0, 8, 58},
|
{0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
|
||||||
{0, 9, 213}, {18, 7, 19}, {0, 8, 106}, {0, 8, 42}, {0, 9, 181}, {0, 8, 10}, {0, 8, 138},
|
{0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
|
||||||
{0, 8, 74}, {0, 9, 245}, {16, 7, 5}, {0, 8, 86}, {0, 8, 22}, {64, 8, 0}, {19, 7, 51},
|
{0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
|
||||||
{0, 8, 118}, {0, 8, 54}, {0, 9, 205}, {17, 7, 15}, {0, 8, 102}, {0, 8, 38}, {0, 9, 173},
|
{0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
|
||||||
{0, 8, 6}, {0, 8, 134}, {0, 8, 70}, {0, 9, 237}, {16, 7, 9}, {0, 8, 94}, {0, 8, 30},
|
{0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
|
||||||
{0, 9, 157}, {20, 7, 99}, {0, 8, 126}, {0, 8, 62}, {0, 9, 221}, {18, 7, 27}, {0, 8, 110},
|
{0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
|
||||||
{0, 8, 46}, {0, 9, 189}, {0, 8, 14}, {0, 8, 142}, {0, 8, 78}, {0, 9, 253}, {96, 7, 0},
|
{0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
|
||||||
{0, 8, 81}, {0, 8, 17}, {21, 8, 131}, {18, 7, 31}, {0, 8, 113}, {0, 8, 49}, {0, 9, 195},
|
{16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
|
||||||
{16, 7, 10}, {0, 8, 97}, {0, 8, 33}, {0, 9, 163}, {0, 8, 1}, {0, 8, 129}, {0, 8, 65},
|
{0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
|
||||||
{0, 9, 227}, {16, 7, 6}, {0, 8, 89}, {0, 8, 25}, {0, 9, 147}, {19, 7, 59}, {0, 8, 121},
|
{0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
|
||||||
{0, 8, 57}, {0, 9, 211}, {17, 7, 17}, {0, 8, 105}, {0, 8, 41}, {0, 9, 179}, {0, 8, 9},
|
{0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
|
||||||
{0, 8, 137}, {0, 8, 73}, {0, 9, 243}, {16, 7, 4}, {0, 8, 85}, {0, 8, 21}, {16, 8, 258},
|
{19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
|
||||||
{19, 7, 43}, {0, 8, 117}, {0, 8, 53}, {0, 9, 203}, {17, 7, 13}, {0, 8, 101}, {0, 8, 37},
|
{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
|
||||||
{0, 9, 171}, {0, 8, 5}, {0, 8, 133}, {0, 8, 69}, {0, 9, 235}, {16, 7, 8}, {0, 8, 93},
|
{0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
|
||||||
{0, 8, 29}, {0, 9, 155}, {20, 7, 83}, {0, 8, 125}, {0, 8, 61}, {0, 9, 219}, {18, 7, 23},
|
{0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
|
||||||
{0, 8, 109}, {0, 8, 45}, {0, 9, 187}, {0, 8, 13}, {0, 8, 141}, {0, 8, 77}, {0, 9, 251},
|
{16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
|
||||||
{16, 7, 3}, {0, 8, 83}, {0, 8, 19}, {21, 8, 195}, {19, 7, 35}, {0, 8, 115}, {0, 8, 51},
|
{0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
|
||||||
{0, 9, 199}, {17, 7, 11}, {0, 8, 99}, {0, 8, 35}, {0, 9, 167}, {0, 8, 3}, {0, 8, 131},
|
{0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
|
||||||
{0, 8, 67}, {0, 9, 231}, {16, 7, 7}, {0, 8, 91}, {0, 8, 27}, {0, 9, 151}, {20, 7, 67},
|
{0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
|
||||||
{0, 8, 123}, {0, 8, 59}, {0, 9, 215}, {18, 7, 19}, {0, 8, 107}, {0, 8, 43}, {0, 9, 183},
|
{0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
|
||||||
{0, 8, 11}, {0, 8, 139}, {0, 8, 75}, {0, 9, 247}, {16, 7, 5}, {0, 8, 87}, {0, 8, 23},
|
{64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
|
||||||
{64, 8, 0}, {19, 7, 51}, {0, 8, 119}, {0, 8, 55}, {0, 9, 207}, {17, 7, 15}, {0, 8, 103},
|
{0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
|
||||||
{0, 8, 39}, {0, 9, 175}, {0, 8, 7}, {0, 8, 135}, {0, 8, 71}, {0, 9, 239}, {16, 7, 9},
|
{0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
|
||||||
{0, 8, 95}, {0, 8, 31}, {0, 9, 159}, {20, 7, 99}, {0, 8, 127}, {0, 8, 63}, {0, 9, 223},
|
{18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
|
||||||
{18, 7, 27}, {0, 8, 111}, {0, 8, 47}, {0, 9, 191}, {0, 8, 15}, {0, 8, 143}, {0, 8, 79},
|
{0,9,255}
|
||||||
{0, 9, 255}
|
};
|
||||||
};
|
|
||||||
|
|
||||||
static const code distfix[32] =
|
static const code distfix[32] = {
|
||||||
{
|
{16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
|
||||||
{16, 5, 1}, {23, 5, 257}, {19, 5, 17}, {27, 5, 4097}, {17, 5, 5}, {25, 5, 1025},
|
{21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
|
||||||
{21, 5, 65}, {29, 5, 16385}, {16, 5, 3}, {24, 5, 513}, {20, 5, 33}, {28, 5, 8193},
|
{18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
|
||||||
{18, 5, 9}, {26, 5, 2049}, {22, 5, 129}, {64, 5, 0}, {16, 5, 2}, {23, 5, 385},
|
{19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
|
||||||
{19, 5, 25}, {27, 5, 6145}, {17, 5, 7}, {25, 5, 1537}, {21, 5, 97}, {29, 5, 24577},
|
{16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
|
||||||
{16, 5, 4}, {24, 5, 769}, {20, 5, 49}, {28, 5, 12289}, {18, 5, 13}, {26, 5, 3073},
|
{22,5,193},{64,5,0}
|
||||||
{22, 5, 193}, {64, 5, 0}
|
};
|
||||||
};
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
||||||
/* inflate.h -- internal inflate state definition
|
/* inflate.h -- internal inflate state definition
|
||||||
* Copyright (C) 1995-2009 Mark Adler
|
* Copyright (C) 1995-2016 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -17,9 +17,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Possible inflate modes between inflate() calls */
|
/* Possible inflate modes between inflate() calls */
|
||||||
typedef enum
|
typedef enum {
|
||||||
{
|
HEAD = 16180, /* i: waiting for magic header */
|
||||||
HEAD, /* i: waiting for magic header */
|
|
||||||
FLAGS, /* i: waiting for method and flags (gzip) */
|
FLAGS, /* i: waiting for method and flags (gzip) */
|
||||||
TIME, /* i: waiting for modification time (gzip) */
|
TIME, /* i: waiting for modification time (gzip) */
|
||||||
OS, /* i: waiting for extra flags and operating system (gzip) */
|
OS, /* i: waiting for extra flags and operating system (gzip) */
|
||||||
|
|
@ -30,21 +29,21 @@ typedef enum
|
||||||
HCRC, /* i: waiting for header crc (gzip) */
|
HCRC, /* i: waiting for header crc (gzip) */
|
||||||
DICTID, /* i: waiting for dictionary check value */
|
DICTID, /* i: waiting for dictionary check value */
|
||||||
DICT, /* waiting for inflateSetDictionary() call */
|
DICT, /* waiting for inflateSetDictionary() call */
|
||||||
TYPE, /* i: waiting for type bits, including last-flag bit */
|
TYPE, /* i: waiting for type bits, including last-flag bit */
|
||||||
TYPEDO, /* i: same, but skip check to exit inflate on new block */
|
TYPEDO, /* i: same, but skip check to exit inflate on new block */
|
||||||
STORED, /* i: waiting for stored size (length and complement) */
|
STORED, /* i: waiting for stored size (length and complement) */
|
||||||
COPY_, /* i/o: same as COPY below, but only first time in */
|
COPY_, /* i/o: same as COPY below, but only first time in */
|
||||||
COPY, /* i/o: waiting for input or output to copy stored block */
|
COPY, /* i/o: waiting for input or output to copy stored block */
|
||||||
TABLE, /* i: waiting for dynamic block table lengths */
|
TABLE, /* i: waiting for dynamic block table lengths */
|
||||||
LENLENS, /* i: waiting for code length code lengths */
|
LENLENS, /* i: waiting for code length code lengths */
|
||||||
CODELENS, /* i: waiting for length/lit and distance code lengths */
|
CODELENS, /* i: waiting for length/lit and distance code lengths */
|
||||||
LEN_, /* i: same as LEN below, but only first time in */
|
LEN_, /* i: same as LEN below, but only first time in */
|
||||||
LEN, /* i: waiting for length/lit/eob code */
|
LEN, /* i: waiting for length/lit/eob code */
|
||||||
LENEXT, /* i: waiting for length extra bits */
|
LENEXT, /* i: waiting for length extra bits */
|
||||||
DIST, /* i: waiting for distance code */
|
DIST, /* i: waiting for distance code */
|
||||||
DISTEXT, /* i: waiting for distance extra bits */
|
DISTEXT, /* i: waiting for distance extra bits */
|
||||||
MATCH, /* o: waiting for output space to copy string */
|
MATCH, /* o: waiting for output space to copy string */
|
||||||
LIT, /* o: waiting for output space to write literal */
|
LIT, /* o: waiting for output space to write literal */
|
||||||
CHECK, /* i: waiting for 32-bit check value */
|
CHECK, /* i: waiting for 32-bit check value */
|
||||||
LENGTH, /* i: waiting for 32-bit length (gzip) */
|
LENGTH, /* i: waiting for 32-bit length (gzip) */
|
||||||
DONE, /* finished check, done -- remain here until reset */
|
DONE, /* finished check, done -- remain here until reset */
|
||||||
|
|
@ -78,43 +77,45 @@ typedef enum
|
||||||
CHECK -> LENGTH -> DONE
|
CHECK -> LENGTH -> DONE
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* state maintained between inflate() calls. Approximately 10K bytes. */
|
/* State maintained between inflate() calls -- approximately 7K bytes, not
|
||||||
struct inflate_state
|
including the allocated sliding window, which is up to 32K bytes. */
|
||||||
{
|
struct inflate_state {
|
||||||
|
z_streamp strm; /* pointer back to this zlib stream */
|
||||||
inflate_mode mode; /* current inflate mode */
|
inflate_mode mode; /* current inflate mode */
|
||||||
int last; /* true if processing last block */
|
int last; /* true if processing last block */
|
||||||
int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
|
int wrap; /* bit 0 true for zlib, bit 1 true for gzip,
|
||||||
|
bit 2 true to validate check value */
|
||||||
int havedict; /* true if dictionary provided */
|
int havedict; /* true if dictionary provided */
|
||||||
int flags; /* gzip header method and flags (0 if zlib) */
|
int flags; /* gzip header method and flags (0 if zlib) */
|
||||||
unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
|
unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
|
||||||
unsigned long check; /* protected copy of check value */
|
unsigned long check; /* protected copy of check value */
|
||||||
unsigned long total; /* protected copy of output count */
|
unsigned long total; /* protected copy of output count */
|
||||||
gz_headerp head; /* where to save gzip header information */
|
gz_headerp head; /* where to save gzip header information */
|
||||||
/* sliding window */
|
/* sliding window */
|
||||||
unsigned wbits; /* log base 2 of requested window size */
|
unsigned wbits; /* log base 2 of requested window size */
|
||||||
unsigned wsize; /* window size or zero if not using window */
|
unsigned wsize; /* window size or zero if not using window */
|
||||||
unsigned whave; /* valid bytes in the window */
|
unsigned whave; /* valid bytes in the window */
|
||||||
unsigned wnext; /* window write index */
|
unsigned wnext; /* window write index */
|
||||||
unsigned char FAR* window; /* allocated sliding window, if needed */
|
unsigned char FAR *window; /* allocated sliding window, if needed */
|
||||||
/* bit accumulator */
|
/* bit accumulator */
|
||||||
unsigned long hold; /* input bit accumulator */
|
unsigned long hold; /* input bit accumulator */
|
||||||
unsigned bits; /* number of bits in "in" */
|
unsigned bits; /* number of bits in "in" */
|
||||||
/* for string and stored block copying */
|
/* for string and stored block copying */
|
||||||
unsigned length; /* literal or length of data to copy */
|
unsigned length; /* literal or length of data to copy */
|
||||||
unsigned offset; /* distance back to copy string from */
|
unsigned offset; /* distance back to copy string from */
|
||||||
/* for table and code decoding */
|
/* for table and code decoding */
|
||||||
unsigned extra; /* extra bits needed */
|
unsigned extra; /* extra bits needed */
|
||||||
/* fixed and dynamic code tables */
|
/* fixed and dynamic code tables */
|
||||||
code const FAR* lencode; /* starting table for length/literal codes */
|
code const FAR *lencode; /* starting table for length/literal codes */
|
||||||
code const FAR* distcode; /* starting table for distance codes */
|
code const FAR *distcode; /* starting table for distance codes */
|
||||||
unsigned lenbits; /* index bits for lencode */
|
unsigned lenbits; /* index bits for lencode */
|
||||||
unsigned distbits; /* index bits for distcode */
|
unsigned distbits; /* index bits for distcode */
|
||||||
/* dynamic table building */
|
/* dynamic table building */
|
||||||
unsigned ncode; /* number of code length code lengths */
|
unsigned ncode; /* number of code length code lengths */
|
||||||
unsigned nlen; /* number of length code lengths */
|
unsigned nlen; /* number of length code lengths */
|
||||||
unsigned ndist; /* number of distance code lengths */
|
unsigned ndist; /* number of distance code lengths */
|
||||||
unsigned have; /* number of code lengths in lens[] */
|
unsigned have; /* number of code lengths in lens[] */
|
||||||
code FAR* next; /* next available space in codes[] */
|
code FAR *next; /* next available space in codes[] */
|
||||||
unsigned short lens[320]; /* temporary storage for code lengths */
|
unsigned short lens[320]; /* temporary storage for code lengths */
|
||||||
unsigned short work[288]; /* work area for code table building */
|
unsigned short work[288]; /* work area for code table building */
|
||||||
code codes[ENOUGH]; /* space for code tables */
|
code codes[ENOUGH]; /* space for code tables */
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* inftrees.c -- generate Huffman trees for efficient decoding
|
/* inftrees.c -- generate Huffman trees for efficient decoding
|
||||||
* Copyright (C) 1995-2012 Mark Adler
|
* Copyright (C) 1995-2017 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -9,8 +9,7 @@
|
||||||
#define MAXBITS 15
|
#define MAXBITS 15
|
||||||
|
|
||||||
const char inflate_copyright[] =
|
const char inflate_copyright[] =
|
||||||
// " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
|
" inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
|
||||||
" inflate 1.2.7.f-hanba-win64 Copyright (C) 2012-14 Jonathan Hanba";
|
|
||||||
/*
|
/*
|
||||||
If you use the zlib library in a product, an acknowledgment is welcome
|
If you use the zlib library in a product, an acknowledgment is welcome
|
||||||
in the documentation of your product. If for some reason you cannot
|
in the documentation of your product. If for some reason you cannot
|
||||||
|
|
@ -18,18 +17,6 @@ const char inflate_copyright[] =
|
||||||
copyright string in the executable of your product.
|
copyright string in the executable of your product.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* !!!!
|
|
||||||
* !!!! Please e-mail mailto://hanbaj@gmail.com for help with this altered source
|
|
||||||
* !!!! distribution. This altered source distribution is NOT supported by the
|
|
||||||
* !!!! original creators Jean-loup Gailly and Mark Adler.
|
|
||||||
* !!!!
|
|
||||||
* !!!! zlib 1.2.7.f-hanba-win64 is an altered source distribution of zlib 1.2.7.
|
|
||||||
* !!!! The purpose of the changes made herein were to specifically address
|
|
||||||
* !!!! compiler errors and warnings in a Microsoft Windows build environment.
|
|
||||||
* !!!!
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Build a set of tables to decode the provided canonical Huffman code.
|
Build a set of tables to decode the provided canonical Huffman code.
|
||||||
The code lengths are lens[0..codes-1]. The result starts at *table,
|
The code lengths are lens[0..codes-1]. The result starts at *table,
|
||||||
|
|
@ -42,17 +29,13 @@ const char inflate_copyright[] =
|
||||||
table index bits. It will differ if the request is greater than the
|
table index bits. It will differ if the request is greater than the
|
||||||
longest code or if it is less than the shortest code.
|
longest code or if it is less than the shortest code.
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
|
||||||
int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR* lens, unsigned int codes, code FAR* FAR* table, unsigned FAR* bits, unsigned short FAR* work)
|
|
||||||
#else
|
|
||||||
int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
|
int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
|
||||||
codetype type;
|
codetype type;
|
||||||
unsigned short FAR* lens;
|
unsigned short FAR *lens;
|
||||||
unsigned codes;
|
unsigned codes;
|
||||||
code FAR* FAR* table;
|
code FAR * FAR *table;
|
||||||
unsigned FAR* bits;
|
unsigned FAR *bits;
|
||||||
unsigned short FAR* work;
|
unsigned short FAR *work;
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
unsigned len; /* a code's length in bits */
|
unsigned len; /* a code's length in bits */
|
||||||
unsigned sym; /* index of code symbols */
|
unsigned sym; /* index of code symbols */
|
||||||
|
|
@ -68,34 +51,26 @@ unsigned short FAR* work;
|
||||||
unsigned low; /* low bits for current root entry */
|
unsigned low; /* low bits for current root entry */
|
||||||
unsigned mask; /* mask for low root bits */
|
unsigned mask; /* mask for low root bits */
|
||||||
code here; /* table entry for duplication */
|
code here; /* table entry for duplication */
|
||||||
code FAR* next; /* next available space in table */
|
code FAR *next; /* next available space in table */
|
||||||
const unsigned short FAR* base; /* base value table to use */
|
const unsigned short FAR *base; /* base value table to use */
|
||||||
const unsigned short FAR* extra; /* extra bits table to use */
|
const unsigned short FAR *extra; /* extra bits table to use */
|
||||||
int end; /* use base and extra for symbol > end */
|
unsigned match; /* use base and extra for symbol >= match */
|
||||||
unsigned short count[MAXBITS + 1]; /* number of codes of each length */
|
unsigned short count[MAXBITS+1]; /* number of codes of each length */
|
||||||
unsigned short offs[MAXBITS + 1]; /* offsets in table for each length */
|
unsigned short offs[MAXBITS+1]; /* offsets in table for each length */
|
||||||
static const unsigned short lbase[31] = /* Length codes 257..285 base */
|
static const unsigned short lbase[31] = { /* Length codes 257..285 base */
|
||||||
{
|
|
||||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
|
||||||
};
|
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
|
||||||
static const unsigned short lext[31] = /* Length codes 257..285 extra */
|
|
||||||
{
|
|
||||||
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
|
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
|
||||||
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 68
|
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
|
||||||
};
|
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
|
||||||
static const unsigned short dbase[32] = /* Distance codes 0..29 base */
|
|
||||||
{
|
|
||||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
||||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
||||||
8193, 12289, 16385, 24577, 0, 0
|
8193, 12289, 16385, 24577, 0, 0};
|
||||||
};
|
static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
|
||||||
static const unsigned short dext[32] = /* Distance codes 0..29 extra */
|
|
||||||
{
|
|
||||||
16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
|
16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
|
||||||
23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
|
23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
|
||||||
28, 28, 29, 29, 64, 64
|
28, 28, 29, 29, 64, 64};
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Process a set of code lengths to create a canonical Huffman code. The
|
Process a set of code lengths to create a canonical Huffman code. The
|
||||||
|
|
@ -131,20 +106,15 @@ unsigned short FAR* work;
|
||||||
/* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
|
/* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
|
||||||
for (len = 0; len <= MAXBITS; len++)
|
for (len = 0; len <= MAXBITS; len++)
|
||||||
count[len] = 0;
|
count[len] = 0;
|
||||||
|
|
||||||
for (sym = 0; sym < codes; sym++)
|
for (sym = 0; sym < codes; sym++)
|
||||||
count[lens[sym]]++;
|
count[lens[sym]]++;
|
||||||
|
|
||||||
/* bound code lengths, force root to be within code lengths */
|
/* bound code lengths, force root to be within code lengths */
|
||||||
root = *bits;
|
root = *bits;
|
||||||
|
|
||||||
for (max = MAXBITS; max >= 1; max--)
|
for (max = MAXBITS; max >= 1; max--)
|
||||||
if (count[max] != 0) break;
|
if (count[max] != 0) break;
|
||||||
|
|
||||||
if (root > max) root = max;
|
if (root > max) root = max;
|
||||||
|
if (max == 0) { /* no symbols to code at all */
|
||||||
if (max == 0) /* no symbols to code at all */
|
|
||||||
{
|
|
||||||
here.op = (unsigned char)64; /* invalid code marker */
|
here.op = (unsigned char)64; /* invalid code marker */
|
||||||
here.bits = (unsigned char)1;
|
here.bits = (unsigned char)1;
|
||||||
here.val = (unsigned short)0;
|
here.val = (unsigned short)0;
|
||||||
|
|
@ -153,29 +123,22 @@ unsigned short FAR* work;
|
||||||
*bits = 1;
|
*bits = 1;
|
||||||
return 0; /* no symbols, but wait for decoding to report error */
|
return 0; /* no symbols, but wait for decoding to report error */
|
||||||
}
|
}
|
||||||
|
|
||||||
for (min = 1; min < max; min++)
|
for (min = 1; min < max; min++)
|
||||||
if (count[min] != 0) break;
|
if (count[min] != 0) break;
|
||||||
|
|
||||||
if (root < min) root = min;
|
if (root < min) root = min;
|
||||||
|
|
||||||
/* check for an over-subscribed or incomplete set of lengths */
|
/* check for an over-subscribed or incomplete set of lengths */
|
||||||
left = 1;
|
left = 1;
|
||||||
|
for (len = 1; len <= MAXBITS; len++) {
|
||||||
for (len = 1; len <= MAXBITS; len++)
|
|
||||||
{
|
|
||||||
left <<= 1;
|
left <<= 1;
|
||||||
left -= count[len];
|
left -= count[len];
|
||||||
|
|
||||||
if (left < 0) return -1; /* over-subscribed */
|
if (left < 0) return -1; /* over-subscribed */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (left > 0 && (type == CODES || max != 1))
|
if (left > 0 && (type == CODES || max != 1))
|
||||||
return -1; /* incomplete set */
|
return -1; /* incomplete set */
|
||||||
|
|
||||||
/* generate offsets into symbol table for each length for sorting */
|
/* generate offsets into symbol table for each length for sorting */
|
||||||
offs[1] = 0;
|
offs[1] = 0;
|
||||||
|
|
||||||
for (len = 1; len < MAXBITS; len++)
|
for (len = 1; len < MAXBITS; len++)
|
||||||
offs[len + 1] = offs[len] + count[len];
|
offs[len + 1] = offs[len] + count[len];
|
||||||
|
|
||||||
|
|
@ -215,25 +178,20 @@ unsigned short FAR* work;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* set up for code type */
|
/* set up for code type */
|
||||||
switch (type)
|
switch (type) {
|
||||||
{
|
case CODES:
|
||||||
case CODES:
|
base = extra = work; /* dummy value--not used */
|
||||||
base = extra = work; /* dummy value--not used */
|
match = 20;
|
||||||
end = 19;
|
break;
|
||||||
break;
|
case LENS:
|
||||||
|
base = lbase;
|
||||||
case LENS:
|
extra = lext;
|
||||||
base = lbase;
|
match = 257;
|
||||||
base -= 257;
|
break;
|
||||||
extra = lext;
|
default: /* DISTS */
|
||||||
extra -= 257;
|
base = dbase;
|
||||||
end = 256;
|
extra = dext;
|
||||||
break;
|
match = 0;
|
||||||
|
|
||||||
default: /* DISTS */
|
|
||||||
base = dbase;
|
|
||||||
extra = dext;
|
|
||||||
end = -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* initialize state for loop */
|
/* initialize state for loop */
|
||||||
|
|
@ -248,28 +206,23 @@ unsigned short FAR* work;
|
||||||
mask = used - 1; /* mask for comparing low */
|
mask = used - 1; /* mask for comparing low */
|
||||||
|
|
||||||
/* check available table space */
|
/* check available table space */
|
||||||
if ((type == LENS && used >= ENOUGH_LENS) ||
|
if ((type == LENS && used > ENOUGH_LENS) ||
|
||||||
(type == DISTS && used >= ENOUGH_DISTS))
|
(type == DISTS && used > ENOUGH_DISTS))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* process all codes and make table entries */
|
/* process all codes and make table entries */
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
/* create table entry */
|
/* create table entry */
|
||||||
here.bits = (unsigned char)(len - drop);
|
here.bits = (unsigned char)(len - drop);
|
||||||
|
if (work[sym] + 1U < match) {
|
||||||
if ((int)(work[sym]) < end)
|
|
||||||
{
|
|
||||||
here.op = (unsigned char)0;
|
here.op = (unsigned char)0;
|
||||||
here.val = work[sym];
|
here.val = work[sym];
|
||||||
}
|
}
|
||||||
else if ((int)(work[sym]) > end)
|
else if (work[sym] >= match) {
|
||||||
{
|
here.op = (unsigned char)(extra[work[sym] - match]);
|
||||||
here.op = (unsigned char)(extra[work[sym]]);
|
here.val = base[work[sym] - match];
|
||||||
here.val = base[work[sym]];
|
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
here.op = (unsigned char)(32 + 64); /* end of block */
|
here.op = (unsigned char)(32 + 64); /* end of block */
|
||||||
here.val = 0;
|
here.val = 0;
|
||||||
}
|
}
|
||||||
|
|
@ -278,22 +231,16 @@ unsigned short FAR* work;
|
||||||
incr = 1U << (len - drop);
|
incr = 1U << (len - drop);
|
||||||
fill = 1U << curr;
|
fill = 1U << curr;
|
||||||
min = fill; /* save offset to next table */
|
min = fill; /* save offset to next table */
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
fill -= incr;
|
fill -= incr;
|
||||||
next[(huff >> drop) + fill] = here;
|
next[(huff >> drop) + fill] = here;
|
||||||
}
|
} while (fill != 0);
|
||||||
while (fill != 0);
|
|
||||||
|
|
||||||
/* backwards increment the len-bit code huff */
|
/* backwards increment the len-bit code huff */
|
||||||
incr = 1U << (len - 1);
|
incr = 1U << (len - 1);
|
||||||
|
|
||||||
while (huff & incr)
|
while (huff & incr)
|
||||||
incr >>= 1;
|
incr >>= 1;
|
||||||
|
if (incr != 0) {
|
||||||
if (incr != 0)
|
|
||||||
{
|
|
||||||
huff &= incr - 1;
|
huff &= incr - 1;
|
||||||
huff += incr;
|
huff += incr;
|
||||||
}
|
}
|
||||||
|
|
@ -302,17 +249,13 @@ unsigned short FAR* work;
|
||||||
|
|
||||||
/* go to next symbol, update count, len */
|
/* go to next symbol, update count, len */
|
||||||
sym++;
|
sym++;
|
||||||
|
if (--(count[len]) == 0) {
|
||||||
if (--(count[len]) == 0)
|
|
||||||
{
|
|
||||||
if (len == max) break;
|
if (len == max) break;
|
||||||
|
|
||||||
len = lens[work[sym]];
|
len = lens[work[sym]];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create new sub-table if needed */
|
/* create new sub-table if needed */
|
||||||
if (len > root && (huff & mask) != low)
|
if (len > root && (huff & mask) != low) {
|
||||||
{
|
|
||||||
/* if first time, transition to sub-tables */
|
/* if first time, transition to sub-tables */
|
||||||
if (drop == 0)
|
if (drop == 0)
|
||||||
drop = root;
|
drop = root;
|
||||||
|
|
@ -323,22 +266,17 @@ unsigned short FAR* work;
|
||||||
/* determine length of next table */
|
/* determine length of next table */
|
||||||
curr = len - drop;
|
curr = len - drop;
|
||||||
left = (int)(1 << curr);
|
left = (int)(1 << curr);
|
||||||
|
while (curr + drop < max) {
|
||||||
while (curr + drop < max)
|
|
||||||
{
|
|
||||||
left -= count[curr + drop];
|
left -= count[curr + drop];
|
||||||
|
|
||||||
if (left <= 0) break;
|
if (left <= 0) break;
|
||||||
|
|
||||||
curr++;
|
curr++;
|
||||||
left <<= 1;
|
left <<= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check for enough space */
|
/* check for enough space */
|
||||||
used += 1U << curr;
|
used += 1U << curr;
|
||||||
|
if ((type == LENS && used > ENOUGH_LENS) ||
|
||||||
if ((type == LENS && used >= ENOUGH_LENS) ||
|
(type == DISTS && used > ENOUGH_DISTS))
|
||||||
(type == DISTS && used >= ENOUGH_DISTS))
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* point entry in root table to sub-table */
|
/* point entry in root table to sub-table */
|
||||||
|
|
@ -352,8 +290,7 @@ unsigned short FAR* work;
|
||||||
/* fill in remaining table entry if code is incomplete (guaranteed to have
|
/* fill in remaining table entry if code is incomplete (guaranteed to have
|
||||||
at most one remaining entry, since if the code is incomplete, the
|
at most one remaining entry, since if the code is incomplete, the
|
||||||
maximum code length that was allowed to get this far is one bit) */
|
maximum code length that was allowed to get this far is one bit) */
|
||||||
if (huff != 0)
|
if (huff != 0) {
|
||||||
{
|
|
||||||
here.op = (unsigned char)64; /* invalid code marker */
|
here.op = (unsigned char)64; /* invalid code marker */
|
||||||
here.bits = (unsigned char)(len - drop);
|
here.bits = (unsigned char)(len - drop);
|
||||||
here.val = (unsigned short)0;
|
here.val = (unsigned short)0;
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,7 @@
|
||||||
of the bit buffer. val is the actual byte to output in the case
|
of the bit buffer. val is the actual byte to output in the case
|
||||||
of a literal, the base length or distance, or the offset from
|
of a literal, the base length or distance, or the offset from
|
||||||
the current table to the next table. Each entry is four bytes. */
|
the current table to the next table. Each entry is four bytes. */
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
unsigned char op; /* operation, extra bits, table bits */
|
unsigned char op; /* operation, extra bits, table bits */
|
||||||
unsigned char bits; /* bits in this part of the code */
|
unsigned char bits; /* bits in this part of the code */
|
||||||
unsigned short val; /* offset in table or code value */
|
unsigned short val; /* offset in table or code value */
|
||||||
|
|
@ -52,13 +51,12 @@ typedef struct
|
||||||
#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
|
#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
|
||||||
|
|
||||||
/* Type of code to build for inflate_table() */
|
/* Type of code to build for inflate_table() */
|
||||||
typedef enum
|
typedef enum {
|
||||||
{
|
|
||||||
CODES,
|
CODES,
|
||||||
LENS,
|
LENS,
|
||||||
DISTS
|
DISTS
|
||||||
} codetype;
|
} codetype;
|
||||||
|
|
||||||
int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR* lens,
|
int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
|
||||||
unsigned codes, code FAR* FAR* table,
|
unsigned codes, code FAR * FAR *table,
|
||||||
unsigned FAR* bits, unsigned short FAR* work));
|
unsigned FAR *bits, unsigned short FAR *work));
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* example.c -- usage example of the zlib compression library
|
/* example.c -- usage example of the zlib compression library
|
||||||
* Copyright (C) 1995-2006, 2011 Jean-loup Gailly.
|
* Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -26,46 +26,46 @@
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
const char hello[] = "hello, hello!";
|
static z_const char hello[] = "hello, hello!";
|
||||||
/* "hello world" would be more standard, but the repeated "hello"
|
/* "hello world" would be more standard, but the repeated "hello"
|
||||||
* stresses the compression code better, sorry...
|
* stresses the compression code better, sorry...
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const char dictionary[] = "hello";
|
static const char dictionary[] = "hello";
|
||||||
uLong dictId; /* Adler32 value of the dictionary */
|
static uLong dictId; /* Adler32 value of the dictionary */
|
||||||
|
|
||||||
void test_deflate OF((Byte* compr, uLong comprLen));
|
void test_deflate OF((Byte *compr, uLong comprLen));
|
||||||
void test_inflate OF((Byte* compr, uLong comprLen,
|
void test_inflate OF((Byte *compr, uLong comprLen,
|
||||||
Byte* uncompr, uLong uncomprLen));
|
Byte *uncompr, uLong uncomprLen));
|
||||||
void test_large_deflate OF((Byte* compr, uLong comprLen,
|
void test_large_deflate OF((Byte *compr, uLong comprLen,
|
||||||
Byte* uncompr, uLong uncomprLen));
|
Byte *uncompr, uLong uncomprLen));
|
||||||
void test_large_inflate OF((Byte* compr, uLong comprLen,
|
void test_large_inflate OF((Byte *compr, uLong comprLen,
|
||||||
Byte* uncompr, uLong uncomprLen));
|
Byte *uncompr, uLong uncomprLen));
|
||||||
void test_flush OF((Byte* compr, uLong* comprLen));
|
void test_flush OF((Byte *compr, uLong *comprLen));
|
||||||
void test_sync OF((Byte* compr, uLong comprLen,
|
void test_sync OF((Byte *compr, uLong comprLen,
|
||||||
Byte* uncompr, uLong uncomprLen));
|
Byte *uncompr, uLong uncomprLen));
|
||||||
void test_dict_deflate OF((Byte* compr, uLong comprLen));
|
void test_dict_deflate OF((Byte *compr, uLong comprLen));
|
||||||
void test_dict_inflate OF((Byte* compr, uLong comprLen,
|
void test_dict_inflate OF((Byte *compr, uLong comprLen,
|
||||||
Byte* uncompr, uLong uncomprLen));
|
Byte *uncompr, uLong uncomprLen));
|
||||||
int main OF((int argc, char* argv[]));
|
int main OF((int argc, char *argv[]));
|
||||||
|
|
||||||
|
|
||||||
#ifdef Z_SOLO
|
#ifdef Z_SOLO
|
||||||
|
|
||||||
void* myalloc OF((void*, unsigned, unsigned));
|
void *myalloc OF((void *, unsigned, unsigned));
|
||||||
void myfree OF((void*, void*));
|
void myfree OF((void *, void *));
|
||||||
|
|
||||||
void* myalloc(q, n, m)
|
void *myalloc(q, n, m)
|
||||||
void* q;
|
void *q;
|
||||||
unsigned n, m;
|
unsigned n, m;
|
||||||
{
|
{
|
||||||
q = Z_NULL;
|
(void)q;
|
||||||
return calloc(n, m);
|
return calloc(n, m);
|
||||||
}
|
}
|
||||||
|
|
||||||
void myfree(void* q, void* p)
|
void myfree(void *q, void *p)
|
||||||
{
|
{
|
||||||
q = Z_NULL;
|
(void)q;
|
||||||
free(p);
|
free(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -77,20 +77,20 @@ static free_func zfree = myfree;
|
||||||
static alloc_func zalloc = (alloc_func)0;
|
static alloc_func zalloc = (alloc_func)0;
|
||||||
static free_func zfree = (free_func)0;
|
static free_func zfree = (free_func)0;
|
||||||
|
|
||||||
void test_compress OF((Byte* compr, uLong comprLen,
|
void test_compress OF((Byte *compr, uLong comprLen,
|
||||||
Byte* uncompr, uLong uncomprLen));
|
Byte *uncompr, uLong uncomprLen));
|
||||||
void test_gzio OF((const char* fname,
|
void test_gzio OF((const char *fname,
|
||||||
Byte* uncompr, uLong uncomprLen));
|
Byte *uncompr, uLong uncomprLen));
|
||||||
|
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
* Test compress() and uncompress()
|
* Test compress() and uncompress()
|
||||||
*/
|
*/
|
||||||
void test_compress(compr, comprLen, uncompr, uncomprLen)
|
void test_compress(compr, comprLen, uncompr, uncomprLen)
|
||||||
Byte* compr, *uncompr;
|
Byte *compr, *uncompr;
|
||||||
uLong comprLen, uncomprLen;
|
uLong comprLen, uncomprLen;
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
uLong len = (uLong)strlen(hello) + 1;
|
uLong len = (uLong)strlen(hello)+1;
|
||||||
|
|
||||||
err = compress(compr, &comprLen, (const Bytef*)hello, len);
|
err = compress(compr, &comprLen, (const Bytef*)hello, len);
|
||||||
CHECK_ERR(err, "compress");
|
CHECK_ERR(err, "compress");
|
||||||
|
|
@ -100,14 +100,11 @@ uLong comprLen, uncomprLen;
|
||||||
err = uncompress(uncompr, &uncomprLen, compr, comprLen);
|
err = uncompress(uncompr, &uncomprLen, compr, comprLen);
|
||||||
CHECK_ERR(err, "uncompress");
|
CHECK_ERR(err, "uncompress");
|
||||||
|
|
||||||
if (strcmp((char*)uncompr, hello))
|
if (strcmp((char*)uncompr, hello)) {
|
||||||
{
|
|
||||||
fprintf(stderr, "bad uncompress\n");
|
fprintf(stderr, "bad uncompress\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
} else {
|
||||||
else
|
printf("uncompress(): %s\n", (char *)uncompr);
|
||||||
{
|
|
||||||
printf("uncompress(): %s\n", (char*)uncompr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -115,105 +112,79 @@ uLong comprLen, uncomprLen;
|
||||||
* Test read/write of .gz files
|
* Test read/write of .gz files
|
||||||
*/
|
*/
|
||||||
void test_gzio(fname, uncompr, uncomprLen)
|
void test_gzio(fname, uncompr, uncomprLen)
|
||||||
const char* fname; /* compressed file name */
|
const char *fname; /* compressed file name */
|
||||||
Byte* uncompr;
|
Byte *uncompr;
|
||||||
uLong uncomprLen;
|
uLong uncomprLen;
|
||||||
{
|
{
|
||||||
#ifdef NO_GZCOMPRESS
|
#ifdef NO_GZCOMPRESS
|
||||||
fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
|
fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
|
||||||
#else
|
#else
|
||||||
int err;
|
int err;
|
||||||
int len = (int)strlen(hello) + 1;
|
int len = (int)strlen(hello)+1;
|
||||||
gzFile file;
|
gzFile file;
|
||||||
z_off_t pos;
|
z_off_t pos;
|
||||||
|
|
||||||
file = gzopen(fname, "wb");
|
file = gzopen(fname, "wb");
|
||||||
|
if (file == NULL) {
|
||||||
if (file == NULL)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "gzopen error\n");
|
fprintf(stderr, "gzopen error\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
gzputc(file, 'h');
|
gzputc(file, 'h');
|
||||||
|
if (gzputs(file, "ello") != 4) {
|
||||||
if (gzputs(file, "ello") != 4)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
|
fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
if (gzprintf(file, ", %s!", "hello") != 8) {
|
||||||
if (gzprintf(file, ", %s!", "hello") != 8)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
|
fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
|
gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
|
||||||
gzclose(file);
|
gzclose(file);
|
||||||
|
|
||||||
file = gzopen(fname, "rb");
|
file = gzopen(fname, "rb");
|
||||||
|
if (file == NULL) {
|
||||||
if (file == NULL)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "gzopen error\n");
|
fprintf(stderr, "gzopen error\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
strcpy((char*)uncompr, "garbage");
|
strcpy((char*)uncompr, "garbage");
|
||||||
|
|
||||||
if (gzread(file, uncompr, (unsigned)uncomprLen) != len)
|
if (gzread(file, uncompr, (unsigned)uncomprLen) != len) {
|
||||||
{
|
|
||||||
fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
|
fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
if (strcmp((char*)uncompr, hello)) {
|
||||||
if (strcmp((char*)uncompr, hello))
|
|
||||||
{
|
|
||||||
fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
|
fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("gzread(): %s\n", (char*)uncompr);
|
printf("gzread(): %s\n", (char*)uncompr);
|
||||||
}
|
}
|
||||||
|
|
||||||
pos = gzseek(file, -8L, SEEK_CUR);
|
pos = gzseek(file, -8L, SEEK_CUR);
|
||||||
|
if (pos != 6 || gztell(file) != pos) {
|
||||||
if (pos != 6 || gztell(file) != pos)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
|
fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
|
||||||
(long)pos, (long)gztell(file));
|
(long)pos, (long)gztell(file));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gzgetc(file) != ' ')
|
if (gzgetc(file) != ' ') {
|
||||||
{
|
|
||||||
fprintf(stderr, "gzgetc error\n");
|
fprintf(stderr, "gzgetc error\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gzungetc(' ', file) != ' ')
|
if (gzungetc(' ', file) != ' ') {
|
||||||
{
|
|
||||||
fprintf(stderr, "gzungetc error\n");
|
fprintf(stderr, "gzungetc error\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
gzgets(file, (char*)uncompr, (int)uncomprLen);
|
gzgets(file, (char*)uncompr, (int)uncomprLen);
|
||||||
|
if (strlen((char*)uncompr) != 7) { /* " hello!" */
|
||||||
if (strlen((char*)uncompr) != 7) /* " hello!" */
|
|
||||||
{
|
|
||||||
fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
|
fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
if (strcmp((char*)uncompr, hello + 6)) {
|
||||||
if (strcmp((char*)uncompr, hello + 6))
|
|
||||||
{
|
|
||||||
fprintf(stderr, "bad gzgets after gzseek\n");
|
fprintf(stderr, "bad gzgets after gzseek\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("gzgets() after gzseek: %s\n", (char*)uncompr);
|
printf("gzgets() after gzseek: %s\n", (char*)uncompr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -227,12 +198,12 @@ uLong uncomprLen;
|
||||||
* Test deflate() with small buffers
|
* Test deflate() with small buffers
|
||||||
*/
|
*/
|
||||||
void test_deflate(compr, comprLen)
|
void test_deflate(compr, comprLen)
|
||||||
Byte* compr;
|
Byte *compr;
|
||||||
uLong comprLen;
|
uLong comprLen;
|
||||||
{
|
{
|
||||||
z_stream c_stream; /* compression stream */
|
z_stream c_stream; /* compression stream */
|
||||||
int err;
|
int err;
|
||||||
uLong len = (uLong)strlen(hello) + 1;
|
uLong len = (uLong)strlen(hello)+1;
|
||||||
|
|
||||||
c_stream.zalloc = zalloc;
|
c_stream.zalloc = zalloc;
|
||||||
c_stream.zfree = zfree;
|
c_stream.zfree = zfree;
|
||||||
|
|
@ -241,24 +212,19 @@ uLong comprLen;
|
||||||
err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
|
err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
|
||||||
CHECK_ERR(err, "deflateInit");
|
CHECK_ERR(err, "deflateInit");
|
||||||
|
|
||||||
c_stream.next_in = (Bytef*)hello;
|
c_stream.next_in = (z_const unsigned char *)hello;
|
||||||
c_stream.next_out = compr;
|
c_stream.next_out = compr;
|
||||||
|
|
||||||
while (c_stream.total_in != len && c_stream.total_out < comprLen)
|
while (c_stream.total_in != len && c_stream.total_out < comprLen) {
|
||||||
{
|
|
||||||
c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
|
c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
|
||||||
err = deflate(&c_stream, Z_NO_FLUSH);
|
err = deflate(&c_stream, Z_NO_FLUSH);
|
||||||
CHECK_ERR(err, "deflate");
|
CHECK_ERR(err, "deflate");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Finish the stream, still forcing small buffers: */
|
/* Finish the stream, still forcing small buffers: */
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
c_stream.avail_out = 1;
|
c_stream.avail_out = 1;
|
||||||
err = deflate(&c_stream, Z_FINISH);
|
err = deflate(&c_stream, Z_FINISH);
|
||||||
|
|
||||||
if (err == Z_STREAM_END) break;
|
if (err == Z_STREAM_END) break;
|
||||||
|
|
||||||
CHECK_ERR(err, "deflate");
|
CHECK_ERR(err, "deflate");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -270,8 +236,8 @@ uLong comprLen;
|
||||||
* Test inflate() with small buffers
|
* Test inflate() with small buffers
|
||||||
*/
|
*/
|
||||||
void test_inflate(compr, comprLen, uncompr, uncomprLen)
|
void test_inflate(compr, comprLen, uncompr, uncomprLen)
|
||||||
Byte* compr, *uncompr;
|
Byte *compr, *uncompr;
|
||||||
uLong comprLen, uncomprLen;
|
uLong comprLen, uncomprLen;
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
z_stream d_stream; /* decompression stream */
|
z_stream d_stream; /* decompression stream */
|
||||||
|
|
@ -289,27 +255,21 @@ uLong comprLen, uncomprLen;
|
||||||
err = inflateInit(&d_stream);
|
err = inflateInit(&d_stream);
|
||||||
CHECK_ERR(err, "inflateInit");
|
CHECK_ERR(err, "inflateInit");
|
||||||
|
|
||||||
while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen)
|
while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
|
||||||
{
|
|
||||||
d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
|
d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
|
||||||
err = inflate(&d_stream, Z_NO_FLUSH);
|
err = inflate(&d_stream, Z_NO_FLUSH);
|
||||||
|
|
||||||
if (err == Z_STREAM_END) break;
|
if (err == Z_STREAM_END) break;
|
||||||
|
|
||||||
CHECK_ERR(err, "inflate");
|
CHECK_ERR(err, "inflate");
|
||||||
}
|
}
|
||||||
|
|
||||||
err = inflateEnd(&d_stream);
|
err = inflateEnd(&d_stream);
|
||||||
CHECK_ERR(err, "inflateEnd");
|
CHECK_ERR(err, "inflateEnd");
|
||||||
|
|
||||||
if (strcmp((char*)uncompr, hello))
|
if (strcmp((char*)uncompr, hello)) {
|
||||||
{
|
|
||||||
fprintf(stderr, "bad inflate\n");
|
fprintf(stderr, "bad inflate\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
} else {
|
||||||
else
|
printf("inflate(): %s\n", (char *)uncompr);
|
||||||
{
|
|
||||||
printf("inflate(): %s\n", (char*)uncompr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -317,8 +277,8 @@ uLong comprLen, uncomprLen;
|
||||||
* Test deflate() with large buffers and dynamic change of compression level
|
* Test deflate() with large buffers and dynamic change of compression level
|
||||||
*/
|
*/
|
||||||
void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
|
void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
|
||||||
Byte* compr, *uncompr;
|
Byte *compr, *uncompr;
|
||||||
uLong comprLen, uncomprLen;
|
uLong comprLen, uncomprLen;
|
||||||
{
|
{
|
||||||
z_stream c_stream; /* compression stream */
|
z_stream c_stream; /* compression stream */
|
||||||
int err;
|
int err;
|
||||||
|
|
@ -340,9 +300,7 @@ uLong comprLen, uncomprLen;
|
||||||
c_stream.avail_in = (uInt)uncomprLen;
|
c_stream.avail_in = (uInt)uncomprLen;
|
||||||
err = deflate(&c_stream, Z_NO_FLUSH);
|
err = deflate(&c_stream, Z_NO_FLUSH);
|
||||||
CHECK_ERR(err, "deflate");
|
CHECK_ERR(err, "deflate");
|
||||||
|
if (c_stream.avail_in != 0) {
|
||||||
if (c_stream.avail_in != 0)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "deflate not greedy\n");
|
fprintf(stderr, "deflate not greedy\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
@ -350,7 +308,7 @@ uLong comprLen, uncomprLen;
|
||||||
/* Feed in already compressed data and switch to no compression: */
|
/* Feed in already compressed data and switch to no compression: */
|
||||||
deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
|
deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
|
||||||
c_stream.next_in = compr;
|
c_stream.next_in = compr;
|
||||||
c_stream.avail_in = (uInt)comprLen / 2;
|
c_stream.avail_in = (uInt)comprLen/2;
|
||||||
err = deflate(&c_stream, Z_NO_FLUSH);
|
err = deflate(&c_stream, Z_NO_FLUSH);
|
||||||
CHECK_ERR(err, "deflate");
|
CHECK_ERR(err, "deflate");
|
||||||
|
|
||||||
|
|
@ -362,13 +320,10 @@ uLong comprLen, uncomprLen;
|
||||||
CHECK_ERR(err, "deflate");
|
CHECK_ERR(err, "deflate");
|
||||||
|
|
||||||
err = deflate(&c_stream, Z_FINISH);
|
err = deflate(&c_stream, Z_FINISH);
|
||||||
|
if (err != Z_STREAM_END) {
|
||||||
if (err != Z_STREAM_END)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "deflate should report Z_STREAM_END\n");
|
fprintf(stderr, "deflate should report Z_STREAM_END\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
err = deflateEnd(&c_stream);
|
err = deflateEnd(&c_stream);
|
||||||
CHECK_ERR(err, "deflateEnd");
|
CHECK_ERR(err, "deflateEnd");
|
||||||
}
|
}
|
||||||
|
|
@ -377,8 +332,8 @@ uLong comprLen, uncomprLen;
|
||||||
* Test inflate() with large buffers
|
* Test inflate() with large buffers
|
||||||
*/
|
*/
|
||||||
void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
|
void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
|
||||||
Byte* compr, *uncompr;
|
Byte *compr, *uncompr;
|
||||||
uLong comprLen, uncomprLen;
|
uLong comprLen, uncomprLen;
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
z_stream d_stream; /* decompression stream */
|
z_stream d_stream; /* decompression stream */
|
||||||
|
|
@ -395,27 +350,21 @@ uLong comprLen, uncomprLen;
|
||||||
err = inflateInit(&d_stream);
|
err = inflateInit(&d_stream);
|
||||||
CHECK_ERR(err, "inflateInit");
|
CHECK_ERR(err, "inflateInit");
|
||||||
|
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
d_stream.next_out = uncompr; /* discard the output */
|
d_stream.next_out = uncompr; /* discard the output */
|
||||||
d_stream.avail_out = (uInt)uncomprLen;
|
d_stream.avail_out = (uInt)uncomprLen;
|
||||||
err = inflate(&d_stream, Z_NO_FLUSH);
|
err = inflate(&d_stream, Z_NO_FLUSH);
|
||||||
|
|
||||||
if (err == Z_STREAM_END) break;
|
if (err == Z_STREAM_END) break;
|
||||||
|
|
||||||
CHECK_ERR(err, "large inflate");
|
CHECK_ERR(err, "large inflate");
|
||||||
}
|
}
|
||||||
|
|
||||||
err = inflateEnd(&d_stream);
|
err = inflateEnd(&d_stream);
|
||||||
CHECK_ERR(err, "inflateEnd");
|
CHECK_ERR(err, "inflateEnd");
|
||||||
|
|
||||||
if (d_stream.total_out != 2 * uncomprLen + comprLen / 2)
|
if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
|
||||||
{
|
|
||||||
fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
|
fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("large_inflate(): OK\n");
|
printf("large_inflate(): OK\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -424,12 +373,12 @@ uLong comprLen, uncomprLen;
|
||||||
* Test deflate() with full flush
|
* Test deflate() with full flush
|
||||||
*/
|
*/
|
||||||
void test_flush(compr, comprLen)
|
void test_flush(compr, comprLen)
|
||||||
Byte* compr;
|
Byte *compr;
|
||||||
uLong* comprLen;
|
uLong *comprLen;
|
||||||
{
|
{
|
||||||
z_stream c_stream; /* compression stream */
|
z_stream c_stream; /* compression stream */
|
||||||
int err;
|
int err;
|
||||||
uInt len = (uInt)strlen(hello) + 1;
|
uInt len = (uInt)strlen(hello)+1;
|
||||||
|
|
||||||
c_stream.zalloc = zalloc;
|
c_stream.zalloc = zalloc;
|
||||||
c_stream.zfree = zfree;
|
c_stream.zfree = zfree;
|
||||||
|
|
@ -438,10 +387,10 @@ uLong* comprLen;
|
||||||
err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
|
err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
|
||||||
CHECK_ERR(err, "deflateInit");
|
CHECK_ERR(err, "deflateInit");
|
||||||
|
|
||||||
c_stream.next_in = (Bytef*)hello;
|
c_stream.next_in = (z_const unsigned char *)hello;
|
||||||
c_stream.next_out = compr;
|
c_stream.next_out = compr;
|
||||||
c_stream.avail_in = 3;
|
c_stream.avail_in = 3;
|
||||||
c_stream.avail_out = (uInt) * comprLen;
|
c_stream.avail_out = (uInt)*comprLen;
|
||||||
err = deflate(&c_stream, Z_FULL_FLUSH);
|
err = deflate(&c_stream, Z_FULL_FLUSH);
|
||||||
CHECK_ERR(err, "deflate");
|
CHECK_ERR(err, "deflate");
|
||||||
|
|
||||||
|
|
@ -449,12 +398,9 @@ uLong* comprLen;
|
||||||
c_stream.avail_in = len - 3;
|
c_stream.avail_in = len - 3;
|
||||||
|
|
||||||
err = deflate(&c_stream, Z_FINISH);
|
err = deflate(&c_stream, Z_FINISH);
|
||||||
|
if (err != Z_STREAM_END) {
|
||||||
if (err != Z_STREAM_END)
|
|
||||||
{
|
|
||||||
CHECK_ERR(err, "deflate");
|
CHECK_ERR(err, "deflate");
|
||||||
}
|
}
|
||||||
|
|
||||||
err = deflateEnd(&c_stream);
|
err = deflateEnd(&c_stream);
|
||||||
CHECK_ERR(err, "deflateEnd");
|
CHECK_ERR(err, "deflateEnd");
|
||||||
|
|
||||||
|
|
@ -465,8 +411,8 @@ uLong* comprLen;
|
||||||
* Test inflateSync()
|
* Test inflateSync()
|
||||||
*/
|
*/
|
||||||
void test_sync(compr, comprLen, uncompr, uncomprLen)
|
void test_sync(compr, comprLen, uncompr, uncomprLen)
|
||||||
Byte* compr, *uncompr;
|
Byte *compr, *uncompr;
|
||||||
uLong comprLen, uncomprLen;
|
uLong comprLen, uncomprLen;
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
z_stream d_stream; /* decompression stream */
|
z_stream d_stream; /* decompression stream */
|
||||||
|
|
@ -486,34 +432,31 @@ uLong comprLen, uncomprLen;
|
||||||
d_stream.next_out = uncompr;
|
d_stream.next_out = uncompr;
|
||||||
d_stream.avail_out = (uInt)uncomprLen;
|
d_stream.avail_out = (uInt)uncomprLen;
|
||||||
|
|
||||||
inflate(&d_stream, Z_NO_FLUSH);
|
err = inflate(&d_stream, Z_NO_FLUSH);
|
||||||
CHECK_ERR(err, "inflate");
|
CHECK_ERR(err, "inflate");
|
||||||
|
|
||||||
d_stream.avail_in = (uInt)comprLen - 2; /* read all compressed data */
|
d_stream.avail_in = (uInt)comprLen-2; /* read all compressed data */
|
||||||
err = inflateSync(&d_stream); /* but skip the damaged part */
|
err = inflateSync(&d_stream); /* but skip the damaged part */
|
||||||
CHECK_ERR(err, "inflateSync");
|
CHECK_ERR(err, "inflateSync");
|
||||||
|
|
||||||
err = inflate(&d_stream, Z_FINISH);
|
err = inflate(&d_stream, Z_FINISH);
|
||||||
|
if (err != Z_DATA_ERROR) {
|
||||||
if (err != Z_DATA_ERROR)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "inflate should report DATA_ERROR\n");
|
fprintf(stderr, "inflate should report DATA_ERROR\n");
|
||||||
/* Because of incorrect adler32 */
|
/* Because of incorrect adler32 */
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
err = inflateEnd(&d_stream);
|
err = inflateEnd(&d_stream);
|
||||||
CHECK_ERR(err, "inflateEnd");
|
CHECK_ERR(err, "inflateEnd");
|
||||||
|
|
||||||
printf("after inflateSync(): hel%s\n", (char*)uncompr);
|
printf("after inflateSync(): hel%s\n", (char *)uncompr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
* Test deflate() with preset dictionary
|
* Test deflate() with preset dictionary
|
||||||
*/
|
*/
|
||||||
void test_dict_deflate(compr, comprLen)
|
void test_dict_deflate(compr, comprLen)
|
||||||
Byte* compr;
|
Byte *compr;
|
||||||
uLong comprLen;
|
uLong comprLen;
|
||||||
{
|
{
|
||||||
z_stream c_stream; /* compression stream */
|
z_stream c_stream; /* compression stream */
|
||||||
int err;
|
int err;
|
||||||
|
|
@ -526,24 +469,21 @@ uLong comprLen;
|
||||||
CHECK_ERR(err, "deflateInit");
|
CHECK_ERR(err, "deflateInit");
|
||||||
|
|
||||||
err = deflateSetDictionary(&c_stream,
|
err = deflateSetDictionary(&c_stream,
|
||||||
(const Bytef*)dictionary, (int)sizeof(dictionary));
|
(const Bytef*)dictionary, (int)sizeof(dictionary));
|
||||||
CHECK_ERR(err, "deflateSetDictionary");
|
CHECK_ERR(err, "deflateSetDictionary");
|
||||||
|
|
||||||
dictId = c_stream.adler;
|
dictId = c_stream.adler;
|
||||||
c_stream.next_out = compr;
|
c_stream.next_out = compr;
|
||||||
c_stream.avail_out = (uInt)comprLen;
|
c_stream.avail_out = (uInt)comprLen;
|
||||||
|
|
||||||
c_stream.next_in = (Bytef*)hello;
|
c_stream.next_in = (z_const unsigned char *)hello;
|
||||||
c_stream.avail_in = (uInt)strlen(hello) + 1;
|
c_stream.avail_in = (uInt)strlen(hello)+1;
|
||||||
|
|
||||||
err = deflate(&c_stream, Z_FINISH);
|
err = deflate(&c_stream, Z_FINISH);
|
||||||
|
if (err != Z_STREAM_END) {
|
||||||
if (err != Z_STREAM_END)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "deflate should report Z_STREAM_END\n");
|
fprintf(stderr, "deflate should report Z_STREAM_END\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
err = deflateEnd(&c_stream);
|
err = deflateEnd(&c_stream);
|
||||||
CHECK_ERR(err, "deflateEnd");
|
CHECK_ERR(err, "deflateEnd");
|
||||||
}
|
}
|
||||||
|
|
@ -552,8 +492,8 @@ uLong comprLen;
|
||||||
* Test inflate() with a preset dictionary
|
* Test inflate() with a preset dictionary
|
||||||
*/
|
*/
|
||||||
void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
|
void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
|
||||||
Byte* compr, *uncompr;
|
Byte *compr, *uncompr;
|
||||||
uLong comprLen, uncomprLen;
|
uLong comprLen, uncomprLen;
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
z_stream d_stream; /* decompression stream */
|
z_stream d_stream; /* decompression stream */
|
||||||
|
|
@ -573,38 +513,28 @@ uLong comprLen, uncomprLen;
|
||||||
d_stream.next_out = uncompr;
|
d_stream.next_out = uncompr;
|
||||||
d_stream.avail_out = (uInt)uncomprLen;
|
d_stream.avail_out = (uInt)uncomprLen;
|
||||||
|
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
err = inflate(&d_stream, Z_NO_FLUSH);
|
err = inflate(&d_stream, Z_NO_FLUSH);
|
||||||
|
|
||||||
if (err == Z_STREAM_END) break;
|
if (err == Z_STREAM_END) break;
|
||||||
|
if (err == Z_NEED_DICT) {
|
||||||
if (err == Z_NEED_DICT)
|
if (d_stream.adler != dictId) {
|
||||||
{
|
|
||||||
if (d_stream.adler != dictId)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "unexpected dictionary");
|
fprintf(stderr, "unexpected dictionary");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
|
err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
|
||||||
(int)sizeof(dictionary));
|
(int)sizeof(dictionary));
|
||||||
}
|
}
|
||||||
|
|
||||||
CHECK_ERR(err, "inflate with dict");
|
CHECK_ERR(err, "inflate with dict");
|
||||||
}
|
}
|
||||||
|
|
||||||
err = inflateEnd(&d_stream);
|
err = inflateEnd(&d_stream);
|
||||||
CHECK_ERR(err, "inflateEnd");
|
CHECK_ERR(err, "inflateEnd");
|
||||||
|
|
||||||
if (strcmp((char*)uncompr, hello))
|
if (strcmp((char*)uncompr, hello)) {
|
||||||
{
|
|
||||||
fprintf(stderr, "bad inflate with dict\n");
|
fprintf(stderr, "bad inflate with dict\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
} else {
|
||||||
else
|
printf("inflate with dictionary: %s\n", (char *)uncompr);
|
||||||
{
|
|
||||||
printf("inflate with dictionary: %s\n", (char*)uncompr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -613,42 +543,38 @@ uLong comprLen, uncomprLen;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int main(argc, argv)
|
int main(argc, argv)
|
||||||
int argc;
|
int argc;
|
||||||
char* argv[];
|
char *argv[];
|
||||||
{
|
{
|
||||||
Byte* compr, *uncompr;
|
Byte *compr, *uncompr;
|
||||||
uLong comprLen = 10000 * sizeof(int); /* don't overflow on MSDOS */
|
uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
|
||||||
uLong uncomprLen = comprLen;
|
uLong uncomprLen = comprLen;
|
||||||
static const char* myVersion = ZLIB_VERSION;
|
static const char* myVersion = ZLIB_VERSION;
|
||||||
|
|
||||||
if (zlibVersion()[0] != myVersion[0])
|
if (zlibVersion()[0] != myVersion[0]) {
|
||||||
{
|
|
||||||
fprintf(stderr, "incompatible zlib version\n");
|
fprintf(stderr, "incompatible zlib version\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
}
|
} else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
|
||||||
else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "warning: different zlib version\n");
|
fprintf(stderr, "warning: different zlib version\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
|
printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
|
||||||
ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());
|
ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());
|
||||||
|
|
||||||
compr = (Byte*)calloc((uInt)comprLen, 1);
|
compr = (Byte*)calloc((uInt)comprLen, 1);
|
||||||
uncompr = (Byte*)calloc((uInt)uncomprLen, 1);
|
uncompr = (Byte*)calloc((uInt)uncomprLen, 1);
|
||||||
|
|
||||||
/* compr and uncompr are cleared to avoid reading uninitialized
|
/* compr and uncompr are cleared to avoid reading uninitialized
|
||||||
* data and to ensure that uncompr compresses well.
|
* data and to ensure that uncompr compresses well.
|
||||||
*/
|
*/
|
||||||
if (compr == Z_NULL || uncompr == Z_NULL)
|
if (compr == Z_NULL || uncompr == Z_NULL) {
|
||||||
{
|
|
||||||
printf("out of memory\n");
|
printf("out of memory\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef Z_SOLO
|
#ifdef Z_SOLO
|
||||||
argc = strlen(argv[0]);
|
(void)argc;
|
||||||
|
(void)argv;
|
||||||
#else
|
#else
|
||||||
test_compress(compr, comprLen, uncompr, uncomprLen);
|
test_compress(compr, comprLen, uncompr, uncomprLen);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* infcover.c -- test zlib's inflate routines with full code coverage
|
/* infcover.c -- test zlib's inflate routines with full code coverage
|
||||||
* Copyright (C) 2011 Mark Adler
|
* Copyright (C) 2011, 2016 Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -53,28 +53,26 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* these items are strung together in a linked list, one for each allocation */
|
/* these items are strung together in a linked list, one for each allocation */
|
||||||
struct mem_item
|
struct mem_item {
|
||||||
{
|
void *ptr; /* pointer to allocated memory */
|
||||||
void* ptr; /* pointer to allocated memory */
|
|
||||||
size_t size; /* requested size of allocation */
|
size_t size; /* requested size of allocation */
|
||||||
struct mem_item* next; /* pointer to next item in list, or NULL */
|
struct mem_item *next; /* pointer to next item in list, or NULL */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* this structure is at the root of the linked list, and tracks statistics */
|
/* this structure is at the root of the linked list, and tracks statistics */
|
||||||
struct mem_zone
|
struct mem_zone {
|
||||||
{
|
struct mem_item *first; /* pointer to first item in list, or NULL */
|
||||||
struct mem_item* first; /* pointer to first item in list, or NULL */
|
|
||||||
size_t total, highwater; /* total allocations, and largest total */
|
size_t total, highwater; /* total allocations, and largest total */
|
||||||
size_t limit; /* memory allocation limit, or 0 if no limit */
|
size_t limit; /* memory allocation limit, or 0 if no limit */
|
||||||
int notlifo, rogue; /* counts of non-LIFO frees and rogue frees */
|
int notlifo, rogue; /* counts of non-LIFO frees and rogue frees */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* memory allocation routine to pass to zlib */
|
/* memory allocation routine to pass to zlib */
|
||||||
local void* mem_alloc(void* mem, unsigned count, unsigned size)
|
local void *mem_alloc(void *mem, unsigned count, unsigned size)
|
||||||
{
|
{
|
||||||
void* ptr;
|
void *ptr;
|
||||||
struct mem_item* item;
|
struct mem_item *item;
|
||||||
struct mem_zone* zone = mem;
|
struct mem_zone *zone = mem;
|
||||||
size_t len = count * (size_t)size;
|
size_t len = count * (size_t)size;
|
||||||
|
|
||||||
/* induced allocation failure */
|
/* induced allocation failure */
|
||||||
|
|
@ -84,21 +82,16 @@ local void* mem_alloc(void* mem, unsigned count, unsigned size)
|
||||||
/* perform allocation using the standard library, fill memory with a
|
/* perform allocation using the standard library, fill memory with a
|
||||||
non-zero value to make sure that the code isn't depending on zeros */
|
non-zero value to make sure that the code isn't depending on zeros */
|
||||||
ptr = malloc(len);
|
ptr = malloc(len);
|
||||||
|
|
||||||
if (ptr == NULL)
|
if (ptr == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
memset(ptr, 0xa5, len);
|
memset(ptr, 0xa5, len);
|
||||||
|
|
||||||
/* create a new item for the list */
|
/* create a new item for the list */
|
||||||
item = malloc(sizeof(struct mem_item));
|
item = malloc(sizeof(struct mem_item));
|
||||||
|
if (item == NULL) {
|
||||||
if (item == NULL)
|
|
||||||
{
|
|
||||||
free(ptr);
|
free(ptr);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
item->ptr = ptr;
|
item->ptr = ptr;
|
||||||
item->size = len;
|
item->size = len;
|
||||||
|
|
||||||
|
|
@ -108,7 +101,6 @@ local void* mem_alloc(void* mem, unsigned count, unsigned size)
|
||||||
|
|
||||||
/* update the statistics */
|
/* update the statistics */
|
||||||
zone->total += item->size;
|
zone->total += item->size;
|
||||||
|
|
||||||
if (zone->total > zone->highwater)
|
if (zone->total > zone->highwater)
|
||||||
zone->highwater = zone->total;
|
zone->highwater = zone->total;
|
||||||
|
|
||||||
|
|
@ -117,14 +109,13 @@ local void* mem_alloc(void* mem, unsigned count, unsigned size)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* memory free routine to pass to zlib */
|
/* memory free routine to pass to zlib */
|
||||||
local void mem_free(void* mem, void* ptr)
|
local void mem_free(void *mem, void *ptr)
|
||||||
{
|
{
|
||||||
struct mem_item* item, *next;
|
struct mem_item *item, *next;
|
||||||
struct mem_zone* zone = mem;
|
struct mem_zone *zone = mem;
|
||||||
|
|
||||||
/* if no zone, just do a free */
|
/* if no zone, just do a free */
|
||||||
if (zone == NULL)
|
if (zone == NULL) {
|
||||||
{
|
|
||||||
free(ptr);
|
free(ptr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -132,22 +123,15 @@ local void mem_free(void* mem, void* ptr)
|
||||||
/* point next to the item that matches ptr, or NULL if not found -- remove
|
/* point next to the item that matches ptr, or NULL if not found -- remove
|
||||||
the item from the linked list if found */
|
the item from the linked list if found */
|
||||||
next = zone->first;
|
next = zone->first;
|
||||||
|
if (next) {
|
||||||
if (next)
|
|
||||||
{
|
|
||||||
if (next->ptr == ptr)
|
if (next->ptr == ptr)
|
||||||
zone->first = next->next; /* first one is it, remove from list */
|
zone->first = next->next; /* first one is it, remove from list */
|
||||||
else
|
else {
|
||||||
{
|
do { /* search the linked list */
|
||||||
do /* search the linked list */
|
|
||||||
{
|
|
||||||
item = next;
|
item = next;
|
||||||
next = item->next;
|
next = item->next;
|
||||||
}
|
} while (next != NULL && next->ptr != ptr);
|
||||||
while (next != NULL && next->ptr != ptr);
|
if (next) { /* if found, remove from linked list */
|
||||||
|
|
||||||
if (next) /* if found, remove from linked list */
|
|
||||||
{
|
|
||||||
item->next = next->next;
|
item->next = next->next;
|
||||||
zone->notlifo++; /* not a LIFO free */
|
zone->notlifo++; /* not a LIFO free */
|
||||||
}
|
}
|
||||||
|
|
@ -156,8 +140,7 @@ local void mem_free(void* mem, void* ptr)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if found, update the statistics and free the item */
|
/* if found, update the statistics and free the item */
|
||||||
if (next)
|
if (next) {
|
||||||
{
|
|
||||||
zone->total -= next->size;
|
zone->total -= next->size;
|
||||||
free(next);
|
free(next);
|
||||||
}
|
}
|
||||||
|
|
@ -172,9 +155,9 @@ local void mem_free(void* mem, void* ptr)
|
||||||
|
|
||||||
/* set up a controlled memory allocation space for monitoring, set the stream
|
/* set up a controlled memory allocation space for monitoring, set the stream
|
||||||
parameters to the controlled routines, with opaque pointing to the space */
|
parameters to the controlled routines, with opaque pointing to the space */
|
||||||
local void mem_setup(z_stream* strm)
|
local void mem_setup(z_stream *strm)
|
||||||
{
|
{
|
||||||
struct mem_zone* zone;
|
struct mem_zone *zone;
|
||||||
|
|
||||||
zone = malloc(sizeof(struct mem_zone));
|
zone = malloc(sizeof(struct mem_zone));
|
||||||
assert(zone != NULL);
|
assert(zone != NULL);
|
||||||
|
|
@ -190,44 +173,42 @@ local void mem_setup(z_stream* strm)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set a limit on the total memory allocation, or 0 to remove the limit */
|
/* set a limit on the total memory allocation, or 0 to remove the limit */
|
||||||
local void mem_limit(z_stream* strm, size_t limit)
|
local void mem_limit(z_stream *strm, size_t limit)
|
||||||
{
|
{
|
||||||
struct mem_zone* zone = strm->opaque;
|
struct mem_zone *zone = strm->opaque;
|
||||||
|
|
||||||
zone->limit = limit;
|
zone->limit = limit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* show the current total requested allocations in bytes */
|
/* show the current total requested allocations in bytes */
|
||||||
local void mem_used(z_stream* strm, char* prefix)
|
local void mem_used(z_stream *strm, char *prefix)
|
||||||
{
|
{
|
||||||
struct mem_zone* zone = strm->opaque;
|
struct mem_zone *zone = strm->opaque;
|
||||||
|
|
||||||
fprintf(stderr, "%s: %lu allocated\n", prefix, zone->total);
|
fprintf(stderr, "%s: %lu allocated\n", prefix, zone->total);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* show the high water allocation in bytes */
|
/* show the high water allocation in bytes */
|
||||||
local void mem_high(z_stream* strm, char* prefix)
|
local void mem_high(z_stream *strm, char *prefix)
|
||||||
{
|
{
|
||||||
struct mem_zone* zone = strm->opaque;
|
struct mem_zone *zone = strm->opaque;
|
||||||
|
|
||||||
fprintf(stderr, "%s: %lu high water mark\n", prefix, zone->highwater);
|
fprintf(stderr, "%s: %lu high water mark\n", prefix, zone->highwater);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* release the memory allocation zone -- if there are any surprises, notify */
|
/* release the memory allocation zone -- if there are any surprises, notify */
|
||||||
local void mem_done(z_stream* strm, char* prefix)
|
local void mem_done(z_stream *strm, char *prefix)
|
||||||
{
|
{
|
||||||
int count = 0;
|
int count = 0;
|
||||||
struct mem_item* item, *next;
|
struct mem_item *item, *next;
|
||||||
struct mem_zone* zone = strm->opaque;
|
struct mem_zone *zone = strm->opaque;
|
||||||
|
|
||||||
/* show high water mark */
|
/* show high water mark */
|
||||||
mem_high(strm, prefix);
|
mem_high(strm, prefix);
|
||||||
|
|
||||||
/* free leftover allocations and item structures, if any */
|
/* free leftover allocations and item structures, if any */
|
||||||
item = zone->first;
|
item = zone->first;
|
||||||
|
while (item != NULL) {
|
||||||
while (item != NULL)
|
|
||||||
{
|
|
||||||
free(item->ptr);
|
free(item->ptr);
|
||||||
next = item->next;
|
next = item->next;
|
||||||
free(item);
|
free(item);
|
||||||
|
|
@ -239,10 +220,8 @@ local void mem_done(z_stream* strm, char* prefix)
|
||||||
if (count || zone->total)
|
if (count || zone->total)
|
||||||
fprintf(stderr, "** %s: %lu bytes in %d blocks not freed\n",
|
fprintf(stderr, "** %s: %lu bytes in %d blocks not freed\n",
|
||||||
prefix, zone->total, count);
|
prefix, zone->total, count);
|
||||||
|
|
||||||
if (zone->notlifo)
|
if (zone->notlifo)
|
||||||
fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
|
fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
|
||||||
|
|
||||||
if (zone->rogue)
|
if (zone->rogue)
|
||||||
fprintf(stderr, "** %s: %d frees not recognized\n",
|
fprintf(stderr, "** %s: %d frees not recognized\n",
|
||||||
prefix, zone->rogue);
|
prefix, zone->rogue);
|
||||||
|
|
@ -258,26 +237,22 @@ local void mem_done(z_stream* strm, char* prefix)
|
||||||
|
|
||||||
/* Decode a hexadecimal string, set *len to length, in[] to the bytes. This
|
/* Decode a hexadecimal string, set *len to length, in[] to the bytes. This
|
||||||
decodes liberally, in that hex digits can be adjacent, in which case two in
|
decodes liberally, in that hex digits can be adjacent, in which case two in
|
||||||
a row writes a byte. Or they can delimited by any non-hex character, where
|
a row writes a byte. Or they can be delimited by any non-hex character,
|
||||||
the delimiters are ignored except when a single hex digit is followed by a
|
where the delimiters are ignored except when a single hex digit is followed
|
||||||
delimiter in which case that single digit writes a byte. The returned
|
by a delimiter, where that single digit writes a byte. The returned data is
|
||||||
data is allocated and must eventually be freed. NULL is returned if out of
|
allocated and must eventually be freed. NULL is returned if out of memory.
|
||||||
memory. If the length is not needed, then len can be NULL. */
|
If the length is not needed, then len can be NULL. */
|
||||||
local unsigned char* h2b(const char* hex, unsigned* len)
|
local unsigned char *h2b(const char *hex, unsigned *len)
|
||||||
{
|
{
|
||||||
unsigned char* in;
|
unsigned char *in, *re;
|
||||||
unsigned next, val;
|
unsigned next, val;
|
||||||
|
|
||||||
in = malloc((strlen(hex) + 1) >> 1);
|
in = malloc((strlen(hex) + 1) >> 1);
|
||||||
|
|
||||||
if (in == NULL)
|
if (in == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
next = 0;
|
next = 0;
|
||||||
val = 1;
|
val = 1;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
if (*hex >= '0' && *hex <= '9')
|
if (*hex >= '0' && *hex <= '9')
|
||||||
val = (val << 4) + *hex - '0';
|
val = (val << 4) + *hex - '0';
|
||||||
else if (*hex >= 'A' && *hex <= 'F')
|
else if (*hex >= 'A' && *hex <= 'F')
|
||||||
|
|
@ -286,20 +261,15 @@ local unsigned char* h2b(const char* hex, unsigned* len)
|
||||||
val = (val << 4) + *hex - 'a' + 10;
|
val = (val << 4) + *hex - 'a' + 10;
|
||||||
else if (val != 1 && val < 32) /* one digit followed by delimiter */
|
else if (val != 1 && val < 32) /* one digit followed by delimiter */
|
||||||
val += 240; /* make it look like two digits */
|
val += 240; /* make it look like two digits */
|
||||||
|
if (val > 255) { /* have two digits */
|
||||||
if (val > 255) /* have two digits */
|
|
||||||
{
|
|
||||||
in[next++] = val & 0xff; /* save the decoded byte */
|
in[next++] = val & 0xff; /* save the decoded byte */
|
||||||
val = 1; /* start over */
|
val = 1; /* start over */
|
||||||
}
|
}
|
||||||
}
|
} while (*hex++); /* go through the loop with the terminating null */
|
||||||
while (*hex++); /* go through the loop with the terminating null */
|
|
||||||
|
|
||||||
if (len != NULL)
|
if (len != NULL)
|
||||||
*len = next;
|
*len = next;
|
||||||
|
re = realloc(in, next);
|
||||||
in = reallocf(in, next);
|
return re == NULL ? in : re;
|
||||||
return in;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* generic inflate() run, where hex is the hexadecimal input data, what is the
|
/* generic inflate() run, where hex is the hexadecimal input data, what is the
|
||||||
|
|
@ -311,12 +281,12 @@ local unsigned char* h2b(const char* hex, unsigned* len)
|
||||||
header information is collected with inflateGetHeader(). If a zlib stream
|
header information is collected with inflateGetHeader(). If a zlib stream
|
||||||
is looking for a dictionary, then an empty dictionary is provided.
|
is looking for a dictionary, then an empty dictionary is provided.
|
||||||
inflate() is run until all of the input data is consumed. */
|
inflate() is run until all of the input data is consumed. */
|
||||||
local void inf(char* hex, char* what, unsigned step, int win, unsigned len,
|
local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
|
||||||
int err)
|
int err)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned have;
|
unsigned have;
|
||||||
unsigned char* in, *out;
|
unsigned char *in, *out;
|
||||||
z_stream strm, copy;
|
z_stream strm, copy;
|
||||||
gz_header head;
|
gz_header head;
|
||||||
|
|
||||||
|
|
@ -324,80 +294,55 @@ local void inf(char* hex, char* what, unsigned step, int win, unsigned len,
|
||||||
strm.avail_in = 0;
|
strm.avail_in = 0;
|
||||||
strm.next_in = Z_NULL;
|
strm.next_in = Z_NULL;
|
||||||
ret = inflateInit2(&strm, win);
|
ret = inflateInit2(&strm, win);
|
||||||
|
if (ret != Z_OK) {
|
||||||
if (ret != Z_OK)
|
|
||||||
{
|
|
||||||
mem_done(&strm, what);
|
mem_done(&strm, what);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
out = malloc(len); assert(out != NULL);
|
||||||
out = malloc(len);
|
if (win == 47) {
|
||||||
assert(out != NULL);
|
|
||||||
|
|
||||||
if (win == 47)
|
|
||||||
{
|
|
||||||
head.extra = out;
|
head.extra = out;
|
||||||
head.extra_max = len;
|
head.extra_max = len;
|
||||||
head.name = out;
|
head.name = out;
|
||||||
head.name_max = len;
|
head.name_max = len;
|
||||||
head.comment = out;
|
head.comment = out;
|
||||||
head.comm_max = len;
|
head.comm_max = len;
|
||||||
ret = inflateGetHeader(&strm, &head);
|
ret = inflateGetHeader(&strm, &head); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
}
|
}
|
||||||
|
in = h2b(hex, &have); assert(in != NULL);
|
||||||
in = h2b(hex, &have);
|
|
||||||
assert(in != NULL);
|
|
||||||
|
|
||||||
if (step == 0 || step > have)
|
if (step == 0 || step > have)
|
||||||
step = have;
|
step = have;
|
||||||
|
|
||||||
strm.avail_in = step;
|
strm.avail_in = step;
|
||||||
have -= step;
|
have -= step;
|
||||||
strm.next_in = in;
|
strm.next_in = in;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
strm.avail_out = len;
|
strm.avail_out = len;
|
||||||
strm.next_out = out;
|
strm.next_out = out;
|
||||||
ret = inflate(&strm, Z_NO_FLUSH);
|
ret = inflate(&strm, Z_NO_FLUSH); assert(err == 9 || ret == err);
|
||||||
assert(err == 9 || ret == err);
|
|
||||||
|
|
||||||
if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
|
if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
|
||||||
break;
|
break;
|
||||||
|
if (ret == Z_NEED_DICT) {
|
||||||
if (ret == Z_NEED_DICT)
|
|
||||||
{
|
|
||||||
ret = inflateSetDictionary(&strm, in, 1);
|
ret = inflateSetDictionary(&strm, in, 1);
|
||||||
assert(ret == Z_DATA_ERROR);
|
assert(ret == Z_DATA_ERROR);
|
||||||
mem_limit(&strm, 1);
|
mem_limit(&strm, 1);
|
||||||
ret = inflateSetDictionary(&strm, out, 0);
|
ret = inflateSetDictionary(&strm, out, 0);
|
||||||
assert(ret == Z_MEM_ERROR);
|
assert(ret == Z_MEM_ERROR);
|
||||||
mem_limit(&strm, 0);
|
mem_limit(&strm, 0);
|
||||||
((struct inflate_state*)strm.state)->mode = DICT;
|
((struct inflate_state *)strm.state)->mode = DICT;
|
||||||
ret = inflateSetDictionary(&strm, out, 0);
|
ret = inflateSetDictionary(&strm, out, 0);
|
||||||
assert(ret == Z_OK);
|
assert(ret == Z_OK);
|
||||||
ret = inflate(&strm, Z_NO_FLUSH);
|
ret = inflate(&strm, Z_NO_FLUSH); assert(ret == Z_BUF_ERROR);
|
||||||
assert(ret == Z_BUF_ERROR);
|
|
||||||
}
|
}
|
||||||
|
ret = inflateCopy(©, &strm); assert(ret == Z_OK);
|
||||||
ret = inflateCopy(©, &strm);
|
ret = inflateEnd(©); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
ret = inflateEnd(©);
|
|
||||||
assert(ret == Z_OK);
|
|
||||||
err = 9; /* don't care next time around */
|
err = 9; /* don't care next time around */
|
||||||
have += strm.avail_in;
|
have += strm.avail_in;
|
||||||
strm.avail_in = step > have ? have : step;
|
strm.avail_in = step > have ? have : step;
|
||||||
have -= strm.avail_in;
|
have -= strm.avail_in;
|
||||||
}
|
} while (strm.avail_in);
|
||||||
while (strm.avail_in);
|
|
||||||
|
|
||||||
free(in);
|
free(in);
|
||||||
free(out);
|
free(out);
|
||||||
ret = inflateReset2(&strm, -8);
|
ret = inflateReset2(&strm, -8); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
ret = inflateEnd(&strm); assert(ret == Z_OK);
|
||||||
ret = inflateEnd(&strm);
|
|
||||||
assert(ret == Z_OK);
|
|
||||||
mem_done(&strm, what);
|
mem_done(&strm, what);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -410,17 +355,13 @@ local void cover_support(void)
|
||||||
mem_setup(&strm);
|
mem_setup(&strm);
|
||||||
strm.avail_in = 0;
|
strm.avail_in = 0;
|
||||||
strm.next_in = Z_NULL;
|
strm.next_in = Z_NULL;
|
||||||
ret = inflateInit(&strm);
|
ret = inflateInit(&strm); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
mem_used(&strm, "inflate init");
|
mem_used(&strm, "inflate init");
|
||||||
ret = inflatePrime(&strm, 5, 31);
|
ret = inflatePrime(&strm, 5, 31); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
ret = inflatePrime(&strm, -1, 0); assert(ret == Z_OK);
|
||||||
ret = inflatePrime(&strm, -1, 0);
|
|
||||||
assert(ret == Z_OK);
|
|
||||||
ret = inflateSetDictionary(&strm, Z_NULL, 0);
|
ret = inflateSetDictionary(&strm, Z_NULL, 0);
|
||||||
assert(ret == Z_STREAM_ERROR);
|
assert(ret == Z_STREAM_ERROR);
|
||||||
ret = inflateEnd(&strm);
|
ret = inflateEnd(&strm); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
mem_done(&strm, "prime");
|
mem_done(&strm, "prime");
|
||||||
|
|
||||||
inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
|
inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
|
||||||
|
|
@ -433,15 +374,13 @@ local void cover_support(void)
|
||||||
strm.avail_in = 0;
|
strm.avail_in = 0;
|
||||||
strm.next_in = Z_NULL;
|
strm.next_in = Z_NULL;
|
||||||
ret = inflateInit_(&strm, ZLIB_VERSION - 1, (int)sizeof(z_stream));
|
ret = inflateInit_(&strm, ZLIB_VERSION - 1, (int)sizeof(z_stream));
|
||||||
assert(ret == Z_VERSION_ERROR);
|
assert(ret == Z_VERSION_ERROR);
|
||||||
mem_done(&strm, "wrong version");
|
mem_done(&strm, "wrong version");
|
||||||
|
|
||||||
strm.avail_in = 0;
|
strm.avail_in = 0;
|
||||||
strm.next_in = Z_NULL;
|
strm.next_in = Z_NULL;
|
||||||
ret = inflateInit(&strm);
|
ret = inflateInit(&strm); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
ret = inflateEnd(&strm); assert(ret == Z_OK);
|
||||||
ret = inflateEnd(&strm);
|
|
||||||
assert(ret == Z_OK);
|
|
||||||
fputs("inflate built-in memory routines\n", stderr);
|
fputs("inflate built-in memory routines\n", stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -452,12 +391,9 @@ local void cover_wrap(void)
|
||||||
z_stream strm, copy;
|
z_stream strm, copy;
|
||||||
unsigned char dict[257];
|
unsigned char dict[257];
|
||||||
|
|
||||||
ret = inflate(Z_NULL, 0);
|
ret = inflate(Z_NULL, 0); assert(ret == Z_STREAM_ERROR);
|
||||||
assert(ret == Z_STREAM_ERROR);
|
ret = inflateEnd(Z_NULL); assert(ret == Z_STREAM_ERROR);
|
||||||
ret = inflateEnd(Z_NULL);
|
ret = inflateCopy(Z_NULL, Z_NULL); assert(ret == Z_STREAM_ERROR);
|
||||||
assert(ret == Z_STREAM_ERROR);
|
|
||||||
ret = inflateCopy(Z_NULL, Z_NULL);
|
|
||||||
assert(ret == Z_STREAM_ERROR);
|
|
||||||
fputs("inflate bad parameters\n", stderr);
|
fputs("inflate bad parameters\n", stderr);
|
||||||
|
|
||||||
inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
|
inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
|
||||||
|
|
@ -479,65 +415,52 @@ local void cover_wrap(void)
|
||||||
strm.next_in = Z_NULL;
|
strm.next_in = Z_NULL;
|
||||||
ret = inflateInit2(&strm, -8);
|
ret = inflateInit2(&strm, -8);
|
||||||
strm.avail_in = 2;
|
strm.avail_in = 2;
|
||||||
strm.next_in = (void*)"\x63";
|
strm.next_in = (void *)"\x63";
|
||||||
strm.avail_out = 1;
|
strm.avail_out = 1;
|
||||||
strm.next_out = (void*)&ret;
|
strm.next_out = (void *)&ret;
|
||||||
mem_limit(&strm, 1);
|
mem_limit(&strm, 1);
|
||||||
ret = inflate(&strm, Z_NO_FLUSH);
|
ret = inflate(&strm, Z_NO_FLUSH); assert(ret == Z_MEM_ERROR);
|
||||||
assert(ret == Z_MEM_ERROR);
|
ret = inflate(&strm, Z_NO_FLUSH); assert(ret == Z_MEM_ERROR);
|
||||||
ret = inflate(&strm, Z_NO_FLUSH);
|
|
||||||
assert(ret == Z_MEM_ERROR);
|
|
||||||
mem_limit(&strm, 0);
|
mem_limit(&strm, 0);
|
||||||
memset(dict, 0, 257);
|
memset(dict, 0, 257);
|
||||||
ret = inflateSetDictionary(&strm, dict, 257);
|
ret = inflateSetDictionary(&strm, dict, 257);
|
||||||
assert(ret == Z_OK);
|
assert(ret == Z_OK);
|
||||||
mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
|
mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
|
||||||
ret = inflatePrime(&strm, 16, 0);
|
ret = inflatePrime(&strm, 16, 0); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
strm.avail_in = 2;
|
strm.avail_in = 2;
|
||||||
strm.next_in = (void*)"\x80";
|
strm.next_in = (void *)"\x80";
|
||||||
ret = inflateSync(&strm);
|
ret = inflateSync(&strm); assert(ret == Z_DATA_ERROR);
|
||||||
assert(ret == Z_DATA_ERROR);
|
ret = inflate(&strm, Z_NO_FLUSH); assert(ret == Z_STREAM_ERROR);
|
||||||
ret = inflate(&strm, Z_NO_FLUSH);
|
|
||||||
assert(ret == Z_STREAM_ERROR);
|
|
||||||
strm.avail_in = 4;
|
strm.avail_in = 4;
|
||||||
strm.next_in = (void*)"\0\0\xff\xff";
|
strm.next_in = (void *)"\0\0\xff\xff";
|
||||||
ret = inflateSync(&strm);
|
ret = inflateSync(&strm); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
(void)inflateSyncPoint(&strm);
|
(void)inflateSyncPoint(&strm);
|
||||||
ret = inflateCopy(©, &strm);
|
ret = inflateCopy(©, &strm); assert(ret == Z_MEM_ERROR);
|
||||||
assert(ret == Z_MEM_ERROR);
|
|
||||||
mem_limit(&strm, 0);
|
mem_limit(&strm, 0);
|
||||||
ret = inflateUndermine(&strm, 1);
|
ret = inflateUndermine(&strm, 1); assert(ret == Z_DATA_ERROR);
|
||||||
assert(ret == Z_DATA_ERROR);
|
|
||||||
(void)inflateMark(&strm);
|
(void)inflateMark(&strm);
|
||||||
ret = inflateEnd(&strm);
|
ret = inflateEnd(&strm); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
mem_done(&strm, "miscellaneous, force memory errors");
|
mem_done(&strm, "miscellaneous, force memory errors");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* input and output functions for inflateBack() */
|
/* input and output functions for inflateBack() */
|
||||||
local unsigned pull(void* desc, unsigned char** buf)
|
local unsigned pull(void *desc, unsigned char **buf)
|
||||||
{
|
{
|
||||||
static unsigned int next = 0;
|
static unsigned int next = 0;
|
||||||
static unsigned char dat[] = {0x63, 0, 2, 0};
|
static unsigned char dat[] = {0x63, 0, 2, 0};
|
||||||
struct inflate_state* state;
|
struct inflate_state *state;
|
||||||
|
|
||||||
if (desc == Z_NULL)
|
if (desc == Z_NULL) {
|
||||||
{
|
|
||||||
next = 0;
|
next = 0;
|
||||||
return 0; /* no input (already provided at next_in) */
|
return 0; /* no input (already provided at next_in) */
|
||||||
}
|
}
|
||||||
|
state = (void *)((z_stream *)desc)->state;
|
||||||
state = (void*)((z_stream*)desc)->state;
|
|
||||||
|
|
||||||
if (state != Z_NULL)
|
if (state != Z_NULL)
|
||||||
state->mode = SYNC; /* force an otherwise impossible situation */
|
state->mode = SYNC; /* force an otherwise impossible situation */
|
||||||
|
|
||||||
return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
|
return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
local int push(void* desc, unsigned char* buf, unsigned len)
|
local int push(void *desc, unsigned char *buf, unsigned len)
|
||||||
{
|
{
|
||||||
buf += len;
|
buf += len;
|
||||||
return desc != Z_NULL; /* force error if desc not null */
|
return desc != Z_NULL; /* force error if desc not null */
|
||||||
|
|
@ -551,49 +474,42 @@ local void cover_back(void)
|
||||||
unsigned char win[32768];
|
unsigned char win[32768];
|
||||||
|
|
||||||
ret = inflateBackInit_(Z_NULL, 0, win, 0, 0);
|
ret = inflateBackInit_(Z_NULL, 0, win, 0, 0);
|
||||||
assert(ret == Z_VERSION_ERROR);
|
assert(ret == Z_VERSION_ERROR);
|
||||||
ret = inflateBackInit(Z_NULL, 0, win);
|
ret = inflateBackInit(Z_NULL, 0, win); assert(ret == Z_STREAM_ERROR);
|
||||||
assert(ret == Z_STREAM_ERROR);
|
|
||||||
ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
|
ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
|
||||||
assert(ret == Z_STREAM_ERROR);
|
assert(ret == Z_STREAM_ERROR);
|
||||||
ret = inflateBackEnd(Z_NULL);
|
ret = inflateBackEnd(Z_NULL); assert(ret == Z_STREAM_ERROR);
|
||||||
assert(ret == Z_STREAM_ERROR);
|
|
||||||
fputs("inflateBack bad parameters\n", stderr);
|
fputs("inflateBack bad parameters\n", stderr);
|
||||||
|
|
||||||
mem_setup(&strm);
|
mem_setup(&strm);
|
||||||
ret = inflateBackInit(&strm, 15, win);
|
ret = inflateBackInit(&strm, 15, win); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
strm.avail_in = 2;
|
strm.avail_in = 2;
|
||||||
strm.next_in = (void*)"\x03";
|
strm.next_in = (void *)"\x03";
|
||||||
ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
|
ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
|
||||||
assert(ret == Z_STREAM_END);
|
assert(ret == Z_STREAM_END);
|
||||||
/* force output error */
|
/* force output error */
|
||||||
strm.avail_in = 3;
|
strm.avail_in = 3;
|
||||||
strm.next_in = (void*)"\x63\x00";
|
strm.next_in = (void *)"\x63\x00";
|
||||||
ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
|
ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
|
||||||
assert(ret == Z_BUF_ERROR);
|
assert(ret == Z_BUF_ERROR);
|
||||||
/* force mode error by mucking with state */
|
/* force mode error by mucking with state */
|
||||||
ret = inflateBack(&strm, pull, &strm, push, Z_NULL);
|
ret = inflateBack(&strm, pull, &strm, push, Z_NULL);
|
||||||
assert(ret == Z_STREAM_ERROR);
|
assert(ret == Z_STREAM_ERROR);
|
||||||
ret = inflateBackEnd(&strm);
|
ret = inflateBackEnd(&strm); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
|
||||||
mem_done(&strm, "inflateBack bad state");
|
mem_done(&strm, "inflateBack bad state");
|
||||||
|
|
||||||
ret = inflateBackInit(&strm, 15, win);
|
ret = inflateBackInit(&strm, 15, win); assert(ret == Z_OK);
|
||||||
assert(ret == Z_OK);
|
ret = inflateBackEnd(&strm); assert(ret == Z_OK);
|
||||||
ret = inflateBackEnd(&strm);
|
|
||||||
assert(ret == Z_OK);
|
|
||||||
fputs("inflateBack built-in memory routines\n", stderr);
|
fputs("inflateBack built-in memory routines\n", stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
|
/* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
|
||||||
|
local int try(char *hex, char *id, int err)
|
||||||
local int try(char* hex, char* id, int err)
|
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned len, size;
|
unsigned len, size;
|
||||||
unsigned char* in, *out, *win;
|
unsigned char *in, *out, *win;
|
||||||
char* prefix;
|
char *prefix;
|
||||||
z_stream strm;
|
z_stream strm;
|
||||||
|
|
||||||
/* convert to hex */
|
/* convert to hex */
|
||||||
|
|
@ -619,31 +535,23 @@ local int try(char* hex, char* id, int err)
|
||||||
assert(ret == Z_OK);
|
assert(ret == Z_OK);
|
||||||
strm.avail_in = len;
|
strm.avail_in = len;
|
||||||
strm.next_in = in;
|
strm.next_in = in;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
strm.avail_out = size;
|
strm.avail_out = size;
|
||||||
strm.next_out = out;
|
strm.next_out = out;
|
||||||
ret = inflate(&strm, Z_TREES);
|
ret = inflate(&strm, Z_TREES);
|
||||||
assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
|
assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
|
||||||
|
|
||||||
if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
|
if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
|
||||||
break;
|
break;
|
||||||
}
|
} while (strm.avail_in || strm.avail_out == 0);
|
||||||
while (strm.avail_in || strm.avail_out == 0);
|
if (err) {
|
||||||
|
|
||||||
if (err)
|
|
||||||
{
|
|
||||||
assert(ret == Z_DATA_ERROR);
|
assert(ret == Z_DATA_ERROR);
|
||||||
assert(strcmp(id, strm.msg) == 0);
|
assert(strcmp(id, strm.msg) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
inflateEnd(&strm);
|
inflateEnd(&strm);
|
||||||
mem_done(&strm, prefix);
|
mem_done(&strm, prefix);
|
||||||
|
|
||||||
/* then with inflateBack */
|
/* then with inflateBack */
|
||||||
if (err >= 0)
|
if (err >= 0) {
|
||||||
{
|
|
||||||
strcpy(prefix, id);
|
strcpy(prefix, id);
|
||||||
strcat(prefix, "-back");
|
strcat(prefix, "-back");
|
||||||
mem_setup(&strm);
|
mem_setup(&strm);
|
||||||
|
|
@ -653,13 +561,10 @@ local int try(char* hex, char* id, int err)
|
||||||
strm.next_in = in;
|
strm.next_in = in;
|
||||||
ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
|
ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
|
||||||
assert(ret != Z_STREAM_ERROR);
|
assert(ret != Z_STREAM_ERROR);
|
||||||
|
if (err) {
|
||||||
if (err)
|
|
||||||
{
|
|
||||||
assert(ret == Z_DATA_ERROR);
|
assert(ret == Z_DATA_ERROR);
|
||||||
assert(strcmp(id, strm.msg) == 0);
|
assert(strcmp(id, strm.msg) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
inflateBackEnd(&strm);
|
inflateBackEnd(&strm);
|
||||||
mem_done(&strm, prefix);
|
mem_done(&strm, prefix);
|
||||||
}
|
}
|
||||||
|
|
@ -676,53 +581,33 @@ local int try(char* hex, char* id, int err)
|
||||||
local void cover_inflate(void)
|
local void cover_inflate(void)
|
||||||
{
|
{
|
||||||
try("0 0 0 0 0", "invalid stored block lengths", 1);
|
try("0 0 0 0 0", "invalid stored block lengths", 1);
|
||||||
|
|
||||||
try("3 0", "fixed", 0);
|
try("3 0", "fixed", 0);
|
||||||
|
|
||||||
try("6", "invalid block type", 1);
|
try("6", "invalid block type", 1);
|
||||||
|
|
||||||
try("1 1 0 fe ff 0", "stored", 0);
|
try("1 1 0 fe ff 0", "stored", 0);
|
||||||
|
|
||||||
try("fc 0 0", "too many length or distance symbols", 1);
|
try("fc 0 0", "too many length or distance symbols", 1);
|
||||||
|
|
||||||
try("4 0 fe ff", "invalid code lengths set", 1);
|
try("4 0 fe ff", "invalid code lengths set", 1);
|
||||||
|
|
||||||
try("4 0 24 49 0", "invalid bit length repeat", 1);
|
try("4 0 24 49 0", "invalid bit length repeat", 1);
|
||||||
|
|
||||||
try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
|
try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
|
||||||
|
|
||||||
try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
|
try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
|
||||||
|
|
||||||
try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
|
try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
|
||||||
"invalid literal/lengths set", 1);
|
"invalid literal/lengths set", 1);
|
||||||
|
|
||||||
try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
|
try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
|
||||||
|
|
||||||
try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
|
try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
|
||||||
|
|
||||||
try("2 7e ff ff", "invalid distance code", 1);
|
try("2 7e ff ff", "invalid distance code", 1);
|
||||||
|
|
||||||
try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
|
try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
|
||||||
|
|
||||||
/* also trailer mismatch just in inflate() */
|
/* also trailer mismatch just in inflate() */
|
||||||
try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
|
try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
|
||||||
|
|
||||||
try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
|
try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
|
||||||
"incorrect length check", -1);
|
"incorrect length check", -1);
|
||||||
|
|
||||||
try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
|
try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
|
||||||
|
|
||||||
try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
|
try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
|
||||||
"long code", 0);
|
"long code", 0);
|
||||||
|
|
||||||
try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
|
try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
|
||||||
|
|
||||||
try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
|
try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
|
||||||
"long distance and extra", 0);
|
"long distance and extra", 0);
|
||||||
|
|
||||||
try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
|
try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
|
||||||
"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
|
"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
|
||||||
|
|
||||||
inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
|
inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
|
||||||
Z_STREAM_END);
|
Z_STREAM_END);
|
||||||
inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
|
inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
|
||||||
|
|
@ -734,22 +619,21 @@ local void cover_trees(void)
|
||||||
int ret;
|
int ret;
|
||||||
unsigned bits;
|
unsigned bits;
|
||||||
unsigned short lens[16], work[16];
|
unsigned short lens[16], work[16];
|
||||||
code* next, table[ENOUGH_DISTS];
|
code *next, table[ENOUGH_DISTS];
|
||||||
|
|
||||||
/* we need to call inflate_table() directly in order to manifest not-
|
/* we need to call inflate_table() directly in order to manifest not-
|
||||||
enough errors, since zlib insures that enough is always enough */
|
enough errors, since zlib insures that enough is always enough */
|
||||||
for (bits = 0; bits < 15; bits++)
|
for (bits = 0; bits < 15; bits++)
|
||||||
lens[bits] = (unsigned short)(bits + 1);
|
lens[bits] = (unsigned short)(bits + 1);
|
||||||
|
|
||||||
lens[15] = 15;
|
lens[15] = 15;
|
||||||
next = table;
|
next = table;
|
||||||
bits = 15;
|
bits = 15;
|
||||||
ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
|
ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
|
||||||
assert(ret == 1);
|
assert(ret == 1);
|
||||||
next = table;
|
next = table;
|
||||||
bits = 1;
|
bits = 1;
|
||||||
ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
|
ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
|
||||||
assert(ret == 1);
|
assert(ret == 1);
|
||||||
fputs("inflate_table not enough errors\n", stderr);
|
fputs("inflate_table not enough errors\n", stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* minigzip.c -- simulate gzip using the zlib compression library
|
/* minigzip.c -- simulate gzip using the zlib compression library
|
||||||
* Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
|
* Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -40,6 +40,10 @@
|
||||||
# define SET_BINARY_MODE(file)
|
# define SET_BINARY_MODE(file)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_MSC_VER) && _MSC_VER < 1900
|
||||||
|
# define snprintf _snprintf
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef VMS
|
#ifdef VMS
|
||||||
# define unlink delete
|
# define unlink delete
|
||||||
# define GZ_SUFFIX "-gz"
|
# define GZ_SUFFIX "-gz"
|
||||||
|
|
@ -55,7 +59,7 @@
|
||||||
|
|
||||||
#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
|
#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
|
||||||
#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
|
#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
|
||||||
extern int unlink OF((const char*));
|
extern int unlink OF((const char *));
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -73,43 +77,38 @@ extern int unlink OF((const char*));
|
||||||
The strwinerror function does not change the current setting
|
The strwinerror function does not change the current setting
|
||||||
of GetLastError. */
|
of GetLastError. */
|
||||||
|
|
||||||
static char* strwinerror(error)
|
static char *strwinerror (error)
|
||||||
DWORD error;
|
DWORD error;
|
||||||
{
|
{
|
||||||
static char buf[1024];
|
static char buf[1024];
|
||||||
|
|
||||||
wchar_t* msgbuf;
|
wchar_t *msgbuf;
|
||||||
DWORD lasterr = GetLastError();
|
DWORD lasterr = GetLastError();
|
||||||
DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
|
DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
|
||||||
| FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
| FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
||||||
NULL,
|
NULL,
|
||||||
error,
|
error,
|
||||||
0, /* Default language */
|
0, /* Default language */
|
||||||
(LPVOID)&msgbuf,
|
(LPVOID)&msgbuf,
|
||||||
0,
|
0,
|
||||||
NULL);
|
NULL);
|
||||||
|
if (chars != 0) {
|
||||||
if (chars != 0)
|
|
||||||
{
|
|
||||||
/* If there is an \r\n appended, zap it. */
|
/* If there is an \r\n appended, zap it. */
|
||||||
if (chars >= 2
|
if (chars >= 2
|
||||||
&& msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n')
|
&& msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
|
||||||
{
|
|
||||||
chars -= 2;
|
chars -= 2;
|
||||||
msgbuf[chars] = 0;
|
msgbuf[chars] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chars > sizeof(buf) - 1)
|
if (chars > sizeof (buf) - 1) {
|
||||||
{
|
chars = sizeof (buf) - 1;
|
||||||
chars = sizeof(buf) - 1;
|
|
||||||
msgbuf[chars] = 0;
|
msgbuf[chars] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
wcstombs(buf, msgbuf, chars + 1);
|
wcstombs(buf, msgbuf, chars + 1);
|
||||||
LocalFree(msgbuf);
|
LocalFree(msgbuf);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
sprintf(buf, "unknown win32 error (%ld)", error);
|
sprintf(buf, "unknown win32 error (%ld)", error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -117,13 +116,13 @@ DWORD error;
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pwinerror(s)
|
static void pwinerror (s)
|
||||||
const char* s;
|
const char *s;
|
||||||
{
|
{
|
||||||
if (s && *s)
|
if (s && *s)
|
||||||
fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError()));
|
fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ()));
|
||||||
else
|
else
|
||||||
fprintf(stderr, "%s\n", strwinerror(GetLastError()));
|
fprintf(stderr, "%s\n", strwinerror(GetLastError ()));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* UNDER_CE */
|
#endif /* UNDER_CE */
|
||||||
|
|
@ -138,7 +137,7 @@ const char* s;
|
||||||
|
|
||||||
#ifdef MAXSEG_64K
|
#ifdef MAXSEG_64K
|
||||||
# define local static
|
# define local static
|
||||||
/* Needed for systems with limitation on stack size. */
|
/* Needed for systems with limitation on stack size. */
|
||||||
#else
|
#else
|
||||||
# define local
|
# define local
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -150,218 +149,183 @@ const char* s;
|
||||||
# include <unistd.h> /* for unlink() */
|
# include <unistd.h> /* for unlink() */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void* myalloc OF((void*, unsigned, unsigned));
|
void *myalloc OF((void *, unsigned, unsigned));
|
||||||
void myfree OF((void*, void*));
|
void myfree OF((void *, void *));
|
||||||
|
|
||||||
void* myalloc(q, n, m)
|
void *myalloc(q, n, m)
|
||||||
void* q;
|
void *q;
|
||||||
unsigned n, m;
|
unsigned n, m;
|
||||||
{
|
{
|
||||||
q = Z_NULL;
|
(void)q;
|
||||||
return calloc(n, m);
|
return calloc(n, m);
|
||||||
}
|
}
|
||||||
|
|
||||||
void myfree(q, p)
|
void myfree(q, p)
|
||||||
void* q, *p;
|
void *q, *p;
|
||||||
{
|
{
|
||||||
q = Z_NULL;
|
(void)q;
|
||||||
free(p);
|
free(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct gzFile_s
|
typedef struct gzFile_s {
|
||||||
{
|
FILE *file;
|
||||||
FILE* file;
|
|
||||||
int write;
|
int write;
|
||||||
int err;
|
int err;
|
||||||
char* msg;
|
char *msg;
|
||||||
z_stream strm;
|
z_stream strm;
|
||||||
}* gzFile;
|
} *gzFile;
|
||||||
|
|
||||||
gzFile gzopen OF((const char*, const char*));
|
gzFile gzopen OF((const char *, const char *));
|
||||||
gzFile gzdopen OF((int, const char*));
|
gzFile gzdopen OF((int, const char *));
|
||||||
gzFile gz_open OF((const char*, int, const char*));
|
gzFile gz_open OF((const char *, int, const char *));
|
||||||
|
|
||||||
gzFile gzopen(path, mode)
|
gzFile gzopen(path, mode)
|
||||||
const char* path;
|
const char *path;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
{
|
{
|
||||||
return gz_open(path, -1, mode);
|
return gz_open(path, -1, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
gzFile gzdopen(fd, mode)
|
gzFile gzdopen(fd, mode)
|
||||||
int fd;
|
int fd;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
{
|
{
|
||||||
return gz_open(NULL, fd, mode);
|
return gz_open(NULL, fd, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
gzFile gz_open(path, fd, mode)
|
gzFile gz_open(path, fd, mode)
|
||||||
const char* path;
|
const char *path;
|
||||||
int fd;
|
int fd;
|
||||||
const char* mode;
|
const char *mode;
|
||||||
{
|
{
|
||||||
gzFile gz;
|
gzFile gz;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
gz = malloc(sizeof(struct gzFile_s));
|
gz = malloc(sizeof(struct gzFile_s));
|
||||||
|
|
||||||
if (gz == NULL)
|
if (gz == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
gz->write = strchr(mode, 'w') != NULL;
|
gz->write = strchr(mode, 'w') != NULL;
|
||||||
gz->strm.zalloc = myalloc;
|
gz->strm.zalloc = myalloc;
|
||||||
gz->strm.zfree = myfree;
|
gz->strm.zfree = myfree;
|
||||||
gz->strm.opaque = Z_NULL;
|
gz->strm.opaque = Z_NULL;
|
||||||
|
|
||||||
if (gz->write)
|
if (gz->write)
|
||||||
ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0);
|
ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0);
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
gz->strm.next_in = 0;
|
gz->strm.next_in = 0;
|
||||||
gz->strm.avail_in = Z_NULL;
|
gz->strm.avail_in = Z_NULL;
|
||||||
ret = inflateInit2(&(gz->strm), 15 + 16);
|
ret = inflateInit2(&(gz->strm), 15 + 16);
|
||||||
}
|
}
|
||||||
|
if (ret != Z_OK) {
|
||||||
if (ret != Z_OK)
|
|
||||||
{
|
|
||||||
free(gz);
|
free(gz);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") :
|
gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") :
|
||||||
fopen(path, gz->write ? "wb" : "rb");
|
fopen(path, gz->write ? "wb" : "rb");
|
||||||
|
if (gz->file == NULL) {
|
||||||
if (gz->file == NULL)
|
|
||||||
{
|
|
||||||
gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm));
|
gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm));
|
||||||
free(gz);
|
free(gz);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
gz->err = 0;
|
gz->err = 0;
|
||||||
gz->msg = "";
|
gz->msg = "";
|
||||||
return gz;
|
return gz;
|
||||||
}
|
}
|
||||||
|
|
||||||
int gzwrite OF((gzFile, const void*, unsigned));
|
int gzwrite OF((gzFile, const void *, unsigned));
|
||||||
|
|
||||||
int gzwrite(gz, buf, len)
|
int gzwrite(gz, buf, len)
|
||||||
gzFile gz;
|
gzFile gz;
|
||||||
const void* buf;
|
const void *buf;
|
||||||
unsigned len;
|
unsigned len;
|
||||||
{
|
{
|
||||||
z_stream* strm;
|
z_stream *strm;
|
||||||
unsigned char out[BUFLEN];
|
unsigned char out[BUFLEN];
|
||||||
|
|
||||||
if (gz == NULL || !gz->write)
|
if (gz == NULL || !gz->write)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
strm = &(gz->strm);
|
strm = &(gz->strm);
|
||||||
strm->next_in = (void*)buf;
|
strm->next_in = (void *)buf;
|
||||||
strm->avail_in = len;
|
strm->avail_in = len;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
strm->next_out = out;
|
strm->next_out = out;
|
||||||
strm->avail_out = BUFLEN;
|
strm->avail_out = BUFLEN;
|
||||||
(void)deflate(strm, Z_NO_FLUSH);
|
(void)deflate(strm, Z_NO_FLUSH);
|
||||||
fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
|
fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
|
||||||
}
|
} while (strm->avail_out == 0);
|
||||||
while (strm->avail_out == 0);
|
|
||||||
|
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
int gzread OF((gzFile, void*, unsigned));
|
int gzread OF((gzFile, void *, unsigned));
|
||||||
|
|
||||||
int gzread(gz, buf, len)
|
int gzread(gz, buf, len)
|
||||||
gzFile gz;
|
gzFile gz;
|
||||||
void* buf;
|
void *buf;
|
||||||
unsigned len;
|
unsigned len;
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned got;
|
unsigned got;
|
||||||
unsigned char in[1];
|
unsigned char in[1];
|
||||||
z_stream* strm;
|
z_stream *strm;
|
||||||
|
|
||||||
if (gz == NULL || gz->write)
|
if (gz == NULL || gz->write)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (gz->err)
|
if (gz->err)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
strm = &(gz->strm);
|
strm = &(gz->strm);
|
||||||
strm->next_out = (void*)buf;
|
strm->next_out = (void *)buf;
|
||||||
strm->avail_out = len;
|
strm->avail_out = len;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
got = fread(in, 1, 1, gz->file);
|
got = fread(in, 1, 1, gz->file);
|
||||||
|
|
||||||
if (got == 0)
|
if (got == 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
strm->next_in = in;
|
strm->next_in = in;
|
||||||
strm->avail_in = 1;
|
strm->avail_in = 1;
|
||||||
ret = inflate(strm, Z_NO_FLUSH);
|
ret = inflate(strm, Z_NO_FLUSH);
|
||||||
|
if (ret == Z_DATA_ERROR) {
|
||||||
if (ret == Z_DATA_ERROR)
|
|
||||||
{
|
|
||||||
gz->err = Z_DATA_ERROR;
|
gz->err = Z_DATA_ERROR;
|
||||||
gz->msg = strm->msg;
|
gz->msg = strm->msg;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret == Z_STREAM_END)
|
if (ret == Z_STREAM_END)
|
||||||
inflateReset(strm);
|
inflateReset(strm);
|
||||||
}
|
} while (strm->avail_out);
|
||||||
while (strm->avail_out);
|
|
||||||
|
|
||||||
return len - strm->avail_out;
|
return len - strm->avail_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
int gzclose OF((gzFile));
|
int gzclose OF((gzFile));
|
||||||
|
|
||||||
int gzclose(gz)
|
int gzclose(gz)
|
||||||
gzFile gz;
|
gzFile gz;
|
||||||
{
|
{
|
||||||
z_stream* strm;
|
z_stream *strm;
|
||||||
unsigned char out[BUFLEN];
|
unsigned char out[BUFLEN];
|
||||||
|
|
||||||
if (gz == NULL)
|
if (gz == NULL)
|
||||||
return Z_STREAM_ERROR;
|
return Z_STREAM_ERROR;
|
||||||
|
|
||||||
strm = &(gz->strm);
|
strm = &(gz->strm);
|
||||||
|
if (gz->write) {
|
||||||
if (gz->write)
|
|
||||||
{
|
|
||||||
strm->next_in = Z_NULL;
|
strm->next_in = Z_NULL;
|
||||||
strm->avail_in = 0;
|
strm->avail_in = 0;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
strm->next_out = out;
|
strm->next_out = out;
|
||||||
strm->avail_out = BUFLEN;
|
strm->avail_out = BUFLEN;
|
||||||
(void)deflate(strm, Z_FINISH);
|
(void)deflate(strm, Z_FINISH);
|
||||||
fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
|
fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
|
||||||
}
|
} while (strm->avail_out == 0);
|
||||||
while (strm->avail_out == 0);
|
|
||||||
|
|
||||||
deflateEnd(strm);
|
deflateEnd(strm);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
inflateEnd(strm);
|
inflateEnd(strm);
|
||||||
|
|
||||||
fclose(gz->file);
|
fclose(gz->file);
|
||||||
free(gz);
|
free(gz);
|
||||||
return Z_OK;
|
return Z_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* gzerror OF((gzFile, int*));
|
const char *gzerror OF((gzFile, int *));
|
||||||
|
|
||||||
const char* gzerror(gz, err)
|
const char *gzerror(gz, err)
|
||||||
gzFile gz;
|
gzFile gz;
|
||||||
int* err;
|
int *err;
|
||||||
{
|
{
|
||||||
*err = gz->err;
|
*err = gz->err;
|
||||||
return gz->msg;
|
return gz->msg;
|
||||||
|
|
@ -369,23 +333,23 @@ int* err;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char* prog;
|
static char *prog;
|
||||||
|
|
||||||
void error OF((const char* msg));
|
void error OF((const char *msg));
|
||||||
void gz_compress OF((FILE* in, gzFile out));
|
void gz_compress OF((FILE *in, gzFile out));
|
||||||
#ifdef USE_MMAP
|
#ifdef USE_MMAP
|
||||||
int gz_compress_mmap OF((FILE* in, gzFile out));
|
int gz_compress_mmap OF((FILE *in, gzFile out));
|
||||||
#endif
|
#endif
|
||||||
void gz_uncompress OF((gzFile in, FILE* out));
|
void gz_uncompress OF((gzFile in, FILE *out));
|
||||||
void file_compress OF((char* file, char* mode));
|
void file_compress OF((char *file, char *mode));
|
||||||
void file_uncompress OF((char* file));
|
void file_uncompress OF((char *file));
|
||||||
int main OF((int argc, char* argv[]));
|
int main OF((int argc, char *argv[]));
|
||||||
|
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
* Display error message and exit
|
* Display error message and exit
|
||||||
*/
|
*/
|
||||||
void error(msg)
|
void error(msg)
|
||||||
const char* msg;
|
const char *msg;
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s: %s\n", prog, msg);
|
fprintf(stderr, "%s: %s\n", prog, msg);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
@ -396,39 +360,30 @@ const char* msg;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void gz_compress(in, out)
|
void gz_compress(in, out)
|
||||||
FILE* in;
|
FILE *in;
|
||||||
gzFile out;
|
gzFile out;
|
||||||
{
|
{
|
||||||
local char buf[BUFLEN];
|
local char buf[BUFLEN];
|
||||||
int len;
|
int len;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
#ifdef USE_MMAP
|
#ifdef USE_MMAP
|
||||||
|
|
||||||
/* Try first compressing with mmap. If mmap fails (minigzip used in a
|
/* Try first compressing with mmap. If mmap fails (minigzip used in a
|
||||||
* pipe), use the normal fread loop.
|
* pipe), use the normal fread loop.
|
||||||
*/
|
*/
|
||||||
if (gz_compress_mmap(in, out) == Z_OK) return;
|
if (gz_compress_mmap(in, out) == Z_OK) return;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
for (;;) {
|
||||||
for (;;)
|
|
||||||
{
|
|
||||||
len = (int)fread(buf, 1, sizeof(buf), in);
|
len = (int)fread(buf, 1, sizeof(buf), in);
|
||||||
|
if (ferror(in)) {
|
||||||
if (ferror(in))
|
|
||||||
{
|
|
||||||
perror("fread");
|
perror("fread");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len == 0) break;
|
if (len == 0) break;
|
||||||
|
|
||||||
if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
|
if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(in);
|
fclose(in);
|
||||||
|
|
||||||
if (gzclose(out) != Z_OK) error("failed gzclose");
|
if (gzclose(out) != Z_OK) error("failed gzclose");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -438,8 +393,8 @@ gzFile out;
|
||||||
* if success, Z_ERRNO otherwise.
|
* if success, Z_ERRNO otherwise.
|
||||||
*/
|
*/
|
||||||
int gz_compress_mmap(in, out)
|
int gz_compress_mmap(in, out)
|
||||||
FILE* in;
|
FILE *in;
|
||||||
gzFile out;
|
gzFile out;
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
int err;
|
int err;
|
||||||
|
|
@ -450,26 +405,21 @@ gzFile out;
|
||||||
|
|
||||||
/* Determine the size of the file, needed for mmap: */
|
/* Determine the size of the file, needed for mmap: */
|
||||||
if (fstat(ifd, &sb) < 0) return Z_ERRNO;
|
if (fstat(ifd, &sb) < 0) return Z_ERRNO;
|
||||||
|
|
||||||
buf_len = sb.st_size;
|
buf_len = sb.st_size;
|
||||||
|
|
||||||
if (buf_len <= 0) return Z_ERRNO;
|
if (buf_len <= 0) return Z_ERRNO;
|
||||||
|
|
||||||
/* Now do the actual mmap: */
|
/* Now do the actual mmap: */
|
||||||
buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
|
buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
|
||||||
|
|
||||||
if (buf == (caddr_t)(-1)) return Z_ERRNO;
|
if (buf == (caddr_t)(-1)) return Z_ERRNO;
|
||||||
|
|
||||||
/* Compress the whole file at once: */
|
/* Compress the whole file at once: */
|
||||||
len = gzwrite(out, (char*)buf, (unsigned)buf_len);
|
len = gzwrite(out, (char *)buf, (unsigned)buf_len);
|
||||||
|
|
||||||
if (len != (int)buf_len) error(gzerror(out, &err));
|
if (len != (int)buf_len) error(gzerror(out, &err));
|
||||||
|
|
||||||
munmap(buf, buf_len);
|
munmap(buf, buf_len);
|
||||||
fclose(in);
|
fclose(in);
|
||||||
|
|
||||||
if (gzclose(out) != Z_OK) error("failed gzclose");
|
if (gzclose(out) != Z_OK) error("failed gzclose");
|
||||||
|
|
||||||
return Z_OK;
|
return Z_OK;
|
||||||
}
|
}
|
||||||
#endif /* USE_MMAP */
|
#endif /* USE_MMAP */
|
||||||
|
|
@ -478,27 +428,22 @@ gzFile out;
|
||||||
* Uncompress input to output then close both files.
|
* Uncompress input to output then close both files.
|
||||||
*/
|
*/
|
||||||
void gz_uncompress(in, out)
|
void gz_uncompress(in, out)
|
||||||
gzFile in;
|
gzFile in;
|
||||||
FILE* out;
|
FILE *out;
|
||||||
{
|
{
|
||||||
local char buf[BUFLEN];
|
local char buf[BUFLEN];
|
||||||
int len;
|
int len;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
len = gzread(in, buf, sizeof(buf));
|
len = gzread(in, buf, sizeof(buf));
|
||||||
|
if (len < 0) error (gzerror(in, &err));
|
||||||
if (len < 0) error(gzerror(in, &err));
|
|
||||||
|
|
||||||
if (len == 0) break;
|
if (len == 0) break;
|
||||||
|
|
||||||
if ((int)fwrite(buf, 1, (unsigned)len, out) != len)
|
if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
|
||||||
{
|
|
||||||
error("failed fwrite");
|
error("failed fwrite");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fclose(out)) error("failed fclose");
|
if (fclose(out)) error("failed fclose");
|
||||||
|
|
||||||
if (gzclose(in) != Z_OK) error("failed gzclose");
|
if (gzclose(in) != Z_OK) error("failed gzclose");
|
||||||
|
|
@ -510,38 +455,35 @@ FILE* out;
|
||||||
* original.
|
* original.
|
||||||
*/
|
*/
|
||||||
void file_compress(file, mode)
|
void file_compress(file, mode)
|
||||||
char* file;
|
char *file;
|
||||||
char* mode;
|
char *mode;
|
||||||
{
|
{
|
||||||
local char outfile[MAX_NAME_LEN];
|
local char outfile[MAX_NAME_LEN];
|
||||||
FILE* in;
|
FILE *in;
|
||||||
gzFile out;
|
gzFile out;
|
||||||
|
|
||||||
if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile))
|
if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
|
||||||
{
|
|
||||||
fprintf(stderr, "%s: filename too long\n", prog);
|
fprintf(stderr, "%s: filename too long\n", prog);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
|
||||||
|
snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX);
|
||||||
|
#else
|
||||||
strcpy(outfile, file);
|
strcpy(outfile, file);
|
||||||
strcat(outfile, GZ_SUFFIX);
|
strcat(outfile, GZ_SUFFIX);
|
||||||
|
#endif
|
||||||
|
|
||||||
in = fopen(file, "rb");
|
in = fopen(file, "rb");
|
||||||
|
if (in == NULL) {
|
||||||
if (in == NULL)
|
|
||||||
{
|
|
||||||
perror(file);
|
perror(file);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
out = gzopen(outfile, mode);
|
out = gzopen(outfile, mode);
|
||||||
|
if (out == NULL) {
|
||||||
if (out == NULL)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
|
fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
gz_compress(in, out);
|
gz_compress(in, out);
|
||||||
|
|
||||||
unlink(file);
|
unlink(file);
|
||||||
|
|
@ -552,47 +494,45 @@ char* mode;
|
||||||
* Uncompress the given file and remove the original.
|
* Uncompress the given file and remove the original.
|
||||||
*/
|
*/
|
||||||
void file_uncompress(file)
|
void file_uncompress(file)
|
||||||
char* file;
|
char *file;
|
||||||
{
|
{
|
||||||
local char buf[MAX_NAME_LEN];
|
local char buf[MAX_NAME_LEN];
|
||||||
char* infile, *outfile;
|
char *infile, *outfile;
|
||||||
FILE* out;
|
FILE *out;
|
||||||
gzFile in;
|
gzFile in;
|
||||||
size_t len = strlen(file);
|
unsigned len = strlen(file);
|
||||||
|
|
||||||
if (len + strlen(GZ_SUFFIX) >= sizeof(buf))
|
if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
|
||||||
{
|
|
||||||
fprintf(stderr, "%s: filename too long\n", prog);
|
fprintf(stderr, "%s: filename too long\n", prog);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
|
||||||
|
snprintf(buf, sizeof(buf), "%s", file);
|
||||||
|
#else
|
||||||
strcpy(buf, file);
|
strcpy(buf, file);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (len > SUFFIX_LEN && strcmp(file + len - SUFFIX_LEN, GZ_SUFFIX) == 0)
|
if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
|
||||||
{
|
|
||||||
infile = file;
|
infile = file;
|
||||||
outfile = buf;
|
outfile = buf;
|
||||||
outfile[len - 3] = '\0';
|
outfile[len-3] = '\0';
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
outfile = file;
|
outfile = file;
|
||||||
infile = buf;
|
infile = buf;
|
||||||
|
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
|
||||||
|
snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX);
|
||||||
|
#else
|
||||||
strcat(infile, GZ_SUFFIX);
|
strcat(infile, GZ_SUFFIX);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
in = gzopen(infile, "rb");
|
in = gzopen(infile, "rb");
|
||||||
|
if (in == NULL) {
|
||||||
if (in == NULL)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
|
fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
out = fopen(outfile, "wb");
|
out = fopen(outfile, "wb");
|
||||||
|
if (out == NULL) {
|
||||||
if (out == NULL)
|
|
||||||
{
|
|
||||||
perror(file);
|
perror(file);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
@ -614,130 +554,98 @@ char* file;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int main(argc, argv)
|
int main(argc, argv)
|
||||||
int argc;
|
int argc;
|
||||||
char* argv[];
|
char *argv[];
|
||||||
{
|
{
|
||||||
int copyout = 0;
|
int copyout = 0;
|
||||||
int uncompr = 0;
|
int uncompr = 0;
|
||||||
gzFile file;
|
gzFile file;
|
||||||
char* bname, outmode[20];
|
char *bname, outmode[20];
|
||||||
|
|
||||||
|
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
|
||||||
|
snprintf(outmode, sizeof(outmode), "%s", "wb6 ");
|
||||||
|
#else
|
||||||
strcpy(outmode, "wb6 ");
|
strcpy(outmode, "wb6 ");
|
||||||
|
#endif
|
||||||
|
|
||||||
prog = argv[0];
|
prog = argv[0];
|
||||||
bname = strrchr(argv[0], '/');
|
bname = strrchr(argv[0], '/');
|
||||||
|
|
||||||
if (bname)
|
if (bname)
|
||||||
bname++;
|
bname++;
|
||||||
else
|
else
|
||||||
bname = argv[0];
|
bname = argv[0];
|
||||||
|
|
||||||
argc--, argv++;
|
argc--, argv++;
|
||||||
|
|
||||||
if (!strcmp(bname, "gunzip"))
|
if (!strcmp(bname, "gunzip"))
|
||||||
uncompr = 1;
|
uncompr = 1;
|
||||||
else if (!strcmp(bname, "zcat"))
|
else if (!strcmp(bname, "zcat"))
|
||||||
copyout = uncompr = 1;
|
copyout = uncompr = 1;
|
||||||
|
|
||||||
while (argc > 0)
|
while (argc > 0) {
|
||||||
{
|
if (strcmp(*argv, "-c") == 0)
|
||||||
if (strcmp(*argv, "-c") == 0)
|
copyout = 1;
|
||||||
copyout = 1;
|
else if (strcmp(*argv, "-d") == 0)
|
||||||
else if (strcmp(*argv, "-d") == 0)
|
uncompr = 1;
|
||||||
uncompr = 1;
|
else if (strcmp(*argv, "-f") == 0)
|
||||||
else if (strcmp(*argv, "-f") == 0)
|
outmode[3] = 'f';
|
||||||
outmode[3] = 'f';
|
else if (strcmp(*argv, "-h") == 0)
|
||||||
else if (strcmp(*argv, "-h") == 0)
|
outmode[3] = 'h';
|
||||||
outmode[3] = 'h';
|
else if (strcmp(*argv, "-r") == 0)
|
||||||
else if (strcmp(*argv, "-r") == 0)
|
outmode[3] = 'R';
|
||||||
outmode[3] = 'R';
|
else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
|
||||||
else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
|
(*argv)[2] == 0)
|
||||||
(*argv)[2] == 0)
|
outmode[2] = (*argv)[1];
|
||||||
outmode[2] = (*argv)[1];
|
else
|
||||||
else
|
break;
|
||||||
break;
|
argc--, argv++;
|
||||||
|
|
||||||
argc--, argv++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (outmode[3] == ' ')
|
if (outmode[3] == ' ')
|
||||||
outmode[3] = 0;
|
outmode[3] = 0;
|
||||||
|
if (argc == 0) {
|
||||||
if (argc == 0)
|
|
||||||
{
|
|
||||||
SET_BINARY_MODE(stdin);
|
SET_BINARY_MODE(stdin);
|
||||||
SET_BINARY_MODE(stdout);
|
SET_BINARY_MODE(stdout);
|
||||||
|
if (uncompr) {
|
||||||
if (uncompr)
|
|
||||||
{
|
|
||||||
file = gzdopen(fileno(stdin), "rb");
|
file = gzdopen(fileno(stdin), "rb");
|
||||||
|
|
||||||
if (file == NULL) error("can't gzdopen stdin");
|
if (file == NULL) error("can't gzdopen stdin");
|
||||||
|
|
||||||
gz_uncompress(file, stdout);
|
gz_uncompress(file, stdout);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
file = gzdopen(fileno(stdout), outmode);
|
file = gzdopen(fileno(stdout), outmode);
|
||||||
|
|
||||||
if (file == NULL) error("can't gzdopen stdout");
|
if (file == NULL) error("can't gzdopen stdout");
|
||||||
|
|
||||||
gz_compress(stdin, file);
|
gz_compress(stdin, file);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
if (copyout) {
|
||||||
{
|
|
||||||
if (copyout)
|
|
||||||
{
|
|
||||||
SET_BINARY_MODE(stdout);
|
SET_BINARY_MODE(stdout);
|
||||||
}
|
}
|
||||||
|
do {
|
||||||
do
|
if (uncompr) {
|
||||||
{
|
if (copyout) {
|
||||||
if (uncompr)
|
|
||||||
{
|
|
||||||
if (copyout)
|
|
||||||
{
|
|
||||||
file = gzopen(*argv, "rb");
|
file = gzopen(*argv, "rb");
|
||||||
|
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
|
fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
|
||||||
else
|
else
|
||||||
gz_uncompress(file, stdout);
|
gz_uncompress(file, stdout);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
file_uncompress(*argv);
|
file_uncompress(*argv);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
if (copyout) {
|
||||||
{
|
FILE * in = fopen(*argv, "rb");
|
||||||
if (copyout)
|
|
||||||
{
|
|
||||||
FILE* in = fopen(*argv, "rb");
|
|
||||||
|
|
||||||
if (in == NULL)
|
if (in == NULL) {
|
||||||
{
|
|
||||||
perror(*argv);
|
perror(*argv);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
file = gzdopen(fileno(stdout), outmode);
|
file = gzdopen(fileno(stdout), outmode);
|
||||||
|
|
||||||
if (file == NULL) error("can't gzdopen stdout");
|
if (file == NULL) error("can't gzdopen stdout");
|
||||||
|
|
||||||
gz_compress(in, file);
|
gz_compress(in, file);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
file_compress(*argv, outmode);
|
file_compress(*argv, outmode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} while (argv++, --argc);
|
||||||
while (argv++, --argc);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,134 +1,128 @@
|
||||||
/* header created automatically with -DGEN_TREES_H */
|
/* header created automatically with -DGEN_TREES_H */
|
||||||
|
|
||||||
local const ct_data static_ltree[L_CODES + 2] =
|
local const ct_data static_ltree[L_CODES+2] = {
|
||||||
{
|
{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}},
|
||||||
{{ 12}, { 8}}, {{140}, { 8}}, {{ 76}, { 8}}, {{204}, { 8}}, {{ 44}, { 8}},
|
{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}},
|
||||||
{{172}, { 8}}, {{108}, { 8}}, {{236}, { 8}}, {{ 28}, { 8}}, {{156}, { 8}},
|
{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}},
|
||||||
{{ 92}, { 8}}, {{220}, { 8}}, {{ 60}, { 8}}, {{188}, { 8}}, {{124}, { 8}},
|
{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}},
|
||||||
{{252}, { 8}}, {{ 2}, { 8}}, {{130}, { 8}}, {{ 66}, { 8}}, {{194}, { 8}},
|
{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}},
|
||||||
{{ 34}, { 8}}, {{162}, { 8}}, {{ 98}, { 8}}, {{226}, { 8}}, {{ 18}, { 8}},
|
{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}},
|
||||||
{{146}, { 8}}, {{ 82}, { 8}}, {{210}, { 8}}, {{ 50}, { 8}}, {{178}, { 8}},
|
{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}},
|
||||||
{{114}, { 8}}, {{242}, { 8}}, {{ 10}, { 8}}, {{138}, { 8}}, {{ 74}, { 8}},
|
{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}},
|
||||||
{{202}, { 8}}, {{ 42}, { 8}}, {{170}, { 8}}, {{106}, { 8}}, {{234}, { 8}},
|
{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}},
|
||||||
{{ 26}, { 8}}, {{154}, { 8}}, {{ 90}, { 8}}, {{218}, { 8}}, {{ 58}, { 8}},
|
{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}},
|
||||||
{{186}, { 8}}, {{122}, { 8}}, {{250}, { 8}}, {{ 6}, { 8}}, {{134}, { 8}},
|
{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}},
|
||||||
{{ 70}, { 8}}, {{198}, { 8}}, {{ 38}, { 8}}, {{166}, { 8}}, {{102}, { 8}},
|
{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}},
|
||||||
{{230}, { 8}}, {{ 22}, { 8}}, {{150}, { 8}}, {{ 86}, { 8}}, {{214}, { 8}},
|
{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}},
|
||||||
{{ 54}, { 8}}, {{182}, { 8}}, {{118}, { 8}}, {{246}, { 8}}, {{ 14}, { 8}},
|
{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}},
|
||||||
{{142}, { 8}}, {{ 78}, { 8}}, {{206}, { 8}}, {{ 46}, { 8}}, {{174}, { 8}},
|
{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}},
|
||||||
{{110}, { 8}}, {{238}, { 8}}, {{ 30}, { 8}}, {{158}, { 8}}, {{ 94}, { 8}},
|
{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}},
|
||||||
{{222}, { 8}}, {{ 62}, { 8}}, {{190}, { 8}}, {{126}, { 8}}, {{254}, { 8}},
|
{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}},
|
||||||
{{ 1}, { 8}}, {{129}, { 8}}, {{ 65}, { 8}}, {{193}, { 8}}, {{ 33}, { 8}},
|
{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}},
|
||||||
{{161}, { 8}}, {{ 97}, { 8}}, {{225}, { 8}}, {{ 17}, { 8}}, {{145}, { 8}},
|
{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}},
|
||||||
{{ 81}, { 8}}, {{209}, { 8}}, {{ 49}, { 8}}, {{177}, { 8}}, {{113}, { 8}},
|
{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}},
|
||||||
{{241}, { 8}}, {{ 9}, { 8}}, {{137}, { 8}}, {{ 73}, { 8}}, {{201}, { 8}},
|
{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}},
|
||||||
{{ 41}, { 8}}, {{169}, { 8}}, {{105}, { 8}}, {{233}, { 8}}, {{ 25}, { 8}},
|
{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}},
|
||||||
{{153}, { 8}}, {{ 89}, { 8}}, {{217}, { 8}}, {{ 57}, { 8}}, {{185}, { 8}},
|
{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}},
|
||||||
{{121}, { 8}}, {{249}, { 8}}, {{ 5}, { 8}}, {{133}, { 8}}, {{ 69}, { 8}},
|
{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}},
|
||||||
{{197}, { 8}}, {{ 37}, { 8}}, {{165}, { 8}}, {{101}, { 8}}, {{229}, { 8}},
|
{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}},
|
||||||
{{ 21}, { 8}}, {{149}, { 8}}, {{ 85}, { 8}}, {{213}, { 8}}, {{ 53}, { 8}},
|
{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}},
|
||||||
{{181}, { 8}}, {{117}, { 8}}, {{245}, { 8}}, {{ 13}, { 8}}, {{141}, { 8}},
|
{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}},
|
||||||
{{ 77}, { 8}}, {{205}, { 8}}, {{ 45}, { 8}}, {{173}, { 8}}, {{109}, { 8}},
|
{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}},
|
||||||
{{237}, { 8}}, {{ 29}, { 8}}, {{157}, { 8}}, {{ 93}, { 8}}, {{221}, { 8}},
|
{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}},
|
||||||
{{ 61}, { 8}}, {{189}, { 8}}, {{125}, { 8}}, {{253}, { 8}}, {{ 19}, { 9}},
|
{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}},
|
||||||
{{275}, { 9}}, {{147}, { 9}}, {{403}, { 9}}, {{ 83}, { 9}}, {{339}, { 9}},
|
{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}},
|
||||||
{{211}, { 9}}, {{467}, { 9}}, {{ 51}, { 9}}, {{307}, { 9}}, {{179}, { 9}},
|
{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}},
|
||||||
{{435}, { 9}}, {{115}, { 9}}, {{371}, { 9}}, {{243}, { 9}}, {{499}, { 9}},
|
{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}},
|
||||||
{{ 11}, { 9}}, {{267}, { 9}}, {{139}, { 9}}, {{395}, { 9}}, {{ 75}, { 9}},
|
{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}},
|
||||||
{{331}, { 9}}, {{203}, { 9}}, {{459}, { 9}}, {{ 43}, { 9}}, {{299}, { 9}},
|
{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}},
|
||||||
{{171}, { 9}}, {{427}, { 9}}, {{107}, { 9}}, {{363}, { 9}}, {{235}, { 9}},
|
{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}},
|
||||||
{{491}, { 9}}, {{ 27}, { 9}}, {{283}, { 9}}, {{155}, { 9}}, {{411}, { 9}},
|
{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}},
|
||||||
{{ 91}, { 9}}, {{347}, { 9}}, {{219}, { 9}}, {{475}, { 9}}, {{ 59}, { 9}},
|
{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}},
|
||||||
{{315}, { 9}}, {{187}, { 9}}, {{443}, { 9}}, {{123}, { 9}}, {{379}, { 9}},
|
{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}},
|
||||||
{{251}, { 9}}, {{507}, { 9}}, {{ 7}, { 9}}, {{263}, { 9}}, {{135}, { 9}},
|
{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}},
|
||||||
{{391}, { 9}}, {{ 71}, { 9}}, {{327}, { 9}}, {{199}, { 9}}, {{455}, { 9}},
|
{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}},
|
||||||
{{ 39}, { 9}}, {{295}, { 9}}, {{167}, { 9}}, {{423}, { 9}}, {{103}, { 9}},
|
{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}},
|
||||||
{{359}, { 9}}, {{231}, { 9}}, {{487}, { 9}}, {{ 23}, { 9}}, {{279}, { 9}},
|
{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}},
|
||||||
{{151}, { 9}}, {{407}, { 9}}, {{ 87}, { 9}}, {{343}, { 9}}, {{215}, { 9}},
|
{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}},
|
||||||
{{471}, { 9}}, {{ 55}, { 9}}, {{311}, { 9}}, {{183}, { 9}}, {{439}, { 9}},
|
{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}},
|
||||||
{{119}, { 9}}, {{375}, { 9}}, {{247}, { 9}}, {{503}, { 9}}, {{ 15}, { 9}},
|
{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}},
|
||||||
{{271}, { 9}}, {{143}, { 9}}, {{399}, { 9}}, {{ 79}, { 9}}, {{335}, { 9}},
|
{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}},
|
||||||
{{207}, { 9}}, {{463}, { 9}}, {{ 47}, { 9}}, {{303}, { 9}}, {{175}, { 9}},
|
{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}},
|
||||||
{{431}, { 9}}, {{111}, { 9}}, {{367}, { 9}}, {{239}, { 9}}, {{495}, { 9}},
|
{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}},
|
||||||
{{ 31}, { 9}}, {{287}, { 9}}, {{159}, { 9}}, {{415}, { 9}}, {{ 95}, { 9}},
|
{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}},
|
||||||
{{351}, { 9}}, {{223}, { 9}}, {{479}, { 9}}, {{ 63}, { 9}}, {{319}, { 9}},
|
{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}},
|
||||||
{{191}, { 9}}, {{447}, { 9}}, {{127}, { 9}}, {{383}, { 9}}, {{255}, { 9}},
|
{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}},
|
||||||
{{511}, { 9}}, {{ 0}, { 7}}, {{ 64}, { 7}}, {{ 32}, { 7}}, {{ 96}, { 7}},
|
{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}},
|
||||||
{{ 16}, { 7}}, {{ 80}, { 7}}, {{ 48}, { 7}}, {{112}, { 7}}, {{ 8}, { 7}},
|
{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}},
|
||||||
{{ 72}, { 7}}, {{ 40}, { 7}}, {{104}, { 7}}, {{ 24}, { 7}}, {{ 88}, { 7}},
|
{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}},
|
||||||
{{ 56}, { 7}}, {{120}, { 7}}, {{ 4}, { 7}}, {{ 68}, { 7}}, {{ 36}, { 7}},
|
{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}},
|
||||||
{{100}, { 7}}, {{ 20}, { 7}}, {{ 84}, { 7}}, {{ 52}, { 7}}, {{116}, { 7}},
|
{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}},
|
||||||
{{ 3}, { 8}}, {{131}, { 8}}, {{ 67}, { 8}}, {{195}, { 8}}, {{ 35}, { 8}},
|
{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}}
|
||||||
{{163}, { 8}}, {{ 99}, { 8}}, {{227}, { 8}}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
local const ct_data static_dtree[D_CODES] =
|
local const ct_data static_dtree[D_CODES] = {
|
||||||
{
|
{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
|
||||||
{{ 0}, { 5}}, {{16}, { 5}}, {{ 8}, { 5}}, {{24}, { 5}}, {{ 4}, { 5}},
|
{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
|
||||||
{{20}, { 5}}, {{12}, { 5}}, {{28}, { 5}}, {{ 2}, { 5}}, {{18}, { 5}},
|
{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
|
||||||
{{10}, { 5}}, {{26}, { 5}}, {{ 6}, { 5}}, {{22}, { 5}}, {{14}, { 5}},
|
{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
|
||||||
{{30}, { 5}}, {{ 1}, { 5}}, {{17}, { 5}}, {{ 9}, { 5}}, {{25}, { 5}},
|
{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
|
||||||
{{ 5}, { 5}}, {{21}, { 5}}, {{13}, { 5}}, {{29}, { 5}}, {{ 3}, { 5}},
|
{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
|
||||||
{{19}, { 5}}, {{11}, { 5}}, {{27}, { 5}}, {{ 7}, { 5}}, {{23}, { 5}}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] =
|
const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
|
||||||
{
|
0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
|
||||||
0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
|
8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||||
8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10,
|
10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
|
||||||
10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
|
11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
|
||||||
11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
|
12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
|
||||||
12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
|
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
|
||||||
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
|
13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
|
||||||
13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
|
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
|
||||||
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
|
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
|
||||||
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
|
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
|
||||||
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
|
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
|
||||||
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
|
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
|
||||||
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
|
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17,
|
||||||
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17,
|
18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
|
||||||
18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
|
23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
|
||||||
23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
|
24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
|
||||||
24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
|
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
|
||||||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
|
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
|
||||||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
|
27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
||||||
27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
||||||
27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
||||||
28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
||||||
28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
|
||||||
28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
|
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
|
||||||
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
|
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
|
||||||
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
|
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
|
||||||
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const uch ZLIB_INTERNAL _length_code[MAX_MATCH - MIN_MATCH + 1] =
|
const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
|
||||||
{
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
|
||||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
|
13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
|
||||||
13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
|
17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
|
||||||
17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
|
19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
|
||||||
19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
|
21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
|
||||||
21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
|
22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
|
||||||
22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
|
23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
|
||||||
23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
|
24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
|
||||||
24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
|
25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
|
||||||
25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
|
25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
|
||||||
25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
|
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
|
||||||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
|
26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
||||||
26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
|
||||||
27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
|
|
||||||
};
|
};
|
||||||
|
|
||||||
local const int base_length[LENGTH_CODES] =
|
local const int base_length[LENGTH_CODES] = {
|
||||||
{
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
|
||||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
|
64, 80, 96, 112, 128, 160, 192, 224, 0
|
||||||
64, 80, 96, 112, 128, 160, 192, 224, 0
|
|
||||||
};
|
};
|
||||||
|
|
||||||
local const int base_dist[D_CODES] =
|
local const int base_dist[D_CODES] = {
|
||||||
{
|
|
||||||
0, 1, 2, 3, 4, 6, 8, 12, 16, 24,
|
0, 1, 2, 3, 4, 6, 8, 12, 16, 24,
|
||||||
32, 48, 64, 96, 128, 192, 256, 384, 512, 768,
|
32, 48, 64, 96, 128, 192, 256, 384, 512, 768,
|
||||||
1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576
|
1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* uncompr.c -- decompress a memory buffer
|
/* uncompr.c -- decompress a memory buffer
|
||||||
* Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
|
* Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -9,63 +9,85 @@
|
||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
|
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
Decompresses the source buffer into the destination buffer. sourceLen is
|
Decompresses the source buffer into the destination buffer. *sourceLen is
|
||||||
the byte length of the source buffer. Upon entry, destLen is the total
|
the byte length of the source buffer. Upon entry, *destLen is the total size
|
||||||
size of the destination buffer, which must be large enough to hold the
|
of the destination buffer, which must be large enough to hold the entire
|
||||||
entire uncompressed data. (The size of the uncompressed data must have
|
uncompressed data. (The size of the uncompressed data must have been saved
|
||||||
been saved previously by the compressor and transmitted to the decompressor
|
previously by the compressor and transmitted to the decompressor by some
|
||||||
by some mechanism outside the scope of this compression library.)
|
mechanism outside the scope of this compression library.) Upon exit,
|
||||||
Upon exit, destLen is the actual size of the compressed buffer.
|
*destLen is the size of the decompressed data and *sourceLen is the number
|
||||||
|
of source bytes consumed. Upon return, source + *sourceLen points to the
|
||||||
|
first unused input byte.
|
||||||
|
|
||||||
uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
|
uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
|
||||||
enough memory, Z_BUF_ERROR if there was not enough room in the output
|
memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
|
||||||
buffer, or Z_DATA_ERROR if the input data was corrupted.
|
Z_DATA_ERROR if the input data was corrupted, including if the input data is
|
||||||
|
an incomplete zlib stream.
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
|
||||||
int ZEXPORT uncompress(Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
|
Bytef *dest;
|
||||||
#else
|
uLongf *destLen;
|
||||||
int ZEXPORT uncompress(dest, destLen, source, sourceLen)
|
const Bytef *source;
|
||||||
Bytef* dest;
|
uLong *sourceLen;
|
||||||
uLongf* destLen;
|
|
||||||
const Bytef* source;
|
|
||||||
uLong sourceLen;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
z_stream stream;
|
z_stream stream;
|
||||||
int err;
|
int err;
|
||||||
|
const uInt max = (uInt)-1;
|
||||||
|
uLong len, left;
|
||||||
|
Byte buf[1]; /* for detection of incomplete stream when *destLen == 0 */
|
||||||
|
|
||||||
stream.next_in = (Bytef*)source;
|
len = *sourceLen;
|
||||||
stream.avail_in = (uInt)sourceLen;
|
if (*destLen) {
|
||||||
|
left = *destLen;
|
||||||
/* Check for source > 64K on 16-bit machine: */
|
*destLen = 0;
|
||||||
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
|
}
|
||||||
|
else {
|
||||||
stream.next_out = dest;
|
left = 1;
|
||||||
stream.avail_out = (uInt) * destLen;
|
dest = buf;
|
||||||
|
|
||||||
if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
|
|
||||||
|
|
||||||
stream.zalloc = (alloc_func)0;
|
|
||||||
stream.zfree = (free_func)0;
|
|
||||||
|
|
||||||
err = inflateInit(&stream);
|
|
||||||
|
|
||||||
if (err != Z_OK) return err;
|
|
||||||
|
|
||||||
err = inflate(&stream, Z_FINISH);
|
|
||||||
|
|
||||||
if (err != Z_STREAM_END)
|
|
||||||
{
|
|
||||||
inflateEnd(&stream);
|
|
||||||
|
|
||||||
if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
|
|
||||||
return Z_DATA_ERROR;
|
|
||||||
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
*destLen = stream.total_out;
|
stream.next_in = (z_const Bytef *)source;
|
||||||
|
stream.avail_in = 0;
|
||||||
|
stream.zalloc = (alloc_func)0;
|
||||||
|
stream.zfree = (free_func)0;
|
||||||
|
stream.opaque = (voidpf)0;
|
||||||
|
|
||||||
err = inflateEnd(&stream);
|
err = inflateInit(&stream);
|
||||||
return err;
|
if (err != Z_OK) return err;
|
||||||
|
|
||||||
|
stream.next_out = dest;
|
||||||
|
stream.avail_out = 0;
|
||||||
|
|
||||||
|
do {
|
||||||
|
if (stream.avail_out == 0) {
|
||||||
|
stream.avail_out = left > (uLong)max ? max : (uInt)left;
|
||||||
|
left -= stream.avail_out;
|
||||||
|
}
|
||||||
|
if (stream.avail_in == 0) {
|
||||||
|
stream.avail_in = len > (uLong)max ? max : (uInt)len;
|
||||||
|
len -= stream.avail_in;
|
||||||
|
}
|
||||||
|
err = inflate(&stream, Z_NO_FLUSH);
|
||||||
|
} while (err == Z_OK);
|
||||||
|
|
||||||
|
*sourceLen -= len + stream.avail_in;
|
||||||
|
if (dest != buf)
|
||||||
|
*destLen = stream.total_out;
|
||||||
|
else if (stream.total_out && err == Z_BUF_ERROR)
|
||||||
|
left = 1;
|
||||||
|
|
||||||
|
inflateEnd(&stream);
|
||||||
|
return err == Z_STREAM_END ? Z_OK :
|
||||||
|
err == Z_NEED_DICT ? Z_DATA_ERROR :
|
||||||
|
err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
|
||||||
|
err;
|
||||||
|
}
|
||||||
|
|
||||||
|
int ZEXPORT uncompress (dest, destLen, source, sourceLen)
|
||||||
|
Bytef *dest;
|
||||||
|
uLongf *destLen;
|
||||||
|
const Bytef *source;
|
||||||
|
uLong sourceLen;
|
||||||
|
{
|
||||||
|
return uncompress2(dest, destLen, source, &sourceLen);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* zconf.h -- configuration of the zlib compression library
|
/* zconf.h -- configuration of the zlib compression library
|
||||||
* Copyright (C) 1995-2012 Jean-loup Gailly.
|
* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -17,10 +17,11 @@
|
||||||
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
|
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
|
||||||
# define Z_PREFIX_SET
|
# define Z_PREFIX_SET
|
||||||
|
|
||||||
/* all linked symbols */
|
/* all linked symbols and init macros */
|
||||||
# define _dist_code z__dist_code
|
# define _dist_code z__dist_code
|
||||||
# define _length_code z__length_code
|
# define _length_code z__length_code
|
||||||
# define _tr_align z__tr_align
|
# define _tr_align z__tr_align
|
||||||
|
# define _tr_flush_bits z__tr_flush_bits
|
||||||
# define _tr_flush_block z__tr_flush_block
|
# define _tr_flush_block z__tr_flush_block
|
||||||
# define _tr_init z__tr_init
|
# define _tr_init z__tr_init
|
||||||
# define _tr_stored_block z__tr_stored_block
|
# define _tr_stored_block z__tr_stored_block
|
||||||
|
|
@ -28,6 +29,7 @@
|
||||||
# define adler32 z_adler32
|
# define adler32 z_adler32
|
||||||
# define adler32_combine z_adler32_combine
|
# define adler32_combine z_adler32_combine
|
||||||
# define adler32_combine64 z_adler32_combine64
|
# define adler32_combine64 z_adler32_combine64
|
||||||
|
# define adler32_z z_adler32_z
|
||||||
# ifndef Z_SOLO
|
# ifndef Z_SOLO
|
||||||
# define compress z_compress
|
# define compress z_compress
|
||||||
# define compress2 z_compress2
|
# define compress2 z_compress2
|
||||||
|
|
@ -36,10 +38,14 @@
|
||||||
# define crc32 z_crc32
|
# define crc32 z_crc32
|
||||||
# define crc32_combine z_crc32_combine
|
# define crc32_combine z_crc32_combine
|
||||||
# define crc32_combine64 z_crc32_combine64
|
# define crc32_combine64 z_crc32_combine64
|
||||||
|
# define crc32_z z_crc32_z
|
||||||
# define deflate z_deflate
|
# define deflate z_deflate
|
||||||
# define deflateBound z_deflateBound
|
# define deflateBound z_deflateBound
|
||||||
# define deflateCopy z_deflateCopy
|
# define deflateCopy z_deflateCopy
|
||||||
# define deflateEnd z_deflateEnd
|
# define deflateEnd z_deflateEnd
|
||||||
|
# define deflateGetDictionary z_deflateGetDictionary
|
||||||
|
# define deflateInit z_deflateInit
|
||||||
|
# define deflateInit2 z_deflateInit2
|
||||||
# define deflateInit2_ z_deflateInit2_
|
# define deflateInit2_ z_deflateInit2_
|
||||||
# define deflateInit_ z_deflateInit_
|
# define deflateInit_ z_deflateInit_
|
||||||
# define deflateParams z_deflateParams
|
# define deflateParams z_deflateParams
|
||||||
|
|
@ -66,6 +72,8 @@
|
||||||
# define gzeof z_gzeof
|
# define gzeof z_gzeof
|
||||||
# define gzerror z_gzerror
|
# define gzerror z_gzerror
|
||||||
# define gzflush z_gzflush
|
# define gzflush z_gzflush
|
||||||
|
# define gzfread z_gzfread
|
||||||
|
# define gzfwrite z_gzfwrite
|
||||||
# define gzgetc z_gzgetc
|
# define gzgetc z_gzgetc
|
||||||
# define gzgetc_ z_gzgetc_
|
# define gzgetc_ z_gzgetc_
|
||||||
# define gzgets z_gzgets
|
# define gzgets z_gzgets
|
||||||
|
|
@ -87,31 +95,39 @@
|
||||||
# define gztell z_gztell
|
# define gztell z_gztell
|
||||||
# define gztell64 z_gztell64
|
# define gztell64 z_gztell64
|
||||||
# define gzungetc z_gzungetc
|
# define gzungetc z_gzungetc
|
||||||
|
# define gzvprintf z_gzvprintf
|
||||||
# define gzwrite z_gzwrite
|
# define gzwrite z_gzwrite
|
||||||
# endif
|
# endif
|
||||||
# define inflate z_inflate
|
# define inflate z_inflate
|
||||||
# define inflateBack z_inflateBack
|
# define inflateBack z_inflateBack
|
||||||
# define inflateBackEnd z_inflateBackEnd
|
# define inflateBackEnd z_inflateBackEnd
|
||||||
|
# define inflateBackInit z_inflateBackInit
|
||||||
# define inflateBackInit_ z_inflateBackInit_
|
# define inflateBackInit_ z_inflateBackInit_
|
||||||
|
# define inflateCodesUsed z_inflateCodesUsed
|
||||||
# define inflateCopy z_inflateCopy
|
# define inflateCopy z_inflateCopy
|
||||||
# define inflateEnd z_inflateEnd
|
# define inflateEnd z_inflateEnd
|
||||||
|
# define inflateGetDictionary z_inflateGetDictionary
|
||||||
# define inflateGetHeader z_inflateGetHeader
|
# define inflateGetHeader z_inflateGetHeader
|
||||||
|
# define inflateInit z_inflateInit
|
||||||
|
# define inflateInit2 z_inflateInit2
|
||||||
# define inflateInit2_ z_inflateInit2_
|
# define inflateInit2_ z_inflateInit2_
|
||||||
# define inflateInit_ z_inflateInit_
|
# define inflateInit_ z_inflateInit_
|
||||||
# define inflateMark z_inflateMark
|
# define inflateMark z_inflateMark
|
||||||
# define inflatePrime z_inflatePrime
|
# define inflatePrime z_inflatePrime
|
||||||
# define inflateReset z_inflateReset
|
# define inflateReset z_inflateReset
|
||||||
# define inflateReset2 z_inflateReset2
|
# define inflateReset2 z_inflateReset2
|
||||||
|
# define inflateResetKeep z_inflateResetKeep
|
||||||
# define inflateSetDictionary z_inflateSetDictionary
|
# define inflateSetDictionary z_inflateSetDictionary
|
||||||
# define inflateSync z_inflateSync
|
# define inflateSync z_inflateSync
|
||||||
# define inflateSyncPoint z_inflateSyncPoint
|
# define inflateSyncPoint z_inflateSyncPoint
|
||||||
# define inflateUndermine z_inflateUndermine
|
# define inflateUndermine z_inflateUndermine
|
||||||
# define inflateResetKeep z_inflateResetKeep
|
# define inflateValidate z_inflateValidate
|
||||||
# define inflate_copyright z_inflate_copyright
|
# define inflate_copyright z_inflate_copyright
|
||||||
# define inflate_fast z_inflate_fast
|
# define inflate_fast z_inflate_fast
|
||||||
# define inflate_table z_inflate_table
|
# define inflate_table z_inflate_table
|
||||||
# ifndef Z_SOLO
|
# ifndef Z_SOLO
|
||||||
# define uncompress z_uncompress
|
# define uncompress z_uncompress
|
||||||
|
# define uncompress2 z_uncompress2
|
||||||
# endif
|
# endif
|
||||||
# define zError z_zError
|
# define zError z_zError
|
||||||
# ifndef Z_SOLO
|
# ifndef Z_SOLO
|
||||||
|
|
@ -221,9 +237,19 @@
|
||||||
# define z_const
|
# define z_const
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Some Mac compilers merge all .h files incorrectly: */
|
#ifdef Z_SOLO
|
||||||
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
|
typedef unsigned long z_size_t;
|
||||||
# define NO_DUMMY_DECL
|
#else
|
||||||
|
# define z_longlong long long
|
||||||
|
# if defined(NO_SIZE_T)
|
||||||
|
typedef unsigned NO_SIZE_T z_size_t;
|
||||||
|
# elif defined(STDC)
|
||||||
|
# include <stddef.h>
|
||||||
|
typedef size_t z_size_t;
|
||||||
|
# else
|
||||||
|
typedef unsigned long z_size_t;
|
||||||
|
# endif
|
||||||
|
# undef z_longlong
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Maximum value for memLevel in deflateInit2 */
|
/* Maximum value for memLevel in deflateInit2 */
|
||||||
|
|
@ -253,11 +279,11 @@
|
||||||
Of course this will generally degrade compression (there's no free lunch).
|
Of course this will generally degrade compression (there's no free lunch).
|
||||||
|
|
||||||
The memory requirements for inflate are (in bytes) 1 << windowBits
|
The memory requirements for inflate are (in bytes) 1 << windowBits
|
||||||
that is, 32K for windowBits=15 (default value) plus a few kilobytes
|
that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
|
||||||
for small objects.
|
for small objects.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Type declarations */
|
/* Type declarations */
|
||||||
|
|
||||||
#ifndef OF /* function prototypes */
|
#ifndef OF /* function prototypes */
|
||||||
# ifdef STDC
|
# ifdef STDC
|
||||||
|
|
@ -283,7 +309,7 @@
|
||||||
*/
|
*/
|
||||||
#ifdef SYS16BIT
|
#ifdef SYS16BIT
|
||||||
# if defined(M_I86SM) || defined(M_I86MM)
|
# if defined(M_I86SM) || defined(M_I86MM)
|
||||||
/* MSC small or medium model */
|
/* MSC small or medium model */
|
||||||
# define SMALL_MEDIUM
|
# define SMALL_MEDIUM
|
||||||
# ifdef _MSC_VER
|
# ifdef _MSC_VER
|
||||||
# define FAR _far
|
# define FAR _far
|
||||||
|
|
@ -292,7 +318,7 @@
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
# if (defined(__SMALL__) || defined(__MEDIUM__))
|
# if (defined(__SMALL__) || defined(__MEDIUM__))
|
||||||
/* Turbo C small or medium model */
|
/* Turbo C small or medium model */
|
||||||
# define SMALL_MEDIUM
|
# define SMALL_MEDIUM
|
||||||
# ifdef __BORLANDC__
|
# ifdef __BORLANDC__
|
||||||
# define FAR _far
|
# define FAR _far
|
||||||
|
|
@ -303,9 +329,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(WINDOWS) || defined(WIN32)
|
#if defined(WINDOWS) || defined(WIN32)
|
||||||
/* If building or using zlib as a DLL, define ZLIB_DLL.
|
/* If building or using zlib as a DLL, define ZLIB_DLL.
|
||||||
* This is not mandatory, but it offers a little performance increase.
|
* This is not mandatory, but it offers a little performance increase.
|
||||||
*/
|
*/
|
||||||
# ifdef ZLIB_DLL
|
# ifdef ZLIB_DLL
|
||||||
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
|
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
|
||||||
# ifdef ZLIB_INTERNAL
|
# ifdef ZLIB_INTERNAL
|
||||||
|
|
@ -315,17 +341,17 @@
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
# endif /* ZLIB_DLL */
|
# endif /* ZLIB_DLL */
|
||||||
/* If building or using zlib with the WINAPI/WINAPIV calling convention,
|
/* If building or using zlib with the WINAPI/WINAPIV calling convention,
|
||||||
* define ZLIB_WINAPI.
|
* define ZLIB_WINAPI.
|
||||||
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
|
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
|
||||||
*/
|
*/
|
||||||
# ifdef ZLIB_WINAPI
|
# ifdef ZLIB_WINAPI
|
||||||
# ifdef FAR
|
# ifdef FAR
|
||||||
# undef FAR
|
# undef FAR
|
||||||
# endif
|
# endif
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
/* No need for _export, use ZLIB.DEF instead. */
|
/* No need for _export, use ZLIB.DEF instead. */
|
||||||
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
|
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
|
||||||
# define ZEXPORT WINAPI
|
# define ZEXPORT WINAPI
|
||||||
# ifdef WIN32
|
# ifdef WIN32
|
||||||
# define ZEXPORTVA WINAPIV
|
# define ZEXPORTVA WINAPIV
|
||||||
|
|
@ -368,10 +394,10 @@ typedef unsigned int uInt; /* 16 bits or more */
|
||||||
typedef unsigned long uLong; /* 32 bits or more */
|
typedef unsigned long uLong; /* 32 bits or more */
|
||||||
|
|
||||||
#ifdef SMALL_MEDIUM
|
#ifdef SMALL_MEDIUM
|
||||||
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
|
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
|
||||||
# define Bytef Byte FAR
|
# define Bytef Byte FAR
|
||||||
#else
|
#else
|
||||||
typedef Byte FAR Bytef;
|
typedef Byte FAR Bytef;
|
||||||
#endif
|
#endif
|
||||||
typedef char FAR charf;
|
typedef char FAR charf;
|
||||||
typedef int FAR intf;
|
typedef int FAR intf;
|
||||||
|
|
@ -379,36 +405,30 @@ typedef uInt FAR uIntf;
|
||||||
typedef uLong FAR uLongf;
|
typedef uLong FAR uLongf;
|
||||||
|
|
||||||
#ifdef STDC
|
#ifdef STDC
|
||||||
typedef void const* voidpc;
|
typedef void const *voidpc;
|
||||||
typedef void FAR* voidpf;
|
typedef void FAR *voidpf;
|
||||||
typedef void* voidp;
|
typedef void *voidp;
|
||||||
#else
|
#else
|
||||||
typedef Byte const* voidpc;
|
typedef Byte const *voidpc;
|
||||||
typedef Byte FAR* voidpf;
|
typedef Byte FAR *voidpf;
|
||||||
typedef Byte* voidp;
|
typedef Byte *voidp;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ./configure may #define Z_U4 here */
|
|
||||||
|
|
||||||
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
|
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
|
||||||
# include <limits.h>
|
# include <limits.h>
|
||||||
# if (UINT_MAX == 0xffffffffUL)
|
# if (UINT_MAX == 0xffffffffUL)
|
||||||
# define Z_U4 unsigned
|
# define Z_U4 unsigned
|
||||||
# else
|
# elif (ULONG_MAX == 0xffffffffUL)
|
||||||
# if (ULONG_MAX == 0xffffffffUL)
|
# define Z_U4 unsigned long
|
||||||
# define Z_U4 unsigned long
|
# elif (USHRT_MAX == 0xffffffffUL)
|
||||||
# else
|
# define Z_U4 unsigned short
|
||||||
# if (USHRT_MAX == 0xffffffffUL)
|
|
||||||
# define Z_U4 unsigned short
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Z_U4
|
#ifdef Z_U4
|
||||||
typedef Z_U4 z_crc_t;
|
typedef Z_U4 z_crc_t;
|
||||||
#else
|
#else
|
||||||
typedef unsigned long z_crc_t;
|
typedef unsigned long z_crc_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
|
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
|
||||||
|
|
@ -425,8 +445,16 @@ typedef unsigned long z_crc_t;
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# include <stdarg.h> /* for va_list */
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# include <stddef.h> /* for wchar_t */
|
# ifndef Z_SOLO
|
||||||
|
# include <stddef.h> /* for wchar_t */
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
|
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
|
||||||
|
|
@ -435,7 +463,7 @@ typedef unsigned long z_crc_t;
|
||||||
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
|
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
|
||||||
* equivalently requesting no 64-bit operations
|
* equivalently requesting no 64-bit operations
|
||||||
*/
|
*/
|
||||||
#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
|
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
|
||||||
# undef _LARGEFILE64_SOURCE
|
# undef _LARGEFILE64_SOURCE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -443,7 +471,7 @@ typedef unsigned long z_crc_t;
|
||||||
# define Z_HAVE_UNISTD_H
|
# define Z_HAVE_UNISTD_H
|
||||||
#endif
|
#endif
|
||||||
#ifndef Z_SOLO
|
#ifndef Z_SOLO
|
||||||
# if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
|
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
|
||||||
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
|
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
|
||||||
# ifdef VMS
|
# ifdef VMS
|
||||||
# include <unixio.h> /* for off_t */
|
# include <unixio.h> /* for off_t */
|
||||||
|
|
@ -488,19 +516,19 @@ typedef unsigned long z_crc_t;
|
||||||
|
|
||||||
/* MVS linker does not support external names larger than 8 bytes */
|
/* MVS linker does not support external names larger than 8 bytes */
|
||||||
#if defined(__MVS__)
|
#if defined(__MVS__)
|
||||||
#pragma map(deflateInit_,"DEIN")
|
#pragma map(deflateInit_,"DEIN")
|
||||||
#pragma map(deflateInit2_,"DEIN2")
|
#pragma map(deflateInit2_,"DEIN2")
|
||||||
#pragma map(deflateEnd,"DEEND")
|
#pragma map(deflateEnd,"DEEND")
|
||||||
#pragma map(deflateBound,"DEBND")
|
#pragma map(deflateBound,"DEBND")
|
||||||
#pragma map(inflateInit_,"ININ")
|
#pragma map(inflateInit_,"ININ")
|
||||||
#pragma map(inflateInit2_,"ININ2")
|
#pragma map(inflateInit2_,"ININ2")
|
||||||
#pragma map(inflateEnd,"INEND")
|
#pragma map(inflateEnd,"INEND")
|
||||||
#pragma map(inflateSync,"INSY")
|
#pragma map(inflateSync,"INSY")
|
||||||
#pragma map(inflateSetDictionary,"INSEDI")
|
#pragma map(inflateSetDictionary,"INSEDI")
|
||||||
#pragma map(compressBound,"CMBND")
|
#pragma map(compressBound,"CMBND")
|
||||||
#pragma map(inflate_table,"INTABL")
|
#pragma map(inflate_table,"INTABL")
|
||||||
#pragma map(inflate_fast,"INFA")
|
#pragma map(inflate_fast,"INFA")
|
||||||
#pragma map(inflate_copyright,"INCOPY")
|
#pragma map(inflate_copyright,"INCOPY")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* ZCONF_H */
|
#endif /* ZCONF_H */
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
||||||
/* zutil.c -- target dependent utility functions for the compression library
|
/* zutil.c -- target dependent utility functions for the compression library
|
||||||
* Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
|
* Copyright (C) 1995-2017 Jean-loup Gailly
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -10,26 +10,21 @@
|
||||||
# include "gzguts.h"
|
# include "gzguts.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NO_DUMMY_DECL
|
z_const char * const z_errmsg[10] = {
|
||||||
struct internal_state {int dummy;}; /* for buggy compilers */
|
(z_const char *)"need dictionary", /* Z_NEED_DICT 2 */
|
||||||
#endif
|
(z_const char *)"stream end", /* Z_STREAM_END 1 */
|
||||||
|
(z_const char *)"", /* Z_OK 0 */
|
||||||
const char* const z_errmsg[10] =
|
(z_const char *)"file error", /* Z_ERRNO (-1) */
|
||||||
{
|
(z_const char *)"stream error", /* Z_STREAM_ERROR (-2) */
|
||||||
"need dictionary", /* Z_NEED_DICT 2 */
|
(z_const char *)"data error", /* Z_DATA_ERROR (-3) */
|
||||||
"stream end", /* Z_STREAM_END 1 */
|
(z_const char *)"insufficient memory", /* Z_MEM_ERROR (-4) */
|
||||||
"", /* Z_OK 0 */
|
(z_const char *)"buffer error", /* Z_BUF_ERROR (-5) */
|
||||||
"file error", /* Z_ERRNO (-1) */
|
(z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
|
||||||
"stream error", /* Z_STREAM_ERROR (-2) */
|
(z_const char *)""
|
||||||
"data error", /* Z_DATA_ERROR (-3) */
|
|
||||||
"insufficient memory", /* Z_MEM_ERROR (-4) */
|
|
||||||
"buffer error", /* Z_BUF_ERROR (-5) */
|
|
||||||
"incompatible version",/* Z_VERSION_ERROR (-6) */
|
|
||||||
""
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const char* ZEXPORT zlibVersion()
|
const char * ZEXPORT zlibVersion()
|
||||||
{
|
{
|
||||||
return ZLIB_VERSION;
|
return ZLIB_VERSION;
|
||||||
}
|
}
|
||||||
|
|
@ -39,76 +34,31 @@ uLong ZEXPORT zlibCompileFlags()
|
||||||
uLong flags;
|
uLong flags;
|
||||||
|
|
||||||
flags = 0;
|
flags = 0;
|
||||||
|
switch ((int)(sizeof(uInt))) {
|
||||||
switch ((int)(sizeof(uInt)))
|
case 2: break;
|
||||||
{
|
case 4: flags += 1; break;
|
||||||
case 2:
|
case 8: flags += 2; break;
|
||||||
break;
|
default: flags += 3;
|
||||||
|
|
||||||
case 4:
|
|
||||||
flags += 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 8:
|
|
||||||
flags += 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
flags += 3;
|
|
||||||
}
|
}
|
||||||
|
switch ((int)(sizeof(uLong))) {
|
||||||
switch ((int)(sizeof(uLong)))
|
case 2: break;
|
||||||
{
|
case 4: flags += 1 << 2; break;
|
||||||
case 2:
|
case 8: flags += 2 << 2; break;
|
||||||
break;
|
default: flags += 3 << 2;
|
||||||
|
|
||||||
case 4:
|
|
||||||
flags += 1 << 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 8:
|
|
||||||
flags += 2 << 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
flags += 3 << 2;
|
|
||||||
}
|
}
|
||||||
|
switch ((int)(sizeof(voidpf))) {
|
||||||
switch ((int)(sizeof(voidpf)))
|
case 2: break;
|
||||||
{
|
case 4: flags += 1 << 4; break;
|
||||||
case 2:
|
case 8: flags += 2 << 4; break;
|
||||||
break;
|
default: flags += 3 << 4;
|
||||||
|
|
||||||
case 4:
|
|
||||||
flags += 1 << 4;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 8:
|
|
||||||
flags += 2 << 4;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
flags += 3 << 4;
|
|
||||||
}
|
}
|
||||||
|
switch ((int)(sizeof(z_off_t))) {
|
||||||
switch ((int)(sizeof(z_off_t)))
|
case 2: break;
|
||||||
{
|
case 4: flags += 1 << 6; break;
|
||||||
case 2:
|
case 8: flags += 2 << 6; break;
|
||||||
break;
|
default: flags += 3 << 6;
|
||||||
|
|
||||||
case 4:
|
|
||||||
flags += 1 << 6;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 8:
|
|
||||||
flags += 2 << 6;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
flags += 3 << 6;
|
|
||||||
}
|
}
|
||||||
|
#ifdef ZLIB_DEBUG
|
||||||
#ifdef DEBUG
|
|
||||||
flags += 1 << 8;
|
flags += 1 << 8;
|
||||||
#endif
|
#endif
|
||||||
#if defined(ASMV) || defined(ASMINF)
|
#if defined(ASMV) || defined(ASMINF)
|
||||||
|
|
@ -162,15 +112,15 @@ uLong ZEXPORT zlibCompileFlags()
|
||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef ZLIB_DEBUG
|
||||||
|
#include <stdlib.h>
|
||||||
# ifndef verbose
|
# ifndef verbose
|
||||||
# define verbose 0
|
# define verbose 0
|
||||||
# endif
|
# endif
|
||||||
int ZLIB_INTERNAL z_verbose = verbose;
|
int ZLIB_INTERNAL z_verbose = verbose;
|
||||||
|
|
||||||
void ZLIB_INTERNAL z_error(m)
|
void ZLIB_INTERNAL z_error (m)
|
||||||
char* m;
|
char *m;
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s\n", m);
|
fprintf(stderr, "%s\n", m);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
@ -180,66 +130,54 @@ char* m;
|
||||||
/* exported to allow conversion of error code to string for compress() and
|
/* exported to allow conversion of error code to string for compress() and
|
||||||
* uncompress()
|
* uncompress()
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
const char * ZEXPORT zError(err)
|
||||||
const char* ZEXPORT zError(int err)
|
int err;
|
||||||
#else
|
|
||||||
const char* ZEXPORT zError(err)
|
|
||||||
int err;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
return ERR_MSG(err);
|
return ERR_MSG(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(_WIN32_WCE)
|
#if defined(_WIN32_WCE)
|
||||||
/* The Microsoft C Run-Time Library for Windows CE doesn't have
|
/* The Microsoft C Run-Time Library for Windows CE doesn't have
|
||||||
* errno. We define it as a global variable to simplify porting.
|
* errno. We define it as a global variable to simplify porting.
|
||||||
* Its value is always 0 and should not be used.
|
* Its value is always 0 and should not be used.
|
||||||
*/
|
*/
|
||||||
int errno = 0;
|
int errno = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef HAVE_MEMCPY
|
#ifndef HAVE_MEMCPY
|
||||||
|
|
||||||
void ZLIB_INTERNAL zmemcpy(dest, source, len)
|
void ZLIB_INTERNAL zmemcpy(dest, source, len)
|
||||||
Bytef* dest;
|
Bytef* dest;
|
||||||
const Bytef* source;
|
const Bytef* source;
|
||||||
uInt len;
|
uInt len;
|
||||||
{
|
{
|
||||||
if (len == 0) return;
|
if (len == 0) return;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
*dest++ = *source++; /* ??? to be unrolled */
|
*dest++ = *source++; /* ??? to be unrolled */
|
||||||
}
|
} while (--len != 0);
|
||||||
while (--len != 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ZLIB_INTERNAL zmemcmp(s1, s2, len)
|
int ZLIB_INTERNAL zmemcmp(s1, s2, len)
|
||||||
const Bytef* s1;
|
const Bytef* s1;
|
||||||
const Bytef* s2;
|
const Bytef* s2;
|
||||||
uInt len;
|
uInt len;
|
||||||
{
|
{
|
||||||
uInt j;
|
uInt j;
|
||||||
|
|
||||||
for (j = 0; j < len; j++)
|
for (j = 0; j < len; j++) {
|
||||||
{
|
if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
|
||||||
if (s1[j] != s2[j]) return 2 * (s1[j] > s2[j]) - 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ZLIB_INTERNAL zmemzero(dest, len)
|
void ZLIB_INTERNAL zmemzero(dest, len)
|
||||||
Bytef* dest;
|
Bytef* dest;
|
||||||
uInt len;
|
uInt len;
|
||||||
{
|
{
|
||||||
if (len == 0) return;
|
if (len == 0) return;
|
||||||
|
do {
|
||||||
do
|
|
||||||
{
|
|
||||||
*dest++ = 0; /* ??? to be unrolled */
|
*dest++ = 0; /* ??? to be unrolled */
|
||||||
}
|
} while (--len != 0);
|
||||||
while (--len != 0);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -263,8 +201,7 @@ uInt len;
|
||||||
|
|
||||||
local int next_ptr = 0;
|
local int next_ptr = 0;
|
||||||
|
|
||||||
typedef struct ptr_table_s
|
typedef struct ptr_table_s {
|
||||||
{
|
|
||||||
voidpf org_ptr;
|
voidpf org_ptr;
|
||||||
voidpf new_ptr;
|
voidpf new_ptr;
|
||||||
} ptr_table;
|
} ptr_table;
|
||||||
|
|
@ -277,63 +214,53 @@ local ptr_table table[MAX_PTR];
|
||||||
* a protected system like OS/2. Use Microsoft C instead.
|
* a protected system like OS/2. Use Microsoft C instead.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
|
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
|
||||||
{
|
{
|
||||||
voidpf buf = opaque; /* just to make some compilers happy */
|
voidpf buf;
|
||||||
ulg bsize = (ulg)items * size;
|
ulg bsize = (ulg)items*size;
|
||||||
|
|
||||||
|
(void)opaque;
|
||||||
|
|
||||||
/* If we allocate less than 65520 bytes, we assume that farmalloc
|
/* If we allocate less than 65520 bytes, we assume that farmalloc
|
||||||
* will return a usable pointer which doesn't have to be normalized.
|
* will return a usable pointer which doesn't have to be normalized.
|
||||||
*/
|
*/
|
||||||
if (bsize < 65520L)
|
if (bsize < 65520L) {
|
||||||
{
|
|
||||||
buf = farmalloc(bsize);
|
buf = farmalloc(bsize);
|
||||||
|
|
||||||
if (*(ush*)&buf != 0) return buf;
|
if (*(ush*)&buf != 0) return buf;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
buf = farmalloc(bsize + 16L);
|
buf = farmalloc(bsize + 16L);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
|
if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
|
||||||
|
|
||||||
table[next_ptr].org_ptr = buf;
|
table[next_ptr].org_ptr = buf;
|
||||||
|
|
||||||
/* Normalize the pointer to seg:0 */
|
/* Normalize the pointer to seg:0 */
|
||||||
*((ush*)&buf + 1) += ((ush)((uch*)buf - 0) + 15) >> 4;
|
*((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
|
||||||
*(ush*)&buf = 0;
|
*(ush*)&buf = 0;
|
||||||
table[next_ptr++].new_ptr = buf;
|
table[next_ptr++].new_ptr = buf;
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
|
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
if (*(ush*)&ptr != 0) /* object < 64K */
|
(void)opaque;
|
||||||
{
|
|
||||||
|
if (*(ush*)&ptr != 0) { /* object < 64K */
|
||||||
farfree(ptr);
|
farfree(ptr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Find the original pointer */
|
/* Find the original pointer */
|
||||||
for (n = 0; n < next_ptr; n++)
|
for (n = 0; n < next_ptr; n++) {
|
||||||
{
|
|
||||||
if (ptr != table[n].new_ptr) continue;
|
if (ptr != table[n].new_ptr) continue;
|
||||||
|
|
||||||
farfree(table[n].org_ptr);
|
farfree(table[n].org_ptr);
|
||||||
|
while (++n < next_ptr) {
|
||||||
while (++n < next_ptr)
|
table[n-1] = table[n];
|
||||||
{
|
|
||||||
table[n - 1] = table[n];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
next_ptr--;
|
next_ptr--;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ptr = opaque; /* just to make some compilers happy */
|
|
||||||
Assert(0, "zcfree: ptr not found");
|
Assert(0, "zcfree: ptr not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -350,17 +277,15 @@ void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
|
||||||
# define _hfree hfree
|
# define _hfree hfree
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
|
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
|
||||||
{
|
{
|
||||||
if (opaque) opaque = 0; /* to make compiler happy */
|
(void)opaque;
|
||||||
|
|
||||||
return _halloc((long)items, size);
|
return _halloc((long)items, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
|
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
|
||||||
{
|
{
|
||||||
if (opaque) opaque = 0; /* to make compiler happy */
|
(void)opaque;
|
||||||
|
|
||||||
_hfree(ptr);
|
_hfree(ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -377,32 +302,22 @@ extern voidp calloc OF((uInt items, uInt size));
|
||||||
extern void free OF((voidpf ptr));
|
extern void free OF((voidpf ptr));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
|
||||||
voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
|
voidpf opaque;
|
||||||
#else
|
unsigned items;
|
||||||
voidpf ZLIB_INTERNAL zcalloc(opaque, items, size)
|
unsigned size;
|
||||||
voidpf opaque;
|
|
||||||
unsigned items;
|
|
||||||
unsigned size;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
if (opaque) items += size - size; /* make compiler happy */
|
(void)opaque;
|
||||||
|
|
||||||
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
|
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
|
||||||
(voidpf)calloc(items, size);
|
(voidpf)calloc(items, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
void ZLIB_INTERNAL zcfree (opaque, ptr)
|
||||||
void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
|
voidpf opaque;
|
||||||
#else
|
voidpf ptr;
|
||||||
void ZLIB_INTERNAL zcfree(opaque, ptr)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf ptr;
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
|
(void)opaque;
|
||||||
free(ptr);
|
free(ptr);
|
||||||
|
|
||||||
if (opaque) return; /* make compiler happy */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* MY_ZCALLOC */
|
#endif /* MY_ZCALLOC */
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* zutil.h -- internal interface and configuration of the compression library
|
/* zutil.h -- internal interface and configuration of the compression library
|
||||||
* Copyright (C) 1995-2012 Jean-loup Gailly.
|
* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -30,13 +30,15 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Z_SOLO
|
#ifdef Z_SOLO
|
||||||
typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
|
typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef local
|
#ifndef local
|
||||||
# define local static
|
# define local static
|
||||||
#endif
|
#endif
|
||||||
/* compile with -Dlocal if your debugger can't find static symbols */
|
/* since "static" is used to mean two completely different things in C, we
|
||||||
|
define "local" for the non-static meaning of "static", for readability
|
||||||
|
(compile with -Dlocal if your debugger can't find static symbols) */
|
||||||
|
|
||||||
typedef unsigned char uch;
|
typedef unsigned char uch;
|
||||||
typedef uch FAR uchf;
|
typedef uch FAR uchf;
|
||||||
|
|
@ -44,16 +46,16 @@ typedef unsigned short ush;
|
||||||
typedef ush FAR ushf;
|
typedef ush FAR ushf;
|
||||||
typedef unsigned long ulg;
|
typedef unsigned long ulg;
|
||||||
|
|
||||||
extern const char* const z_errmsg[10]; /* indexed by 2-zlib_error */
|
extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
||||||
/* (size given to avoid silly warnings with Visual C++) */
|
/* (size given to avoid silly warnings with Visual C++) */
|
||||||
|
|
||||||
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
|
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
|
||||||
|
|
||||||
#define ERR_RETURN(strm,err) \
|
#define ERR_RETURN(strm,err) \
|
||||||
return (strm->msg = (char*)ERR_MSG(err), (err))
|
return (strm->msg = ERR_MSG(err), (err))
|
||||||
/* To be used only when the state is known to be valid */
|
/* To be used only when the state is known to be valid */
|
||||||
|
|
||||||
/* common constants */
|
/* common constants */
|
||||||
|
|
||||||
#ifndef DEF_WBITS
|
#ifndef DEF_WBITS
|
||||||
# define DEF_WBITS MAX_WBITS
|
# define DEF_WBITS MAX_WBITS
|
||||||
|
|
@ -78,16 +80,16 @@ extern const char* const z_errmsg[10]; /* indexed by 2-zlib_error */
|
||||||
|
|
||||||
#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
|
#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
|
||||||
|
|
||||||
/* target dependencies */
|
/* target dependencies */
|
||||||
|
|
||||||
#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
|
#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
|
||||||
# define OS_CODE 0x00
|
# define OS_CODE 0x00
|
||||||
# ifndef Z_SOLO
|
# ifndef Z_SOLO
|
||||||
# if defined(__TURBOC__) || defined(__BORLANDC__)
|
# if defined(__TURBOC__) || defined(__BORLANDC__)
|
||||||
# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
|
# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
|
||||||
/* Allow compilation with ANSI keywords only enabled */
|
/* Allow compilation with ANSI keywords only enabled */
|
||||||
void _Cdecl farfree(void* block);
|
void _Cdecl farfree( void *block );
|
||||||
void* _Cdecl farmalloc(unsigned long nbytes);
|
void *_Cdecl farmalloc( unsigned long nbytes );
|
||||||
# else
|
# else
|
||||||
# include <alloc.h>
|
# include <alloc.h>
|
||||||
# endif
|
# endif
|
||||||
|
|
@ -98,28 +100,38 @@ void* _Cdecl farmalloc(unsigned long nbytes);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef AMIGA
|
#ifdef AMIGA
|
||||||
# define OS_CODE 0x01
|
# define OS_CODE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(VAXC) || defined(VMS)
|
#if defined(VAXC) || defined(VMS)
|
||||||
# define OS_CODE 0x02
|
# define OS_CODE 2
|
||||||
# define F_OPEN(name, mode) \
|
# define F_OPEN(name, mode) \
|
||||||
fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
|
fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __370__
|
||||||
|
# if __TARGET_LIB__ < 0x20000000
|
||||||
|
# define OS_CODE 4
|
||||||
|
# elif __TARGET_LIB__ < 0x40000000
|
||||||
|
# define OS_CODE 11
|
||||||
|
# else
|
||||||
|
# define OS_CODE 8
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(ATARI) || defined(atarist)
|
#if defined(ATARI) || defined(atarist)
|
||||||
# define OS_CODE 0x05
|
# define OS_CODE 5
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef OS2
|
#ifdef OS2
|
||||||
# define OS_CODE 0x06
|
# define OS_CODE 6
|
||||||
# if defined(M_I86) && !defined(Z_SOLO)
|
# if defined(M_I86) && !defined(Z_SOLO)
|
||||||
# include <malloc.h>
|
# include <malloc.h>
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MACOS) || defined(TARGET_OS_MAC)
|
#if defined(MACOS) || defined(TARGET_OS_MAC)
|
||||||
# define OS_CODE 0x07
|
# define OS_CODE 7
|
||||||
# ifndef Z_SOLO
|
# ifndef Z_SOLO
|
||||||
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
|
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
|
||||||
# include <unix.h> /* for fdopen */
|
# include <unix.h> /* for fdopen */
|
||||||
|
|
@ -131,18 +143,24 @@ void* _Cdecl farmalloc(unsigned long nbytes);
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TOPS20
|
#ifdef __acorn
|
||||||
# define OS_CODE 0x0a
|
# define OS_CODE 13
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||||
# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
|
# define OS_CODE 10
|
||||||
# define OS_CODE 0x0b
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __50SERIES /* Prime/PRIMOS */
|
#ifdef _BEOS_
|
||||||
# define OS_CODE 0x0f
|
# define OS_CODE 16
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __TOS_OS400__
|
||||||
|
# define OS_CODE 18
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
# define OS_CODE 19
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_BEOS_) || defined(RISCOS)
|
#if defined(_BEOS_) || defined(RISCOS)
|
||||||
|
|
@ -153,7 +171,7 @@ void* _Cdecl farmalloc(unsigned long nbytes);
|
||||||
# if defined(_WIN32_WCE)
|
# if defined(_WIN32_WCE)
|
||||||
# define fdopen(fd,mode) NULL /* No fdopen() */
|
# define fdopen(fd,mode) NULL /* No fdopen() */
|
||||||
# ifndef _PTRDIFF_T_DEFINED
|
# ifndef _PTRDIFF_T_DEFINED
|
||||||
typedef int ptrdiff_t;
|
typedef int ptrdiff_t;
|
||||||
# define _PTRDIFF_T_DEFINED
|
# define _PTRDIFF_T_DEFINED
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
|
|
@ -162,37 +180,38 @@ typedef int ptrdiff_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__BORLANDC__) && !defined(MSDOS)
|
#if defined(__BORLANDC__) && !defined(MSDOS)
|
||||||
#pragma warn -8004
|
#pragma warn -8004
|
||||||
#pragma warn -8008
|
#pragma warn -8008
|
||||||
#pragma warn -8066
|
#pragma warn -8066
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* provide prototypes for these when building zlib without LFS */
|
/* provide prototypes for these when building zlib without LFS */
|
||||||
#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
|
#if !defined(_WIN32) && \
|
||||||
ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
|
(!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
|
||||||
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
|
ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
|
||||||
|
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* common defaults */
|
/* common defaults */
|
||||||
|
|
||||||
#ifndef OS_CODE
|
#ifndef OS_CODE
|
||||||
# define OS_CODE 0x03 /* assume Unix */
|
# define OS_CODE 3 /* assume Unix */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef F_OPEN
|
#ifndef F_OPEN
|
||||||
# define F_OPEN(name, mode) fopen((name), (mode))
|
# define F_OPEN(name, mode) fopen((name), (mode))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* functions */
|
/* functions */
|
||||||
|
|
||||||
#if defined(pyr) || defined(Z_SOLO)
|
#if defined(pyr) || defined(Z_SOLO)
|
||||||
# define NO_MEMCPY
|
# define NO_MEMCPY
|
||||||
#endif
|
#endif
|
||||||
#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
|
#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
|
||||||
/* Use our own functions for small and medium model with MSC <= 5.0.
|
/* Use our own functions for small and medium model with MSC <= 5.0.
|
||||||
* You may have to use the same strategy for Borland C (untested).
|
* You may have to use the same strategy for Borland C (untested).
|
||||||
* The __SC__ check is for Symantec.
|
* The __SC__ check is for Symantec.
|
||||||
*/
|
*/
|
||||||
# define NO_MEMCPY
|
# define NO_MEMCPY
|
||||||
#endif
|
#endif
|
||||||
#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
|
#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
|
||||||
|
|
@ -209,16 +228,16 @@ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
|
||||||
# define zmemzero(dest, len) memset(dest, 0, len)
|
# define zmemzero(dest, len) memset(dest, 0, len)
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
|
void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
|
||||||
int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
|
int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
|
||||||
void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
|
void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Diagnostic functions */
|
/* Diagnostic functions */
|
||||||
#ifdef DEBUG
|
#ifdef ZLIB_DEBUG
|
||||||
# include <stdio.h>
|
# include <stdio.h>
|
||||||
extern int ZLIB_INTERNAL z_verbose;
|
extern int ZLIB_INTERNAL z_verbose;
|
||||||
extern void ZLIB_INTERNAL z_error OF((char* m));
|
extern void ZLIB_INTERNAL z_error OF((char *m));
|
||||||
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
|
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
|
||||||
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
|
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
|
||||||
# define Tracev(x) {if (z_verbose>0) fprintf x ;}
|
# define Tracev(x) {if (z_verbose>0) fprintf x ;}
|
||||||
|
|
@ -235,9 +254,9 @@ extern void ZLIB_INTERNAL z_error OF((char* m));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef Z_SOLO
|
#ifndef Z_SOLO
|
||||||
voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
|
voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
|
||||||
unsigned size));
|
unsigned size));
|
||||||
void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
|
void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ZALLOC(strm, items, size) \
|
#define ZALLOC(strm, items, size) \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue