Mark Adler [Sun, 3 Jun 2012 23:28:06 +0000 (16:28 -0700)]
Use _snprintf for snprintf under Microsoft C in test/minigzip.c.
Mark Adler [Sun, 3 Jun 2012 19:45:55 +0000 (12:45 -0700)]
Use _snprintf for snprinf in Microsoft C.
More than a decade later, Microsoft C does not support the C99
standard. It's good that _snprintf has a different name, since it
does not guarantee that the result is null terminated, as does
snprintf. However where _snprintf is used under Microsoft C, the
destination string is assured to be long enough, so this will not
be a problem. This occurs in two places, both in gzlib.c. Where
sprintf functionality is needed by gzprintf, vsnprintf is used in
the case of Microsoft C.
Mark Adler [Sat, 2 Jun 2012 17:16:43 +0000 (10:16 -0700)]
Correct comment in deflate.h.
Mark Adler [Sat, 26 May 2012 17:37:17 +0000 (10:37 -0700)]
Add inflateGetDictionary() function.
Mark Adler [Wed, 23 May 2012 05:31:19 +0000 (22:31 -0700)]
Fix bug in 'F' mode for gzopen().
Mark Adler [Sun, 20 May 2012 18:32:13 +0000 (11:32 -0700)]
Eliminate use of mktemp in Makefile (not always available).
Mark Adler [Fri, 18 May 2012 04:13:23 +0000 (21:13 -0700)]
Fix gzgetc undefine when Z_PREFIX set [Turk].
Mark Adler [Fri, 4 May 2012 04:23:45 +0000 (21:23 -0700)]
Avoid including stddef.h on Windows for Z_SOLO compile [Niessink].
Mark Adler [Thu, 3 May 2012 06:18:38 +0000 (23:18 -0700)]
Replace use of unsafe string functions with snprintf if available.
This avoids warnings in OpenBSD that apparently can't be turned
off whenever you link strcpy, strcat, or sprintf. When snprintf
isn't available, the use of the "unsafe" string functions has
always in fact been safe, since the lengths are all checked before
those functions are called.
We do not use strlcpy or strlcat, since they are not (yet) found on
all systems. snprintf on the other hand is part of the C standard
library and is very common.
Mark Adler [Thu, 3 May 2012 05:38:26 +0000 (22:38 -0700)]
Change version number to 1.2.7.1.
Mark Adler [Thu, 3 May 2012 03:32:41 +0000 (20:32 -0700)]
zlib 1.2.7
Mark Adler [Thu, 3 May 2012 03:17:59 +0000 (20:17 -0700)]
Add instructions to win32/Makefile.gcc for shared install [Torri].
Mark Adler [Wed, 2 May 2012 04:17:08 +0000 (21:17 -0700)]
Force the native libtool in Mac OS X to avoid GNU libtool [Beebe].
Daniel Snider [Tue, 3 Apr 2012 14:26:07 +0000 (09:26 -0500)]
Fix the path to zlib.map in CMakeLists.txt.
Mark Adler [Mon, 30 Apr 2012 04:15:12 +0000 (21:15 -0700)]
Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler].
Mark Adler [Mon, 30 Apr 2012 01:23:46 +0000 (18:23 -0700)]
Fix location of executable for finding a four-byte integer.
Mark Adler [Sun, 29 Apr 2012 23:18:12 +0000 (16:18 -0700)]
Fix type mismatch between get_crc_table() and crc_table.
crc_table is made using a four-byte integer (when that can be
determined). However get_crc_table() returned a pointer to an
unsigned long, which could be eight bytes. This fixes that by
creating a new z_crc_t type for the crc_table.
This type is also used for the BYFOUR crc calculations that depend
on a four-byte type. The four-byte type can now be determined by
./configure, which also solves a problem where ./configure --solo
would never use BYFOUR. No the Z_U4 #define indicates that four-
byte integer was found either by ./configure or by zconf.h.
Mark Adler [Mon, 23 Apr 2012 05:58:06 +0000 (22:58 -0700)]
Avoid race condition for parallel make (-j) running example.
Mark Adler [Mon, 23 Apr 2012 01:41:11 +0000 (18:41 -0700)]
Remove -R. from Solaris shared build (possible security issue).
Mark Adler [Mon, 23 Apr 2012 01:27:41 +0000 (18:27 -0700)]
Update ./configure for Solaris, support --64 [Mooney].
Mark Adler [Sun, 1 Apr 2012 15:46:37 +0000 (08:46 -0700)]
Add more comments to configure.
jK [Mon, 26 Mar 2012 18:18:13 +0000 (20:18 +0200)]
Fix contrib/minizip compilation in the MinGW environment.
Birunthan Mohanathas [Thu, 22 Mar 2012 16:22:01 +0000 (18:22 +0200)]
Remove gzflags from zlibvc.def in vc9 and vc10.
Mark Adler [Sun, 18 Mar 2012 21:52:31 +0000 (14:52 -0700)]
Attempt to convert the wchar_t path in gzopen_w() for errors.
The conversion to multi-byte will be locale-specific, but it's
better than nothing and is only to provide more information in the
error message returned by gz_error(). The conversion has no
effect on what's opened.
Mark Adler [Sun, 18 Mar 2012 21:25:00 +0000 (14:25 -0700)]
Fix syntax error in gzlib.c.
Peter Kuemmel [Sun, 18 Mar 2012 12:21:24 +0000 (13:21 +0100)]
Look in build directory for zlib.pc in CMakeLists.txt.
Mark Adler [Sun, 18 Mar 2012 16:29:44 +0000 (09:29 -0700)]
More fixes for gzopen_w().
Also need to #include <stddef.h> for zlib.h, and need to workaround
the inability to use wide characters in constructed error messages
with zlib's interface.
Mark Adler [Sun, 18 Mar 2012 04:42:30 +0000 (21:42 -0700)]
Fix gzopen_w() type and add #include for the type.
Peter Kuemmel [Sat, 17 Mar 2012 18:57:44 +0000 (19:57 +0100)]
Add source directory in CMakeLists.txt for building examples.
Peter Kuemmel [Sat, 17 Mar 2012 18:56:03 +0000 (19:56 +0100)]
Rename zconf.h in CMakeLists.txt to move it out of the way.
Mark Adler [Sat, 17 Mar 2012 03:53:09 +0000 (20:53 -0700)]
Add gzopen_w() in Windows for wide character path names.
Mark Adler [Thu, 15 Mar 2012 06:14:13 +0000 (23:14 -0700)]
Recognize clang as gcc.
Mark Adler [Wed, 14 Mar 2012 18:16:22 +0000 (11:16 -0700)]
Improve inflate() documentation on the use of Z_FINISH.
Mark Adler [Wed, 14 Mar 2012 17:30:41 +0000 (10:30 -0700)]
Make sure that unistd.h is included before using _LFS64_LARGEFILE.
Mark Adler [Wed, 14 Mar 2012 16:18:15 +0000 (09:18 -0700)]
Repair some damage caused by -Wundef allowance.
Mark Adler [Wed, 14 Mar 2012 15:34:50 +0000 (08:34 -0700)]
Avoid the use of the -u option with mktemp.
Mark Adler [Wed, 14 Mar 2012 06:19:38 +0000 (23:19 -0700)]
Allow the use of -Wundef when compiling or using zlib.
Mark Adler [Tue, 13 Mar 2012 05:21:24 +0000 (22:21 -0700)]
Move obsolete emx makefile to old [Truta].
Mark Adler [Tue, 13 Mar 2012 05:18:36 +0000 (22:18 -0700)]
Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta].
Christoph J. Thompson [Mon, 12 Mar 2012 16:31:58 +0000 (17:31 +0100)]
If using cmake with MSVC, add the source directory to the includes.
modified: CMakeLists.txt
Christoph J. Thompson [Sun, 11 Mar 2012 09:19:06 +0000 (10:19 +0100)]
Include version symbols for cmake builds.
Add a version variable so it gets added to the pkg-config file.
Christoph J. Thompson [Sun, 11 Mar 2012 09:17:57 +0000 (10:17 +0100)]
Build both a static and a shared version of zlib with cmake.
Christoph J. Thompson [Sun, 11 Mar 2012 09:17:16 +0000 (10:17 +0100)]
Generate and install the pkg-config file with cmake.
Christoph J. Thompson [Sun, 11 Mar 2012 09:15:31 +0000 (10:15 +0100)]
Allow overriding the default install locations for cmake.
Mark Adler [Sun, 11 Mar 2012 06:24:08 +0000 (22:24 -0800)]
Update copyright years in gzlib.c.
Mark Adler [Sat, 10 Mar 2012 17:58:37 +0000 (09:58 -0800)]
Fix comments in win32/Makefile.gcc for proper usage.
Mark Adler [Sat, 10 Mar 2012 17:54:08 +0000 (09:54 -0800)]
Avoid warnings when O_CLOEXEC or O_EXCL are not defined.
Nathan Phillip Brink [Fri, 9 Mar 2012 01:29:46 +0000 (01:29 +0000)]
Add DESTDIR support to mingw32 win32/Makefile.gcc.
Mark Adler [Sat, 10 Mar 2012 02:43:50 +0000 (18:43 -0800)]
Add ability to choose the builder in make_vms.com [Schweda].
Mark Adler [Sun, 4 Mar 2012 19:26:25 +0000 (11:26 -0800)]
Make sure that O_EXCL is used portably.
Mark Adler [Sun, 4 Mar 2012 17:46:25 +0000 (09:46 -0800)]
Fix contrib/vstudio project link errors [Mohanathas].
Mark Adler [Sun, 4 Mar 2012 06:43:15 +0000 (22:43 -0800)]
Fix bug in test/minigzip.c for configure --solo.
Mark Adler [Sat, 3 Mar 2012 18:24:44 +0000 (10:24 -0800)]
Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen().
Mark Adler [Sat, 3 Mar 2012 17:28:00 +0000 (09:28 -0800)]
Fix bug in gzclose_w() when gzwrite() fails to allocate memory.
Mark Adler [Sat, 3 Mar 2012 08:20:00 +0000 (00:20 -0800)]
Simplify test and use of gcc hidden attribute.
Mark Adler [Sat, 3 Mar 2012 08:03:30 +0000 (00:03 -0800)]
Don't use library or built-in byte swaps.
Using optimized byte swaps reduced portability for no real benefit,
since they are in parts of the code that represent a tiny fraction
of the execution time. So a simple definition of a byte swap is
now used.
Mark Adler [Sat, 3 Mar 2012 07:50:17 +0000 (23:50 -0800)]
Fix make_vms.com for VAX [Zinser].
Mark Adler [Sat, 3 Mar 2012 07:47:42 +0000 (23:47 -0800)]
Cast to char * in gzprintf to avoid warnings [Zinser].
Mark Adler [Mon, 20 Feb 2012 17:24:30 +0000 (09:24 -0800)]
Avoid using __int64 for gcc or solo compilation.
Mark Adler [Mon, 20 Feb 2012 07:31:55 +0000 (23:31 -0800)]
Improve the detection of no hidden visibility attribute.
Mark Adler [Mon, 20 Feb 2012 06:45:10 +0000 (22:45 -0800)]
Do not use the visibility attribute if NO_VIZ defined.
Mark Adler [Mon, 20 Feb 2012 06:36:40 +0000 (22:36 -0800)]
Update version numbers and year in win32/README-WIN32.txt.
Mark Adler [Sun, 19 Feb 2012 07:11:49 +0000 (23:11 -0800)]
Use __WATCOMC__ instead of __WATCOM__.
Mark Adler [Sat, 18 Feb 2012 23:21:13 +0000 (15:21 -0800)]
Include unistd.h for Watcom C.
Mark Adler [Sat, 18 Feb 2012 23:19:44 +0000 (15:19 -0800)]
Require gcc 4.0 or later on Mac OS X to use the hidden attribute.
Török Edwin [Tue, 14 Feb 2012 10:50:18 +0000 (12:50 +0200)]
Fix build with non-GNU make on Solaris.
Mark Adler [Sat, 18 Feb 2012 22:10:20 +0000 (14:10 -0800)]
Restore gzgetc_ for backward compatibility with 1.2.6.
Mark Adler [Sat, 18 Feb 2012 21:55:09 +0000 (13:55 -0800)]
Test for existence of strerror.
SunOS 4.1 claims that it is __STDC__, but it does not have strerror
in string.h. Instead of using __STDC__, this puts a direct test
for strerror in configure, and uses that information in gzguts.h.
Mark Adler [Sat, 18 Feb 2012 16:19:59 +0000 (08:19 -0800)]
Replace use of memmove() with a simple copy for portability.
SunOS 4.1 doesn't have memmove(), and there may be others. memcpy()
should not be used for overlapping copies, so here a simple copy is
implemented that works for the particular direction of the overlap,
which is where the destination precedes the source.
Mark Adler [Tue, 14 Feb 2012 07:34:48 +0000 (23:34 -0800)]
Expunge gzgetc_ from configuration files.
Mark Adler [Tue, 14 Feb 2012 07:02:13 +0000 (23:02 -0800)]
Remove unnecessary include for byte swap built-in [Bosmans].
Mark Adler [Mon, 13 Feb 2012 03:28:06 +0000 (19:28 -0800)]
Don't use built-in byte swaps if compiled solo.
Mark Adler [Mon, 13 Feb 2012 00:15:47 +0000 (16:15 -0800)]
Change version number to 1.2.7.
Mark Adler [Sun, 12 Feb 2012 22:11:48 +0000 (14:11 -0800)]
zlib 1.2.6.1
Mark Adler [Sat, 11 Feb 2012 08:31:24 +0000 (00:31 -0800)]
Fix minor typo in zlib.h comments [Rześniowiecki].
Mark Adler [Sat, 11 Feb 2012 08:26:38 +0000 (00:26 -0800)]
Use optimized byte swap operations for Microsoft and GNU [Snyder].
Mark Adler [Sat, 11 Feb 2012 07:55:12 +0000 (23:55 -0800)]
Remove unnecessary gzgetc_ function.
Mark Adler [Sun, 5 Feb 2012 18:55:09 +0000 (10:55 -0800)]
Update make_vms.com [Zinser].
Mark Adler [Sat, 4 Feb 2012 18:14:13 +0000 (10:14 -0800)]
Minor cleanup in contrib/minizip/zip.c [Vollant].
Mark Adler [Sat, 4 Feb 2012 06:56:16 +0000 (22:56 -0800)]
Use name in GCC_CLASSIC as C compiler for coverage testing, if set.
Apple removed support for gcov in the default gcc compiler chain,
when they moved to llvm. This can be circumvented in XCode 4.2 by
using the gcc chain with gcc-4.2. This patch allows setting
GCC_CLASSIC to the name of a real gcc executable (e.g. "gcc-4.2")
to allow coverage testing.
Mark Adler [Thu, 2 Feb 2012 07:47:47 +0000 (23:47 -0800)]
Avoid library header include in crc32.c for Z_SOLO.
crc32.c was #including limits.h in order to find a four-byte integer
type. It was doing this even if Z_SOLO were defined, violating the
intent of Z_SOLO, which is to include no library headers and require
no library functions. Now crc32.c obeys the intent of Z_SOLO, but
with the downside that crc32() will be slower than when not compiled
with Z_SOLO. This can be remedied manually by typedefing u4 to a
known four-byte unsigned integer type, and #defining BYFOUR in
crc32.c.
Mark Adler [Thu, 2 Feb 2012 07:25:34 +0000 (23:25 -0800)]
Put gzflags() functionality back in zutil.c.
gzflags() was put in gzwrite.c in order to be compiled exactly the
same as gzprintf(), so that it was guaranteed to return the correct
information. However that causes a static linkage to zlib to bring
in many routines that are often not used. All that is required to
duplicate the compilation environment of gzprintf() is to include
gzguts.h. So that is now done in zutil.c to assure that the correct
flags are returned.
Mark Adler [Thu, 2 Feb 2012 06:41:52 +0000 (22:41 -0800)]
Include gz_header definition when compiling zlib solo.
Mark Adler [Tue, 31 Jan 2012 07:55:14 +0000 (23:55 -0800)]
Fix problem with ./configure --prefix and gzgetc macro.
Mark Adler [Mon, 30 Jan 2012 03:20:13 +0000 (19:20 -0800)]
Include io.h in gzguts.h for Microsoft compilers.
Mark Adler [Mon, 30 Jan 2012 01:44:04 +0000 (17:44 -0800)]
Avoid the use of the Objective-C reserved name "id".
Mark Adler [Mon, 30 Jan 2012 03:25:44 +0000 (19:25 -0800)]
Change version number to 1.2.6.1.
Mark Adler [Sun, 29 Jan 2012 18:13:15 +0000 (10:13 -0800)]
zlib 1.2.6
Mark Adler [Sun, 29 Jan 2012 17:57:58 +0000 (09:57 -0800)]
Correct in zlib.map when deflateResetKeep was added.
Mark Adler [Sun, 29 Jan 2012 17:27:41 +0000 (09:27 -0800)]
Use the -m option on ldconfig for BSD systems [Tobias].
Mark Adler [Sun, 29 Jan 2012 17:12:08 +0000 (09:12 -0800)]
Have gzputc return the character written instead of the argument.
When successful, gzputc would return the second argument. If the
second argument were -1, gzputc would return -1 instead of the
character written, which was 255. However the -1 would not be
distinguishable from an error. Now gzputc returns 255 in that
case.
Mark Adler [Sun, 29 Jan 2012 16:53:53 +0000 (08:53 -0800)]
Exit when required parameters not provided to win32/Makefile.gcc.
Mark Adler [Sat, 28 Jan 2012 22:48:50 +0000 (14:48 -0800)]
Add the generation of configure.log by ./configure.
Jonathan Nieder [Sat, 21 Jan 2012 21:55:54 +0000 (15:55 -0600)]
Add an --enable-demos option to contrib/minizip/configure.
This makes build-testing and installing the minizip/miniunzip programs
as simple as "autoreconf -if && ./configure --enable-demos && make &&
make install". Without --enable-demos, the makefile will only build
and install the library, as before. Helped by Mike Frysinger.
minizip/miniunzip were not intended to be general-purpose installed
utilities, but they can be useful from time to time as a lightweight
substitute for zip/unzip. You can also use them to quickly test that
the library installation procedure worked.
Jonathan Nieder [Tue, 17 Jan 2012 21:06:41 +0000 (15:06 -0600)]
Add support for VPATH builds in contrib/minizip.
Instead of using relative paths directly, use paths relative to
top_srcdir and top_builddir to refer to source files and built files,
respectively.
Note that the toplevel zlib configure script still does not have any
special support for out-of-tree builds. But now you can do
(cd contrib/minizip && autoreconf -fis)
mkdir -p BUILD/test
cp *.c *.h *.in zlib.map configure zlib.3 BUILD
cp test/*.c BUILD/test
(cd BUILD && ./configure --shared)
(cd BUILD && make)
mkdir -p BUILD/contrib/minizip
cd BUILD/contrib/minizip
../../../contrib/minizip/configure
make
While at it, move the include path and library path settings to
CPPFLAGS and LDFLAGS respectively instead of setting both in CFLAGS.
Thanks to Mike Frysinger for advice.
Jonathan Nieder [Tue, 17 Jan 2012 20:28:30 +0000 (14:28 -0600)]
Add missing libs to minizip linker command.
Trying to build the minizip utility from contrib/minizip after an
autoreconf -f:
libtool: link: gcc -g -O2 -o minizip minizip.o
minizip.o: In function `getFileCrc':
/tmp/zlib/contrib/minizip/minizip.c:211: undefined reference to `crc32'
minizip.o: In function `main':
/tmp/zlib/contrib/minizip/minizip.c:378: undefined reference to `zipOpen64'
/tmp/zlib/contrib/minizip/minizip.c:451: undefined reference to `zipOpenNewFileInZip3_64'
/tmp/zlib/contrib/minizip/minizip.c:502: undefined reference to `zipCloseFileInZip'
/tmp/zlib/contrib/minizip/minizip.c:509: undefined reference to `zipClose'
/tmp/zlib/contrib/minizip/minizip.c:485: undefined reference to `zipWriteInFileInZip'
collect2: error: ld returned 1 exit status
The cause: contrib/minizip/Makefile.am does not specify that minizip
needs to be linked to libminizip. With some linkers (e.g., GNU
binutils without --copy-dt-needed-entries), an indirect dependency
cannot be used to resolve symbols, so link to libz for crc32(), too.
Jonathan Nieder [Tue, 17 Jan 2012 20:26:05 +0000 (14:26 -0600)]
Add -I../.. -L../.. to CFLAGS for minizip and miniunzip.
Trying to build miniunzip utility from contrib/minizip after an
autoreconf -f produces
[...]
In file included from minizip.c:61:0:
zip.h:50:18: fatal error: zlib.h: No such file or directory
unless zlib is already installed. Use AM_CFLAGS to set the include
path and library path to point to the just-build copy of zlib to
fix this. (This was already done for libminizip but not the binaries
that use it before this patch.)
Mark Adler [Sat, 21 Jan 2012 19:59:32 +0000 (11:59 -0800)]
Remove trailing space in contrib/minizip/minizip.c.
Mark Adler [Sat, 21 Jan 2012 19:54:52 +0000 (11:54 -0800)]
Avoid some warnings in contrib/minizip [Vollant].
Mark Adler [Sat, 21 Jan 2012 19:51:54 +0000 (11:51 -0800)]
Protect for long name and extra fields in contrib/minizip [Vollant].