zlib 1.0.1

ChangeLog

@@ -1,5 +1,115 @@
+
 		ChangeLog file for zlib
 
+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 inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generated bad compressed data.
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+  and compression strategy.
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen.
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count).
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
+     (what's wrong with far data in far model?).
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+  not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+  (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+  typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
 Changes in 0.93 (25 June 95)
 - temporarily disable inline functions
 - make deflate deterministic

INDEX

@@ -0,0 +1,46 @@
+ChangeLog	history of changes
+INDEX		this file
+Make_vms.com	script for Vax/VMS
+Makefile	makefile for Unix (generated by configure)
+Makefile.b32	makefile for Borland C++   32-bit
+Makefile.bor	makefile for Borland C/C++ 16-bit
+Makefile.dj2	makefile for DJGPP 2.x
+Makefile.in	makefile for Unix (template for configure)
+Makefile.msc	makefile for Microsoft C 16-bit
+Makefile.sas	makefile for Amiga SAS/C
+Makefile.tc	makefile for Turbo C
+Makefile.wat	makefile for Watcom C
+README		guess what
+configure	configure script for Unix
+descrip.mms	makefile for Vax/VMS
+
+		zlib public header files (must be kept):
+zconf.h
+zlib.h
+
+		private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+deflate.c
+deflate.h
+gzio.c
+infblock.c
+infblock.h
+infcodes.c
+infcodes.h
+inffast.c
+inffast.h
+inflate.c
+inftrees.c
+inftrees.h
+infutil.c
+infutil.h
+trees.c
+uncompr.c
+zutil.c
+zutil.h
+
+		source files for sample programs:
+example.c
+minigzip.c

Make_vms.com

@@ -0,0 +1,115 @@
+$! make libz under VMS
+$! written by Martin P.J. Zinser <m.zinser@gsi.de>
+$!
+$! Look for the compiler used
+$!
+$ ccopt = ""
+$ if f$getsyi("HW_MODEL").ge.1024
+$ then
+$  ccopt = "/prefix=all"+ccopt
+$  comp  = "__decc__=1"
+$  if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ else
+$  if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""
+$   then
+$    comp  = "__vaxc__=1"
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$   else
+$    if f$trnlnm("SYS").eqs."" then define sys decc$library_include:
+$    ccopt = "/decc/prefix=all"+ccopt
+$    comp  = "__decc__=1"
+$  endif
+$ endif
+$!
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if f$search("SYS$SYSTEM:MMS.EXE").eqs.""
+$  then
+$   dele example.obj;*,minigzip.obj;*
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+                adler32.c zutil.h zlib.h zconf.h
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+                compress.c zlib.h zconf.h
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+                crc32.c zutil.h zlib.h zconf.h
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+                deflatec.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
+                gsio.c zutil.h zlib.h zconf.h
+$   CALL MAKE infblock.OBJ "CC ''CCOPT' infblock" -
+                infblock.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE infcodes.OBJ "CC ''CCOPT' infcodes" -
+                infcodes.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+                inffast.c zutil.h zlib.h zconf.h inffast.h
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+                inflate.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE infutil.OBJ "CC ''CCOPT' infutil" -
+                infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+                trees.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+                uncompr.c zlib.h zconf.h
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+                zutil.c zutil.h zlib.h zconf.h
+$   write sys$output "Building Zlib ..."
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   write sys$output "Building example..."
+$   CALL MAKE example.OBJ "CC ''CCOPT' example" -
+                example.c zlib.h zconf.h
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   write sys$output "Building minigzip..."
+$   CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
+                minigzip.c zlib.h zconf.h
+$   call make minigzip.exe - 
+                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - 
+                minigzip.obj libz.olb
+$  else
+$   mms/macro=('comp')
+$  endif
+$ write sys$output "Zlib build completed"
+$ exit
+$!
+$!
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8  What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$       Argument = P'arg
+$       If Argument .Eqs. "" Then Goto Exit
+$       El=0
+$Loop2:
+$       File = F$Element(El," ",Argument)
+$       If File .Eqs. " " Then Goto Endl
+$       AFile = ""
+$Loop3:
+$       OFile = AFile
+$       AFile = F$Search(File)
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       Goto Loop3
+$NextEL:
+$       El = El + 1
+$       Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE

Makefile

@@ -1,72 +1,129 @@
 # Makefile for zlib
-# Copyright (C) 1995 Jean-loup Gailly.
+# Copyright (C) 1995-1996 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 
-CC=cc
+# To compile and test, type:
-CFLAGS=-O
+#   ./configure; make test
-#use -O3 for gcc to take advantage of inlining
+# The call of configure is optional if you don't have special requirements
-#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
-#CFLAGS=-g -DDEBUG
-LDFLAGS=-L. -lgz
 
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+LDFLAGS=-L. -lz
+LDSHARED=$(CC)
+
+VER=1.0.1
+LIBS=libz.a
+
+AR=ar rc
 RANLIB=ranlib
+TAR=tar
 
 prefix=/usr/local
+exec_prefix = $(prefix)
 
 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
        zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
 
 TEST_OBJS = example.o minigzip.o
 
+DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] descrip.mms *.[ch]
+
 all: example minigzip
 
 test: all
 	./example
 	echo hello world | ./minigzip | ./minigzip -d 
 
-install: libgz.a
+libz.a: $(OBJS)
-	-@mkdir $(prefix)/include
+	$(AR) $@ $(OBJS)
-	-@mkdir $(prefix)/lib
+	-@ ($(RANLIB) $@ || true) 2>/dev/null
-	cp zlib.h zconf.h $(prefix)/include
-	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-	cp libgz.a $(prefix)/lib
-	chmod 644 $(prefix)/lib/libgz.a
 
-libgz.a: $(OBJS)
+libz.so.$(VER): $(OBJS)
-	ar rc $@ $(OBJS)
+	$(LDSHARED) -o $@ $(OBJS)
-	$(RANLIB) $@
+	rm -f libz.so; ln -s $@ libz.so
 
-example: example.o libgz.a
+example: example.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
 
-minigzip: minigzip.o libgz.a
+minigzip: minigzip.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
+install: $(LIBS)
+	-@if [ ! $(prefix)/include  ]; then mkdir $(prefix)/include; fi
+	-@if [ ! $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
+	cp zlib.h zconf.h $(prefix)/include
+	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+	cp $(LIBS) $(exec_prefix)/lib
+	cd $(exec_prefix)/lib; chmod 644 $(LIBS)
+	-@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
+	cd $(exec_prefix)/lib; if test -f libz.so.$(VER); then \
+	  ln -s libz.so.$(VER) libz.so; \
+	fi
+# The ranlib in install is needed on NeXTSTEP which checks file times
+
+uninstall:
+	cd $(exec_prefix)/lib; rm -f $(LIBS); \
+	if test -f libz.so; then \
+	 v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p'<$(prefix)/include/zlib.h`;\
+	 rm -f libz.so.$$v libz.so; \
+	fi
+	cd $(prefix)/include; rm -f zlib.h zconf.h
+
 clean:
-	rm -f *.o example minigzip libgz.a foo.gz
+	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
 
 zip:
-	zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
+	v=`sed -n -e 's/\./-/g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	zip -ul9 zlib-$$v $(DISTFILES)
+	mv Makefile~ Makefile
 
-tgz:
+dist:
-	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
-		zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	rm -f $$d.tar.gz; \
+	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
+	files=""; \
+	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
+	cd ..; \
+	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
+	if test ! -d $$d; then rm -f $$d; fi
+	mv Makefile~ Makefile
+
+tags:	
+	etags *.[ch]
+
+depend:
+	makedepend -- $(CFLAGS) -- *.[ch]
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-adler32.o: zutil.h zlib.h zconf.h
+adler32.o: zlib.h zconf.h
 compress.o: zlib.h zconf.h
-crc32.o: zutil.h zlib.h zconf.h
+crc32.o: zlib.h zconf.h
 deflate.o: deflate.h zutil.h zlib.h zconf.h
 example.o: zlib.h zconf.h
 gzio.o: zutil.h zlib.h zconf.h
-infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
-infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+infcodes.o: zutil.h zlib.h zconf.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h
+inffast.o: infblock.h infcodes.h infutil.h inffast.h
 inflate.o: zutil.h zlib.h zconf.h infblock.h
 inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
+infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-minigzip.o: zlib.h zconf.h
+minigzip.o:  zlib.h zconf.h 
-trees.o: deflate.h zutil.h zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h 
 uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h  

Makefile.b32

@@ -0,0 +1,104 @@
+# Makefile for zlib
+# Borland C++   
+
+# This version of the zlib makefile was adapted by Chris Young for use
+# with Borland C 4.5x with the Dos Power Pack for a 32-bit protected mode
+# flat memory model.  It was created for use with POV-Ray ray tracer and
+# you may choose to edit the CFLAGS to suit your needs but the
+# switches -WX and -DMSDOS are required.
+# -- Chris Young 76702.1655@compuserve.com
+
+# To use, do "make -fmakefile.b32"
+
+# See zconf.h for details about the memory requirements.
+
+# ------------- Borland C++ -------------
+MODEL=-WX 
+CFLAGS= $(MODEL) -P-C -K -N- -k- -d -3 -r- -v- -f -DMSDOS
+CC=bcc32
+LD=bcc32
+LIB=tlib
+LDFLAGS= $(MODEL)
+O=.obj
+
+# variables
+OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+  trees$(O)
+OBJP1 = adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)+\
+  trees$(O)
+OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
+  infutil$(O) inffast$(O)
+OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\
+  infutil$(O)+inffast$(O)
+
+all: test
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
+   infcodes.h infutil.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
+   infcodes.h inffast.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+	$(CC) -c $(CFLAGS) $*.c
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+example.obj: example.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+# we must cut the command line to fit in the MS/DOS 128 byte limit:
+zlib.lib: $(OBJ1) $(OBJ2)
+	del zlib.lib
+	$(LIB) zlib +$(OBJP1)
+	$(LIB) zlib +$(OBJP2)
+
+example.exe: example.obj zlib.lib
+	$(LD) $(LDFLAGS) example.obj zlib.lib
+
+minigzip.exe: minigzip.obj zlib.lib
+	$(LD) $(LDFLAGS) minigzip.obj zlib.lib
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d 
+
+#clean:
+#	del *.obj
+#	del *.exe

Makefile.bor

@@ -2,11 +2,14 @@
 # Borland C++   ************ UNTESTED ***********
 
 # To use, do "make -fmakefile.bor"
+# To compile in small model, set below: MODEL=-ms
 
 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
-# requirements (default 256K for big objects plus a few K), you can add
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C++, Borland C++ -------------
@@ -15,7 +18,7 @@ CFLAGS=-O2 -Z $(MODEL)
 CC=bcc
 LD=bcc
 LIB=tlib
-#   replace bcc with tcc for Turbo C++ 1.0
+#   replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
 LDFLAGS=$(MODEL)
 O=.obj
 
@@ -83,6 +86,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+	del zlib.lib
 	$(LIB) zlib +$(OBJP1)
 	$(LIB) zlib +$(OBJP2)
 

Makefile.dj2

@@ -0,0 +1,79 @@
+# Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
+# Copyright (C) 1995-1996 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
+# To compile and test, type:
+#   make -fmakefile.dj2;  make test -fmakefile.dj2
+
+# To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
+#    make install -fmakefile.dj2
+# after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env for [make].
+# Alternately these variables may be defined below.
+
+CC=gcc
+
+#CFLAGS=-MMD -O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-MMD -g -DDEBUG
+CFLAGS=-MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+           -Wstrict-prototypes -Wmissing-prototypes
+INSTALL=install
+LDLIBS=-L. -lz
+LD=$(CC) -s -o
+LDSHARED=$(CC)
+
+VER=1.0
+LIBS=libz.a
+
+AR=ar rcs
+# The default value of RM is "rm -f."  If "rm.exe" is not found, uncomment:
+# RM=del
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+DISTFILES = README Change.Log configur Makefile.in Makefile Makefile.msc \
+	    Makefile.bor Makefile.tc Make_vms.com descrip.mms zlib099.pat \
+	    *.bak *.old *.[ch]
+
+all: example.exe minigzip.exe
+
+test: all
+	./example
+	echo hello world | .\minigzip | .\minigzip -d 
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+libz.a: $(OBJS)
+	$(AR) $@ $(OBJS)
+
+libz.so.$(VER): $(OBJS)
+	$(LDSHARED) -o $@ $(OBJS)
+	rm -f libz.so; ln -s $@ libz.so
+
+%.exe : %.o $(LIBS)
+	$(LD) $@ $< $(LDLIBS)
+
+# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env
+
+install: $(LIBS)
+	$(INSTALL) zlib.h zconf.h $(INCLUDE_PATH)
+	$(INSTALL) $(LIBS) $(LIBRARY_PATH)
+
+uninstall:
+	$(RM) $(LIBRARY_PATH)/$(LIBS)
+	$(RM) $(INCLUDE_PATH)/zlib.h $(INCLUDE_PATH)/zconf.h
+
+clean:
+	$(RM) *.d *.o *.~ *.exe libz.a libz.so* foo.gz
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif

Makefile.in

@@ -0,0 +1,129 @@
+# Makefile for zlib
+# Copyright (C) 1995-1996 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
+# To compile and test, type:
+#   ./configure; make test
+# The call of configure is optional if you don't have special requirements
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+LDFLAGS=-L. -lz
+LDSHARED=$(CC)
+
+VER=1.0.1
+LIBS=libz.a
+
+AR=ar rc
+RANLIB=ranlib
+TAR=tar
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] descrip.mms *.[ch]
+
+all: example minigzip
+
+test: all
+	./example
+	echo hello world | ./minigzip | ./minigzip -d 
+
+libz.a: $(OBJS)
+	$(AR) $@ $(OBJS)
+	-@ ($(RANLIB) $@ || true) 2>/dev/null
+
+libz.so.$(VER): $(OBJS)
+	$(LDSHARED) -o $@ $(OBJS)
+	rm -f libz.so; ln -s $@ libz.so
+
+example: example.o $(LIBS)
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o $(LIBS)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+install: $(LIBS)
+	-@if [ ! $(prefix)/include  ]; then mkdir $(prefix)/include; fi
+	-@if [ ! $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
+	cp zlib.h zconf.h $(prefix)/include
+	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+	cp $(LIBS) $(exec_prefix)/lib
+	cd $(exec_prefix)/lib; chmod 644 $(LIBS)
+	-@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
+	cd $(exec_prefix)/lib; if test -f libz.so.$(VER); then \
+	  ln -s libz.so.$(VER) libz.so; \
+	fi
+# The ranlib in install is needed on NeXTSTEP which checks file times
+
+uninstall:
+	cd $(exec_prefix)/lib; rm -f $(LIBS); \
+	if test -f libz.so; then \
+	 v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p'<$(prefix)/include/zlib.h`;\
+	 rm -f libz.so.$$v libz.so; \
+	fi
+	cd $(prefix)/include; rm -f zlib.h zconf.h
+
+clean:
+	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
+
+zip:
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
+	v=`sed -n -e 's/\./-/g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	zip -ul9 zlib-$$v $(DISTFILES)
+	mv Makefile~ Makefile
+
+dist:
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
+	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	rm -f $$d.tar.gz; \
+	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
+	files=""; \
+	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
+	cd ..; \
+	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
+	if test ! -d $$d; then rm -f $$d; fi
+	mv Makefile~ Makefile
+
+tags:	
+	etags *.[ch]
+
+depend:
+	makedepend -- $(CFLAGS) -- *.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
+infcodes.o: zutil.h zlib.h zconf.h
+infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h
+inffast.o: infblock.h infcodes.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+minigzip.o:  zlib.h zconf.h 
+trees.o: deflate.h zutil.h zlib.h zconf.h 
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h  

Makefile.msc

@@ -2,11 +2,11 @@
 # Microsoft C 5.1 or later
 
 # To use, do "make makefile.msc"
+# To compile in small model, set below: MODEL=-AS
 
-# WARNING: the small model is supported but only for small values of
+# If you wish to reduce the memory requirements (default 256K for big
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# objects plus a few K), you can add to CFLAGS below: 
-# requirements (default 256K for big objects plus a few K), you can add
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Microsoft C 5.1 and later -------------
@@ -80,6 +80,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+        del zlib.lib
 	lib zlib $(OBJ1);
 	lib zlib $(OBJ2);
 

Makefile.sas

@@ -0,0 +1,64 @@
+# SMakefile for zlib
+# Modified from the standard UNIX Makefile Copyright Jean-loup Gailly
+# Osma Ahvenlampi <Osma.Ahvenlampi@hut.fi>
+# Amiga, SAS/C 6.56 & Smake
+
+CC=sc
+CFLAGS=OPT
+#CFLAGS=OPT CPU=68030
+#CFLAGS=DEBUG=LINE
+LDFLAGS=LIB z.lib
+
+SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
+       NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX 
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: SCOPTIONS example minigzip
+
+test: all
+	`cd`/example
+	echo hello world | minigzip | minigzip -d 
+
+install: z.lib
+	copy zlib.h zconf.h INCLUDE: clone
+	copy z.lib LIB: clone
+
+z.lib: $(OBJS)
+	oml z.lib r $(OBJS)
+
+example: example.o z.lib
+	$(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o z.lib
+	$(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS)
+
+clean:
+	-delete force quiet *.o example minigzip z.lib foo.gz *.lnk SCOPTIONS
+
+SCOPTIONS: Smakefile
+        copy to $@ <from <
+$(SCOPTIONS)
+<
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zutil.h zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h

Makefile.tc

@@ -2,20 +2,24 @@
 # TurboC 2.0
 
 # To use, do "make -fmakefile.tc"
+# To compile in small model, set below: MODEL=-ms
 
 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
-# requirements (default 256K for big objects plus a few K), you can add
+#    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C 2.0 -------------
 MODEL=-ml
-CFLAGS=-O2 -Z $(MODEL)
+# CFLAGS=-O2 -G -Z $(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-CC=tcc
+CFLAGS=-O2 -G -Z $(MODEL)
-LD=tcc
+CC=tcc -I\tc\include
+LD=tcc -L\tc\lib
 LIB=tlib
-LDFLAGS=$(MODEL)
+LDFLAGS=$(MODEL) -f-
 O=.obj
 
 # variables
@@ -82,6 +86,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+	del zlib.lib
 	$(LIB) zlib +$(OBJP1)
 	$(LIB) zlib +$(OBJP2)
 

Makefile.wat

@@ -0,0 +1,103 @@
+# Makefile for zlib
+# Watcom 10a
+
+# This version of the zlib makefile was adapted by Chris Young for use
+# with Watcom 10a 32-bit protected mode flat memory model.  It was created 
+# for use with POV-Ray ray tracer and you may choose to edit the CFLAGS to 
+# suit your needs but the -DMSDOS is required.
+# -- Chris Young 76702.1655@compuserve.com
+
+# To use, do "wmake -f makefile.wat"
+
+# See zconf.h for details about the memory requirements.
+
+# ------------- Watcom 10a -------------
+MODEL=-mf 
+CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DMSDOS
+CC=wcc386
+LD=wcl386
+LIB=wlib -b -c 
+LDFLAGS= 
+O=.obj
+
+# variables
+OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) 
+OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) 
+OBJ3=infutil$(O) inffast$(O)
+OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
+OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
+OBJP3=infutil$(O)+inffast$(O)
+
+all: test
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h &
+  infcodes.h infutil.h
+	$(CC) $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h &
+  infcodes.h inffast.h
+	$(CC) $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+	$(CC) $(CFLAGS) $*.c
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+	$(CC) $(CFLAGS) $*.c
+
+infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+	$(CC) $(CFLAGS) $*.c
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+	$(CC) $(CFLAGS) $*.c
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+example.obj: example.c zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+	$(CC) $(CFLAGS) $*.c
+
+# we must cut the command line to fit in the MS/DOS 128 byte limit:
+zlib.lib: $(OBJ1) $(OBJ2) $(OBJ3) 
+	del zlib.lib
+	$(LIB) zlib.lib +$(OBJP1)
+	$(LIB) zlib.lib +$(OBJP2)
+	$(LIB) zlib.lib +$(OBJP3)
+
+example.exe: example.obj zlib.lib
+	$(LD) $(LDFLAGS) example.obj zlib.lib
+
+minigzip.exe: minigzip.obj zlib.lib
+	$(LD) $(LDFLAGS) minigzip.obj zlib.lib
+
+test: minigzip.exe example.exe
+	example
+	echo hello world | minigzip | minigzip -d >test
+	type test
+
+#clean:
+#	del *.obj
+#	del *.exe

README

@@ -1,40 +1,66 @@
-zlib 0.93 is a beta version of a general purpose compression library.
+zlib 1.0.1 is a general purpose data compression library.  All the code
-
+is reentrant (thread safe).  The data format used by the zlib library
-The data format used by the zlib library is described in the
+is described in the files zlib-3.3.doc, deflate-1.3.doc and
-files zlib-3.1.doc, deflate-1.1.doc and gzip-4.1.doc, available
+gzip-4.3.doc, available in various formats from
-in ftp.uu.net:/pub/archiving/zip/doc.
+ftp://swrinde.nde.swri.edu/pub/png/documents/zlib/
 
 All functions of the compression library are documented in the file
 zlib.h. A usage example of the library is given in the file example.c
-which also tests that the library is working correctly.
+which also tests that the library is working correctly. Another
+example is given in the file minigzip.c. The compression library itself
+is composed of all source files except example.c and minigzip.c.
 
-To compile all files and run the test program, just type: make test
+To compile all files and run the test program, follow the instructions
-(For MSDOS, use one of the special makefiles such as Makefile.msc.)
+given at the top of Makefile. In short "make test; make install"
-To install the zlib library (libgz.a) in /usr/local/lib, type: make install
+should work for most machines.  For MSDOS, use one of the special
-To install in a different directory, use for example: make install prefix=$HOME
+makefiles such as Makefile.msc; for VMS, use Make_vms.com or descrip.mms.
-This will install in $HOME/lib instead of /usr/local/lib.
 
-The changes made in version 0.93 are documented in the file ChangeLog.
+Questions about zlib should be sent to <zlib@quest.jpl.nasa.gov> or,
-The main changes since 0.9 are:
+if this fails, to the addresses given below in the Copyright section.
-- temporarily disable inline functions
-- make deflate deterministic
-- don't use signed char in inflate (not portable enough)
-- fix inflate memory leak for segmented architectures
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-- Document the memory requirements in zconf.h
-- added "make install"
-- added support for DJGPP and Pyramid
-- fix an inflate bug for stored blocks.
-- various speedups
 
-On MSDOS, this version works in both large and small model. However
+The changes made in version 1.0.1 are documented in the file ChangeLog.
-small model compression works only for small values of MAX_MEM_LEVEL
+Version number 1.0 was skipped to avoid confusion with version 0.99
-and MAX_WBITS (see zconf.h). Small model decompression should work up
+which had some references to 1.0 already. The main changes since 0.99 are:
-to MAX_WBITS=15.  This version of zlib does not support small or
+
-medium model with far allocation of big objects.
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generated bad compressed data.
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- several portability improvements
+
+Notes for some targets:
+
+- For Turbo C the small model is supported only with reduced performance to
+  avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+
+- For 64-bit Iris, deflate.c must be compiled without any optimization.
+  With -O, one libpng test fails. The test works in 32 bit mode (with
+  the -32 compiler flag).
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1   
+  it works when compiled with cc.
+
+- zlib doesn't work on HP-UX 9.05 with one cc compiler (the one not
+  accepting the -O option). It works with the other cc compiler.
+
+A Perl interface to zlib written by Paul Marquess <pmarquess@bfsec.bt.co.uk>
+is in the CPAN (Comprehensive Perl Archive Network) sites, such as:
+ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
 
 
-  Copyright (C) 1995 Jean-loup Gailly and Mark Adler
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz. The deflate
+  and zlib specifications were written by Peter Deutsch. Thanks to all the
+  people who reported problems and suggested various improvements in zlib;
+  they are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-1996 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

adler32.c

@@ -1,26 +1,26 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: adler32.c,v 1.6 1995/05/03 17:27:08 jloup Exp $ */
+/* $Id: adler32.c,v 1.9 1996/01/30 21:59:09 me Exp $ */
 
-#include "zutil.h"
+#include "zlib.h"
 
-#define BASE 65521 /* largest prime smaller than 65536 */
+#define BASE 65521L /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
-#define DO1(buf)  {s1 += *buf++; s2 += s1;}
+#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
-#define DO2(buf)  DO1(buf); DO1(buf);
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf)  DO2(buf); DO2(buf);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf)  DO4(buf); DO4(buf);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf) DO8(buf); DO8(buf);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
 /* ========================================================================= */
 uLong adler32(adler, buf, len)
     uLong adler;
-    Byte *buf;
+    const Bytef *buf;
     uInt len;
 {
     unsigned long s1 = adler & 0xffff;
@@ -34,10 +34,12 @@ uLong adler32(adler, buf, len)
         len -= k;
         while (k >= 16) {
             DO16(buf);
+	    buf += 16;
             k -= 16;
         }
         if (k != 0) do {
-            DO1(buf);
+            s1 += *buf++;
+	    s2 += s1;
         } while (--k);
         s1 %= BASE;
         s2 %= BASE;

compress.c

@@ -1,9 +1,9 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: compress.c,v 1.6 1995/05/03 17:27:08 jloup Exp $ */
+/* $Id: compress.c,v 1.9 1996/01/30 21:59:09 me Exp $ */
 
 #include "zlib.h"
 
@@ -20,15 +20,15 @@
    buffer.
 */
 int compress (dest, destLen, source, sourceLen)
-    Byte *dest;
+    Bytef *dest;
-    uLong *destLen;
+    uLongf *destLen;
-    Byte *source;
+    const Bytef *source;
     uLong sourceLen;
 {
     z_stream stream;
     int err;
 
-    stream.next_in = source;
+    stream.next_in = (Bytef*)source;
     stream.avail_in = (uInt)sourceLen;
     /* Check for source > 64K on 16-bit machine: */
     if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
@@ -39,6 +39,7 @@ int compress (dest, destLen, source, sourceLen)
 
     stream.zalloc = (alloc_func)0;
     stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
 
     err = deflateInit(&stream, Z_DEFAULT_COMPRESSION);
     if (err != Z_OK) return err;

configure

@@ -0,0 +1,86 @@
+#!/bin/sh
+# configure script for zlib. This script is needed only if
+# you wish to build a shared library and your system supports them,
+# of if you need special compiler, flags or install directory.
+# Otherwise, you can just use directly "make test; make install"
+#
+# To impose specific compiler or flags or install directory, use for example:
+#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
+# or for csh/tcsh users:
+#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
+# LDSHARED is the command to be used to create a shared library
+
+LIBS=libz.a
+VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+AR=${AR-"ar rc"}
+RANLIB=${RANLIB-"ranlib"}
+prefix=${prefix-/usr/local}
+exec_prefix=${exec_prefix-$prefix}
+
+test -z "$CC" && echo Checking for gcc...
+test=ztest$$
+cat > $test.c <<EOF
+int hello() { printf("hello\n"); }
+EOF
+if test -z "$CC" && (gcc -c -O3 $test.c) 2>/dev/null; then
+  CC=gcc
+  SFLAGS=${CFLAGS-"-fPIC -O3"}
+  CFLAGS=${CFLAGS-"-O3"}
+  LDSHARED=${LDSHARED-"gcc -shared"}
+else
+  # find system name and corresponding cc options
+  CC=${CC-cc}
+  case `(uname -sr || echo unknown) 2>/dev/null` in
+  SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
+             CFLAGS=${CFLAGS-"-fast -xcg89"}
+	     LDSHARED=${LDSHARED-"cc -G"};;
+  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+	     CFLAGS=${CFLAGS-"-O2"}
+	     LDSHARED=${LDSHARED-"ld"};;
+  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
+	     CFLAGS=${CFLAGS-"-ansi -O2"}
+	     LDSHARED=${LDSHARED-"cc -shared"};;
+  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
+             CFLAGS=${CFLAGS-"-4 -O"}
+	     LDSHARED=${LDSHARED-"cc"}
+             RANLIB=${RANLIB-"true"}
+             AR="cc -A";;
+  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
+	     CFLAGS=${CFLAGS-"-O3"}
+	     LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
+  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
+	     CFLAGS=${CFLAGS-"-O"}
+	     LDSHARED=${LDSHARED-"ld -b"}
+	     SHAREDLIBS='libz.sl';;
+  # send working options for other systems to gzip@prep.ai.mit.edu
+  *)         SFLAGS=${CFLAGS-"-O"}
+	     CFLAGS=${CFLAGS-"-O"}
+	     LDSHARED=${LDSHARED-"cc -shared"};;
+  esac
+fi
+
+echo Checking for shared library support...
+# we must test in two steps (cc then ld), required at least on SunOS 4.x
+if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
+   test "`($LDSHARED -o $test.so $test.o) 2>&1`" = ""; then
+  CFLAGS="$SFLAGS"
+  LIBS='libz.so.$(VER)'
+  echo Building shared library libz.so.$VER with $CC.
+else
+  LDSHARED="$CC"
+  echo Building static library $LIBS version $VER with $CC.
+fi
+rm -f $test.[co] $test.so
+
+# udpate Makefile
+sed < Makefile.in "
+/^CC *=/s/=.*/=$CC/
+/^CFLAGS *=/s/=.*/=$CFLAGS/
+/^LDSHARED *=/s/=.*/=$LDSHARED/
+/^LIBS *=/s,=.*,=$LIBS,
+/^AR *=/s/=.*/=$AR/
+/^RANLIB *=/s,=.*,=$RANLIB,
+/^VER *=/s/=.*/=$VER/
+/^prefix *=/s,=.*,=$prefix,
+/^exec_prefix *=/s,=.*,=$exec_prefix,
+" > Makefile

crc32.c

@@ -1,32 +1,62 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: crc32.c,v 1.5 1995/05/01 13:55:46 jloup Exp $ */
+/* $Id: crc32.c,v 1.8 1996/01/30 21:59:10 me Exp $ */
 
 #include "zlib.h"
 
 #define local static
 
 #ifdef DYNAMIC_CRC_TABLE
-/* =========================================================================
- * Make the crc table. This function is needed only if you want to compute
- * the table dynamically.
- */
-local int crc_table_empty = 1;
-local uLong crc_table[256];
 
+local int crc_table_empty = 1;
+local uLongf crc_table[256];
+local void make_crc_table OF((void));
+
+/*
+  Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The table is simply the CRC of all possible eight bit values.  This is all
+  the information needed to generate CRC's on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+*/
 local void make_crc_table()
 {
   uLong c;
   int n, k;
+  uLong poly;            /* polynomial exclusive-or pattern */
+  /* terms of polynomial defining this crc (except x^32): */
+  static Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+  /* make exclusive-or pattern from polynomial (0xedb88320L) */
+  poly = 0L;
+  for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
+    poly |= 1L << (31 - p[n]);
  
   for (n = 0; n < 256; n++)
   {
     c = (uLong)n;
     for (k = 0; k < 8; k++)
-      c = c & 1 ? 0xedb88320L ^ (c >> 1) : c >> 1;
+      c = c & 1 ? poly ^ (c >> 1) : c >> 1;
     crc_table[n] = c;
   }
   crc_table_empty = 0;
@@ -35,7 +65,7 @@ local void make_crc_table()
 /* ========================================================================
  * Table of CRC-32's of all single-byte values (made by make_crc_table)
  */
-local uLong crc_table[] = {
+local uLongf crc_table[256] = {
   0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
   0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
   0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
@@ -91,6 +121,18 @@ local uLong crc_table[] = {
 };
 #endif
 
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+uLongf *get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+  if (crc_table_empty) make_crc_table();
+#endif
+  return (uLongf *)crc_table;
+}
+
+/* ========================================================================= */
 #define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
 #define DO2(buf)  DO1(buf); DO1(buf);
 #define DO4(buf)  DO2(buf); DO2(buf);
@@ -99,7 +141,7 @@ local uLong crc_table[] = {
 /* ========================================================================= */
 uLong crc32(crc, buf, len)
     uLong crc;
-    Byte *buf;
+    const Bytef *buf;
     uInt len;
 {
     if (buf == Z_NULL) return 0L;

deflate.h

@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995 Jean-loup Gailly
+ * Copyright (C) 1995-1996 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -8,7 +8,10 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: deflate.h,v 1.5 1995/05/03 17:27:09 jloup Exp $ */
+/* $Id: deflate.h,v 1.9 1996/01/30 21:59:13 me Exp $ */
+
+#ifndef _DEFLATE_H
+#define _DEFLATE_H
 
 #include "zutil.h"
 
@@ -16,11 +19,6 @@
  * Internal compression state.
  */
 
-/* Data type */
-#define BINARY  0
-#define ASCII   1
-#define UNKNOWN 2
-
 #define LENGTH_CODES 29
 /* number of length codes, not counting the special END_BLOCK code */
 
@@ -58,7 +56,7 @@ typedef struct ct_data_s {
         ush  dad;        /* father node in Huffman tree */
         ush  len;        /* length of bit string */
     } dl;
-} ct_data;
+} FAR ct_data;
 
 #define Freq fc.freq
 #define Code fc.code
@@ -71,10 +69,12 @@ typedef struct tree_desc_s {
     ct_data *dyn_tree;           /* the dynamic tree */
     int     max_code;            /* largest code with non zero frequency */
     static_tree_desc *stat_desc; /* the corresponding static tree */
-} tree_desc;
+} FAR tree_desc;
 
 typedef ush Pos;
+typedef Pos FAR Posf;
 typedef unsigned IPos;
+
 /* A Pos is an index in the character window. We use short instead of int to
  * save space in the various tables. IPos is used only for parameter passing.
  */
@@ -82,13 +82,13 @@ typedef unsigned IPos;
 typedef struct internal_state {
     z_stream *strm;      /* pointer back to this zlib stream */
     int   status;        /* as the name implies */
-    Byte *pending_buf;   /* output still pending */
+    Bytef *pending_buf;  /* output still pending */
-    Byte *pending_out;   /* next pending byte to output to the stream */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
     int   pending;       /* nb of bytes in the pending buffer */
-    uLong adler;         /* adler32 of uncompressed data */
     int   noheader;      /* suppress zlib header and adler32 */
     Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
     Byte  method;        /* STORED (for zip only) or DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
 
                 /* used by deflate.c: */
 
@@ -96,7 +96,7 @@ typedef struct internal_state {
     uInt  w_bits;        /* log2(w_size)  (8..16) */
     uInt  w_mask;        /* w_size - 1 */
 
-    Byte *window;
+    Bytef *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
      * bytes. With this organization, matches are limited to a distance of
@@ -111,13 +111,13 @@ typedef struct internal_state {
      * is directly used as sliding window.
      */
 
-    Pos *prev;
+    Posf *prev;
     /* 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.
      * An index in this array is thus a window index modulo 32K.
      */
 
-    Pos *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  hash_size;      /* number of elements in hash table */
@@ -171,17 +171,17 @@ typedef struct internal_state {
     uInt good_match;
     /* Use a faster search when the previous match is longer than this */
 
-     int nice_match; /* Stop searching when current match exceeds this */
+    int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
+    /* Didn't use ct_data typedef below to supress compiler warning */
+    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 bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
 
-    ct_data dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    ct_data dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    ct_data bl_tree[2*BL_CODES+1];  /* Huffman tree for the bit lengths */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    tree_desc l_desc;               /* descriptor for literal tree */
-    tree_desc d_desc;               /* descriptor for distance tree */
-    tree_desc bl_desc;              /* descriptor for bit length tree */
 
     ush bl_count[MAX_BITS+1];
     /* number of codes at each bit length for an optimal tree */
@@ -197,7 +197,7 @@ typedef struct internal_state {
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
-    uch *l_buf;           /* buffer for literals or lengths */
+    uchf *l_buf;          /* buffer for literals or lengths */
 
     uInt  lit_bufsize;
     /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -221,7 +221,7 @@ typedef struct internal_state {
 
     uInt last_lit;      /* running index in l_buf */
 
-    ush *d_buf;
+    ushf *d_buf;
     /* 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
      * array would be necessary.
@@ -231,6 +231,7 @@ typedef struct internal_state {
     ulg static_len;     /* bit length of current block with static trees */
     ulg compressed_len; /* total bit length of compressed file */
     uInt matches;       /* number of string matches in current block */
+    int last_eob_len;   /* bit length of EOB code for last block */
 
 #ifdef DEBUG
     ulg bits_sent;      /* bit length of the compressed data */
@@ -245,8 +246,7 @@ typedef struct internal_state {
      * are always zero.
      */
 
-} deflate_state;
+} FAR deflate_state;
-
 
 /* Output a byte on the stream.
  * IN assertion: there is enough room in pending_buf.
@@ -265,9 +265,11 @@ typedef struct internal_state {
  */
 
         /* in trees.c */
-void ct_init       __P((deflate_state *s));
+void _tr_init         OF((deflate_state *s));
-int  ct_tally      __P((deflate_state *s, int dist, int lc));
+int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-ulg ct_flush_block __P((deflate_state *s, char *buf, ulg stored_len, int eof));
+ulg  _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-void ct_align      __P((deflate_state *s));
+			  int eof));
-void ct_stored_block __P((deflate_state *s, char *buf, ulg stored_len,
+void _tr_align        OF((deflate_state *s));
+void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
                           int eof));
+#endif

descrip.mms

@@ -0,0 +1,48 @@
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser <m.zinser@gsi.de>
+
+cc_defs = 
+c_deb = 
+
+.ifdef __DECC__
+pref = /prefix=all
+.endif
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
+       inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
+
+CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
+
+all : example.exe minigzip.exe
+        @ write sys$output " Example applications available"
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
+
+clean : 
+	delete *.obj;*,libz.olb;*
+
+
+# Other dependencies.
+adler32.obj : zutil.h zlib.h zconf.h
+compress.obj : zlib.h zconf.h
+crc32.obj : zutil.h zlib.h zconf.h
+deflate.obj : deflate.h zutil.h zlib.h zconf.h
+example.obj : zlib.h zconf.h
+gzio.obj : zutil.h zlib.h zconf.h
+infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.obj : zutil.h zlib.h zconf.h infblock.h
+inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
+infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.obj : zlib.h zconf.h
+trees.obj : deflate.h zutil.h zlib.h zconf.h
+uncompr.obj : zlib.h zconf.h
+zutil.obj : zutil.h zlib.h zconf.h

example.c

@@ -1,29 +1,20 @@
 /* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: example.c,v 1.9 1995/05/03 17:27:09 jloup Exp $ */
+/* $Id: example.c,v 1.13 1996/01/30 21:59:13 me Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
 
 #ifdef STDC
 #  include <string.h>
+#  include <stdlib.h>
+#else
+   extern void exit  OF((int));
 #endif
 
-#ifndef __GO32__
-extern void exit  __P((int));
-#endif
-
-#define BUFLEN 4096
-
-#define local static
-/* For MSDOS and other systems with limitation on stack size. For Unix,
-    #define local
-   works also.
- */
-
 #define CHECK_ERR(err, msg) { \
     if (err != Z_OK) { \
         fprintf(stderr, "%s error: %d\n", msg, err); \
@@ -31,27 +22,44 @@ extern void exit  __P((int));
     } \
 }
 
-char *hello = "hello world";
+const char hello[] = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */
 
-void test_compress __P((void));
+const char dictionary[] = "hello";
-void test_gzio     __P((char *out, char *in));
+uLong dictId; /* Adler32 value of the dictionary */
-void test_deflate  __P((Byte compr[]));
+
-void test_inflate  __P((Byte compr[]));
+void test_compress      OF((Byte *compr, uLong comprLen,
-void main          __P((int argc, char *argv[]));
+		            Byte *uncompr, uLong uncomprLen));
+void test_gzio          OF((const char *out, const char *in, 
+		            Byte *uncompr, int uncomprLen));
+void test_deflate       OF((Byte *compr, uLong comprLen));
+void test_inflate       OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_large_deflate OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_large_inflate OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_flush         OF((Byte *compr, uLong comprLen));
+void test_sync          OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+void test_dict_deflate  OF((Byte *compr, uLong comprLen));
+void test_dict_inflate  OF((Byte *compr, uLong comprLen,
+		            Byte *uncompr, uLong uncomprLen));
+int  main               OF((int argc, char *argv[]));
 
 /* ===========================================================================
  * Test compress() and uncompress()
  */
-void test_compress()
+void test_compress(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
 {
-    local Byte compr[BUFLEN];
-    uLong comprLen = sizeof(compr);
-    local Byte uncompr[BUFLEN];
-    uLong uncomprLen = sizeof(uncompr);
     int err;
     uLong len = strlen(hello)+1;
 
-    err = compress(compr, &comprLen, (Byte*)hello, len);
+    err = compress(compr, &comprLen, (const Bytef*)hello, len);
     CHECK_ERR(err, "compress");
 
     strcpy((char*)uncompr, "garbage");
@@ -69,12 +77,12 @@ void test_compress()
 /* ===========================================================================
  * Test read/write of .gz files
  */
-void test_gzio(out, in)
+void test_gzio(out, in, uncompr, uncomprLen)
-    char *out; /* output file */
+    const char *out; /* output file */
-    char *in;  /* input file */
+    const char *in;  /* input file */
+    Byte *uncompr;
+    int  uncomprLen;
 {
-    local Byte uncompr[BUFLEN];
-    int uncomprLen = sizeof(uncompr);
     int err;
     int len = strlen(hello)+1;
     gzFile file;
@@ -85,7 +93,7 @@ void test_gzio(out, in)
         exit(1);
     }
 
-    if (gzwrite(file, hello, len) != len) {
+    if (gzwrite(file, (const voidp)hello, (unsigned)len) != len) {
         fprintf(stderr, "gzwrite err: %s\n", gzerror(file, &err));
     }
     gzclose(file);
@@ -96,7 +104,7 @@ void test_gzio(out, in)
     }
     strcpy((char*)uncompr, "garbage");
 
-    uncomprLen = gzread(file, uncompr, uncomprLen);
+    uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
     if (uncomprLen != len) {
         fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
     }
@@ -112,8 +120,9 @@ void test_gzio(out, in)
 /* ===========================================================================
  * Test deflate() with small buffers
  */
-void test_deflate(compr)
+void test_deflate(compr, comprLen)
-    Byte compr[];
+    Byte *compr;
+    uLong comprLen;
 {
     z_stream c_stream; /* compression stream */
     int err;
@@ -121,14 +130,15 @@ void test_deflate(compr)
 
     c_stream.zalloc = (alloc_func)0;
     c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
 
     err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
     CHECK_ERR(err, "deflateInit");
 
-    c_stream.next_in  = (Byte*)hello;
+    c_stream.next_in  = (Bytef*)hello;
     c_stream.next_out = compr;
 
-    while (c_stream.total_in != (uLong)len) {
+    while (c_stream.total_in != (uLong)len && c_stream.total_out < comprLen) {
         c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
         err = deflate(&c_stream, Z_NO_FLUSH);
         CHECK_ERR(err, "deflate");
@@ -148,10 +158,10 @@ void test_deflate(compr)
 /* ===========================================================================
  * Test inflate() with small buffers
  */
-void test_inflate(compr)
+void test_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte compr[];
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
 {
-    local Byte uncompr[BUFLEN];
     int err;
     z_stream d_stream; /* decompression stream */
 
@@ -159,6 +169,7 @@ void test_inflate(compr)
 
     d_stream.zalloc = (alloc_func)0;
     d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
 
     err = inflateInit(&d_stream);
     CHECK_ERR(err, "inflateInit");
@@ -166,7 +177,7 @@ void test_inflate(compr)
     d_stream.next_in  = compr;
     d_stream.next_out = uncompr;
 
-    for (;;) {
+    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
         d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
         err = inflate(&d_stream, Z_NO_FLUSH);
         if (err == Z_STREAM_END) break;
@@ -183,11 +194,105 @@ void test_inflate(compr)
     }
 }
 
+/* ===========================================================================
+ * Test deflate() with large buffers and dynamic change of compression level
+ */
+void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_SPEED);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    /* At this point, uncompr is still mostly zeroes, so it should compress
+     * very well:
+     */
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+    if (c_stream.avail_in != 0) {
+        fprintf(stderr, "deflate not greedy\n");
+    }
+
+    /* Feed in already compressed data and switch to no compression: */
+    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
+    c_stream.next_in = compr;
+    c_stream.avail_in = (uInt)comprLen/2;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    /* Switch back to compressing mode: */
+    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with large buffers
+ */
+void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    for (;;) {
+        d_stream.next_out = uncompr;            /* discard the output */
+	d_stream.avail_out = (uInt)uncomprLen;
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "large inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
+        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
+    } else {
+        printf("large_inflate(): OK\n");
+    }
+}
+
 /* ===========================================================================
  * Test deflate() with full flush
  */
-void test_flush(compr)
+void test_flush(compr, comprLen)
-    Byte compr[];
+    Byte *compr;
+    uLong comprLen;
 {
     z_stream c_stream; /* compression stream */
     int err;
@@ -195,14 +300,15 @@ void test_flush(compr)
 
     c_stream.zalloc = (alloc_func)0;
     c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
 
     err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
     CHECK_ERR(err, "deflateInit");
 
-    c_stream.next_in  = (Byte*)hello;
+    c_stream.next_in  = (Bytef*)hello;
     c_stream.next_out = compr;
     c_stream.avail_in = 3;
-    c_stream.avail_out = BUFLEN;
+    c_stream.avail_out = (uInt)comprLen;
     err = deflate(&c_stream, Z_FULL_FLUSH);
     CHECK_ERR(err, "deflate");
 
@@ -220,10 +326,10 @@ void test_flush(compr)
 /* ===========================================================================
  * Test inflateSync()
  */
-void test_sync(compr)
+void test_sync(compr, comprLen, uncompr, uncomprLen)
-    Byte compr[];
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
 {
-    local Byte uncompr[BUFLEN];
     int err;
     z_stream d_stream; /* decompression stream */
 
@@ -231,6 +337,7 @@ void test_sync(compr)
 
     d_stream.zalloc = (alloc_func)0;
     d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
 
     err = inflateInit(&d_stream);
     CHECK_ERR(err, "inflateInit");
@@ -238,13 +345,13 @@ void test_sync(compr)
     d_stream.next_in  = compr;
     d_stream.next_out = uncompr;
     d_stream.avail_in = 2; /* just read the zlib header */
-    d_stream.avail_out = sizeof(uncompr);
+    d_stream.avail_out = (uInt)uncomprLen;
 
     inflate(&d_stream, Z_NO_FLUSH);
     CHECK_ERR(err, "inflate");
 
-    d_stream.avail_in = BUFLEN-2; /* let inflate read all compressed data */
+    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
-    err = inflateSync(&d_stream); /* skip the damaged part */
+    err = inflateSync(&d_stream);           /* but skip the damaged part */
     CHECK_ERR(err, "inflateSync");
 
     err = inflate(&d_stream, Z_FINISH);
@@ -258,15 +365,102 @@ void test_sync(compr)
     printf("after inflateSync(): hel%s\n", uncompr);
 }
 
+/* ===========================================================================
+ * Test deflate() with preset dictionary
+ */
+void test_dict_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    err = deflateSetDictionary(&c_stream,
+			       (const Bytef*)dictionary, sizeof(dictionary));
+    CHECK_ERR(err, "deflateSetDictionary");
+
+    dictId = c_stream.adler;
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    c_stream.next_in = (Bytef*)hello;
+    c_stream.avail_in = (uInt)strlen(hello)+1;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with a preset dictionary
+ */
+void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    for (;;) {
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+	if (err == Z_NEED_DICT) {
+	    if (d_stream.adler != dictId) {
+		fprintf(stderr, "unexpected dictionary");
+		exit(1);
+	    }
+	    err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
+				       sizeof(dictionary));
+	}
+        CHECK_ERR(err, "inflate with dict");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate with dict\n");
+    } else {
+        printf("inflate with dictionary: %s\n", uncompr);
+    }
+}
+
 /* ===========================================================================
  * Usage:  example [output.gz  [input.gz]]
  */
 
-void main(argc, argv)
+int main(argc, argv)
     int argc;
     char *argv[];
 {
-    local Byte compr[BUFLEN];
+    Byte *compr, *uncompr;
+    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
+    uLong uncomprLen = comprLen;
 
     if (zlib_version[0] != ZLIB_VERSION[0]) {
         fprintf(stderr, "incompatible zlib version\n");
@@ -275,16 +469,32 @@ void main(argc, argv)
     } else if (strcmp(zlib_version, ZLIB_VERSION) != 0) {
         fprintf(stderr, "warning: different zlib version\n");
     }
-    test_compress();
+
+    compr    = (Byte*)malloc((uInt)comprLen);
+    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1); /* must be cleared */
+    if (compr == Z_NULL || uncompr == Z_NULL) {
+        printf("out of memory\n");
+	exit(1);
+    }
+
+    test_compress(compr, comprLen, uncompr, uncomprLen);
 
     test_gzio((argc > 1 ? argv[1] : "foo.gz"),
-              (argc > 2 ? argv[2] : "foo.gz"));
+              (argc > 2 ? argv[2] : "foo.gz"),
+	      uncompr, (int)uncomprLen);
 
-    test_deflate(compr);
+    test_deflate(compr, comprLen);
-    test_inflate(compr);
+    test_inflate(compr, comprLen, uncompr, uncomprLen);
 
-    test_flush(compr);
+    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-    test_sync(compr);
+    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_flush(compr, comprLen);
+    test_sync(compr, comprLen, uncompr, uncomprLen);
+
+    test_dict_deflate(compr, comprLen);
+    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
 
     exit(0);
+    return 0; /* to avoid warning */
 }

gzio.c

@@ -1,9 +1,9 @@
 /* gzio.c -- IO on .gz files
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* $Id: gzio.c,v 1.8 1995/05/03 17:27:09 jloup Exp $ */
+/* $Id: gzio.c,v 1.12 1996/01/30 21:59:14 me Exp $ */
 
 #include <stdio.h>
 
@@ -13,11 +13,10 @@ struct internal_state {int dummy;}; /* for buggy compilers */
 
 #define Z_BUFSIZE 4096
 
-#define ALLOC(size) zcalloc((voidp)0, 1, size)
+#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) zcfree((voidp)0, p);}
+#define TRYFREE(p) {if (p) free(p);}
 
-#define GZ_MAGIC_1 0x1f
+static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-#define GZ_MAGIC_2 0x8b
 
 /* gzip flag byte */
 #define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
@@ -27,10 +26,6 @@ struct internal_state {int dummy;}; /* for buggy compilers */
 #define COMMENT      0x10 /* bit 4 set: file comment present */
 #define RESERVED     0xE0 /* bits 5..7: reserved */
 
-#ifndef SEEK_CUR
-#  define SEEK_CUR 1
-#endif
-
 typedef struct gz_stream {
     z_stream stream;
     int      z_err;   /* error code for last stream operation */
@@ -46,44 +41,16 @@ typedef struct gz_stream {
 } gz_stream;
 
 
-local int    destroy __P((gz_stream *s));
+local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
-local gzFile gz_open __P((char *path, char *mode, int  fd));
+local int    get_byte     OF((gz_stream *s));
-local void   putLong __P((FILE *file, uLong x));
+local void   check_header OF((gz_stream *s));
-local uLong  getLong __P((Byte *buf));
+local int    destroy      OF((gz_stream *s));
-
+local void   putLong      OF((FILE *file, uLong x));
- /* ===========================================================================
+local uLong  getLong      OF((gz_stream *s));
- * Cleanup then free the given gz_stream. Return a zlib error code.
- */
-local int destroy (s)
-    gz_stream *s;
-{
-    int err = Z_OK;
-
-    if (!s) return Z_STREAM_ERROR;
-
-    TRYFREE(s->inbuf);
-    TRYFREE(s->outbuf);
-    TRYFREE(s->path);
-    TRYFREE(s->msg);
-
-    if (s->stream.state != NULL) {
-       if (s->mode == 'w') {
-           err = deflateEnd(&(s->stream));
-       } else if (s->mode == 'r') {
-           err = inflateEnd(&(s->stream));
-       }
-    }
-    if (s->file != NULL && fclose(s->file)) {
-        err = Z_ERRNO;
-    }
-    if (s->z_err < 0) err = s->z_err;
-    zcfree((voidp)0, s);
-    return err;
-}
 
 /* ===========================================================================
      Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descritor
+   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
    or path name (if fd == -1).
      gz_open return NULL if the file could not be opened or if there was
    insufficient memory to allocate the (de)compression state; errno
@@ -91,18 +58,25 @@ local int destroy (s)
    zlib error is Z_MEM_ERROR).
 */
 local gzFile gz_open (path, mode, fd)
-    char *path;
+    const char *path;
-    char *mode;
+    const char *mode;
     int  fd;
 {
     int err;
-    char *p = mode;
+    int level = Z_DEFAULT_COMPRESSION; /* compression level */
-    gz_stream *s = (gz_stream *)ALLOC(sizeof(gz_stream));
+    char *p = (char*)mode;
+    gz_stream *s;
+    char fmode[80]; /* copy of mode, without the compression level */
+    char *m = fmode;
 
+    if (!path || !mode) return Z_NULL;
+
+    s = (gz_stream *)ALLOC(sizeof(gz_stream));
     if (!s) return Z_NULL;
 
     s->stream.zalloc = (alloc_func)0;
     s->stream.zfree = (free_func)0;
+    s->stream.opaque = (voidpf)0;
     s->stream.next_in = s->inbuf = Z_NULL;
     s->stream.next_out = s->outbuf = Z_NULL;
     s->stream.avail_in = s->stream.avail_out = 0;
@@ -122,23 +96,28 @@ local gzFile gz_open (path, mode, fd)
     s->mode = '\0';
     do {
         if (*p == 'r') s->mode = 'r';
-        if (*p == 'w') s->mode = 'w';
+        if (*p == 'w' || *p == 'a') s->mode = 'w';
-    } while (*p++);
+        if (*p >= '0' && *p <= '9') {
+	    level = *p - '0';
+	} else {
+	    *m++ = *p; /* copy the mode */
+	}
+    } while (*p++ && m != fmode + sizeof(fmode));
     if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
     
     if (s->mode == 'w') {
-        err = deflateInit2(&(s->stream), Z_DEFAULT_COMPRESSION,
+        err = deflateInit2(&(s->stream), level,
-                           DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
+                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
         /* windowBits is passed < 0 to suppress zlib header */
 
-        s->stream.next_out = s->outbuf = ALLOC(Z_BUFSIZE);
+        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
 
         if (err != Z_OK || s->outbuf == Z_NULL) {
             return destroy(s), (gzFile)Z_NULL;
         }
     } else {
         err = inflateInit2(&(s->stream), -MAX_WBITS);
-        s->stream.next_in  = s->inbuf = ALLOC(Z_BUFSIZE);
+        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
 
         if (err != Z_OK || s->inbuf == Z_NULL) {
             return destroy(s), (gzFile)Z_NULL;
@@ -147,7 +126,7 @@ local gzFile gz_open (path, mode, fd)
     s->stream.avail_out = Z_BUFSIZE;
 
     errno = 0;
-    s->file = fd < 0 ? FOPEN(path, mode) : fdopen(fd, mode);
+    s->file = fd < 0 ? FOPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
 
     if (s->file == NULL) {
         return destroy(s), (gzFile)Z_NULL;
@@ -155,50 +134,10 @@ local gzFile gz_open (path, mode, fd)
     if (s->mode == 'w') {
         /* Write a very simple .gz header:
          */
-        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", GZ_MAGIC_1, GZ_MAGIC_2,
+        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-               DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
     } else {
-        /* Check and skip the header:
+	check_header(s); /* skip the .gz header */
-         */
-        Byte c1 = 0, c2 = 0;
-        Byte method = 0;
-        Byte flags = 0;
-        Byte xflags = 0;
-        Byte time[4];
-        Byte osCode;
-        int c;
-
-        s->stream.avail_in = fread(s->inbuf, 1, 2, s->file);
-        if (s->stream.avail_in != 2 || s->inbuf[0] != GZ_MAGIC_1
-            || s->inbuf[1] != GZ_MAGIC_2) {
-            s->transparent = 1;
-            return (gzFile)s;
-        }
-        s->stream.avail_in = 0;
-        fscanf(s->file,"%c%c%4c%c%c", &method, &flags, time, &xflags, &osCode);
-
-        if (method != DEFLATED || feof(s->file) || (flags & RESERVED) != 0) {
-            s->z_err = Z_DATA_ERROR;
-            return (gzFile)s;
-        }
-        if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-            long len;
-            fscanf(s->file, "%c%c", &c1, &c2);
-            len = c1 + ((long)c2<<8);
-            fseek(s->file, len, SEEK_CUR);
-        }
-        if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-            while ((c = getc(s->file)) != 0 && c != EOF) ;
-        }
-        if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-            while ((c = getc(s->file)) != 0 && c != EOF) ;
-        }
-        if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-            fscanf(s->file, "%c%c", &c1, &c2);
-        }
-        if (feof(s->file)) {
-            s->z_err = Z_DATA_ERROR;
-        }
     }
     return (gzFile)s;
 }
@@ -207,25 +146,138 @@ local gzFile gz_open (path, mode, fd)
      Opens a gzip (.gz) file for reading or writing.
 */
 gzFile gzopen (path, mode)
-    char *path;
+    const char *path;
-    char *mode;
+    const char *mode;
 {
     return gz_open (path, mode, -1);
 }
 
 /* ===========================================================================
-     Associate a gzFile with the file descriptor fd.
+     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
+   to mimic the behavio(u)r of fdopen.
 */
 gzFile gzdopen (fd, mode)
     int fd;
-    char *mode;
+    const char *mode;
 {
     char name[20];
+
+    if (fd < 0) return (gzFile)Z_NULL;
     sprintf(name, "<fd:%d>", fd); /* for debugging */
 
     return gz_open (name, mode, fd);
 }
 
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+local int get_byte(s)
+    gz_stream *s;
+{
+    if (s->z_eof) return EOF;
+    if (s->stream.avail_in == 0) {
+	errno = 0;
+	s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+	if (s->stream.avail_in == 0) {
+	    s->z_eof = 1;
+	    if (ferror(s->file)) s->z_err = Z_ERRNO;
+	    return EOF;
+	}
+	s->stream.next_in = s->inbuf;
+    }
+    s->stream.avail_in--;
+    return *(s->stream.next_in)++;
+}
+
+/* ===========================================================================
+      Check the gzip header of a gz_stream opened for reading. Set the stream
+    mode to transparent if the gzip magic header is not present; set s->err
+    to Z_DATA_ERROR if the magic header is present but the rest of the header
+    is incorrect.
+    IN assertion: the stream s has already been created sucessfully;
+       s->stream.avail_in is zero for the first time, but may be non-zero
+       for concatenated .gz files.
+*/
+local void check_header(s)
+    gz_stream *s;
+{
+    int method; /* method byte */
+    int flags;  /* flags byte */
+    uInt len;
+    int c;
+
+    /* Check the gzip magic header */
+    for (len = 0; len < 2; len++) {
+	c = get_byte(s);
+	if (c != gz_magic[len]) {
+	    s->transparent = 1;
+	    if (c != EOF) s->stream.avail_in++, s->stream.next_in--;
+	    s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
+	    return;
+	}
+    }
+    method = get_byte(s);
+    flags = get_byte(s);
+    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
+	s->z_err = Z_DATA_ERROR;
+	return;
+    }
+
+    /* Discard time, xflags and OS code: */
+    for (len = 0; len < 6; len++) (void)get_byte(s);
+
+    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
+	len  =  (uInt)get_byte(s);
+	len += ((uInt)get_byte(s))<<8;
+	/* len is garbage if EOF but the loop below will quit anyway */
+	while (len-- != 0 && get_byte(s) != EOF) ;
+    }
+    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
+	while ((c = get_byte(s)) != 0 && c != EOF) ;
+    }
+    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
+	while ((c = get_byte(s)) != 0 && c != EOF) ;
+    }
+    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
+	for (len = 0; len < 2; len++) (void)get_byte(s);
+    }
+    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
+}
+
+ /* ===========================================================================
+ * Cleanup then free the given gz_stream. Return a zlib error code.
+   Try freeing in the reverse order of allocations.
+ */
+local int destroy (s)
+    gz_stream *s;
+{
+    int err = Z_OK;
+
+    if (!s) return Z_STREAM_ERROR;
+
+    TRYFREE(s->msg);
+
+    if (s->stream.state != NULL) {
+       if (s->mode == 'w') {
+           err = deflateEnd(&(s->stream));
+       } else if (s->mode == 'r') {
+           err = inflateEnd(&(s->stream));
+       }
+    }
+    if (s->file != NULL && fclose(s->file)) {
+        err = Z_ERRNO;
+    }
+    if (s->z_err < 0) err = s->z_err;
+
+    TRYFREE(s->inbuf);
+    TRYFREE(s->outbuf);
+    TRYFREE(s->path);
+    TRYFREE(s);
+    return err;
+}
+
 /* ===========================================================================
      Reads the given number of uncompressed bytes from the compressed file.
    gzread returns the number of bytes actually read (0 for end of file).
@@ -236,52 +288,73 @@ int gzread (file, buf, len)
     unsigned len;
 {
     gz_stream *s = (gz_stream*)file;
+    Bytef *start = buf; /* starting point for crc computation */
+    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
 
     if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
 
-    if (s->transparent) {
+    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-        unsigned n = 0;
+    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-        Byte *b = (Byte*)buf;
-        /* Copy the first two (non-magic) bytes if not done already */
-        while (s->stream.avail_in > 0 && len > 0) {
-            *b++ = *s->stream.next_in++;
-            s->stream.avail_in--;
-            len--; n++;
-        }
-        if (len == 0) return n;
-        return n + fread(b, 1, len, s->file);
-    }
-    if (s->z_err == Z_DATA_ERROR) return -1; /* bad .gz file */
-    if (s->z_err == Z_STREAM_END) return 0;  /* don't read crc as data */
 
-    s->stream.next_out = buf;
+    s->stream.next_out = next_out = buf;
     s->stream.avail_out = len;
 
     while (s->stream.avail_out != 0) {
 
+	if (s->transparent) {
+	    /* Copy first the lookahead bytes: */
+	    uInt n = s->stream.avail_in;
+	    if (n > s->stream.avail_out) n = s->stream.avail_out;
+	    if (n > 0) {
+		zmemcpy(s->stream.next_out, s->stream.next_in, n);
+		next_out += n;
+		s->stream.next_out = next_out;
+		s->stream.next_in   += n;
+		s->stream.avail_out -= n;
+		s->stream.avail_in  -= n;
+	    }
+	    if (s->stream.avail_out > 0) {
+		s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
+					     s->file);
+	    }
+	    return (int)(len - s->stream.avail_out);
+	}
         if (s->stream.avail_in == 0 && !s->z_eof) {
 
             errno = 0;
-            s->stream.avail_in =
+            s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-                fread(s->inbuf, 1, Z_BUFSIZE, s->file);
             if (s->stream.avail_in == 0) {
                 s->z_eof = 1;
-            } else if (s->stream.avail_in == (uInt)EOF) {
+		if (ferror(s->file)) {
-                s->stream.avail_in = 0;
+		    s->z_err = Z_ERRNO;
-                s->z_eof = 1;
+		    break;
-                s->z_err = Z_ERRNO;
+		}
-                break;
             }
             s->stream.next_in = s->inbuf;
         }
         s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
 
-        if (s->z_err == Z_STREAM_END ||
+	if (s->z_err == Z_STREAM_END) {
-            s->z_err != Z_OK  || s->z_eof) break;
+	    /* Check CRC and original size */
+	    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+	    start = s->stream.next_out;
+
+	    if (getLong(s) != s->crc || getLong(s) != s->stream.total_out) {
+		s->z_err = Z_DATA_ERROR;
+	    } else {
+		/* Check for concatenated .gz files: */
+		check_header(s);
+		if (s->z_err == Z_OK) {
+		    inflateReset(&(s->stream));
+		    s->crc = crc32(0L, Z_NULL, 0);
+		}
+	    }
+	}
+	if (s->z_err != Z_OK || s->z_eof) break;
     }
-    len -= s->stream.avail_out;
+    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-    s->crc = crc32(s->crc, buf, len);
+
-    return len;
+    return (int)(len - s->stream.avail_out);
 }
 
 /* ===========================================================================
@@ -290,7 +363,7 @@ int gzread (file, buf, len)
 */
 int gzwrite (file, buf, len)
     gzFile file;
-    voidp buf;
+    const voidp buf;
     unsigned len;
 {
     gz_stream *s = (gz_stream*)file;
@@ -312,12 +385,11 @@ int gzwrite (file, buf, len)
             s->stream.avail_out = Z_BUFSIZE;
         }
         s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-
         if (s->z_err != Z_OK) break;
     }
     s->crc = crc32(s->crc, buf, len);
 
-    return len - s->stream.avail_in;
+    return (int)(len - s->stream.avail_in);
 }
 
 /* ===========================================================================
@@ -342,7 +414,7 @@ int gzflush (file, flush)
         len = Z_BUFSIZE - s->stream.avail_out;
 
         if (len != 0) {
-            if (fwrite(s->outbuf, 1, len, s->file) != len) {
+            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
                 s->z_err = Z_ERRNO;
                 return Z_ERRNO;
             }
@@ -359,6 +431,7 @@ int gzflush (file, flush)
  
         if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
     }
+    fflush(s->file);
     return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 
@@ -377,18 +450,19 @@ local void putLong (file, x)
 }
 
 /* ===========================================================================
-   Reads a long in LSB order from the given buffer
+   Reads a long in LSB order from the given gz_stream. Sets 
 */
-local uLong getLong (buf)
+local uLong getLong (s)
-    Byte *buf;
+    gz_stream *s;
 {
-    uLong x = 0;
+    uLong x = (uLong)get_byte(s);
-    Byte *p = buf+4;
+    int c;
 
-    do {
+    x += ((uLong)get_byte(s))<<8;
-        x <<= 8;
+    x += ((uLong)get_byte(s))<<16;
-        x |= *--p; 
+    c = get_byte(s);
-    } while (p != buf);
+    if (c == EOF) s->z_err = Z_DATA_ERROR;
+    x += ((uLong)c)<<24;
     return x;
 }
 
@@ -399,7 +473,6 @@ local uLong getLong (buf)
 int gzclose (file)
     gzFile file;
 {
-    uInt n;
     int err;
     gz_stream *s = (gz_stream*)file;
 
@@ -412,25 +485,6 @@ int gzclose (file)
         putLong (s->file, s->crc);
         putLong (s->file, s->stream.total_in);
 
-    } else if (s->mode == 'r' && s->z_err == Z_STREAM_END) {
-
-        /* slide CRC and original size if they are at the end of inbuf */
-        if ((n = s->stream.avail_in) < 8  && !s->z_eof) {
-            Byte *p = s->inbuf;
-            Byte *q = s->stream.next_in;
-            while (n--) { *p++ = *q++; };
-
-            n = s->stream.avail_in;
-            n += fread(p, 1, 8, s->file);
-            s->stream.next_in = s->inbuf;
-        }
-        /* check CRC and original size */
-        if (n < 8 ||
-            getLong(s->stream.next_in) != s->crc ||
-            getLong(s->stream.next_in + 4) != s->stream.total_out) {
-
-            s->z_err = Z_DATA_ERROR;
-        }
     }
     return destroy(file);
 }
@@ -451,14 +505,14 @@ char*  gzerror (file, errnum)
 
     if (s == NULL) {
         *errnum = Z_STREAM_ERROR;
-        return z_errmsg[1-Z_STREAM_ERROR];
+        return ERR_MSG(Z_STREAM_ERROR);
     }
     *errnum = s->z_err;
-    if (*errnum == Z_OK) return "";
+    if (*errnum == Z_OK) return (char*)"";
 
-    m =  *errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg;
+    m =  (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
 
-    if (m == NULL || *m == '\0') m = z_errmsg[1-s->z_err];
+    if (m == NULL || *m == '\0') m = ERR_MSG(s->z_err);
 
     TRYFREE(s->msg);
     s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);

infblock.c

@@ -1,5 +1,5 @@
 /* infblock.c -- interpret and process block types to last block
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -62,9 +62,9 @@ local uInt border[] = { /* Order of the bit length code lengths */
 
 
 void inflate_blocks_reset(s, z, c)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
-uLong *c;
+uLongf *c;
 {
   if (s->checkfn != Z_NULL)
     *c = s->check;
@@ -81,22 +81,22 @@ uLong *c;
   s->bitb = 0;
   s->read = s->write = s->window;
   if (s->checkfn != Z_NULL)
-    s->check = (*s->checkfn)(0L, Z_NULL, 0);
+    z->adler = s->check = (*s->checkfn)(0L, Z_NULL, 0);
   Trace((stderr, "inflate:   blocks reset\n"));
 }
 
 
-struct inflate_blocks_state *inflate_blocks_new(z, c, w)
+inflate_blocks_statef *inflate_blocks_new(z, c, w)
 z_stream *z;
 check_func c;
 uInt w;
 {
-  struct inflate_blocks_state *s;
+  inflate_blocks_statef *s;
 
-  if ((s = (struct inflate_blocks_state *)ZALLOC
+  if ((s = (inflate_blocks_statef *)ZALLOC
        (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
     return s;
-  if ((s->window = (Byte *)ZALLOC(z, 1, w)) == Z_NULL)
+  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
   {
     ZFREE(z, s);
     return Z_NULL;
@@ -110,17 +110,20 @@ uInt w;
 }
 
 
+#ifdef DEBUG
+  extern uInt inflate_hufts;
+#endif
 int inflate_blocks(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
   uInt t;               /* temporary storage */
   uLong b;              /* bit buffer */
   uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
   uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
   uInt m;               /* bytes to end of window or read pointer */
 
   /* copy input/output information to locals (UPDATE macro restores) */
@@ -172,24 +175,24 @@ int r;
         case 3:                         /* illegal */
           DUMPBITS(3)
           s->mode = BAD;
-          z->msg = "invalid block type";
+          z->msg = (char*)"invalid block type";
           r = Z_DATA_ERROR;
           LEAVE
       }
       break;
     case LENS:
       NEEDBITS(32)
-      if ((~b) >> 16 != (b & 0xffff))
+      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
       {
         s->mode = BAD;
-        z->msg = "invalid stored block lengths";
+        z->msg = (char*)"invalid stored block lengths";
         r = Z_DATA_ERROR;
         LEAVE
       }
       s->sub.left = (uInt)b & 0xffff;
       b = k = 0;                      /* dump bits */
       Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
-      s->mode = s->sub.left ? STORED : TYPE;
+      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
       break;
     case STORED:
       if (n == 0)
@@ -215,7 +218,7 @@ int r;
       if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
       {
         s->mode = BAD;
-        z->msg = "too many length or distance symbols";
+        z->msg = (char*)"too many length or distance symbols";
         r = Z_DATA_ERROR;
         LEAVE
       }
@@ -223,7 +226,7 @@ int r;
       t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
       if (t < 19)
         t = 19;
-      if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
+      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
       {
         r = Z_MEM_ERROR;
         LEAVE
@@ -285,7 +288,7 @@ int r;
               (c == 16 && i < 1))
           {
             s->mode = BAD;
-            z->msg = "invalid bit length repeat";
+            z->msg = (char*)"invalid bit length repeat";
             r = Z_DATA_ERROR;
             LEAVE
           }
@@ -301,11 +304,14 @@ int r;
       {
         uInt bl, bd;
         inflate_huft *tl, *td;
-        struct inflate_codes_state *c;
+        inflate_codes_statef *c;
 
-        bl = 9;
+        bl = 9;         /* must be <= 9 for lookahead assumptions */
-        bd = 6;
+        bd = 6;         /* must be <= 9 for lookahead assumptions */
         t = s->sub.trees.table;
+#ifdef DEBUG
+      inflate_hufts = 0;
+#endif
         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
                                   s->sub.trees.blens, &bl, &bd, &tl, &td, z);
         if (t != Z_OK)
@@ -315,7 +321,8 @@ int r;
           r = t;
           LEAVE
         }
-        Tracev((stderr, "inflate:       trees ok\n"));
+        Tracev((stderr, "inflate:       trees ok, %d * %d bytes used\n",
+              inflate_hufts, sizeof(inflate_huft)));
         if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
         {
           inflate_trees_free(td, z);
@@ -373,9 +380,9 @@ int r;
 
 
 int inflate_blocks_free(s, z, c)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
-uLong *c;
+uLongf *c;
 {
   inflate_blocks_reset(s, z, c);
   ZFREE(z, s->window);
@@ -383,3 +390,13 @@ uLong *c;
   Trace((stderr, "inflate:   blocks freed\n"));
   return Z_OK;
 }
+
+
+void inflate_set_dictionary(s, d, n)
+inflate_blocks_statef *s;
+const Bytef *d;
+uInt  n;
+{
+  zmemcpy((charf *)s->window, d, n);
+  s->read = s->write = s->window + n;
+}

infblock.h

@@ -1,5 +1,5 @@
 /* infblock.h -- header to use infblock.c
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -9,23 +9,29 @@
  */
 
 struct inflate_blocks_state;
+typedef struct inflate_blocks_state FAR inflate_blocks_statef;
 
-extern struct inflate_blocks_state * inflate_blocks_new __P((
+extern inflate_blocks_statef * inflate_blocks_new OF((
-    z_stream *,
+    z_stream *z,
-    check_func,                 /* check function */
+    check_func c,               /* check function */
-    uInt));                     /* window size */
+    uInt w));                   /* window size */
 
-extern int inflate_blocks __P((
+extern int inflate_blocks OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
     int));                      /* initial return code */
 
-extern void inflate_blocks_reset __P((
+extern void inflate_blocks_reset OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
-    uLong *));                  /* check value on output */
+    uLongf *));                  /* check value on output */
 
-extern int inflate_blocks_free __P((
+extern int inflate_blocks_free OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
-    uLong *));                  /* check value on output */
+    uLongf *));                  /* check value on output */
+
+extern void inflate_set_dictionary OF((
+    inflate_blocks_statef *s,
+    const Bytef *d,  /* dictionary */
+    uInt  n));       /* dictionary length */

infcodes.c

@@ -1,13 +1,14 @@
 /* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
 #include "zutil.h"
 #include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
 #include "infutil.h"
 #include "inffast.h"
-#include "infcodes.h"
 
 /* simplify the use of the inflate_huft type with some defines */
 #define base more.Base
@@ -55,14 +56,15 @@ struct inflate_codes_state {
 };
 
 
-struct inflate_codes_state *inflate_codes_new(bl, bd, tl, td, z)
+inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
 uInt bl, bd;
-inflate_huft *tl, *td;
+inflate_huft *tl;
+inflate_huft *td; /* need separate declaration for Borland C++ */
 z_stream *z;
 {
-  struct inflate_codes_state *c;
+  inflate_codes_statef *c;
 
-  if ((c = (struct inflate_codes_state *)
+  if ((c = (inflate_codes_statef *)
        ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
   {
     c->mode = START;
@@ -77,7 +79,7 @@ z_stream *z;
 
 
 int inflate_codes(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
@@ -86,12 +88,12 @@ int r;
   uInt e;               /* extra bits or operation */
   uLong b;              /* bit buffer */
   uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
   uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
   uInt m;               /* bytes to end of window or read pointer */
-  Byte *f;              /* pointer to copy strings from */
+  Bytef *f;             /* pointer to copy strings from */
-  struct inflate_codes_state *c = s->sub.decode.codes;  /* codes state */
+  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
 
   /* copy input/output information to locals (UPDATE macro restores) */
   LOAD
@@ -151,7 +153,7 @@ int r;
         break;
       }
       c->mode = BADCODE;        /* invalid code */
-      z->msg = "invalid literal/length code";
+      z->msg = (char*)"invalid literal/length code";
       r = Z_DATA_ERROR;
       LEAVE
     case LENEXT:        /* i: getting length extra (have base) */
@@ -183,7 +185,7 @@ int r;
         break;
       }
       c->mode = BADCODE;        /* invalid code */
-      z->msg = "invalid distance code";
+      z->msg = (char*)"invalid distance code";
       r = Z_DATA_ERROR;
       LEAVE
     case DISTEXT:       /* i: getting distance extra */
@@ -194,9 +196,15 @@ int r;
       Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
       c->mode = COPY;
     case COPY:          /* o: copying bytes in window, waiting for space */
+#ifndef __TURBOC__ /* Turbo C bug for following expression */
       f = (uInt)(q - s->window) < c->sub.copy.dist ?
           s->end - (c->sub.copy.dist - (q - s->window)) :
           q - c->sub.copy.dist;
+#else
+      f = q - c->sub.copy.dist;
+      if ((uInt)(q - s->window) < c->sub.copy.dist)
+        f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
+#endif
       while (c->len)
       {
         NEEDOUT
@@ -231,7 +239,7 @@ int r;
 
 
 void inflate_codes_free(c, z)
-struct inflate_codes_state *c;
+inflate_codes_statef *c;
 z_stream *z;
 {
   ZFREE(z, c);

infcodes.h

@@ -1,5 +1,5 @@
 /* infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -9,17 +9,19 @@
  */
 
 struct inflate_codes_state;
+typedef struct inflate_codes_state FAR inflate_codes_statef;
 
-extern struct inflate_codes_state *inflate_codes_new __P((
+extern inflate_codes_statef *inflate_codes_new OF((
     uInt, uInt,
     inflate_huft *, inflate_huft *,
     z_stream *));
 
-extern int inflate_codes __P((
+extern int inflate_codes OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
     int));
 
-extern void inflate_codes_free __P((
+extern void inflate_codes_free OF((
-    struct inflate_codes_state *,
+    inflate_codes_statef *,
     z_stream *));
+

inffast.c

@@ -1,10 +1,12 @@
 /* inffast.c -- process literals and length/distance pairs fast
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
 #include "zutil.h"
 #include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
 #include "infutil.h"
 #include "inffast.h"
 
@@ -27,23 +29,24 @@ struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 
 int inflate_fast(bl, bd, tl, td, s, z)
 uInt bl, bd;
-inflate_huft *tl, *td;
+inflate_huft *tl;
-struct inflate_blocks_state *s;
+inflate_huft *td; /* need separate declaration for Borland C++ */
+inflate_blocks_statef *s;
 z_stream *z;
 {
   inflate_huft *t;      /* temporary pointer */
   uInt e;               /* extra bits or operation */
   uLong b;              /* bit buffer */
   uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
   uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
   uInt m;               /* bytes to end of window or read pointer */
   uInt ml;              /* mask for literal/length tree */
   uInt md;              /* mask for distance tree */
   uInt c;               /* bytes to copy */
   uInt d;               /* distance back to copy from */
-  Byte *r;              /* copy source pointer */
+  Bytef *r;             /* copy source pointer */
 
   /* load input, output, bit values */
   LOAD
@@ -100,7 +103,7 @@ z_stream *z;
             }
             else                        /* else offset after destination */
             {
-              e = d - (q - s->window);  /* bytes from offset to end */
+              e = d - (uInt)(q - s->window); /* bytes from offset to end */
               r = s->end - e;           /* pointer to offset */
               if (c > e)                /* if source crosses, */
               {
@@ -120,7 +123,7 @@ z_stream *z;
             e = (t = t->next + ((uInt)b & inflate_mask[e]))->exop;
           else
           {
-            z->msg = "invalid distance code";
+            z->msg = (char*)"invalid distance code";
             UNGRAB
             UPDATE
             return Z_DATA_ERROR;
@@ -150,7 +153,7 @@ z_stream *z;
       }
       else
       {
-        z->msg = "invalid literal/length code";
+        z->msg = (char*)"invalid literal/length code";
         UNGRAB
         UPDATE
         return Z_DATA_ERROR;

inffast.h

@@ -1,5 +1,5 @@
 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -8,10 +8,10 @@
    subject to change. Applications should only use zlib.h.
  */
 
-extern int inflate_fast __P((
+extern int inflate_fast OF((
     uInt,
     uInt,
     inflate_huft *,
     inflate_huft *,
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *));

inflate.c

@@ -1,5 +1,5 @@
 /* inflate.c -- zlib interface to inflate modules
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -15,6 +15,11 @@ struct internal_state {
   enum {
       METHOD,   /* waiting for method byte */
       FLAG,     /* waiting for flag byte */
+      DICT4,    /* four dictionary check bytes to go */
+      DICT3,    /* three dictionary check bytes to go */
+      DICT2,    /* two dictionary check bytes to go */
+      DICT1,    /* one dictionary check byte to go */
+      DICT0,    /* waiting for inflateSetDictionary */
       BLOCKS,   /* decompressing blocks */
       CHECK4,   /* four check bytes to go */
       CHECK3,   /* three check bytes to go */
@@ -37,7 +42,7 @@ struct internal_state {
   /* mode independent information */
   int  nowrap;          /* flag for no wrapper */
   uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  struct inflate_blocks_state
+  inflate_blocks_statef 
     *blocks;            /* current inflate_blocks state */
 
 };
@@ -75,16 +80,27 @@ z_stream *z;
 }
 
 
-int inflateInit2(z, w)
+int inflateInit2_(z, w, version, stream_size)
 z_stream *z;
 int w;
+const char *version;
+int stream_size;
 {
+  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+      stream_size != sizeof(z_stream))
+      return Z_VERSION_ERROR;
+
   /* initialize state */
   if (z == Z_NULL)
     return Z_STREAM_ERROR;
-  if (z->zalloc == Z_NULL) z->zalloc = zcalloc;
+  z->msg = Z_NULL;
+  if (z->zalloc == Z_NULL)
+  {
+    z->zalloc = zcalloc;
+    z->opaque = (voidpf)0;
+  }
   if (z->zfree == Z_NULL) z->zfree = zcfree;
-  if ((z->state = (struct internal_state *)
+  if ((z->state = (struct internal_state FAR *)
        ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
     return Z_MEM_ERROR;
   z->state->blocks = Z_NULL;
@@ -107,7 +123,7 @@ int w;
 
   /* create inflate_blocks state */
   if ((z->state->blocks =
-       inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, 1 << w))
+      inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w))
       == Z_NULL)
   {
     inflateEnd(z);
@@ -121,10 +137,12 @@ int w;
 }
 
 
-int inflateInit(z)
+int inflateInit_(z, version, stream_size)
 z_stream *z;
+const char *version;
+int stream_size;
 {
-  return inflateInit2(z, DEF_WBITS);
+  return inflateInit2_(z, DEF_WBITS, version, stream_size);
 }
 
 
@@ -135,49 +153,71 @@ int inflate(z, f)
 z_stream *z;
 int f;
 {
-  int r = f;    /* to avoid warning about unused f */
+  int r;
   uInt b;
 
-  if (z == Z_NULL || z->next_in == Z_NULL)
+  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL || f < 0)
     return Z_STREAM_ERROR;
   r = Z_BUF_ERROR;
   while (1) switch (z->state->mode)
   {
     case METHOD:
       NEEDBYTE
-      if (((z->state->sub.method = NEXTBYTE) & 0xf) != DEFLATED)
+      if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
       {
         z->state->mode = BAD;
-        z->msg = "unknown compression method";
+        z->msg = (char*)"unknown compression method";
         z->state->sub.marker = 5;       /* can't try inflateSync */
         break;
       }
       if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
       {
         z->state->mode = BAD;
-        z->msg = "invalid window size";
+        z->msg = (char*)"invalid window size";
         z->state->sub.marker = 5;       /* can't try inflateSync */
         break;
       }
       z->state->mode = FLAG;
     case FLAG:
       NEEDBYTE
-      if ((b = NEXTBYTE) & 0x20)
+      b = NEXTBYTE;
-      {
-        z->state->mode = BAD;
-        z->msg = "invalid reserved bit";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
       if (((z->state->sub.method << 8) + b) % 31)
       {
         z->state->mode = BAD;
-        z->msg = "incorrect header check";
+        z->msg = (char*)"incorrect header check";
         z->state->sub.marker = 5;       /* can't try inflateSync */
         break;
       }
       Trace((stderr, "inflate: zlib header ok\n"));
-      z->state->mode = BLOCKS;
+      if (!(b & PRESET_DICT))
+      {
+        z->state->mode = BLOCKS;
+	break;
+      }
+      z->state->mode = DICT4;
+    case DICT4:
+      NEEDBYTE
+      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
+      z->state->mode = DICT3;
+    case DICT3:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
+      z->state->mode = DICT2;
+    case DICT2:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
+      z->state->mode = DICT1;
+    case DICT1:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE;
+      z->adler = z->state->sub.check.need;
+      z->state->mode = DICT0;
+      return Z_NEED_DICT;
+    case DICT0:
+      z->state->mode = BAD;
+      z->msg = (char*)"need dictionary";
+      z->state->sub.marker = 0;       /* can try inflateSync */
+      return Z_STREAM_ERROR;
     case BLOCKS:
       r = inflate_blocks(z->state->blocks, z, r);
       if (r == Z_DATA_ERROR)
@@ -215,7 +255,7 @@ int f;
       if (z->state->sub.check.was != z->state->sub.check.need)
       {
         z->state->mode = BAD;
-        z->msg = "incorrect data check";
+        z->msg = (char*)"incorrect data check";
         z->state->sub.marker = 5;       /* can't try inflateSync */
         break;
       }
@@ -231,11 +271,34 @@ int f;
 }
 
 
+int inflateSetDictionary(z, dictionary, dictLength)
+z_stream *z;
+const Bytef *dictionary;
+uInt  dictLength;
+{
+  uInt length = dictLength;
+
+  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
+    return Z_STREAM_ERROR;
+  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
+  z->adler = 1L;
+
+  if (length >= ((uInt)1<<z->state->wbits))
+  {
+    length = (1<<z->state->wbits)-1;
+    dictionary += dictLength - length;
+  }
+  inflate_set_dictionary(z->state->blocks, dictionary, length);
+  z->state->mode = BLOCKS;
+  return Z_OK;
+}
+
+
 int inflateSync(z)
 z_stream *z;
 {
   uInt n;       /* number of bytes to look at */
-  Byte *p;      /* pointer to bytes */
+  Bytef *p;     /* pointer to bytes */
   uInt m;       /* number of marker bytes found in a row */
   uLong r, w;   /* temporaries to save total_in and total_out */
 

inftrees.c

@@ -1,11 +1,18 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
 #include "zutil.h"
 #include "inftrees.h"
 
+char inflate_copyright[] = " inflate 1.0.1 Copyright 1995-1996 Mark Adler ";
+/*
+  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
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
 struct internal_state  {int dummy;}; /* for buggy compilers */
 
 /* simplify the use of the inflate_huft type with some defines */
@@ -15,38 +22,34 @@ struct internal_state  {int dummy;}; /* for buggy compilers */
 #define bits word.what.Bits
 
 
-local int huft_build __P((
+local int huft_build OF((
-    uInt *,             /* code lengths in bits */
+    uIntf *,            /* code lengths in bits */
     uInt,               /* number of codes */
     uInt,               /* number of "simple" codes */
-    uInt *,             /* list of base values for non-simple codes */
+    uIntf *,            /* list of base values for non-simple codes */
-    uInt *,             /* list of extra bits for non-simple codes */
+    uIntf *,            /* list of extra bits for non-simple codes */
-    inflate_huft **,    /* result: starting table */
+    inflate_huft * FAR*,/* result: starting table */
-    uInt *,             /* maximum lookup bits (returns actual) */
+    uIntf *,            /* maximum lookup bits (returns actual) */
     z_stream *));       /* for zalloc function */
 
-local voidp falloc __P((
+local voidpf falloc OF((
-    voidp,              /* opaque pointer (not used) */
+    voidpf,             /* opaque pointer (not used) */
     uInt,               /* number of items */
     uInt));             /* size of item */
 
-local void ffree __P((
-    voidp q,            /* opaque pointer (not used) */
-    voidp p));          /* what to free (not used) */
-
 /* Tables for deflate from PKZIP's appnote.txt. */
-local uInt cplens[] = { /* Copy lengths for literal codes 257..285 */
+local uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
         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};
         /* actually lengths - 2; also see note #13 above about 258 */
-local uInt cplext[] = { /* Extra bits for literal codes 257..285 */
+local uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
         0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
         3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 192, 192}; /* 192==invalid */
-local uInt cpdist[] = { /* Copy offsets for distance codes 0..29 */
+local uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
         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,
         8193, 12289, 16385, 24577};
-local uInt cpdext[] = { /* Extra bits for distance codes */
+local uInt cpdext[30] = { /* Extra bits for distance codes */
         0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
         7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
         12, 12, 13, 13};
@@ -93,13 +96,13 @@ local uInt cpdext[] = { /* Extra bits for distance codes */
 #endif
 
 local int huft_build(b, n, s, d, e, t, m, zs)
-uInt *b;                /* code lengths in bits (all assumed <= BMAX) */
+uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
 uInt n;                 /* number of codes (assumed <= N_MAX) */
 uInt s;                 /* number of simple-valued codes (0..s-1) */
-uInt *d;                /* list of base values for non-simple codes */
+uIntf *d;               /* list of base values for non-simple codes */
-uInt *e;                /* list of extra bits for non-simple codes */
+uIntf *e;               /* list of extra bits for non-simple codes */  
-inflate_huft **t;       /* result: starting table */
+inflate_huft * FAR *t;  /* result: starting table */
-uInt *m;                /* maximum lookup bits, returns actual */
+uIntf *m;               /* maximum lookup bits, returns actual */
 z_stream *zs;           /* for zalloc function */
 /* Given a list of code lengths and a maximum table size, make a set of
    tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
@@ -107,6 +110,7 @@ z_stream *zs;           /* for zalloc function */
    case), Z_DATA_ERROR if the input is invalid (all zero length codes or an
    over-subscribed set of lengths), or Z_MEM_ERROR if not enough memory. */
 {
+
   uInt a;                       /* counter for codes of length k */
   uInt c[BMAX+1];               /* bit length count table */
   uInt f;                       /* i repeats in table every f entries */
@@ -116,14 +120,14 @@ z_stream *zs;           /* for zalloc function */
   register uInt j;              /* counter */
   register int k;               /* number of bits in current code */
   int l;                        /* bits per table (returned in m) */
-  register uInt *p;             /* pointer into c[], b[], or v[] */
+  register uIntf *p;            /* pointer into c[], b[], or v[] */
-  register inflate_huft *q;     /* points to current table */
+  inflate_huft *q;              /* points to current table */
-  inflate_huft r;               /* table entry for structure assignment */
+  struct inflate_huft_s r;      /* table entry for structure assignment */
   inflate_huft *u[BMAX];        /* table stack */
   uInt v[N_MAX];                /* values in order of bit length */
   register int w;               /* bits before this table == (l * h) */
   uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uInt *xp;                     /* pointer into x */
+  uIntf *xp;                    /* pointer into x */
   int y;                        /* number of dummy codes added */
   uInt z;                       /* number of entries in current table */
 
@@ -211,7 +215,8 @@ z_stream *zs;           /* for zalloc function */
         w += l;                 /* previous table always l bits */
 
         /* compute minimum size table less than or equal to l bits */
-        z = (z = g - w) > (uInt)l ? l : z;      /* table size upper limit */
+        z = g - w;
+        z = z > (uInt)l ? l : z;        /* table size upper limit */
         if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
         {                       /* too few codes for k-w bit table */
           f -= a + 1;           /* deduct codes from patterns left */
@@ -238,7 +243,7 @@ z_stream *zs;           /* for zalloc function */
         inflate_hufts += z + 1;
 #endif
         *t = q + 1;             /* link to list for huft_free() */
-        *(t = &(q->next)) = (inflate_huft *)Z_NULL;
+        *(t = &(q->next)) = Z_NULL;
         u[h] = ++q;             /* table starts after link */
 
         /* connect to last table, if there is one */
@@ -246,7 +251,7 @@ z_stream *zs;           /* for zalloc function */
         {
           x[h] = i;             /* save pattern for backing up */
           r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = j;           /* bits in this table */
+          r.exop = (Byte)j;     /* bits in this table */
           r.next = q;           /* pointer to this table */
           j = i >> (w - l);     /* (get around Turbo C bug) */
           u[h-1][j] = r;        /* connect to last table */
@@ -259,12 +264,12 @@ z_stream *zs;           /* for zalloc function */
         r.exop = 128 + 64;      /* out of values--invalid code */
       else if (*p < s)
       {
-        r.exop = (*p < 256 ? 0 : 32 + 64);      /* 256 is end-of-block */
+        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
         r.base = *p++;          /* simple code is just the value */
       }
       else
       {
-        r.exop = e[*p - s] + 16 + 64;   /* non-simple--look up in lists */
+        r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
         r.base = d[*p++ - s];
       }
 
@@ -294,20 +299,20 @@ z_stream *zs;           /* for zalloc function */
 
 
 int inflate_trees_bits(c, bb, tb, z)
-uInt *c;                /* 19 code lengths */
+uIntf *c;               /* 19 code lengths */
-uInt *bb;               /* bits tree desired/actual depth */
+uIntf *bb;              /* bits tree desired/actual depth */
-inflate_huft **tb;      /* bits tree result */
+inflate_huft * FAR *tb; /* bits tree result */
 z_stream *z;            /* for zfree function */
 {
   int r;
 
-  r = huft_build(c, 19, 19, (uInt*)Z_NULL, (uInt*)Z_NULL, tb, bb, z);
+  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL, tb, bb, z);
   if (r == Z_DATA_ERROR)
-    z->msg = "oversubscribed dynamic bit lengths tree";
+    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
   else if (r == Z_BUF_ERROR)
   {
     inflate_trees_free(*tb, z);
-    z->msg = "incomplete dynamic bit lengths tree";
+    z->msg = (char*)"incomplete dynamic bit lengths tree";
     r = Z_DATA_ERROR;
   }
   return r;
@@ -317,11 +322,11 @@ z_stream *z;            /* for zfree function */
 int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, z)
 uInt nl;                /* number of literal/length codes */
 uInt nd;                /* number of distance codes */
-uInt *c;                /* that many (total) code lengths */
+uIntf *c;               /* that many (total) code lengths */
-uInt *bl;               /* literal desired/actual bit depth */
+uIntf *bl;              /* literal desired/actual bit depth */
-uInt *bd;               /* distance desired/actual bit depth */
+uIntf *bd;              /* distance desired/actual bit depth */
-inflate_huft **tl;      /* literal/length tree result */
+inflate_huft * FAR *tl; /* literal/length tree result */
-inflate_huft **td;      /* distance tree result */
+inflate_huft * FAR *td; /* distance tree result */
 z_stream *z;            /* for zfree function */
 {
   int r;
@@ -330,11 +335,11 @@ z_stream *z;            /* for zfree function */
   if ((r = huft_build(c, nl, 257, cplens, cplext, tl, bl, z)) != Z_OK)
   {
     if (r == Z_DATA_ERROR)
-      z->msg = "oversubscribed literal/length tree";
+      z->msg = (char*)"oversubscribed literal/length tree";
     else if (r == Z_BUF_ERROR)
     {
       inflate_trees_free(*tl, z);
-      z->msg = "incomplete literal/length tree";
+      z->msg = (char*)"incomplete literal/length tree";
       r = Z_DATA_ERROR;
     }
     return r;
@@ -344,14 +349,14 @@ z_stream *z;            /* for zfree function */
   if ((r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, z)) != Z_OK)
   {
     if (r == Z_DATA_ERROR)
-      z->msg = "oversubscribed literal/length tree";
+      z->msg = (char*)"oversubscribed literal/length tree";
     else if (r == Z_BUF_ERROR) {
 #ifdef PKZIP_BUG_WORKAROUND
       r = Z_OK;
     }
 #else
       inflate_trees_free(*td, z);
-      z->msg = "incomplete literal/length tree";
+      z->msg = (char*)"incomplete literal/length tree";
       r = Z_DATA_ERROR;
     }
     inflate_trees_free(*tl, z);
@@ -365,10 +370,8 @@ z_stream *z;            /* for zfree function */
 
 
 /* build fixed tables only once--keep them here */
-local int fixed_lock = 0;
 local int fixed_built = 0;
 #define FIXEDH 530      /* number of hufts used by fixed tables */
-local uInt fixed_left = FIXEDH;
 local inflate_huft fixed_mem[FIXEDH];
 local uInt fixed_bl;
 local uInt fixed_bd;
@@ -376,47 +379,36 @@ local inflate_huft *fixed_tl;
 local inflate_huft *fixed_td;
 
 
-local voidp falloc(q, n, s)
+local voidpf falloc(q, n, s)
-voidp q;        /* opaque pointer (not used) */
+voidpf q;       /* opaque pointer */
 uInt n;         /* number of items */
 uInt s;         /* size of item */
 {
-  Assert(s == sizeof(inflate_huft) && n <= fixed_left,
+  Assert(s == sizeof(inflate_huft) && n <= *(intf *)q,
          "inflate_trees falloc overflow");
-  if (q) s++; /* to make some compilers happy */
+  *(intf *)q -= n+s-s; /* s-s to avoid warning */
-  fixed_left -= n;
+  return (voidpf)(fixed_mem + *(intf *)q);
-  return (voidp)(fixed_mem + fixed_left);
-}
-
-
-local void ffree(q, p)
-voidp q;
-voidp p;
-{
-  Assert(0, "inflate_trees ffree called!");
-  if (q) q = p; /* to make some compilers happy */
 }
 
 
 int inflate_trees_fixed(bl, bd, tl, td)
-uInt *bl;               /* literal desired/actual bit depth */
+uIntf *bl;               /* literal desired/actual bit depth */
-uInt *bd;               /* distance desired/actual bit depth */
+uIntf *bd;               /* distance desired/actual bit depth */
-inflate_huft **tl;      /* literal/length tree result */
+inflate_huft * FAR *tl;  /* literal/length tree result */
-inflate_huft **td;      /* distance tree result */
+inflate_huft * FAR *td;  /* distance tree result */
 {
-  /* build fixed tables if not built already--lock out other instances */
+  /* build fixed tables if not already (multiple overlapped executions ok) */
-  while (++fixed_lock > 1)
-    fixed_lock--;
   if (!fixed_built)
   {
     int k;              /* temporary variable */
     unsigned c[288];    /* length list for huft_build */
     z_stream z;         /* for falloc function */
+    int f = FIXEDH;     /* number of hufts left in fixed_mem */
 
     /* set up fake z_stream for memory routines */
     z.zalloc = falloc;
-    z.zfree = ffree;
+    z.zfree = Z_NULL;
-    z.opaque = Z_NULL;
+    z.opaque = (voidpf)&f;
 
     /* literal table */
     for (k = 0; k < 144; k++)
@@ -437,9 +429,9 @@ inflate_huft **td;      /* distance tree result */
     huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd, &z);
 
     /* done */
+    Assert(f == 0, "invalid build of fixed tables");
     fixed_built = 1;
   }
-  fixed_lock--;
   *bl = fixed_bl;
   *bd = fixed_bd;
   *tl = fixed_tl;
@@ -455,10 +447,19 @@ z_stream *z;            /* for zfree function */
    list of the tables it made, with the links in a dummy first entry of
    each table. */
 {
-  register inflate_huft *p, *q;
+  register inflate_huft *p, *q, *r;
 
+  /* Reverse linked list */
+  p = Z_NULL;
+  q = t;
+  while (q != Z_NULL)
+  {
+    r = (q - 1)->next;
+    (q - 1)->next = p;
+    p = q;
+    q = r;
+  }
   /* Go through linked list, freeing from the malloced (t[-1]) address. */
-  p = t;
   while (p != Z_NULL)
   {
     q = (--p)->next;

inftrees.h

@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -11,14 +11,15 @@
 /* Huffman code lookup table entry--this entry is four bytes for machines
    that have 16-bit pointers (e.g. PC's in the small or medium model). */
 
-typedef struct inflate_huft_s inflate_huft;
+typedef struct inflate_huft_s FAR inflate_huft;
+
 struct inflate_huft_s {
   union {
     struct {
       Byte Exop;        /* number of extra bits or operation */
       Byte Bits;        /* number of bits in this code or subcode */
     } what;
-    Byte *pad;          /* pad structure to a power of 2 (4 bytes for */
+    Bytef *pad;         /* pad structure to a power of 2 (4 bytes for */
   } word;               /*  16-bit, 8 bytes for 32-bit machines) */
   union {
     uInt Base;          /* literal, length base, or distance base */
@@ -30,28 +31,29 @@ struct inflate_huft_s {
   extern uInt inflate_hufts;
 #endif
 
-extern int inflate_trees_bits __P((
+extern int inflate_trees_bits OF((
-    uInt *,                     /* 19 code lengths */
+    uIntf *,                    /* 19 code lengths */
-    uInt *,                     /* bits tree desired/actual depth */
+    uIntf *,                    /* bits tree desired/actual depth */
-    inflate_huft **,            /* bits tree result */
+    inflate_huft * FAR *,       /* bits tree result */
     z_stream *));               /* for zalloc, zfree functions */
 
-extern int inflate_trees_dynamic __P((
+extern int inflate_trees_dynamic OF((
     uInt,                       /* number of literal/length codes */
     uInt,                       /* number of distance codes */
-    uInt *,                     /* that many (total) code lengths */
+    uIntf *,                    /* that many (total) code lengths */
-    uInt *,                     /* literal desired/actual bit depth */
+    uIntf *,                    /* literal desired/actual bit depth */
-    uInt *,                     /* distance desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft **,            /* literal/length tree result */
+    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft **,            /* distance tree result */
+    inflate_huft * FAR *,       /* distance tree result */
     z_stream *));               /* for zalloc, zfree functions */
 
-extern int inflate_trees_fixed __P((
+extern int inflate_trees_fixed OF((
-    uInt *,                     /* literal desired/actual bit depth */
+    uIntf *,                    /* literal desired/actual bit depth */
-    uInt *,                     /* distance desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft **,            /* literal/length tree result */
+    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft **));          /* distance tree result */
+    inflate_huft * FAR *));     /* distance tree result */
 
-extern int inflate_trees_free __P((
+extern int inflate_trees_free OF((
     inflate_huft *,             /* tables to free */
     z_stream *));               /* for zfree function */
+

infutil.c

@@ -1,16 +1,18 @@
 /* inflate_util.c -- data and routines common to blocks and codes
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
 #include "zutil.h"
+#include "infblock.h"
 #include "inftrees.h"
+#include "infcodes.h"
 #include "infutil.h"
 
 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 
 /* And'ing with mask[n] masks the lower n bits */
-uInt inflate_mask[] = {
+uInt inflate_mask[17] = {
     0x0000,
     0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
     0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
@@ -19,12 +21,12 @@ uInt inflate_mask[] = {
 
 /* copy as much as possible from the sliding window to the output area */
 int inflate_flush(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
   uInt n;
-  Byte *p, *q;
+  Bytef *p, *q;
 
   /* local copies of source and destination pointers */
   p = z->next_out;
@@ -41,7 +43,7 @@ int r;
 
   /* update check information */
   if (s->checkfn != Z_NULL)
-    s->check = (*s->checkfn)(s->check, q, n);
+    z->adler = s->check = (*s->checkfn)(s->check, q, n);
 
   /* copy as far as end of window */
   zmemcpy(p, q, n);
@@ -67,7 +69,7 @@ int r;
 
     /* update check information */
     if (s->checkfn != Z_NULL)
-      s->check = (*s->checkfn)(s->check, q, n);
+      z->adler = s->check = (*s->checkfn)(s->check, q, n);
 
     /* copy */
     zmemcpy(p, q, n);

infutil.h

@@ -1,5 +1,5 @@
 /* infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -8,11 +8,10 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* inflate blocks semi-private state */
+#ifndef _INFUTIL_H
-struct inflate_blocks_state {
+#define _INFUTIL_H
 
-  /* mode */
+typedef enum {
-  enum {
       TYPE,     /* get type bits (3, including end bit) */
       LENS,     /* get lengths for stored */
       STORED,   /* processing stored block */
@@ -23,7 +22,13 @@ struct inflate_blocks_state {
       DRY,      /* output remaining window bytes */
       DONE,     /* finished last block, done */
       BAD}      /* got a data error--stuck here */
-    mode;               /* current inflate_block mode */
+inflate_block_mode;
+
+/* inflate blocks semi-private state */
+struct inflate_blocks_state {
+
+  /* mode */
+  inflate_block_mode  mode;     /* current inflate_block mode */
 
   /* mode dependent information */
   union {
@@ -31,14 +36,15 @@ struct inflate_blocks_state {
     struct {
       uInt table;               /* table lengths (14 bits) */
       uInt index;               /* index into blens (or border) */
-      uInt *blens;              /* bit lengths of codes */
+      uIntf *blens;             /* bit lengths of codes */
       uInt bb;                  /* bit length tree depth */
       inflate_huft *tb;         /* bit length decoding tree */
     } trees;            /* if DTREE, decoding info for trees */
     struct {
-      inflate_huft *tl, *td;    /* trees to free */
+      inflate_huft *tl;
-      struct inflate_codes_state
+      inflate_huft *td;         /* trees to free */
-        *codes;
+      inflate_codes_statef 
+         *codes;
     } decode;           /* if CODES, current state */
   } sub;                /* submode */
   uInt last;            /* true if this block is the last block */
@@ -46,15 +52,16 @@ struct inflate_blocks_state {
   /* mode independent information */
   uInt bitk;            /* bits in bit buffer */
   uLong bitb;           /* bit buffer */
-  Byte *window;         /* sliding window */
+  Bytef *window;        /* sliding window */
-  Byte *end;            /* one byte after sliding window */
+  Bytef *end;           /* one byte after sliding window */
-  Byte *read;           /* window read pointer */
+  Bytef *read;          /* window read pointer */
-  Byte *write;          /* window write pointer */
+  Bytef *write;         /* window write pointer */
   check_func checkfn;   /* check function */
   uLong check;          /* check on output */
 
 };
 
+
 /* defines for inflate input/output */
 /*   update pointers and return */
 #define UPDBITS {s->bitb=b;s->bitk=k;}
@@ -69,22 +76,24 @@ struct inflate_blocks_state {
 #define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
 #define DUMPBITS(j) {b>>=(j);k-=(j);}
 /*   output bytes */
-#define WAVAIL (q<s->read?s->read-q-1:s->end-q)
+#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
-#define LOADOUT {q=s->write;m=WAVAIL;}
+#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
-#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=WAVAIL;}}
+#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
 #define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
 #define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
 #define OUTBYTE(a) {*q++=(Byte)(a);m--;}
 /*   load local pointers */
 #define LOAD {LOADIN LOADOUT}
 
-/* masks for lower bits */
+/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
-extern uInt inflate_mask[];
+extern uInt inflate_mask[17];
 
 /* copy as much as possible from the sliding window to the output area */
-extern int inflate_flush __P((
+extern int inflate_flush OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
     int));
 
 struct internal_state      {int dummy;}; /* for buggy compilers */
+
+#endif

minigzip.c

@@ -1,5 +1,5 @@
 /* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -13,20 +13,19 @@
  * or in pipe mode.
  */
 
-/* $Id: minigzip.c,v 1.5 1995/05/03 17:27:11 jloup Exp $ */
+/* $Id: minigzip.c,v 1.8 1996/01/30 21:59:23 me Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
 
-#ifndef __GO32__
-extern void exit  __P((int));
-#endif
-extern int unlink __P((const char *));
-
 #ifdef STDC
 #  include <string.h>
+#  include <stdlib.h>
+#else
+   extern void exit  OF((int));
 #endif
 
+
 #if defined(MSDOS) || defined(OS2) || defined(WIN32)
 #  include <fcntl.h>
 #  include <io.h>
@@ -35,6 +34,16 @@ extern int unlink __P((const char *));
 #  define SET_BINARY_MODE(file)
 #endif
 
+#ifdef VMS
+#  define unlink delete
+#  define GZ_SUFFIX "-gz"
+#else
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN sizeof(GZ_SUFFIX)
+
+extern int unlink OF((const char *));
+
 #define BUFLEN 4096
 #define MAX_NAME_LEN 1024
 
@@ -46,18 +55,18 @@ extern int unlink __P((const char *));
 
 char *prog;
 
-void error           __P((char *msg));
+void error           OF((const char *msg));
-void gz_compress     __P((FILE   *in, gzFile out));
+void gz_compress     OF((FILE   *in, gzFile out));
-void gz_uncompress   __P((gzFile in, FILE   *out));
+void gz_uncompress   OF((gzFile in, FILE   *out));
-void file_compress   __P((char  *file));
+void file_compress   OF((char  *file));
-void file_uncompress __P((char  *file));
+void file_uncompress OF((char  *file));
-void main            __P((int argc, char *argv[]));
+int  main            OF((int argc, char *argv[]));
 
 /* ===========================================================================
  * Display error message and exit
  */
 void error(msg)
-    char *msg;
+    const char *msg;
 {
     fprintf(stderr, "%s: %s\n", prog, msg);
     exit(1);
@@ -82,7 +91,7 @@ void gz_compress(in, out)
         }
         if (len == 0) break;
 
-        if (gzwrite(out, buf, len) != len) error(gzerror(out, &err));
+        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
     }
     fclose(in);
     if (gzclose(out) != Z_OK) error("failed gzclose");
@@ -104,7 +113,9 @@ void gz_uncompress(in, out)
         if (len < 0) error (gzerror(in, &err));
         if (len == 0) break;
 
-        if (fwrite(buf, 1, len, out) != (uInt)len) error("failed fwrite");
+        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
+	    error("failed fwrite");
+	}
     }
     if (fclose(out)) error("failed fclose");
 
@@ -124,14 +135,14 @@ void file_compress(file)
     gzFile out;
 
     strcpy(outfile, file);
-    strcat(outfile, ".gz");
+    strcat(outfile, GZ_SUFFIX);
 
     in = fopen(file, "rb");
     if (in == NULL) {
         perror(file);
         exit(1);
     }
-    out = gzopen(outfile, "wb");
+    out = gzopen(outfile, "wb"); /* use "wb9" for maximal compression */
     if (out == NULL) {
         fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
         exit(1);
@@ -156,14 +167,14 @@ void file_uncompress(file)
 
     strcpy(buf, file);
 
-    if (len > 3 && strcmp(file+len-3, ".gz") == 0) {
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
         infile = file;
         outfile = buf;
         outfile[len-3] = '\0';
     } else {
         outfile = file;
         infile = buf;
-        strcat(infile, ".gz");
+        strcat(infile, GZ_SUFFIX);
     }
     in = gzopen(infile, "rb");
     if (in == NULL) {
@@ -186,7 +197,7 @@ void file_uncompress(file)
  * Usage:  minigzip [-d] [files...]
  */
 
-void main(argc, argv)
+int main(argc, argv)
     int argc;
     char *argv[];
 {
@@ -210,7 +221,7 @@ void main(argc, argv)
             if (file == NULL) error("can't gzdopen stdin");
             gz_uncompress(file, stdout);
         } else {
-            file = gzdopen(fileno(stdout), "wb");
+            file = gzdopen(fileno(stdout), "wb"); /* "wb9" for max compr. */
             if (file == NULL) error("can't gzdopen stdout");
             gz_compress(stdin, file);
         }
@@ -224,4 +235,5 @@ void main(argc, argv)
         } while (argv++, --argc);
     }
     exit(0);
+    return 0; /* to avoid warning */
 }

trees.c

@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995 Jean-loup Gailly
+ * Copyright (C) 1995-1996 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -78,13 +78,12 @@ local uch bl_order[BL_CODES]
 
 /* ===========================================================================
  * Local data. These are initialized only once.
- * To do: initialize at compile time to be completely reentrant. ???
  */
 
 local ct_data static_ltree[L_CODES+2];
 /* The static literal tree. Since the bit lengths are imposed, there is no
  * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see ct_init
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
  * below).
  */
 
@@ -110,7 +109,7 @@ local int base_dist[D_CODES];
 
 struct static_tree_desc_s {
     ct_data *static_tree;        /* static tree or NULL */
-    int     *extra_bits;         /* extra bits for each code or NULL */
+    intf    *extra_bits;         /* extra bits for each code or NULL */
     int     extra_base;          /* base index for extra_bits */
     int     elems;               /* max number of elements in the tree */
     int     max_length;          /* max bit length for the codes */
@@ -129,25 +128,25 @@ local static_tree_desc  static_bl_desc =
  * Local (static) routines in this file.
  */
 
-local void ct_static_init __P((void));
+local void tr_static_init OF((void));
-local void init_block     __P((deflate_state *s));
+local void init_block     OF((deflate_state *s));
-local void pqdownheap     __P((deflate_state *s, ct_data *tree, int k));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     __P((deflate_state *s, tree_desc *desc));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      __P((ct_data *tree, int max_code, ush bl_count[]));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     __P((deflate_state *s, tree_desc *desc));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      __P((deflate_state *s, ct_data *tree, int max_code));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      __P((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  __P((deflate_state *s));
+local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees __P((deflate_state *s, int lcodes, int dcodes,
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                               int blcodes));
-local void compress_block __P((deflate_state *s, ct_data *ltree,
+local void compress_block OF((deflate_state *s, ct_data *ltree,
                               ct_data *dtree));
-local void set_data_type  __P((deflate_state *s));
+local void set_data_type  OF((deflate_state *s));
-local void send_bits      __P((deflate_state *s, int value, int length));
+local unsigned bi_reverse OF((unsigned value, int length));
-local unsigned bi_reverse __P((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
-local void bi_windup      __P((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
-local void copy_block     __P((deflate_state *s, char *buf, unsigned len,
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                               int header));
+                              int header));
 
 #ifndef DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
@@ -166,15 +165,74 @@ local void copy_block     __P((deflate_state *s, char *buf, unsigned len,
  * used.
  */
 
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (value << s->bi_valid);
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = value;\
+    s->bi_buf |= (val << s->bi_valid);\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* DEBUG */
+
+
 #define MAX(a,b) (a >= b ? a : b)
 /* the arguments must not have side effects */
 
 /* ===========================================================================
- * Initialize the various 'constant' tables.
+ * Initialize the various 'constant' tables. In a multi-threaded environment,
- * To do: do this at compile time.
+ * this function may be called by two threads concurrently, but this is
+ * harmless since both invocations do exactly the same thing.
  */
-local void ct_static_init()
+local void tr_static_init()
 {
+    static int static_init_done = 0;
     int n;        /* iterates over tree elements */
     int bits;     /* bit counter */
     int length;   /* length value */
@@ -183,6 +241,8 @@ local void ct_static_init()
     ush bl_count[MAX_BITS+1];
     /* number of codes at each bit length for an optimal tree */
 
+    if (static_init_done) return;
+
     /* Initialize the mapping length (0..255) -> length code (0..28) */
     length = 0;
     for (code = 0; code < LENGTH_CODES-1; code++) {
@@ -191,7 +251,7 @@ local void ct_static_init()
             length_code[length++] = (uch)code;
         }
     }
-    Assert (length == 256, "ct_static_init: length != 256");
+    Assert (length == 256, "tr_static_init: length != 256");
     /* Note that the length 255 (match length 258) can be represented
      * in two different ways: code 284 + 5 bits or code 285, so we
      * overwrite length_code[255] to use the best encoding:
@@ -206,7 +266,7 @@ local void ct_static_init()
             dist_code[dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "ct_static_init: dist != 256");
+    Assert (dist == 256, "tr_static_init: dist != 256");
     dist >>= 7; /* from now on, all distances are divided by 128 */
     for ( ; code < D_CODES; code++) {
         base_dist[code] = dist << 7;
@@ -214,7 +274,7 @@ local void ct_static_init()
             dist_code[256 + dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "ct_static_init: 256+dist != 512");
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");
 
     /* Construct the codes of the static literal tree */
     for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -232,19 +292,18 @@ local void ct_static_init()
     /* The static distance tree is trivial: */
     for (n = 0; n < D_CODES; n++) {
         static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse(n, 5);
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
     }
+    static_init_done = 1;
 }
 
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void ct_init(s)
+void _tr_init(s)
     deflate_state *s;
 {
-    if (static_dtree[0].Len == 0) {
+    tr_static_init();
-        ct_static_init();              /* To do: at compile time */
-    }
 
     s->compressed_len = 0L;
 
@@ -259,6 +318,7 @@ void ct_init(s)
 
     s->bi_buf = 0;
     s->bi_valid = 0;
+    s->last_eob_len = 8; /* enough lookahead for inflate */
 #ifdef DEBUG
     s->bits_sent = 0L;
 #endif
@@ -356,7 +416,7 @@ local void gen_bitlen(s, desc)
     ct_data *tree  = desc->dyn_tree;
     int max_code   = desc->max_code;
     ct_data *stree = desc->stat_desc->static_tree;
-    int *extra     = desc->stat_desc->extra_bits;
+    intf *extra    = desc->stat_desc->extra_bits;
     int base       = desc->stat_desc->extra_base;
     int max_length = desc->stat_desc->max_length;
     int h;              /* heap index */
@@ -439,7 +499,7 @@ local void gen_bitlen(s, desc)
 local void gen_codes (tree, max_code, bl_count)
     ct_data *tree;             /* the tree to decorate */
     int max_code;              /* largest code with non zero frequency */
-    ush bl_count[];            /* number of codes at each bit length */
+    ushf *bl_count;            /* number of codes at each bit length */
 {
     ush next_code[MAX_BITS+1]; /* next code value for each bit length */
     ush code = 0;              /* running code value */
@@ -465,7 +525,7 @@ local void gen_codes (tree, max_code, bl_count)
         /* Now reverse the bits */
         tree[n].Code = bi_reverse(next_code[len]++, len);
 
-        Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
              n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
     }
 }
@@ -487,8 +547,7 @@ local void build_tree(s, desc)
     int elems       = desc->stat_desc->elems;
     int n, m;          /* iterate over heap elements */
     int max_code = -1; /* largest code with non zero frequency */
-    int node = elems;  /* next internal node of the tree */
+    int node;          /* new node being created */
-    int new;           /* new node being created */
 
     /* Construct the initial heap, with least frequent element in
      * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
@@ -511,11 +570,11 @@ local void build_tree(s, desc)
      * two codes of non zero frequency.
      */
     while (s->heap_len < 2) {
-        new = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[new].Freq = 1;
+        tree[node].Freq = 1;
-        s->depth[new] = 0;
+        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[new].Len;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* new is 0 or 1 so it does not have extra bits */
+        /* node is 0 or 1 so it does not have extra bits */
     }
     desc->max_code = max_code;
 
@@ -527,6 +586,7 @@ local void build_tree(s, desc)
     /* Construct the Huffman tree by repeatedly combining the least two
      * frequent nodes.
      */
+    node = elems;              /* next internal node of the tree */
     do {
         pqremove(s, tree, n);  /* n = node of least frequency */
         m = s->heap[SMALLEST]; /* m = node of next least frequency */
@@ -725,28 +785,49 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
 /* ===========================================================================
  * Send a stored block
  */
-void ct_stored_block(s, buf, stored_len, eof)
+void _tr_stored_block(s, buf, stored_len, eof)
     deflate_state *s;
-    char *buf;        /* input block */
+    charf *buf;       /* input block */
     ulg stored_len;   /* length of input block */
     int eof;          /* true if this is the last block for a file */
 {
     send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
-    s->compressed_len = (s->compressed_len + 3 + 7) & ~7L;
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
 
     copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
 /* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
  */
-void ct_align(s)
+void _tr_align(s)
     deflate_state *s;
 {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+    bi_flush(s);
+    /* Of the 10 bits for the empty block, we have already sent
+     * (10 - bi_valid) bits. The lookahead for the last real code (before
+     * the EOB of the previous block) was thus at least one plus the length
+     * of the EOB plus what we have just sent of the empty static block.
+     */
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+        send_bits(s, STATIC_TREES<<1, 3);
+        send_code(s, END_BLOCK, static_ltree);
+        s->compressed_len += 10L;
+        bi_flush(s);
+    }
+    s->last_eob_len = 7;
 }
 
 /* ===========================================================================
@@ -754,44 +835,52 @@ void ct_align(s)
  * trees or store, and output the encoded block to the zip file. This function
  * returns the total compressed length for the file so far.
  */
-ulg ct_flush_block(s, buf, stored_len, eof)
+ulg _tr_flush_block(s, buf, stored_len, eof)
     deflate_state *s;
-    char *buf;        /* input block, or NULL if too old */
+    charf *buf;       /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
     int eof;          /* true if this is the last block for a file */
 {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex;  /* index of last bit length code of non zero freq */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
 
-     /* Check if the file is ascii or binary */
+    /* Build the Huffman trees unless a stored block is forced */
-    if (s->data_type == UNKNOWN) set_data_type(s);
+    if (s->level > 0) {
 
-    /* Construct the literal and distance trees */
+	 /* Check if the file is ascii or binary */
-    build_tree(s, (tree_desc *)(&(s->l_desc)));
+	if (s->data_type == Z_UNKNOWN) set_data_type(s);
-    Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-            s->static_len));
 
-    build_tree(s, (tree_desc *)(&(s->d_desc)));
+	/* Construct the literal and distance trees */
-    Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+	build_tree(s, (tree_desc *)(&(s->l_desc)));
-            s->static_len));
+	Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-    /* At this point, opt_len and static_len are the total bit lengths of
+		s->static_len));
-     * the compressed block data, excluding the tree representations.
-     */
 
-    /* Build the bit length tree for the above two trees, and get the index
+	build_tree(s, (tree_desc *)(&(s->d_desc)));
-     * in bl_order of the last bit length code to send.
+	Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-     */
+		s->static_len));
-    max_blindex = build_bl_tree(s);
+	/* At this point, opt_len and static_len are the total bit lengths of
+	 * the compressed block data, excluding the tree representations.
+	 */
 
-    /* Determine the best encoding. Compute first the block length in bytes */
+	/* Build the bit length tree for the above two trees, and get the index
-    opt_lenb = (s->opt_len+3+7)>>3;
+	 * in bl_order of the last bit length code to send.
-    static_lenb = (s->static_len+3+7)>>3;
+	 */
+	max_blindex = build_bl_tree(s);
 
-    Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+	/* Determine the best encoding. Compute first the block length in bytes*/
-            opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+	opt_lenb = (s->opt_len+3+7)>>3;
-            s->last_lit));
+	static_lenb = (s->static_len+3+7)>>3;
 
-    if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+	Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+		opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+		s->last_lit));
+
+	if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+	opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
 
     /* If compression failed and this is the first and last block,
      * and if the .zip file can be seeked (to rewrite the local header),
@@ -799,12 +888,12 @@ ulg ct_flush_block(s, buf, stored_len, eof)
      */
 #ifdef STORED_FILE_OK
 #  ifdef FORCE_STORED_FILE
-    if (eof && compressed_len == 0L) { /* force stored file */
+    if (eof && s->compressed_len == 0L) { /* force stored file */
 #  else
     if (stored_len <= opt_lenb && eof && s->compressed_len==0L && seekable()) {
 #  endif
         /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
-        if (buf == (char*)0) error ("block vanished");
+        if (buf == (charf*)0) error ("block vanished");
 
         copy_block(buf, (unsigned)stored_len, 0); /* without header */
         s->compressed_len = stored_len << 3;
@@ -824,7 +913,7 @@ ulg ct_flush_block(s, buf, stored_len, eof)
          * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
          * transform a block into a stored block.
          */
-        ct_stored_block(s, buf, stored_len, eof);
+        _tr_stored_block(s, buf, stored_len, eof);
 
 #ifdef FORCE_STATIC
     } else if (static_lenb >= 0) { /* force static trees */
@@ -858,10 +947,10 @@ ulg ct_flush_block(s, buf, stored_len, eof)
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int ct_tally (s, dist, lc)
+int _tr_tally (s, dist, lc)
     deflate_state *s;
-    int dist;  /* distance of matched string */
+    unsigned dist;  /* distance of matched string */
-    int lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
 {
     s->d_buf[s->last_lit] = (ush)dist;
     s->l_buf[s->last_lit++] = (uch)lc;
@@ -874,7 +963,7 @@ int ct_tally (s, dist, lc)
         dist--;             /* dist = match distance - 1 */
         Assert((ush)dist < (ush)MAX_DIST(s) &&
                (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "ct_tally: bad match");
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
         s->dyn_ltree[length_code[lc]+LITERALS+1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
@@ -884,7 +973,7 @@ int ct_tally (s, dist, lc)
     if (s->level > 2 && (s->last_lit & 0xfff) == 0) {
         /* Compute an upper bound for the compressed length */
         ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)s->strstart - s->block_start;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
         int dcode;
         for (dcode = 0; dcode < D_CODES; dcode++) {
             out_length += (ulg)s->dyn_dtree[dcode].Freq *
@@ -950,6 +1039,7 @@ local void compress_block(s, ltree, dtree)
     } while (lx < s->last_lit);
 
     send_code(s, END_BLOCK, ltree);
+    s->last_eob_len = ltree[END_BLOCK].Len;
 }
 
 /* ===========================================================================
@@ -967,45 +1057,7 @@ local void set_data_type(s)
     while (n < 7)        bin_freq += s->dyn_ltree[n++].Freq;
     while (n < 128)    ascii_freq += s->dyn_ltree[n++].Freq;
     while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq;
-    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? BINARY : ASCII);
+    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII);
-}
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-#ifdef DEBUG
-    Tracev((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-#endif
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= value << s->bi_valid;
-        s->bi_valid += length;
-    }
 }
 
 /* ===========================================================================
@@ -1026,7 +1078,24 @@ local unsigned bi_reverse(code, len)
 }
 
 /* ===========================================================================
- * Write out any remaining bits in an incomplete byte.
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
  */
 local void bi_windup(s)
     deflate_state *s;
@@ -1049,11 +1118,12 @@ local void bi_windup(s)
  */
 local void copy_block(s, buf, len, header)
     deflate_state *s;
-    char     *buf;    /* the input data */
+    charf    *buf;    /* the input data */
     unsigned len;     /* its length */
     int      header;  /* true if block header must be written */
 {
-    bi_windup(s);              /* align on byte boundary */
+    bi_windup(s);        /* align on byte boundary */
+    s->last_eob_len = 8; /* enough lookahead for inflate */
 
     if (header) {
         put_short(s, (ush)len);   

uncompr.c

@@ -1,9 +1,9 @@
 /* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: uncompr.c,v 1.5 1995/05/03 17:27:12 jloup Exp $ */
+/* $Id: uncompr.c,v 1.8 1996/01/30 21:59:26 me Exp $ */
 
 #include "zlib.h"
 
@@ -23,15 +23,15 @@
    buffer, or Z_DATA_ERROR if the input data was corrupted.
 */
 int uncompress (dest, destLen, source, sourceLen)
-    Byte *dest;
+    Bytef *dest;
-    uLong *destLen;
+    uLongf *destLen;
-    Byte *source;
+    const Bytef *source;
     uLong sourceLen;
 {
     z_stream stream;
     int err;
 
-    stream.next_in = source;
+    stream.next_in = (Bytef*)source;
     stream.avail_in = (uInt)sourceLen;
     /* Check for source > 64K on 16-bit machine: */
     if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;

zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -9,33 +9,80 @@
 #define _ZCONF_H
 
 /*
-     The library does not install any signal handler. It is recommended to
+ * If you *really* need a unique prefix for all types and library functions,
-  add at least a handler for SIGSEGV when decompressing; the library checks
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-  the consistency of the input data whenever possible but may go nuts
-  for some forms of corrupted input.
  */
+#ifdef Z_PREFIX
+#  define deflateInit_	z_deflateInit_
+#  define deflate	z_deflate
+#  define deflateEnd	z_deflateEnd
+#  define inflateInit_ 	z_inflateInit_
+#  define inflate	z_inflate
+#  define inflateEnd	z_inflateEnd
+#  define deflateInit2_	z_deflateInit2_
+#  define deflateSetDictionary z_deflateSetDictionary
+#  define deflateCopy	z_deflateCopy
+#  define deflateReset	z_deflateReset
+#  define deflateParams	z_deflateParams
+#  define inflateInit2_	z_inflateInit2_
+#  define inflateSetDictionary z_inflateSetDictionary
+#  define inflateSync	z_inflateSync
+#  define inflateReset	z_inflateReset
+#  define compress	z_compress
+#  define uncompress	z_uncompress
+#  define adler32	z_adler32
+#  define crc32		z_crc32
+#  define get_crc_table z_get_crc_table
 
-/*
+#  define Byte		z_Byte
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+#  define uInt		z_uInt
- * than 64k bytes at a time (needed on systems with 16-bit int).
+#  define uLong		z_uLong
- */
+/* #  define Bytef	z_Bytef */
-#if defined(_GNUC__) && !defined(__32BIT__)
+#  define charf		z_charf
+#  define intf		z_intf
+#  define uIntf		z_uIntf
+#  define uLongf	z_uLongf
+#  define voidpf	z_voidpf
+#  define voidp		z_voidp
+#endif
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#  define WIN32
+#endif
+#if (defined(__GNUC__) || defined(WIN32)) && !defined(__32BIT__)
 #  define __32BIT__
 #endif
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
 #endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
 #if defined(MSDOS) && !defined(__32BIT__)
 #  define MAXSEG_64K
 #endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
+#  define STDC
+#endif
+#if (defined(__STDC__) || defined(__cplusplus)) && !defined(STDC)
+#  define STDC
+#endif
+
 #ifndef STDC
-#  if defined(MSDOS) || defined(__STDC__) || defined(__cplusplus)
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define STDC
+#    define const
 #  endif
 #endif
 
-#if !defined(STDC) && !defined(const)
+#ifdef	__MWERKS__ /* Metrowerks CodeWarrior declares fileno() in unix.h */
-#  define const
+#  include <unix.h>
+#  define NO_DUMMY_DECL /* buggy compiler merges all .h files incorrectly */
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -67,30 +114,59 @@
 
                         /* Type declarations */
 
-#ifndef __P /* function prototypes */
+#ifndef OF /* function prototypes */
 #  ifdef STDC
-#    define __P(args)  args
+#    define OF(args)  args
 #  else
-#    define __P(args)  ()
+#    define OF(args)  ()
 #  endif
 #endif
 
-#ifndef Byte
+/* The following definitions for FAR are needed only for MSDOS mixed
-  typedef unsigned char  Byte;  /* 8 bits */
+ * model programming (small or medium model with some far allocations).
-#endif
+ * This was tested only with MSC; for other MSDOS compilers you may have
-#ifndef uInt
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
-  typedef unsigned int   uInt;  /* 16 bits or more */
+ * just define FAR to be empty.
-#endif
+ */
-#ifndef uLong
+#if defined(M_I86SM) || defined(M_I86MM) /* MSC small or medium model */
-  typedef unsigned long  uLong; /* 32 bits or more */
+#  define SMALL_MEDIUM
-#endif
+#  ifdef _MSC_VER
-#ifndef voidp
+#    define FAR __far
-#  ifdef STDC
-     typedef void *voidp;
 #  else
-     typedef Byte *voidp;
+#    define FAR far
 #  endif
 #endif
+#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
+#    define SMALL_MEDIUM
+#    define FAR __far
+#endif
+#ifndef FAR
+#   define FAR
+#endif
+/* The Watcom compiler defines M_I86SM and __SMALL__ even in 32 bit mode */
+#if defined(__WATCOMC__) && defined(__386__)
+#  undef FAR
+#  define FAR
+#  undef SMALL_MEDIUM
+#endif
+
+typedef unsigned char  Byte;  /* 8 bits */
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+/* "typedef Byte  FAR Bytef;" doesn't work with Borland C/C++ */
+#define Bytef Byte  FAR 
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void FAR *voidpf;
+   typedef void     *voidp;
+#else
+   typedef Byte FAR *voidpf;
+   typedef Byte     *voidp;
+#endif
 
 #endif /* _ZCONF_H */
-

zlib.h

@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 0.93 June 25th, 1995.
+  version 1.0.1, May 20th, 1996.
 
-  Copyright (C) 1995 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -26,9 +26,13 @@
 #ifndef _ZLIB_H
 #define _ZLIB_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "zconf.h"
 
-#define ZLIB_VERSION "0.93"
+#define ZLIB_VERSION "1.0.1"
 
 /* 
      The 'zlib' compression library provides in-memory compression and
@@ -47,31 +51,37 @@
   repeated calls of the compression function.  In the latter case, the
   application must provide more input and/or consume the output
   (providing more output space) before each call.
+
+     The library does not install any signal handler. It is recommended to
+  add at least a handler for SIGSEGV when decompressing; the library checks
+  the consistency of the input data whenever possible but may go nuts
+  for some forms of corrupted input.
 */
 
-typedef voidp (*alloc_func) __P((voidp opaque, uInt items, uInt size));
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void  (*free_func)  __P((voidp opaque, voidp address));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
 
 struct internal_state;
 
 typedef struct z_stream_s {
-    Byte     *next_in;  /* next input byte */
+    Bytef    *next_in;  /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total nb of input bytes read so far */
 
-    Byte     *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total nb of bytes output so far */
 
     char     *msg;      /* last error message, NULL if no error */
-    struct internal_state *state; /* not visible by applications */
+    struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
     free_func  zfree;   /* used to free the internal state */
-    voidp      opaque;  /* private data object passed to zalloc and zfree */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    Byte     data_type; /* best guess about the data type: ascii or binary */
 
+    int     data_type;  /* best guess about the data type: ascii or binary */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
 } z_stream;
 
 /*
@@ -107,20 +117,25 @@ typedef struct z_stream_s {
 
 #define Z_NO_FLUSH      0
 #define Z_PARTIAL_FLUSH 1
-#define Z_FULL_FLUSH    2
+#define Z_SYNC_FLUSH    2
-#define Z_SYNC_FLUSH    3 /* experimental: partial_flush + byte align */
+#define Z_FULL_FLUSH    3
 #define Z_FINISH        4
-/* See deflate() below for the usage of these constants */
+/* Allowed flush values; see deflate() below for details */
 
 #define Z_OK            0
 #define Z_STREAM_END    1
+#define Z_NEED_DICT     2
 #define Z_ERRNO        (-1)
 #define Z_STREAM_ERROR (-2)
 #define Z_DATA_ERROR   (-3)
 #define Z_MEM_ERROR    (-4)
 #define Z_BUF_ERROR    (-5)
-/* error codes for the compression/decompression functions */
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
 
+#define Z_NO_COMPRESSION         0
 #define Z_BEST_SPEED             1
 #define Z_BEST_COMPRESSION       9
 #define Z_DEFAULT_COMPRESSION  (-1)
@@ -129,15 +144,19 @@ typedef struct z_stream_s {
 #define Z_FILTERED            1
 #define Z_HUFFMAN_ONLY        2
 #define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
 
 #define Z_BINARY   0
 #define Z_ASCII    1
 #define Z_UNKNOWN  2
-/* Used to set the data_type field */
+/* Possible values of the data_type field */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
 
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
 
-extern char *zlib_version;
+extern const char *zlib_version;
 /* The application can compare zlib_version and ZLIB_VERSION for consistency.
    If the first character differs, the library code actually used is
    not compatible with the zlib.h header file used by the application.
@@ -145,26 +164,30 @@ extern char *zlib_version;
 
                         /* basic functions */
 
-extern int deflateInit __P((z_stream *strm, int level));
 /* 
+extern int deflateInit OF((z_stream *strm, int level));
+
      Initializes the internal stream state for compression. The fields
    zalloc, zfree and opaque must be initialized before by the caller.
    If zalloc and zfree are set to Z_NULL, deflateInit updates them to
    use default allocation functions.
 
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 1 and 9:
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression. Z_DEFAULT_COMPRESSION requests
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   a default compromise between speed and compression (currently equivalent
+   all (the input data is simply copied a block at a time).
-   to level 6).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).
 
      deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level.
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).
    msg is set to null if there is no error message.  deflateInit does not
    perform any compression: this will be done by deflate().
 */
 
 
-extern int deflate __P((z_stream *strm, int flush));
+extern int deflate OF((z_stream *strm, int flush));
 /*
   Performs one or both of the following actions:
 
@@ -184,18 +207,28 @@ extern int deflate __P((z_stream *strm, int flush));
   more output, and updating avail_in or avail_out accordingly; avail_out
   should never be zero before the call. The application can consume the
   compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate().
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+  and with zero avail_out, it must be called again after making room in the
+  output buffer because there might be more output pending.
 
     If the parameter flush is set to Z_PARTIAL_FLUSH, the current compression
   block is terminated and flushed to the output buffer so that the
   decompressor can get all input data available so far. For method 9, a future
   variant on method 8, the current block will be flushed but not terminated.
-  If flush is set to Z_FULL_FLUSH, the compression block is terminated, a
+  Z_SYNC_FLUSH has the same effect as partial flush except that the compressed
+  output is byte aligned (the compressor can clear its internal bit buffer)
+  and the current block is always terminated; this can be useful if the
+  compressor has to be restarted from scratch after an interruption (in which
+  case the internal state of the compressor may be lost).
+    If flush is set to Z_FULL_FLUSH, the compression block is terminated, a
   special marker is output and the compression dictionary is discarded; this
   is useful to allow the decompressor to synchronize if one compressed block
   has been damaged (see inflateSync below).  Flushing degrades compression and
   so should be used only when necessary.  Using Z_FULL_FLUSH too often can
-  seriously degrade the compression.
+  seriously degrade the compression. If deflate returns with avail_out == 0,
+  this function must be called again with the same value of the flush
+  parameter and more output space (updated avail_out), until the flush is
+  complete (deflate returns with non-zero avail_out).
 
     If the parameter flush is set to Z_FINISH, all pending input is processed,
   all pending output is flushed and deflate returns with Z_STREAM_END if there
@@ -223,33 +256,37 @@ extern int deflate __P((z_stream *strm, int flush));
 */
 
 
-extern int deflateEnd __P((z_stream *strm));
+extern int deflateEnd OF((z_stream *strm));
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
    pending output.
 
      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent. In the error case, msg may be set
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   but then points to a static string (which must not be deallocated).
+   prematurely (some input or output was discarded). In the error case,
+   msg may be set but then points to a static string (which must not be
+   deallocated).
 */
 
 
-extern int inflateInit __P((z_stream *strm));
 /* 
+extern int inflateInit OF((z_stream *strm));
+
      Initializes the internal stream state for decompression. The fields
-   zalloc and zfree must be initialized before by the caller.  If zalloc and
+   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zfree are set to Z_NULL, deflateInit updates them to use default allocation
+   zalloc and zfree are set to Z_NULL, inflateInit updates them to use default
-   functions.
+   allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory.  msg is set to null if there is no error message.
+   enough memory, Z_VERSION_ERROR if the zlib library version is incompatible
-   inflateInit does not perform any decompression: this will be done by
+   with the version assumed by the caller.  msg is set to null if there is no
-   inflate().
+   error message. inflateInit does not perform any decompression: this will be
+   done by inflate().
 */
 
 
-extern int inflate __P((z_stream *strm, int flush));
+extern int inflate OF((z_stream *strm, int flush));
 /*
   Performs one or both of the following actions:
 
@@ -259,15 +296,18 @@ extern int inflate __P((z_stream *strm, int flush));
     will resume at this point for the next call of inflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() always provides as much output as possible
+    accordingly.  inflate() provides as much output as possible, until there
-    (until no more input data or no more space in the output buffer).
+    is no more input data or no more space in the output buffer (see below
+    about the flush parameter).
 
   Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming
   more output, and updating the next_* and avail_* values accordingly.
   The application can consume the uncompressed output when it wants, for
   example when the output buffer is full (avail_out == 0), or after each
-  call of inflate().
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+  must be called again after making room in the output buffer because there
+  might be more output pending.
 
     If the parameter flush is set to Z_PARTIAL_FLUSH, inflate flushes as much
   output as possible to the output buffer. The flushing behavior of inflate is
@@ -282,21 +322,26 @@ extern int inflate __P((z_stream *strm, int flush));
   output is flushed; avail_out must be large enough to hold all the
   uncompressed data. (The size of the uncompressed data may have been saved
   by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state.
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster routine
+  may be used for the single inflate() call.
 
     inflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if the end of the
   compressed data has been reached and all uncompressed output has been
-  produced, Z_DATA_ERROR if the input data was corrupted, Z_STREAM_ERROR if
+  produced, Z_NEED_DICT if a preset dictionary is needed at this point (see
-  the stream structure was inconsistent (for example if next_in or next_out
+  inflateSetDictionary below), Z_DATA_ERROR if the input data was corrupted,
-  was NULL), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if no
+  Z_STREAM_ERROR if the stream structure was inconsistent (for example if
-  progress is possible or if there was not enough room in the output buffer
+  next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  when Z_FINISH is used. In the Z_DATA_ERROR case, the application may then
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in
-  call inflateSync to look for a good compression block.
+  the output buffer when Z_FINISH is used. In the Z_DATA_ERROR case, the
+  application may then call inflateSync to look for a good compression block.
+  In the Z_NEED_DICT case, strm->adler is set to the Adler32 value of the
+  dictionary chosen by the compressor.
 */
 
 
-extern int inflateEnd __P((z_stream *strm));
+extern int inflateEnd OF((z_stream *strm));
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
@@ -307,24 +352,26 @@ extern int inflateEnd __P((z_stream *strm));
    static string (which must not be deallocated).
 */
 
-                        /* advanced functions */
+                        /* Advanced functions */
 
 /*
     The following functions are needed only in some special applications.
 */
 
-extern int deflateInit2 __P((z_stream *strm,
-                             int  level,
-                             int  method,
-                             int  windowBits,
-                             int  memLevel,
-                             int  strategy));
 /*   
-     This is another version of deflateInit with more compression options. The
+extern int deflateInit2 OF((z_stream *strm,
-   fields next_in, zalloc and zfree must be initialized before by the caller.
+                            int  level,
+                            int  method,
+                            int  windowBits,
+                            int  memLevel,
+                            int  strategy));
 
-     The method parameter is the compression method. It must be 8 in this
+     This is another version of deflateInit with more compression options. The
-   version of the library. (Method 9 will allow a 64K history buffer and
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.
+
+     The method parameter is the compression method. It must be Z_DEFLATED in
+   this version of the library. (Method 9 will allow a 64K history buffer and
    partial block flushes.)
 
      The windowBits parameter is the base two logarithm of the window size
@@ -333,20 +380,22 @@ extern int deflateInit2 __P((z_stream *strm,
    values of this parameter result in better compression at the expense of
    memory usage. The default value is 15 if deflateInit is used instead.
 
-    The memLevel parameter specifies how much memory should be allocated
+     The memLevel parameter specifies how much memory should be allocated
    for the internal compression state. memLevel=1 uses minimum memory but
    is slow and reduces compression ratio; memLevel=9 uses maximum memory
    for optimal speed. The default value is 8. See zconf.h for total memory
    usage as a function of windowBits and memLevel.
 
-     The strategy parameter is used to tune the compression algorithm. Use
+     The strategy parameter is used to tune the compression algorithm. Use the
-   the value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   produced by a filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman
+   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   encoding only (no string match).  Filtered data consists mostly of small
+   string match).  Filtered data consists mostly of small values with a
-   values with a somewhat random distribution. In this case, the
+   somewhat random distribution. In this case, the compression algorithm is
-   compression algorithm is tuned to compress them better. The strategy
+   tuned to compress them better. The effect of Z_FILTERED is to force more
-   parameter only affects the compression ratio but not the correctness of
+   Huffman coding and less string matching; it is somewhat intermediate
-   the compressed output even if it is not set appropriately.
+   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
+   the compression ratio but not the correctness of the compressed output even
+   if it is not set appropriately.
 
      If next_in is not null, the library will use this buffer to hold also
    some history information; the buffer must either hold the entire input
@@ -365,11 +414,40 @@ extern int deflateInit2 __P((z_stream *strm,
    not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
    an invalid method). msg is set to null if there is no error message.
    deflateInit2 does not perform any compression: this will be done by
-   deflate().
+   deflate(). 
 */
                             
-extern int deflateCopy __P((z_stream *dest,
+extern int deflateSetDictionary OF((z_stream *strm,
-                            z_stream *source));
+				    const Bytef *dictionary,
+				    uInt  dictLength));
+/*
+     Initializes the compression dictionary (history buffer) from the given
+   byte sequence without producing any compressed output. This function must
+   be called immediately after deflateInit or deflateInit2, before any call
+   of deflate. The compressor and decompressor must use exactly the same
+   dictionary (see inflateSetDictionary).
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary. Using a
+   dictionary is most useful when the data to be compressed is short and
+   can be predicted with good accuracy; the data can then be compressed better
+   than with the default empty dictionary. In this version of the library,
+   only the last 32K bytes of the dictionary are used.
+     Upon return of this function, strm->adler is set to the Adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor. (The Adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.)
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state
+   is inconsistent (for example if deflate has already been called for this
+   stream). deflateSetDictionary does not perform any compression: this will
+   be done by deflate(). 
+*/
+
+extern int deflateCopy OF((z_stream *dest,
+                           z_stream *source));
 /*
      Sets the destination stream as a complete copy of the source stream.  If
    the source stream is using an application-supplied history buffer, a new
@@ -378,20 +456,20 @@ extern int deflateCopy __P((z_stream *dest,
    application to provide the correct values of next_out and avail_out for the
    next call of deflate.
 
-     This function is useful when several compression strategies will be
+     This function can be useful when several compression strategies will be
    tried, for example when there are several ways of pre-processing the input
    data with a filter. The streams that will be discarded should then be freed
    by calling deflateEnd.  Note that deflateCopy duplicates the internal
    compression state which can be quite large, so this strategy is slow and
    can consume lots of memory.
 
-      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
    (such as zalloc being NULL). msg is left unchanged in both source and
    destination.
 */
 
-extern int deflateReset __P((z_stream *strm));
+extern int deflateReset OF((z_stream *strm));
 /*
      This function is equivalent to deflateEnd followed by deflateInit,
    but does not free and reallocate all the internal compression state.
@@ -402,11 +480,31 @@ extern int deflateReset __P((z_stream *strm));
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 
-extern int inflateInit2 __P((z_stream *strm,
+extern int deflateParams OF((z_stream *strm, int level, int strategy));
-                             int  windowBits));
+/*
+     Dynamically update the compression level and compression strategy.
+   This can be used to switch between compression and straight copy of
+   the input data, or to switch to a different kind of input data requiring
+   a different strategy. If the compression level is changed, the input
+   available so far is compressed with the old level (and may be flushed);
+   the new level will take effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to
+   be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+   if strm->avail_out was zero.
+*/
+
 /*   
+extern int inflateInit2 OF((z_stream *strm,
+                            int  windowBits));
+
      This is another version of inflateInit with more compression options. The
-   fields next_out, zalloc and zfree must be initialized before by the caller.
+   fields next_out, zalloc, zfree and opaque must be initialized before by
+   the caller.
 
      The windowBits parameter is the base two logarithm of the maximum window
    size (the size of the history buffer).  It should be in the range 8..15 for
@@ -431,11 +529,30 @@ extern int inflateInit2 __P((z_stream *strm,
       inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
    not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
    windowBits < 8). msg is set to null if there is no error message.
-   inflateInit2 does not perform any compression: this will be done by
+   inflateInit2 does not perform any decompression: this will be done by
    inflate().
 */
 
-extern int inflateSync __P((z_stream *strm));
+extern int inflateSetDictionary OF((z_stream *strm,
+				    const Bytef *dictionary,
+				    uInt  dictLength));
+/*
+     Initializes the decompression dictionary (history buffer) from the given
+   uncompressed byte sequence. This function must be called immediately after
+   a call of inflate if this call returned Z_NEED_DICT. The dictionary chosen
+   by the compressor can be determined from the Adler32 value returned by this
+   call of inflate. The compressor and decompressor must use exactly the same
+   dictionary (see deflateSetDictionary).
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect Adler32 value). inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+extern int inflateSync OF((z_stream *strm));
 /* 
     Skips invalid compressed data until the special marker (see deflate()
   above) can be found, or until all available input is skipped. No output
@@ -450,7 +567,7 @@ extern int inflateSync __P((z_stream *strm));
   until success or end of the input data.
 */
 
-extern int inflateReset __P((z_stream *strm));
+extern int inflateReset OF((z_stream *strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate all the internal decompression state.
@@ -471,8 +588,8 @@ extern int inflateReset __P((z_stream *strm));
    utility functions can easily be modified if you need special options.
 */
 
-extern int compress __P((Byte *dest,   uLong *destLen,
+extern int compress OF((Bytef *dest,   uLongf *destLen,
-                         Byte *source, uLong sourceLen));
+                        const Bytef *source, uLong sourceLen));
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer. Upon entry, destLen is the total
@@ -486,8 +603,8 @@ extern int compress __P((Byte *dest,   uLong *destLen,
    buffer.
 */
 
-extern int uncompress __P((Byte *dest,   uLong *destLen,
+extern int uncompress OF((Bytef *dest,   uLongf *destLen,
-                           Byte *source, uLong sourceLen));
+                          const Bytef *source, uLong sourceLen));
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer. Upon entry, destLen is the total
@@ -507,28 +624,32 @@ extern int uncompress __P((Byte *dest,   uLong *destLen,
 
 typedef voidp gzFile;
 
-extern gzFile gzopen  __P((char *path, char *mode));
+extern gzFile gzopen  OF((const char *path, const char *mode));
 /*
      Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). gzopen can also be used to read a file
+   is as in fopen ("rb" or "wb") but can also include a compression level
-   which is not in gzip format; in this case gzread will directly read from
+   ("wb9").  gzopen can be used to read a file which is not in gzip format;
-   the file without decompression.
+   in this case gzread will directly read from the file without decompression.
      gzopen returns NULL if the file could not be opened or if there was
    insufficient memory to allocate the (de)compression state; errno
    can be checked to distinguish the two cases (if errno is zero, the
    zlib error is Z_MEM_ERROR).
 */
 
-extern gzFile gzdopen  __P((int fd, char *mode));
+extern gzFile gzdopen  OF((int fd, const char *mode));
 /*
      gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, or pipe.
+   descriptors are obtained from calls like open, dup, creat, pipe or
-   The mode parameter is as in fopen ("rb" or "wb").
+   fileno (in the file has been previously opened with fopen).
+   The mode parameter is as in gzopen.
+     The next call of gzclose on the returned gzFile will also close the
+   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
      gzdopen returns NULL if there was insufficient memory to allocate
    the (de)compression state.
 */
 
-extern int    gzread  __P((gzFile file, voidp buf, unsigned len));
+extern int    gzread  OF((gzFile file, voidp buf, unsigned len));
 /*
      Reads the given number of uncompressed bytes from the compressed file.
    If the input file was not in gzip format, gzread copies the given number
@@ -536,14 +657,14 @@ extern int    gzread  __P((gzFile file, voidp buf, unsigned len));
      gzread returns the number of uncompressed bytes actually read (0 for
    end of file, -1 for error). */
 
-extern int    gzwrite __P((gzFile file, voidp buf, unsigned len));
+extern int    gzwrite OF((gzFile file, const voidp buf, unsigned len));
 /*
      Writes the given number of uncompressed bytes into the compressed file.
    gzwrite returns the number of uncompressed bytes actually written
    (0 in case of error).
 */
 
-extern int    gzflush __P((gzFile file, int flush));
+extern int    gzflush OF((gzFile file, int flush));
 /*
      Flushes all pending output into the compressed file. The parameter
    flush is as in the deflate() function. The return value is the zlib
@@ -553,14 +674,14 @@ extern int    gzflush __P((gzFile file, int flush));
    degrade compression.
 */
 
-extern int    gzclose __P((gzFile file));
+extern int    gzclose OF((gzFile file));
 /*
      Flushes all pending output if necessary, closes the compressed file
    and deallocates all the (de)compression state. The return value is the zlib
    error number (see function gzerror below).
 */
 
-extern char*   gzerror __P((gzFile file, int *errnum));
+extern char*   gzerror OF((gzFile file, int *errnum));
 /*
      Returns the error message for the last error which occurred on the
    given compressed file. errnum is set to zlib error number. If an
@@ -577,7 +698,8 @@ extern char*   gzerror __P((gzFile file, int *errnum));
    compression library.
 */
 
-extern uLong adler32 __P((uLong adler, Byte *buf, uInt len));
+extern uLong adler32 OF((uLong adler, const Bytef *buf, uInt len));
+
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
    return the updated checksum. If buf is NULL, this function returns
@@ -593,7 +715,7 @@ extern uLong adler32 __P((uLong adler, Byte *buf, uInt len));
      if (adler != original_adler) error();
 */
 
-extern uLong crc32   __P((uLong crc, Byte *buf, uInt len));
+extern uLong crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running crc with the bytes buf[0..len-1] and return the updated
    crc. If buf is NULL, this function returns the required initial value
@@ -609,8 +731,39 @@ extern uLong crc32   __P((uLong crc, Byte *buf, uInt len));
      if (crc != original_crc) error();
 */
 
-#ifndef _Z_UTIL_H
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+extern int deflateInit_ OF((z_stream *strm, int level,
+			    const char *version, int stream_size));
+extern int inflateInit_ OF((z_stream *strm,
+			    const char *version, int stream_size));
+extern int deflateInit2_ OF((z_stream *strm, int  level, int  method,
+                             int  windowBits, int  memLevel, int  strategy,
+			     const char *version, int stream_size));
+extern int inflateInit2_ OF((z_stream *strm, int  windowBits,
+			     const char *version, int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+		      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+
+#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
     struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
+uLongf *get_crc_table OF((void)); /* can be used by asm versions of crc32() */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ZLIB_H */

zutil.c

@@ -1,28 +1,32 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: zutil.c,v 1.8 1995/05/03 17:27:12 jloup Exp $ */
+/* $Id: zutil.c,v 1.12 1996/01/30 21:59:29 me Exp $ */
 
 #include <stdio.h>
 
 #include "zutil.h"
 
-#ifndef __GO32__
+struct internal_state      {int dummy;}; /* for buggy compilers */
-extern void exit __P((int));
+
+#ifndef STDC
+extern void exit OF((int));
 #endif
 
-char *zlib_version = ZLIB_VERSION;
+const char *zlib_version = ZLIB_VERSION;
 
-char *z_errmsg[] = {
+const char *z_errmsg[10] = {
-"stream end",          /* Z_STREAM_END    1 */
+"need dictionary",     /* Z_NEED_DICT       2  */
-"",                    /* Z_OK            0 */
+"stream end",          /* Z_STREAM_END      1  */
-"file error",          /* Z_ERRNO        (-1) */
+"",                    /* Z_OK              0  */
-"stream error",        /* Z_STREAM_ERROR (-2) */
+"file error",          /* Z_ERRNO         (-1) */
-"data error",          /* Z_DATA_ERROR   (-3) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
-"insufficient memory", /* Z_MEM_ERROR    (-4) */
+"data error",          /* Z_DATA_ERROR    (-3) */
-"buffer error",        /* Z_BUF_ERROR    (-5) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
 ""};
 
 
@@ -36,8 +40,8 @@ void z_error (m)
 #ifndef HAVE_MEMCPY
 
 void zmemcpy(dest, source, len)
-    Byte* dest;
+    Bytef* dest;
-    Byte* source;
+    Bytef* source;
     uInt  len;
 {
     if (len == 0) return;
@@ -47,7 +51,7 @@ void zmemcpy(dest, source, len)
 }
 
 void zmemzero(dest, len)
-    Byte* dest;
+    Bytef* dest;
     uInt  len;
 {
     if (len == 0) return;
@@ -57,8 +61,11 @@ void zmemzero(dest, len)
 }
 #endif
 
-#if defined(__TURBOC__) && !defined(__SMALL__)
+#ifdef __TURBOC__
-
+#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
+/* Small and medium model in Turbo C are for now limited to near allocation
+ * with reduced MAX_WBITS and MAX_MEM_LEVEL
+ */
 #  define MY_ZCALLOC
 
 /* Turbo C malloc() does not allow dynamic allocation of 64K bytes
@@ -73,8 +80,8 @@ void zmemzero(dest, len)
 local int next_ptr = 0;
 
 typedef struct ptr_table_s {
-    voidp org_ptr;
+    voidpf org_ptr;
-    voidp new_ptr;
+    voidpf new_ptr;
 } ptr_table;
 
 local ptr_table table[MAX_PTR];
@@ -85,12 +92,15 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidp zcalloc (voidp opaque, unsigned items, unsigned size)
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
-    voidp buf = opaque; /* just to make some compilers happy */
+    voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
 
-    if (bsize < 65536L) {
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
         buf = farmalloc(bsize);
         if (*(ush*)&buf != 0) return buf;
     } else {
@@ -106,7 +116,7 @@ voidp zcalloc (voidp opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void  zcfree (voidp opaque, voidp ptr)
+void  zcfree (voidpf opaque, voidpf ptr)
 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */
@@ -127,9 +137,12 @@ void  zcfree (voidp opaque, voidp ptr)
     ptr = opaque; /* just to make some compilers happy */
     z_error("zcfree: ptr not found");
 }
+#endif
 #endif /* __TURBOC__ */
 
-#if defined(M_I86CM) || defined(M_I86LM) /* MSC compact or large model */
+
+#if defined(M_I86) && !(defined(__WATCOMC__) && defined(__386__))
+/* Microsoft C */
 
 #  define MY_ZCALLOC
 
@@ -138,41 +151,43 @@ void  zcfree (voidp opaque, voidp ptr)
 #  define _hfree   hfree
 #endif
 
-voidp zcalloc (voidp opaque, unsigned items, unsigned size)
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
-void  zcfree (voidp opaque, voidp ptr)
+void  zcfree (voidpf opaque, voidpf ptr)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
 }
 
-#endif /* defined(M_I86CM) || defined(M_I86LM) */
+#endif /* MSC */
 
 
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
-#ifndef __GO32__
+#ifndef STDC
-extern voidp calloc __P((uInt items, uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
-extern void  free   __P((voidp ptr));
+extern void   free   OF((voidpf ptr));
 #endif
 
-voidp zcalloc (opaque, items, size)
+voidpf zcalloc (opaque, items, size)
-    voidp opaque;
+    voidpf opaque;
     unsigned items;
     unsigned size;
 {
-    return calloc(items, size);
+    if (opaque) items += size - size; /* make compiler happy */
+    return (voidpf)calloc(items, size);
 }
 
 void  zcfree (opaque, ptr)
-    voidp opaque;
+    voidpf opaque;
-    voidp ptr;
+    voidpf ptr;
 {
     free(ptr);
+    if (opaque) return; /* make compiler happy */
 }
 
 #endif /* MY_ZCALLOC */

zutil.h

@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,18 +8,14 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: zutil.h,v 1.9 1995/05/03 17:27:12 jloup Exp $ */
+/* $Id: zutil.h,v 1.13 1996/01/30 21:59:29 me Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 
 #include "zlib.h"
 
-/* #ifndef __GNUC__   disable inline for now */
+#if defined(MSDOS) || defined(VMS) || defined(CRAY) || defined(WIN32)
-#  define inline
-/* #endif */
-
-#ifdef MSDOS
 #   include <stddef.h>
 #   include <errno.h>
 #else
@@ -27,6 +23,7 @@
 #endif
 #ifdef STDC
 #  include <string.h>
+#  include <stdlib.h>
 #endif
 
 #ifndef local
@@ -35,19 +32,25 @@
 /* compile with -Dlocal if your debugger can't find static symbols */
 
 typedef unsigned char  uch;
+typedef uch FAR uchf;
 typedef unsigned short ush;
+typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
-extern char *z_errmsg[]; /* indexed by 1-zlib_error */
+extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
 
-#define ERR_RETURN(strm,err) return (strm->msg=z_errmsg[1-err], err)
+#define ERR_MSG(err) (char*)z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
 
         /* common constants */
 
-#define DEFLATED   8
+#ifndef DEF_WBITS
-
+#  define DEF_WBITS MAX_WBITS
-#define DEF_WBITS 15
+#endif
 /* default windowBits for decompression. MAX_WBITS is for compression only */
 
 #if MAX_MEM_LEVEL >= 8
@@ -66,13 +69,15 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #define MAX_MATCH  258
 /* The minimum and maximum match lengths */
 
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
         /* target dependencies */
 
 #ifdef MSDOS
 #  define OS_CODE  0x00
 #  ifdef __TURBOC__
 #    include <alloc.h>
-#  else /* MSC */
+#  else /* MSC or DJGPP */
 #    include <malloc.h>
 #  endif
 #endif
@@ -81,7 +86,7 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #  define OS_CODE  0x06
 #endif
 
-#ifdef WIN32 /* Windows NT */
+#ifdef WIN32 /* Window 95 & Windows NT */
 #  define OS_CODE  0x0b
 #endif
 
@@ -109,6 +114,10 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 
 #ifdef TOPS20
 #  define OS_CODE  0x0a
+#endif
+
+#ifdef _BEOS_
+#  define fdopen(fd,mode) NULL /* No fdopen() */
 #endif
 
         /* Common defaults */
@@ -124,24 +133,37 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
          /* functions */
 
 #ifdef HAVE_STRERROR
-   extern char *strerror __P((int));
+   extern char *strerror OF((int));
 #  define zstrerror(errnum) strerror(errnum)
 #else
 #  define zstrerror(errnum) ""
 #endif
 
-#if defined(pyr) && !defined(NO_MEMCPY)
+#if defined(pyr)
+#  define NO_MEMCPY
+#endif
+#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(_MSC_VER)
+ /* 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).
+  */
 #  define NO_MEMCPY
 #endif
 #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
 #  define HAVE_MEMCPY
 #endif
 #ifdef HAVE_MEMCPY
-#  define zmemcpy memcpy
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#  define zmemzero(dest, len) memset(dest, 0, len)
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
 #else
-   extern void zmemcpy  __P((Byte* dest, Byte* source, uInt len));
+   extern void zmemcpy  OF((Bytef* dest, Bytef* source, uInt len));
-   extern void zmemzero __P((Byte* dest, uInt len));
+   extern void zmemzero OF((Bytef* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
@@ -166,16 +188,16 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #endif
 
 
-typedef uLong (*check_func) __P((uLong check, Byte *buf, uInt len));
+typedef uLong (*check_func) OF((uLong check, const Bytef *buf, uInt len));
 
-extern void z_error    __P((char *m));
+extern void z_error    OF((char *m));
 
-voidp zcalloc __P((voidp opaque, unsigned items, unsigned size));
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void  zcfree  __P((voidp opaque, voidp ptr));
+void   zcfree  OF((voidpf opaque, voidpf ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidp)(addr))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
 #endif /* _Z_UTIL_H */