NetBSD/common/dist/zlib/examples/gzlog.c
christos c34236556b Changes in 1.2.10 (2 Jan 2017)
- Avoid warnings on snprintf() return value
- Fix bug in deflate_stored() for zero-length input
- Fix bug in gzwrite.c that produced corrupt gzip files
- Remove files to be installed before copying them in Makefile.in
- Add warnings when compiling with assembler code

Changes in 1.2.9 (31 Dec 2016)
- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
- Improve contrib/blast to return unused bytes
- Assure that gzoffset() is correct when appending
- Improve compress() and uncompress() to support large lengths
- Fix bug in test/example.c where error code not saved
- Remedy Coverity warning [Randers-Pehrson]
- Improve speed of gzprintf() in transparent mode
- Fix inflateInit2() bug when windowBits is 16 or 32
- Change DEBUG macro to ZLIB_DEBUG
- Avoid uninitialized access by gzclose_w()
- 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)
- Replace use of memmove() with a simple copy for portability
- Test for existence of strerror
- Restore gzgetc_ for backward compatibility with 1.2.6
- Fix build with non-GNU make on Solaris
- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
- Include unistd.h for Watcom C
- Use __WATCOMC__ instead of __WATCOM__
- Do not use the visibility attribute if NO_VIZ defined
- Improve the detection of no hidden visibility attribute
- Avoid using __int64 for gcc or solo compilation
- Cast to char * in gzprintf to avoid warnings [Zinser]
- Fix make_vms.com for VAX [Zinser]
- Don't use library or built-in byte swaps
- Simplify test and use of gcc hidden attribute
- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
- Fix bug in test/minigzip.c for configure --solo
- Fix contrib/vstudio project link errors [Mohanathas]
- Add ability to choose the builder in make_vms.com [Schweda]
- Add DESTDIR support to mingw32 win32/Makefile.gcc
- Fix comments in win32/Makefile.gcc for proper usage
- Allow overriding the default install locations for cmake
- Generate and install the pkg-config file with cmake
- Build both a static and a shared version of zlib with cmake
- Include version symbols for cmake builds
- If using cmake with MSVC, add the source directory to the includes
- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
- Move obsolete emx makefile to old [Truta]
- Allow the use of -Wundef when compiling or using zlib
- Avoid the use of the -u option with mktemp
- Improve inflate() documentation on the use of Z_FINISH
- Recognize clang as gcc
- Add gzopen_w() in Windows for wide character path names
- Rename zconf.h in CMakeLists.txt to move it out of the way
- Add source directory in CMakeLists.txt for building examples
- Look in build directory for zlib.pc in CMakeLists.txt
- Remove gzflags from zlibvc.def in vc9 and vc10
- Fix contrib/minizip compilation in the MinGW environment
- Update ./configure for Solaris, support --64 [Mooney]
- Remove -R. from Solaris shared build (possible security issue)
- Avoid race condition for parallel make (-j) running example
- Fix type mismatch between get_crc_table() and crc_table
- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
- Fix the path to zlib.map in CMakeLists.txt
- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
- Add instructions to win32/Makefile.gcc for shared install [Torri]

Changes in 1.2.6.1 (12 Feb 2012)
- Avoid the use of the Objective-C reserved name "id"
- Include io.h in gzguts.h for Microsoft compilers
- Fix problem with ./configure --prefix and gzgetc macro
- Include gz_header definition when compiling zlib solo
- Put gzflags() functionality back in zutil.c
- Avoid library header include in crc32.c for Z_SOLO
- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
- Minor cleanup in contrib/minizip/zip.c [Vollant]
- Update make_vms.com [Zinser]
- Remove unnecessary gzgetc_ function
- Use optimized byte swap operations for Microsoft and GNU [Snyder]
- Fix minor typo in zlib.h comments [Rzesniowiecki]

Changes in 1.2.6 (29 Jan 2012)
- Update the Pascal interface in contrib/pascal
- Fix function numbers for gzgetc_ in zlibvc.def files
- Fix configure.ac for contrib/minizip [Schiffer]
- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
- Have ./configure use the compiler return code for error indication
- Fix CMakeLists.txt for cross compilation [McClure]
- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
- Fix compilation of contrib/minizip on FreeBSD [Marquez]
- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
- Include io.h for Turbo C / Borland C on all platforms [Truta]
- Make version explicit in contrib/minizip/configure.ac [Bosmans]
- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
- Minor cleanup up contrib/minizip/unzip.c [Vollant]
- Fix bug when compiling minizip with C++ [Vollant]
- Protect for long name and extra fields in contrib/minizip [Vollant]
- Avoid some warnings in contrib/minizip [Vollant]
- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
- Add missing libs to minizip linker command
- Add support for VPATH builds in contrib/minizip
- Add an --enable-demos option to contrib/minizip/configure
- Add the generation of configure.log by ./configure
- Exit when required parameters not provided to win32/Makefile.gcc
- Have gzputc return the character written instead of the argument
- Use the -m option on ldconfig for BSD systems [Tobias]
- Correct in zlib.map when deflateResetKeep was added

Changes in 1.2.5.3 (15 Jan 2012)
- Restore gzgetc function for binary compatibility
- Do not use _lseeki64 under Borland C++ [Truta]
- Update win32/Makefile.msc to build test/*.c [Truta]
- Remove old/visualc6 given CMakefile and other alternatives
- Update AS400 build files and documentation [Monnerat]
- Update win32/Makefile.gcc to build test/*.c [Truta]
- Permit stronger flushes after Z_BLOCK flushes
- Avoid extraneous empty blocks when doing empty flushes
- Permit Z_NULL arguments to deflatePending
- Allow deflatePrime() to insert bits in the middle of a stream
- Remove second empty static block for Z_PARTIAL_FLUSH
- Write out all of the available bits when using Z_BLOCK
- Insert the first two strings in the hash table after a flush

Changes in 1.2.5.2 (17 Dec 2011)
- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
- use relative symlinks for shared libs
- Avoid searching past window for Z_RLE strategy
- Assure that high-water mark initialization is always applied in deflate
- Add assertions to fill_window() in deflate.c to match comments
- Update python link in README
- Correct spelling error in gzread.c
- Fix bug in gzgets() for a concatenated empty gzip stream
- Correct error in comment for gz_make()
- Change gzread() and related to ignore junk after gzip streams
- Allow gzread() and related to continue after gzclearerr()
- Allow gzrewind() and gzseek() after a premature end-of-file
- Simplify gzseek() now that raw after gzip is ignored
- Change gzgetc() to a macro for speed (~40% speedup in testing)
- Fix gzclose() to return the actual error last encountered
- Always add large file support for windows
- Include zconf.h for windows large file support
- Include zconf.h.cmakein for windows large file support
- Update zconf.h.cmakein on make distclean
- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
- Clarify how gzopen() appends in zlib.h comments
- Correct documentation of gzdirect() since junk at end now ignored
- Add a transparent write mode to gzopen() when 'T' is in the mode
- Update python link in zlib man page
- Get inffixed.h and MAKEFIXED result to match
- Add a ./config --solo option to make zlib subset with no library use
- Add undocumented inflateResetKeep() function for CAB file decoding
- Add --cover option to ./configure for gcc coverage testing
- Add #define ZLIB_CONST option to use const in the z_stream interface
- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
- Note behavior of uncompress() to provide as much data as it can
- Add files in contrib/minizip to aid in building libminizip
- Split off AR options in Makefile.in and configure
- Change ON macro to Z_ARG to avoid application conflicts
- Facilitate compilation with Borland C++ for pragmas and vsnprintf
- Include io.h for Turbo C / Borland C++
- Move example.c and minigzip.c to test/
- Simplify incomplete code table filling in inflate_table()
- Remove code from inflate.c and infback.c that is impossible to execute
- Test the inflate code with full coverage
- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
- Fix gzwrite.c to accommodate reduced memory zlib compilation
- Have inflate() with Z_FINISH avoid the allocation of a window
- Do not set strm->adler when doing raw inflate
- Fix gzeof() to behave just like feof() when read is not past end of file
- Fix bug in gzread.c when end-of-file is reached
- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
- Document gzread() capability to read concurrently written files
- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]

Changes in 1.2.5.1 (10 Sep 2011)
- Update FAQ entry on shared builds (#13)
- Avoid symbolic argument to chmod in Makefile.in
- Fix bug and add consts in contrib/puff [Oberhumer]
- Update contrib/puff/zeros.raw test file to have all block types
- Add full coverage test for puff in contrib/puff/Makefile
- Fix static-only-build install in Makefile.in
- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
- Add libz.a dependency to shared in Makefile.in for parallel builds
- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
- Replace $(...) with `...` in configure for non-bash sh [Bowler]
- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
- Add solaris* to Linux* in configure to allow gcc use [Groffen]
- Add *bsd* to Linux* case in configure [Bar-Lev]
- Add inffast.obj to dependencies in win32/Makefile.msc
- Correct spelling error in deflate.h [Kohler]
- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
- Add test to configure for GNU C looking for gcc in output of $cc -v
- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
- Make stronger test in zconf.h to include unistd.h for LFS
- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
- Fix zlib.h LFS support when Z_PREFIX used
- Add updated as400 support (removed from old) [Monnerat]
- Avoid deflate sensitivity to volatile input data
- Avoid division in adler32_combine for NO_DIVIDE
- Clarify the use of Z_FINISH with deflateBound() amount of space
- Set binary for output file in puff.c
- Use u4 type for crc_table to avoid conversion warnings
- Apply casts in zlib.h to avoid conversion warnings
- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
- Improve inflateSync() documentation to note indeterminancy
- Add deflatePending() function to return the amount of pending output
- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
- Add a check in configure for stdarg.h, use for gzprintf()
- Check that pointers fit in ints when gzprint() compiled old style
- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
- Add debug records in assmebler code [Londer]
- Update RFC references to use http://tools.ietf.org/html/... [Li]
- Add --archs option, use of libtool to configure for Mac OS X [Borstel]

Changes in 1.2.5 (19 Apr 2010)
- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
- Default to libdir as sharedlibdir in configure [Nieder]
- Update copyright dates on modified source files
- Update trees.c to be able to generate modified trees.h
- Exit configure for MinGW, suggesting win32/Makefile.gcc
- Check for NULL path in gz_open [Homurlu]

Changes in 1.2.4.5 (18 Apr 2010)
- Set sharedlibdir in configure [Torok]
- Set LDFLAGS in Makefile.in [Bar-Lev]
- Avoid mkdir objs race condition in Makefile.in [Bowler]
- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
- Don't use hidden attribute when it is a warning generator (e.g. Solaris)

Changes in 1.2.4.4 (18 Apr 2010)
- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
- Try to use bash or ksh regardless of functionality of /bin/sh
- Fix configure incompatibility with NetBSD sh
- Remove attempt to run under bash or ksh since have better NetBSD fix
- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
- Add diagnostic messages when using CROSS_PREFIX in configure
- Added --sharedlibdir option to configure [Weigelt]
- Use hidden visibility attribute when available [Frysinger]

Changes in 1.2.4.3 (10 Apr 2010)
- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
- Use CROSS_PREFIX for nm [Bar-Lev]
- Assume _LARGEFILE64_SOURCE defined is equivalent to true
- Avoid use of undefined symbols in #if with && and ||
- Make *64 prototypes in gzguts.h consistent with functions
- Add -shared load option for MinGW in configure [Bowler]
- Move z_off64_t to public interface, use instead of off64_t
- Remove ! from shell test in configure (not portable to Solaris)
- Change +0 macro tests to -0 for possibly increased portability

Changes in 1.2.4.2 (9 Apr 2010)
- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
- Really provide prototypes for *64 functions when building without LFS
- Only define unlink() in minigzip.c if unistd.h not included
- Update README to point to contrib/vstudio project files
- Move projects/vc6 to old/ and remove projects/
- Include stdlib.h in minigzip.c for setmode() definition under WinCE
- Clean up assembler builds in win32/Makefile.msc [Rowe]
- Include sys/types.h for Microsoft for off_t definition
- Fix memory leak on error in gz_open()
- Symbolize nm as $NM in configure [Weigelt]
- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
- Fix bug in gzeof() to take into account unused input data
- Avoid initialization of structures with variables in puff.c
- Updated win32/README-WIN32.txt [Rowe]

Changes in 1.2.4.1 (28 Mar 2010)
- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
- Restore "for debugging" comment on sprintf() in gzlib.c
- Remove fdopen for MVS from gzguts.h
- Put new README-WIN32.txt in win32 [Rowe]
- Add check for shell to configure and invoke another shell if needed
- Fix big fat stinking bug in gzseek() on uncompressed files
- Remove vestigial F_OPEN64 define in zutil.h
- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
- Avoid errors on non-LFS systems when applications define LFS macros
- Set EXE to ".exe" in configure for MINGW [Kahle]
- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
- Add DLL install in win32/makefile.gcc [Bar-Lev]
- Allow Linux* or linux* from uname in configure [Bar-Lev]
- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
- Add cross-compilation prefixes to configure [Bar-Lev]
- Match type exactly in gz_load() invocation in gzread.c
- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
- Provide prototypes for *64 functions when building zlib without LFS
- Don't use -lc when linking shared library on MinGW
- Remove errno.h check in configure and vestigial errno code in zutil.h

Changes in 1.2.4 (14 Mar 2010)
- Fix VER3 extraction in configure for no fourth subversion
- Update zlib.3, add docs to Makefile.in to make .pdf out of it
- Add zlib.3.pdf to distribution
- Don't set error code in gzerror() if passed pointer is NULL
- Apply destination directory fixes to CMakeLists.txt [Lowman]
- Move #cmakedefine's to a new zconf.in.cmakein
- Restore zconf.h for builds that don't use configure or cmake
- Add distclean to dummy Makefile for convenience
- Update and improve INDEX, README, and FAQ
- Update CMakeLists.txt for the return of zconf.h [Lowman]
- Update contrib/vstudio/vc9 and vc10 [Vollant]
- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
- Apply license and readme changes to contrib/asm686 [Raiter]
- Check file name lengths and add -c option in minigzip.c [Li]
- Update contrib/amd64 and contrib/masmx86/ [Vollant]
- Avoid use of "eof" parameter in trees.c to not shadow library variable
- Update make_vms.com for removal of zlibdefs.h [Zinser]
- Update assembler code and vstudio projects in contrib [Vollant]
- Remove outdated assembler code contrib/masm686 and contrib/asm586
- Remove old vc7 and vc8 from contrib/vstudio
- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
- Fix bug in void-returning vsprintf() case in gzwrite.c
- Fix name change from inflate.h in contrib/inflate86/inffas86.c
- Check if temporary file exists before removing in make_vms.com [Zinser]
- Fix make install and uninstall for --static option
- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
- Update readme.txt in contrib/masmx64 and masmx86 to assemble

Changes in 1.2.3.9 (21 Feb 2010)
- Expunge gzio.c
- Move as400 build information to old
- Fix updates in contrib/minizip and contrib/vstudio
- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
- Delete zconf.h (made by configure) [Weigelt]
- Change zconf.in.h to zconf.h.in per convention [Weigelt]
- Check for NULL buf in gzgets()
- Return empty string for gzgets() with len == 1 (like fgets())
- Fix description of gzgets() in zlib.h for end-of-file, NULL return
- Update minizip to 1.1 [Vollant]
- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
- Note in zlib.h that gzerror() should be used to distinguish from EOF
- Remove use of snprintf() from gzlib.c
- Fix bug in gzseek()
- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
- Fix zconf.h generation in CMakeLists.txt [Lowman]
- Improve comments in zconf.h where modified by configure

Changes in 1.2.3.8 (13 Feb 2010)
- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
- Fix missing error return in gzflush(), add zlib.h note
- Add *64 functions to zlib.map [Levin]
- Fix signed/unsigned comparison in gz_comp()
- Use SFLAGS when testing shared linking in configure
- Add --64 option to ./configure to use -m64 with gcc
- Fix ./configure --help to correctly name options
- Have make fail if a test fails [Levin]
- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
- Remove assembler object files from contrib

Changes in 1.2.3.7 (24 Jan 2010)
- Always gzopen() with O_LARGEFILE if available
- Fix gzdirect() to work immediately after gzopen() or gzdopen()
- Make gzdirect() more precise when the state changes while reading
- Improve zlib.h documentation in many places
- Catch memory allocation failure in gz_open()
- Complete close operation if seek forward in gzclose_w() fails
- Return Z_ERRNO from gzclose_r() if close() fails
- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
- Return zero for gzwrite() errors to match zlib.h description
- Return -1 on gzputs() error to match zlib.h description
- Add zconf.in.h to allow recovery from configure modification [Weigelt]
- Fix static library permissions in Makefile.in [Weigelt]
- Avoid warnings in configure tests that hide functionality [Weigelt]
- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
- Keep object files in subdirectories to reduce the clutter somewhat
- Remove default Makefile and zlibdefs.h, add dummy Makefile
- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
- Remove zlibdefs.h completely -- modify zconf.h instead

Changes in 1.2.3.6 (17 Jan 2010)
- Avoid void * arithmetic in gzread.c and gzwrite.c
- Make compilers happier with const char * for gz_error message
- Avoid unused parameter warning in inflate.c
- Avoid signed-unsigned comparison warning in inflate.c
- Indent #pragma's for traditional C
- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
- Correct email address in configure for system options
- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
- Update zlib.map [Brown]
- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
- Apply various fixes to CMakeLists.txt [Lowman]
- Add checks on len in gzread() and gzwrite()
- Add error message for no more room for gzungetc()
- Remove zlib version check in gzwrite()
- Defer compression of gzprintf() result until need to
- Use snprintf() in gzdopen() if available
- Remove USE_MMAP configuration determination (only used by minigzip)
- Remove examples/pigz.c (available separately)
- Update examples/gun.c to 1.6

Changes in 1.2.3.5 (8 Jan 2010)
- Add space after #if in zutil.h for some compilers
- Fix relatively harmless bug in deflate_fast() [Exarevsky]
- Fix same problem in deflate_slow()
- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
- Add deflate_rle() for faster Z_RLE strategy run-length encoding
- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
- Change name of "write" variable in inffast.c to avoid library collisions
- Fix premature EOF from gzread() in gzio.c [Brown]
- Use zlib header window size if windowBits is 0 in inflateInit2()
- Remove compressBound() call in deflate.c to avoid linking compress.o
- Replace use of errno in gz* with functions, support WinCE [Alves]
- Provide alternative to perror() in minigzip.c for WinCE [Alves]
- Don't use _vsnprintf on later versions of MSVC [Lowman]
- Add CMake build script and input file [Lowman]
- Update contrib/minizip to 1.1 [Svensson, Vollant]
- Moved nintendods directory from contrib to .
- Replace gzio.c with a new set of routines with the same functionality
- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
- Update contrib/minizip to 1.1b
- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h

Changes in 1.2.3.4 (21 Dec 2009)
- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
- Update comments in configure and Makefile.in for default --shared
- Fix test -z's in configure [Marquess]
- Build examplesh and minigzipsh when not testing
- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
- Import LDFLAGS from the environment in configure
- Fix configure to populate SFLAGS with discovered CFLAGS options
- Adapt make_vms.com to the new Makefile.in [Zinser]
- Add zlib2ansi script for C++ compilation [Marquess]
- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
- Add AMD64 assembler code for longest match to contrib [Teterin]
- Include options from $SFLAGS when doing $LDSHARED
- Simplify 64-bit file support by introducing z_off64_t type
- Make shared object files in objs directory to work around old Sun cc
- Use only three-part version number for Darwin shared compiles
- Add rc option to ar in Makefile.in for when ./configure not run
- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
- Rename Makefile.in targets allstatic to static and allshared to shared
- Fix static and shared Makefile.in targets to be independent
- Correct error return bug in gz_open() by setting state [Brown]
- Put spaces before ;;'s in configure for better sh compatibility
- Add pigz.c (parallel implementation of gzip) to examples/
- Correct constant in crc32.c to UL [Leventhal]
- Reject negative lengths in crc32_combine()
- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
- Correct typo in doc/algorithm.txt [Janik]
- Fix bug in adler32_combine() [Zhu]
- Catch missing-end-of-block-code error in all inflates and in puff
    Assures that random input to inflate eventually results in an error
- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
- Update ENOUGH and its usage to reflect discovered bounds
- Fix gzerror() error report on empty input file [Brown]
- Add ush casts in trees.c to avoid pedantic runtime errors
- Fix typo in zlib.h uncompress() description [Reiss]
- Correct inflate() comments with regard to automatic header detection
- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
- Put new version of gzlog (2.0) in examples with interruption recovery
- Add puff compile option to permit invalid distance-too-far streams
- Add puff TEST command options, ability to read piped input
- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
  _LARGEFILE64_SOURCE not defined
- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
- Fix deflateSetDictionary() to use all 32K for output consistency
- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
- Clear bytes after deflate lookahead to avoid use of uninitialized data
- Change a limit in inftrees.c to be more transparent to Coverity Prevent
- Update win32/zlib.def with exported symbols from zlib.h
- Correct spelling errors in zlib.h [Willem, Sobrado]
- Allow Z_BLOCK for deflate() to force a new block
- Allow negative bits in inflatePrime() to delete existing bit buffer
- Add Z_TREES flush option to inflate() to return at end of trees
- Add inflateMark() to return current state information for random access
- Add Makefile for NintendoDS to contrib [Costa]
- Add -w in configure compile tests to avoid spurious warnings [Beucler]
- Fix typos in zlib.h comments for deflateSetDictionary()
- Fix EOF detection in transparent gzread() [Maier]

Changes in 1.2.3.3 (2 October 2006)
- Make --shared the default for configure, add a --static option
- Add compile option to permit invalid distance-too-far streams
- Add inflateUndermine() function which is required to enable above
- Remove use of "this" variable name for C++ compatibility [Marquess]
- Add testing of shared library in make test, if shared library built
- Use ftello() and fseeko() if available instead of ftell() and fseek()
- Provide two versions of all functions that use the z_off_t type for
  binary compatibility -- a normal version and a 64-bit offset version,
  per the Large File Support Extension when _LARGEFILE64_SOURCE is
  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
  is defined to be 64
- Add a --uname= option to configure to perhaps help with cross-compiling

Changes in 1.2.3.2 (3 September 2006)
- Turn off silly Borland warnings [Hay]
- Use off64_t and define _LARGEFILE64_SOURCE when present
- Fix missing dependency on inffixed.h in Makefile.in
- Rig configure --shared to build both shared and static [Teredesai, Truta]
- Remove zconf.in.h and instead create a new zlibdefs.h file
- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]

Changes in 1.2.3.1 (16 August 2006)
- Add watcom directory with OpenWatcom make files [Daniel]
- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
- Update make_vms.com [Zinser]
- Use -fPIC for shared build in configure [Teredesai, Nicholson]
- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
- Add some FAQ entries about the contrib directory
- Update the MVS question in the FAQ
- Avoid extraneous reads after EOF in gzio.c [Brown]
- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
- Add comments to zlib.h about gzerror() usage [Brown]
- Set extra flags in gzip header in gzopen() like deflate() does
- Make configure options more compatible with double-dash conventions
  [Weigelt]
- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
- Fix uninstall target in Makefile.in [Truta]
- Add pkgconfig support [Weigelt]
- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
- Replace set_data_type() with a more accurate detect_data_type() in
  trees.c, according to the txtvsbin.txt document [Truta]
- Swap the order of #include <stdio.h> and #include "zlib.h" in
  gzio.c, example.c and minigzip.c [Truta]
- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
  Truta] (where?)
- Fix target "clean" from win32/Makefile.bor [Truta]
- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
- Enable browse info in the "Debug" and "ASM Debug" configurations in
  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
- Add pkgconfig support [Weigelt]
- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
- Add a document that explains the new text detection scheme to
  doc/txtvsbin.txt [Truta]
- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
- Move algorithm.txt into doc/ [Truta]
- Synchronize FAQ with website
- Fix compressBound(), was low for some pathological cases [Fearnley]
- Take into account wrapper variations in deflateBound()
- Set examples/zpipe.c input and output to binary mode for Windows
- Update examples/zlib_how.html with new zpipe.c (also web site)
- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
  that gcc became pickier in 4.0)
- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
  un-versioned, the patch adds versioning only for symbols introduced in
  zlib-1.2.0 or later.  It also declares as local those symbols which are
  not designed to be exported." [Levin]
- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
- Do not initialize global static by default in trees.c, add a response
  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
- Don't use strerror() in gzio.c under WinCE [Yakimov]
- Don't use errno.h in zutil.h under WinCE [Yakimov]
- Move arguments for AR to its usage to allow replacing ar [Marot]
- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
- Improve inflateInit() and inflateInit2() documentation
- Fix structure size comment in inflate.h
- Change configure help option from --h* to --help [Santos]
2017-01-10 00:25:29 +00:00

1060 lines
40 KiB
C

/*
* gzlog.c
* Copyright (C) 2004, 2008, 2012, 2016 Mark Adler, all rights reserved
* For conditions of distribution and use, see copyright notice in gzlog.h
* version 2.2, 14 Aug 2012
*/
/*
gzlog provides a mechanism for frequently appending short strings to a gzip
file that is efficient both in execution time and compression ratio. The
strategy is to write the short strings in an uncompressed form to the end of
the gzip file, only compressing when the amount of uncompressed data has
reached a given threshold.
gzlog also provides protection against interruptions in the process due to
system crashes. The status of the operation is recorded in an extra field
in the gzip file, and is only updated once the gzip file is brought to a
valid state. The last data to be appended or compressed is saved in an
auxiliary file, so that if the operation is interrupted, it can be completed
the next time an append operation is attempted.
gzlog maintains another auxiliary file with the last 32K of data from the
compressed portion, which is preloaded for the compression of the subsequent
data. This minimizes the impact to the compression ratio of appending.
*/
/*
Operations Concept:
Files (log name "foo"):
foo.gz -- gzip file with the complete log
foo.add -- last message to append or last data to compress
foo.dict -- dictionary of the last 32K of data for next compression
foo.temp -- temporary dictionary file for compression after this one
foo.lock -- lock file for reading and writing the other files
foo.repairs -- log file for log file recovery operations (not compressed)
gzip file structure:
- fixed-length (no file name) header with extra field (see below)
- compressed data ending initially with empty stored block
- uncompressed data filling out originally empty stored block and
subsequent stored blocks as needed (16K max each)
- gzip trailer
- no junk at end (no other gzip streams)
When appending data, the information in the first three items above plus the
foo.add file are sufficient to recover an interrupted append operation. The
extra field has the necessary information to restore the start of the last
stored block and determine where to append the data in the foo.add file, as
well as the crc and length of the gzip data before the append operation.
The foo.add file is created before the gzip file is marked for append, and
deleted after the gzip file is marked as complete. So if the append
operation is interrupted, the data to add will still be there. If due to
some external force, the foo.add file gets deleted between when the append
operation was interrupted and when recovery is attempted, the gzip file will
still be restored, but without the appended data.
When compressing data, the information in the first two items above plus the
foo.add file are sufficient to recover an interrupted compress operation.
The extra field has the necessary information to find the end of the
compressed data, and contains both the crc and length of just the compressed
data and of the complete set of data including the contents of the foo.add
file.
Again, the foo.add file is maintained during the compress operation in case
of an interruption. If in the unlikely event the foo.add file with the data
to be compressed is missing due to some external force, a gzip file with
just the previous compressed data will be reconstructed. In this case, all
of the data that was to be compressed is lost (approximately one megabyte).
This will not occur if all that happened was an interruption of the compress
operation.
The third state that is marked is the replacement of the old dictionary with
the new dictionary after a compress operation. Once compression is
complete, the gzip file is marked as being in the replace state. This
completes the gzip file, so an interrupt after being so marked does not
result in recompression. Then the dictionary file is replaced, and the gzip
file is marked as completed. This state prevents the possibility of
restarting compression with the wrong dictionary file.
All three operations are wrapped by a lock/unlock procedure. In order to
gain exclusive access to the log files, first a foo.lock file must be
exclusively created. When all operations are complete, the lock is
released by deleting the foo.lock file. If when attempting to create the
lock file, it already exists and the modify time of the lock file is more
than five minutes old (set by the PATIENCE define below), then the old
lock file is considered stale and deleted, and the exclusive creation of
the lock file is retried. To assure that there are no false assessments
of the staleness of the lock file, the operations periodically touch the
lock file to update the modified date.
Following is the definition of the extra field with all of the information
required to enable the above append and compress operations and their
recovery if interrupted. Multi-byte values are stored little endian
(consistent with the gzip format). File pointers are eight bytes long.
The crc's and lengths for the gzip trailer are four bytes long. (Note that
the length at the end of a gzip file is used for error checking only, and
for large files is actually the length modulo 2^32.) The stored block
length is two bytes long. The gzip extra field two-byte identification is
"ap" for append. It is assumed that writing the extra field to the file is
an "atomic" operation. That is, either all of the extra field is written
to the file, or none of it is, if the operation is interrupted right at the
point of updating the extra field. This is a reasonable assumption, since
the extra field is within the first 52 bytes of the file, which is smaller
than any expected block size for a mass storage device (usually 512 bytes or
larger).
Extra field (35 bytes):
- Pointer to first stored block length -- this points to the two-byte length
of the first stored block, which is followed by the two-byte, one's
complement of that length. The stored block length is preceded by the
three-bit header of the stored block, which is the actual start of the
stored block in the deflate format. See the bit offset field below.
- Pointer to the last stored block length. This is the same as above, but
for the last stored block of the uncompressed data in the gzip file.
Initially this is the same as the first stored block length pointer.
When the stored block gets to 16K (see the MAX_STORE define), then a new
stored block as added, at which point the last stored block length pointer
is different from the first stored block length pointer. When they are
different, the first bit of the last stored block header is eight bits, or
one byte back from the block length.
- Compressed data crc and length. This is the crc and length of the data
that is in the compressed portion of the deflate stream. These are used
only in the event that the foo.add file containing the data to compress is
lost after a compress operation is interrupted.
- Total data crc and length. This is the crc and length of all of the data
stored in the gzip file, compressed and uncompressed. It is used to
reconstruct the gzip trailer when compressing, as well as when recovering
interrupted operations.
- Final stored block length. This is used to quickly find where to append,
and allows the restoration of the original final stored block state when
an append operation is interrupted.
- First stored block start as the number of bits back from the final stored
block first length byte. This value is in the range of 3..10, and is
stored as the low three bits of the final byte of the extra field after
subtracting three (0..7). This allows the last-block bit of the stored
block header to be updated when a new stored block is added, for the case
when the first stored block and the last stored block are the same. (When
they are different, the numbers of bits back is known to be eight.) This
also allows for new compressed data to be appended to the old compressed
data in the compress operation, overwriting the previous first stored
block, or for the compressed data to be terminated and a valid gzip file
reconstructed on the off chance that a compression operation was
interrupted and the data to compress in the foo.add file was deleted.
- The operation in process. This is the next two bits in the last byte (the
bits under the mask 0x18). The are interpreted as 0: nothing in process,
1: append in process, 2: compress in process, 3: replace in process.
- The top three bits of the last byte in the extra field are reserved and
are currently set to zero.
Main procedure:
- Exclusively create the foo.lock file using the O_CREAT and O_EXCL modes of
the system open() call. If the modify time of an existing lock file is
more than PATIENCE seconds old, then the lock file is deleted and the
exclusive create is retried.
- Load the extra field from the foo.gz file, and see if an operation was in
progress but not completed. If so, apply the recovery procedure below.
- Perform the append procedure with the provided data.
- If the uncompressed data in the foo.gz file is 1MB or more, apply the
compress procedure.
- Delete the foo.lock file.
Append procedure:
- Put what to append in the foo.add file so that the operation can be
restarted if this procedure is interrupted.
- Mark the foo.gz extra field with the append operation in progress.
+ Restore the original last-block bit and stored block length of the last
stored block from the information in the extra field, in case a previous
append operation was interrupted.
- Append the provided data to the last stored block, creating new stored
blocks as needed and updating the stored blocks last-block bits and
lengths.
- Update the crc and length with the new data, and write the gzip trailer.
- Write over the extra field (with a single write operation) with the new
pointers, lengths, and crc's, and mark the gzip file as not in process.
Though there is still a foo.add file, it will be ignored since nothing
is in process. If a foo.add file is leftover from a previously
completed operation, it is truncated when writing new data to it.
- Delete the foo.add file.
Compress and replace procedures:
- Read all of the uncompressed data in the stored blocks in foo.gz and write
it to foo.add. Also write foo.temp with the last 32K of that data to
provide a dictionary for the next invocation of this procedure.
- Rewrite the extra field marking foo.gz with a compression in process.
* If there is no data provided to compress (due to a missing foo.add file
when recovering), reconstruct and truncate the foo.gz file to contain
only the previous compressed data and proceed to the step after the next
one. Otherwise ...
- Compress the data with the dictionary in foo.dict, and write to the
foo.gz file starting at the bit immediately following the last previously
compressed block. If there is no foo.dict, proceed anyway with the
compression at slightly reduced efficiency. (For the foo.dict file to be
missing requires some external failure beyond simply the interruption of
a compress operation.) During this process, the foo.lock file is
periodically touched to assure that that file is not considered stale by
another process before we're done. The deflation is terminated with a
non-last empty static block (10 bits long), that is then located and
written over by a last-bit-set empty stored block.
- Append the crc and length of the data in the gzip file (previously
calculated during the append operations).
- Write over the extra field with the updated stored block offsets, bits
back, crc's, and lengths, and mark foo.gz as in process for a replacement
of the dictionary.
@ Delete the foo.add file.
- Replace foo.dict with foo.temp.
- Write over the extra field, marking foo.gz as complete.
Recovery procedure:
- If not a replace recovery, read in the foo.add file, and provide that data
to the appropriate recovery below. If there is no foo.add file, provide
a zero data length to the recovery. In that case, the append recovery
restores the foo.gz to the previous compressed + uncompressed data state.
For the the compress recovery, a missing foo.add file results in foo.gz
being restored to the previous compressed-only data state.
- Append recovery:
- Pick up append at + step above
- Compress recovery:
- Pick up compress at * step above
- Replace recovery:
- Pick up compress at @ step above
- Log the repair with a date stamp in foo.repairs
*/
#include <sys/types.h>
#include <stdio.h> /* rename, fopen, fprintf, fclose */
#include <stdlib.h> /* malloc, free */
#include <string.h> /* strlen, strrchr, strcpy, strncpy, strcmp */
#include <fcntl.h> /* open */
#include <unistd.h> /* lseek, read, write, close, unlink, sleep, */
/* ftruncate, fsync */
#include <errno.h> /* errno */
#include <time.h> /* time, ctime */
#include <sys/stat.h> /* stat */
#include <sys/time.h> /* utimes */
#include "zlib.h" /* crc32 */
#include "gzlog.h" /* header for external access */
#define local static
typedef unsigned int uint;
typedef unsigned long ulong;
/* Macro for debugging to deterministically force recovery operations */
#ifdef GZLOG_DEBUG
#include <setjmp.h> /* longjmp */
jmp_buf gzlog_jump; /* where to go back to */
int gzlog_bail = 0; /* which point to bail at (1..8) */
int gzlog_count = -1; /* number of times through to wait */
# define BAIL(n) do { if (n == gzlog_bail && gzlog_count-- == 0) \
longjmp(gzlog_jump, gzlog_bail); } while (0)
#else
# define BAIL(n)
#endif
/* how old the lock file can be in seconds before considering it stale */
#define PATIENCE 300
/* maximum stored block size in Kbytes -- must be in 1..63 */
#define MAX_STORE 16
/* number of stored Kbytes to trigger compression (must be >= 32 to allow
dictionary construction, and <= 204 * MAX_STORE, in order for >> 10 to
discard the stored block headers contribution of five bytes each) */
#define TRIGGER 1024
/* size of a deflate dictionary (this cannot be changed) */
#define DICT 32768U
/* values for the operation (2 bits) */
#define NO_OP 0
#define APPEND_OP 1
#define COMPRESS_OP 2
#define REPLACE_OP 3
/* macros to extract little-endian integers from an unsigned byte buffer */
#define PULL2(p) ((p)[0]+((uint)((p)[1])<<8))
#define PULL4(p) (PULL2(p)+((ulong)PULL2(p+2)<<16))
#define PULL8(p) (PULL4(p)+((off_t)PULL4(p+4)<<32))
/* macros to store integers into a byte buffer in little-endian order */
#define PUT2(p,a) do {(p)[0]=a;(p)[1]=(a)>>8;} while(0)
#define PUT4(p,a) do {PUT2(p,a);PUT2(p+2,a>>16);} while(0)
#define PUT8(p,a) do {PUT4(p,a);PUT4(p+4,a>>32);} while(0)
/* internal structure for log information */
#define LOGID "\106\035\172" /* should be three non-zero characters */
struct log {
char id[4]; /* contains LOGID to detect inadvertent overwrites */
int fd; /* file descriptor for .gz file, opened read/write */
char *path; /* allocated path, e.g. "/var/log/foo" or "foo" */
char *end; /* end of path, for appending suffices such as ".gz" */
off_t first; /* offset of first stored block first length byte */
int back; /* location of first block id in bits back from first */
uint stored; /* bytes currently in last stored block */
off_t last; /* offset of last stored block first length byte */
ulong ccrc; /* crc of compressed data */
ulong clen; /* length (modulo 2^32) of compressed data */
ulong tcrc; /* crc of total data */
ulong tlen; /* length (modulo 2^32) of total data */
time_t lock; /* last modify time of our lock file */
};
/* gzip header for gzlog */
local unsigned char log_gzhead[] = {
0x1f, 0x8b, /* magic gzip id */
8, /* compression method is deflate */
4, /* there is an extra field (no file name) */
0, 0, 0, 0, /* no modification time provided */
0, 0xff, /* no extra flags, no OS specified */
39, 0, 'a', 'p', 35, 0 /* extra field with "ap" subfield */
/* 35 is EXTRA, 39 is EXTRA + 4 */
};
#define HEAD sizeof(log_gzhead) /* should be 16 */
/* initial gzip extra field content (52 == HEAD + EXTRA + 1) */
local unsigned char log_gzext[] = {
52, 0, 0, 0, 0, 0, 0, 0, /* offset of first stored block length */
52, 0, 0, 0, 0, 0, 0, 0, /* offset of last stored block length */
0, 0, 0, 0, 0, 0, 0, 0, /* compressed data crc and length */
0, 0, 0, 0, 0, 0, 0, 0, /* total data crc and length */
0, 0, /* final stored block data length */
5 /* op is NO_OP, last bit 8 bits back */
};
#define EXTRA sizeof(log_gzext) /* should be 35 */
/* initial gzip data and trailer */
local unsigned char log_gzbody[] = {
1, 0, 0, 0xff, 0xff, /* empty stored block (last) */
0, 0, 0, 0, /* crc */
0, 0, 0, 0 /* uncompressed length */
};
#define BODY sizeof(log_gzbody)
/* Exclusively create foo.lock in order to negotiate exclusive access to the
foo.* files. If the modify time of an existing lock file is greater than
PATIENCE seconds in the past, then consider the lock file to have been
abandoned, delete it, and try the exclusive create again. Save the lock
file modify time for verification of ownership. Return 0 on success, or -1
on failure, usually due to an access restriction or invalid path. Note that
if stat() or unlink() fails, it may be due to another process noticing the
abandoned lock file a smidge sooner and deleting it, so those are not
flagged as an error. */
local int log_lock(struct log *log)
{
int fd;
struct stat st;
strcpy(log->end, ".lock");
while ((fd = open(log->path, O_CREAT | O_EXCL, 0644)) < 0) {
if (errno != EEXIST)
return -1;
if (stat(log->path, &st) == 0 && time(NULL) - st.st_mtime > PATIENCE) {
unlink(log->path);
continue;
}
sleep(2); /* relinquish the CPU for two seconds while waiting */
}
close(fd);
if (stat(log->path, &st) == 0)
log->lock = st.st_mtime;
return 0;
}
/* Update the modify time of the lock file to now, in order to prevent another
task from thinking that the lock is stale. Save the lock file modify time
for verification of ownership. */
local void log_touch(struct log *log)
{
struct stat st;
strcpy(log->end, ".lock");
utimes(log->path, NULL);
if (stat(log->path, &st) == 0)
log->lock = st.st_mtime;
}
/* Check the log file modify time against what is expected. Return true if
this is not our lock. If it is our lock, touch it to keep it. */
local int log_check(struct log *log)
{
struct stat st;
strcpy(log->end, ".lock");
if (stat(log->path, &st) || st.st_mtime != log->lock)
return 1;
log_touch(log);
return 0;
}
/* Unlock a previously acquired lock, but only if it's ours. */
local void log_unlock(struct log *log)
{
if (log_check(log))
return;
strcpy(log->end, ".lock");
unlink(log->path);
log->lock = 0;
}
/* Check the gzip header and read in the extra field, filling in the values in
the log structure. Return op on success or -1 if the gzip header was not as
expected. op is the current operation in progress last written to the extra
field. This assumes that the gzip file has already been opened, with the
file descriptor log->fd. */
local int log_head(struct log *log)
{
int op;
unsigned char buf[HEAD + EXTRA];
if (lseek(log->fd, 0, SEEK_SET) < 0 ||
read(log->fd, buf, HEAD + EXTRA) != HEAD + EXTRA ||
memcmp(buf, log_gzhead, HEAD)) {
return -1;
}
log->first = PULL8(buf + HEAD);
log->last = PULL8(buf + HEAD + 8);
log->ccrc = PULL4(buf + HEAD + 16);
log->clen = PULL4(buf + HEAD + 20);
log->tcrc = PULL4(buf + HEAD + 24);
log->tlen = PULL4(buf + HEAD + 28);
log->stored = PULL2(buf + HEAD + 32);
log->back = 3 + (buf[HEAD + 34] & 7);
op = (buf[HEAD + 34] >> 3) & 3;
return op;
}
/* Write over the extra field contents, marking the operation as op. Use fsync
to assure that the device is written to, and in the requested order. This
operation, and only this operation, is assumed to be atomic in order to
assure that the log is recoverable in the event of an interruption at any
point in the process. Return -1 if the write to foo.gz failed. */
local int log_mark(struct log *log, int op)
{
int ret;
unsigned char ext[EXTRA];
PUT8(ext, log->first);
PUT8(ext + 8, log->last);
PUT4(ext + 16, log->ccrc);
PUT4(ext + 20, log->clen);
PUT4(ext + 24, log->tcrc);
PUT4(ext + 28, log->tlen);
PUT2(ext + 32, log->stored);
ext[34] = log->back - 3 + (op << 3);
fsync(log->fd);
ret = lseek(log->fd, HEAD, SEEK_SET) < 0 ||
write(log->fd, ext, EXTRA) != EXTRA ? -1 : 0;
fsync(log->fd);
return ret;
}
/* Rewrite the last block header bits and subsequent zero bits to get to a byte
boundary, setting the last block bit if last is true, and then write the
remainder of the stored block header (length and one's complement). Leave
the file pointer after the end of the last stored block data. Return -1 if
there is a read or write failure on the foo.gz file */
local int log_last(struct log *log, int last)
{
int back, len, mask;
unsigned char buf[6];
/* determine the locations of the bytes and bits to modify */
back = log->last == log->first ? log->back : 8;
len = back > 8 ? 2 : 1; /* bytes back from log->last */
mask = 0x80 >> ((back - 1) & 7); /* mask for block last-bit */
/* get the byte to modify (one or two back) into buf[0] -- don't need to
read the byte if the last-bit is eight bits back, since in that case
the entire byte will be modified */
buf[0] = 0;
if (back != 8 && (lseek(log->fd, log->last - len, SEEK_SET) < 0 ||
read(log->fd, buf, 1) != 1))
return -1;
/* change the last-bit of the last stored block as requested -- note
that all bits above the last-bit are set to zero, per the type bits
of a stored block being 00 and per the convention that the bits to
bring the stream to a byte boundary are also zeros */
buf[1] = 0;
buf[2 - len] = (*buf & (mask - 1)) + (last ? mask : 0);
/* write the modified stored block header and lengths, move the file
pointer to after the last stored block data */
PUT2(buf + 2, log->stored);
PUT2(buf + 4, log->stored ^ 0xffff);
return lseek(log->fd, log->last - len, SEEK_SET) < 0 ||
write(log->fd, buf + 2 - len, len + 4) != len + 4 ||
lseek(log->fd, log->stored, SEEK_CUR) < 0 ? -1 : 0;
}
/* Append len bytes from data to the locked and open log file. len may be zero
if recovering and no .add file was found. In that case, the previous state
of the foo.gz file is restored. The data is appended uncompressed in
deflate stored blocks. Return -1 if there was an error reading or writing
the foo.gz file. */
local int log_append(struct log *log, unsigned char *data, size_t len)
{
uint put;
off_t end;
unsigned char buf[8];
/* set the last block last-bit and length, in case recovering an
interrupted append, then position the file pointer to append to the
block */
if (log_last(log, 1))
return -1;
/* append, adding stored blocks and updating the offset of the last stored
block as needed, and update the total crc and length */
while (len) {
/* append as much as we can to the last block */
put = (MAX_STORE << 10) - log->stored;
if (put > len)
put = (uint)len;
if (put) {
if (write(log->fd, data, put) != put)
return -1;
BAIL(1);
log->tcrc = crc32(log->tcrc, data, put);
log->tlen += put;
log->stored += put;
data += put;
len -= put;
}
/* if we need to, add a new empty stored block */
if (len) {
/* mark current block as not last */
if (log_last(log, 0))
return -1;
/* point to new, empty stored block */
log->last += 4 + log->stored + 1;
log->stored = 0;
}
/* mark last block as last, update its length */
if (log_last(log, 1))
return -1;
BAIL(2);
}
/* write the new crc and length trailer, and truncate just in case (could
be recovering from partial append with a missing foo.add file) */
PUT4(buf, log->tcrc);
PUT4(buf + 4, log->tlen);
if (write(log->fd, buf, 8) != 8 ||
(end = lseek(log->fd, 0, SEEK_CUR)) < 0 || ftruncate(log->fd, end))
return -1;
/* write the extra field, marking the log file as done, delete .add file */
if (log_mark(log, NO_OP))
return -1;
strcpy(log->end, ".add");
unlink(log->path); /* ignore error, since may not exist */
return 0;
}
/* Replace the foo.dict file with the foo.temp file. Also delete the foo.add
file, since the compress operation may have been interrupted before that was
done. Returns 1 if memory could not be allocated, or -1 if reading or
writing foo.gz fails, or if the rename fails for some reason other than
foo.temp not existing. foo.temp not existing is a permitted error, since
the replace operation may have been interrupted after the rename is done,
but before foo.gz is marked as complete. */
local int log_replace(struct log *log)
{
int ret;
char *dest;
/* delete foo.add file */
strcpy(log->end, ".add");
unlink(log->path); /* ignore error, since may not exist */
BAIL(3);
/* rename foo.name to foo.dict, replacing foo.dict if it exists */
strcpy(log->end, ".dict");
dest = malloc(strlen(log->path) + 1);
if (dest == NULL)
return -2;
strcpy(dest, log->path);
strcpy(log->end, ".temp");
ret = rename(log->path, dest);
free(dest);
if (ret && errno != ENOENT)
return -1;
BAIL(4);
/* mark the foo.gz file as done */
return log_mark(log, NO_OP);
}
/* Compress the len bytes at data and append the compressed data to the
foo.gz deflate data immediately after the previous compressed data. This
overwrites the previous uncompressed data, which was stored in foo.add
and is the data provided in data[0..len-1]. If this operation is
interrupted, it picks up at the start of this routine, with the foo.add
file read in again. If there is no data to compress (len == 0), then we
simply terminate the foo.gz file after the previously compressed data,
appending a final empty stored block and the gzip trailer. Return -1 if
reading or writing the log.gz file failed, or -2 if there was a memory
allocation failure. */
local int log_compress(struct log *log, unsigned char *data, size_t len)
{
int fd;
uint got, max;
ssize_t dict;
off_t end;
z_stream strm;
unsigned char buf[DICT];
/* compress and append compressed data */
if (len) {
/* set up for deflate, allocating memory */
strm.zalloc = Z_NULL;
strm.zfree = Z_NULL;
strm.opaque = Z_NULL;
if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -15, 8,
Z_DEFAULT_STRATEGY) != Z_OK)
return -2;
/* read in dictionary (last 32K of data that was compressed) */
strcpy(log->end, ".dict");
fd = open(log->path, O_RDONLY, 0);
if (fd >= 0) {
dict = read(fd, buf, DICT);
close(fd);
if (dict < 0) {
deflateEnd(&strm);
return -1;
}
if (dict)
deflateSetDictionary(&strm, buf, (uint)dict);
}
log_touch(log);
/* prime deflate with last bits of previous block, position write
pointer to write those bits and overwrite what follows */
if (lseek(log->fd, log->first - (log->back > 8 ? 2 : 1),
SEEK_SET) < 0 ||
read(log->fd, buf, 1) != 1 || lseek(log->fd, -1, SEEK_CUR) < 0) {
deflateEnd(&strm);
return -1;
}
deflatePrime(&strm, (8 - log->back) & 7, *buf);
/* compress, finishing with a partial non-last empty static block */
strm.next_in = data;
max = (((uint)0 - 1) >> 1) + 1; /* in case int smaller than size_t */
do {
strm.avail_in = len > max ? max : (uint)len;
len -= strm.avail_in;
do {
strm.avail_out = DICT;
strm.next_out = buf;
deflate(&strm, len ? Z_NO_FLUSH : Z_PARTIAL_FLUSH);
got = DICT - strm.avail_out;
if (got && write(log->fd, buf, got) != got) {
deflateEnd(&strm);
return -1;
}
log_touch(log);
} while (strm.avail_out == 0);
} while (len);
deflateEnd(&strm);
BAIL(5);
/* find start of empty static block -- scanning backwards the first one
bit is the second bit of the block, if the last byte is zero, then
we know the byte before that has a one in the top bit, since an
empty static block is ten bits long */
if ((log->first = lseek(log->fd, -1, SEEK_CUR)) < 0 ||
read(log->fd, buf, 1) != 1)
return -1;
log->first++;
if (*buf) {
log->back = 1;
while ((*buf & ((uint)1 << (8 - log->back++))) == 0)
; /* guaranteed to terminate, since *buf != 0 */
}
else
log->back = 10;
/* update compressed crc and length */
log->ccrc = log->tcrc;
log->clen = log->tlen;
}
else {
/* no data to compress -- fix up existing gzip stream */
log->tcrc = log->ccrc;
log->tlen = log->clen;
}
/* complete and truncate gzip stream */
log->last = log->first;
log->stored = 0;
PUT4(buf, log->tcrc);
PUT4(buf + 4, log->tlen);
if (log_last(log, 1) || write(log->fd, buf, 8) != 8 ||
(end = lseek(log->fd, 0, SEEK_CUR)) < 0 || ftruncate(log->fd, end))
return -1;
BAIL(6);
/* mark as being in the replace operation */
if (log_mark(log, REPLACE_OP))
return -1;
/* execute the replace operation and mark the file as done */
return log_replace(log);
}
/* log a repair record to the .repairs file */
local void log_log(struct log *log, int op, char *record)
{
time_t now;
FILE *rec;
now = time(NULL);
strcpy(log->end, ".repairs");
rec = fopen(log->path, "a");
if (rec == NULL)
return;
fprintf(rec, "%.24s %s recovery: %s\n", ctime(&now), op == APPEND_OP ?
"append" : (op == COMPRESS_OP ? "compress" : "replace"), record);
fclose(rec);
return;
}
/* Recover the interrupted operation op. First read foo.add for recovering an
append or compress operation. Return -1 if there was an error reading or
writing foo.gz or reading an existing foo.add, or -2 if there was a memory
allocation failure. */
local int log_recover(struct log *log, int op)
{
int fd, ret = 0;
unsigned char *data = NULL;
size_t len = 0;
struct stat st;
/* log recovery */
log_log(log, op, "start");
/* load foo.add file if expected and present */
if (op == APPEND_OP || op == COMPRESS_OP) {
strcpy(log->end, ".add");
if (stat(log->path, &st) == 0 && st.st_size) {
len = (size_t)(st.st_size);
if ((off_t)len != st.st_size ||
(data = malloc(st.st_size)) == NULL) {
log_log(log, op, "allocation failure");
return -2;
}
if ((fd = open(log->path, O_RDONLY, 0)) < 0) {
log_log(log, op, ".add file read failure");
return -1;
}
ret = (size_t)read(fd, data, len) != len;
close(fd);
if (ret) {
log_log(log, op, ".add file read failure");
return -1;
}
log_log(log, op, "loaded .add file");
}
else
log_log(log, op, "missing .add file!");
}
/* recover the interrupted operation */
switch (op) {
case APPEND_OP:
ret = log_append(log, data, len);
break;
case COMPRESS_OP:
ret = log_compress(log, data, len);
break;
case REPLACE_OP:
ret = log_replace(log);
}
/* log status */
log_log(log, op, ret ? "failure" : "complete");
/* clean up */
if (data != NULL)
free(data);
return ret;
}
/* Close the foo.gz file (if open) and release the lock. */
local void log_close(struct log *log)
{
if (log->fd >= 0)
close(log->fd);
log->fd = -1;
log_unlock(log);
}
/* Open foo.gz, verify the header, and load the extra field contents, after
first creating the foo.lock file to gain exclusive access to the foo.*
files. If foo.gz does not exist or is empty, then write the initial header,
extra, and body content of an empty foo.gz log file. If there is an error
creating the lock file due to access restrictions, or an error reading or
writing the foo.gz file, or if the foo.gz file is not a proper log file for
this object (e.g. not a gzip file or does not contain the expected extra
field), then return true. If there is an error, the lock is released.
Otherwise, the lock is left in place. */
local int log_open(struct log *log)
{
int op;
/* release open file resource if left over -- can occur if lock lost
between gzlog_open() and gzlog_write() */
if (log->fd >= 0)
close(log->fd);
log->fd = -1;
/* negotiate exclusive access */
if (log_lock(log) < 0)
return -1;
/* open the log file, foo.gz */
strcpy(log->end, ".gz");
log->fd = open(log->path, O_RDWR | O_CREAT, 0644);
if (log->fd < 0) {
log_close(log);
return -1;
}
/* if new, initialize foo.gz with an empty log, delete old dictionary */
if (lseek(log->fd, 0, SEEK_END) == 0) {
if (write(log->fd, log_gzhead, HEAD) != HEAD ||
write(log->fd, log_gzext, EXTRA) != EXTRA ||
write(log->fd, log_gzbody, BODY) != BODY) {
log_close(log);
return -1;
}
strcpy(log->end, ".dict");
unlink(log->path);
}
/* verify log file and load extra field information */
if ((op = log_head(log)) < 0) {
log_close(log);
return -1;
}
/* check for interrupted process and if so, recover */
if (op != NO_OP && log_recover(log, op)) {
log_close(log);
return -1;
}
/* touch the lock file to prevent another process from grabbing it */
log_touch(log);
return 0;
}
/* See gzlog.h for the description of the external methods below */
gzlog *gzlog_open(char *path)
{
size_t n;
struct log *log;
/* check arguments */
if (path == NULL || *path == 0)
return NULL;
/* allocate and initialize log structure */
log = malloc(sizeof(struct log));
if (log == NULL)
return NULL;
strcpy(log->id, LOGID);
log->fd = -1;
/* save path and end of path for name construction */
n = strlen(path);
log->path = malloc(n + 9); /* allow for ".repairs" */
if (log->path == NULL) {
free(log);
return NULL;
}
strcpy(log->path, path);
log->end = log->path + n;
/* gain exclusive access and verify log file -- may perform a
recovery operation if needed */
if (log_open(log)) {
free(log->path);
free(log);
return NULL;
}
/* return pointer to log structure */
return log;
}
/* gzlog_compress() return values:
0: all good
-1: file i/o error (usually access issue)
-2: memory allocation failure
-3: invalid log pointer argument */
int gzlog_compress(gzlog *logd)
{
int fd, ret;
uint block;
size_t len, next;
unsigned char *data, buf[5];
struct log *log = logd;
/* check arguments */
if (log == NULL || strcmp(log->id, LOGID))
return -3;
/* see if we lost the lock -- if so get it again and reload the extra
field information (it probably changed), recover last operation if
necessary */
if (log_check(log) && log_open(log))
return -1;
/* create space for uncompressed data */
len = ((size_t)(log->last - log->first) & ~(((size_t)1 << 10) - 1)) +
log->stored;
if ((data = malloc(len)) == NULL)
return -2;
/* do statement here is just a cheap trick for error handling */
do {
/* read in the uncompressed data */
if (lseek(log->fd, log->first - 1, SEEK_SET) < 0)
break;
next = 0;
while (next < len) {
if (read(log->fd, buf, 5) != 5)
break;
block = PULL2(buf + 1);
if (next + block > len ||
read(log->fd, (char *)data + next, block) != block)
break;
next += block;
}
if (lseek(log->fd, 0, SEEK_CUR) != log->last + 4 + log->stored)
break;
log_touch(log);
/* write the uncompressed data to the .add file */
strcpy(log->end, ".add");
fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0)
break;
ret = (size_t)write(fd, data, len) != len;
if (ret | close(fd))
break;
log_touch(log);
/* write the dictionary for the next compress to the .temp file */
strcpy(log->end, ".temp");
fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0)
break;
next = DICT > len ? len : DICT;
ret = (size_t)write(fd, (char *)data + len - next, next) != next;
if (ret | close(fd))
break;
log_touch(log);
/* roll back to compressed data, mark the compress in progress */
log->last = log->first;
log->stored = 0;
if (log_mark(log, COMPRESS_OP))
break;
BAIL(7);
/* compress and append the data (clears mark) */
ret = log_compress(log, data, len);
free(data);
return ret;
} while (0);
/* broke out of do above on i/o error */
free(data);
return -1;
}
/* gzlog_write() return values:
0: all good
-1: file i/o error (usually access issue)
-2: memory allocation failure
-3: invalid log pointer argument */
int gzlog_write(gzlog *logd, void *data, size_t len)
{
int fd, ret;
struct log *log = logd;
/* check arguments */
if (log == NULL || strcmp(log->id, LOGID))
return -3;
if (data == NULL || len <= 0)
return 0;
/* see if we lost the lock -- if so get it again and reload the extra
field information (it probably changed), recover last operation if
necessary */
if (log_check(log) && log_open(log))
return -1;
/* create and write .add file */
strcpy(log->end, ".add");
fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0)
return -1;
ret = (size_t)write(fd, data, len) != len;
if (ret | close(fd))
return -1;
log_touch(log);
/* mark log file with append in progress */
if (log_mark(log, APPEND_OP))
return -1;
BAIL(8);
/* append data (clears mark) */
if (log_append(log, data, len))
return -1;
/* check to see if it's time to compress -- if not, then done */
if (((log->last - log->first) >> 10) + (log->stored >> 10) < TRIGGER)
return 0;
/* time to compress */
return gzlog_compress(log);
}
/* gzlog_close() return values:
0: ok
-3: invalid log pointer argument */
int gzlog_close(gzlog *logd)
{
struct log *log = logd;
/* check arguments */
if (log == NULL || strcmp(log->id, LOGID))
return -3;
/* close the log file and release the lock */
log_close(log);
/* free structure and return */
if (log->path != NULL)
free(log->path);
strcpy(log->id, "bad");
free(log);
return 0;
}