zlib 0.95

ChangeLog

@@ -1,5 +1,82 @@
+
 		ChangeLog file for zlib
 
+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
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks.
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+  was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that.
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+  pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+  is incompatible with previous versions of zlib which returned Z_OK.
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+  (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
 Changes in 0.71 (14 April 95)
 - Fixed more MSDOS compilation problems :( There is still a bug with
   TurboC large model.

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$trnlnm("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,43 +1,57 @@
+# Makefile for zlib
+# Copyright (C) 1995 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
 CC=cc
 CFLAGS=-O
+#use -O3 for gcc to take advantage of inlining
+#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 #CFLAGS=-g -DDEBUG
-LDFLAGS=-L. -lgz
+LDFLAGS=-L. -lz
 
 RANLIB=ranlib
 
+prefix=/usr/local
+
 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
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
 
-TEST_OBJS = example.o minigzip.o inftest.o
+TEST_OBJS = example.o minigzip.o
 
-all: example minigzip inftest
+all: example minigzip
 
 test: all
 	./example
 	echo hello world | ./minigzip | ./minigzip -d 
 
-libgz.a: $(OBJS)
+install: libz.a
+	-@mkdir $(prefix)/include
+	-@mkdir $(prefix)/lib
+	cp zlib.h zconf.h $(prefix)/include
+	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+	cp libz.a $(prefix)/lib
+	chmod 644 $(prefix)/lib/libz.a
+
+libz.a: $(OBJS)
 	ar rc $@ $(OBJS)
 	$(RANLIB) $@
 
-example: example.o libgz.a
+example: example.o libz.a
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
 
-minigzip: minigzip.o libgz.a
+minigzip: minigzip.o libz.a
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
-inftest: inftest.o libgz.a
-	$(CC) $(CFLAGS) -o $@ inftest.o $(LDFLAGS)
-
 clean:
-	rm -f *.o example minigzip inftest libgz.a foo.gz
+	rm -f *.o example minigzip libz.a foo.gz
 
 zip:
-	zip -ul9 zlib README ChangeLog Makefile *.[ch]
+	zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
+	  descrip.mms *.[ch]
 
 tgz:
 	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-		zlib/*.[ch]
+	  zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
@@ -48,9 +62,9 @@ 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
+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
-inftest.o: zutil.h zlib.h zconf.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

Makefile.bor

@@ -0,0 +1,105 @@
+# Makefile for zlib
+# 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. For example:
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
+# 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++ -------------
+MODEL=-ml
+CFLAGS=-O2 -Z $(MODEL)
+CC=bcc
+LD=bcc
+LIB=tlib
+#   replace bcc with tcc for Turbo C++ 1.0
+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.msc

@@ -0,0 +1,99 @@
+# Makefile for zlib
+# Microsoft C 5.1 or later
+
+# To use, do "make makefile.msc"
+# To compile in small model, set below: MODEL=-AS
+
+# 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.
+
+# ------------- Microsoft C 5.1 and later -------------
+MODEL=-AL
+CFLAGS=-Oait -Gs -nologo -W3 $(MODEL)
+#-Ox generates bad code with MSC 5.1
+CC=cl
+LD=link
+LDFLAGS=/e/st:0x1000/noe
+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)
+
+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 $(OBJ1);
+	lib zlib $(OBJ2);
+
+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.qnx

@@ -0,0 +1,75 @@
+# Makefile for zlib
+# Copyright (C) 1995 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
+# Modified slightly for QNX by Chris Herborth (chrish@qnx.com)
+
+CC=cc
+CFLAGS=-4 -O -Q
+#use -O3 for gcc to take advantage of inlining
+#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+#CFLAGS=-g -DDEBUG
+LDFLAGS=-L. -lz
+
+#RANLIB=ranlib
+
+prefix=/usr/local
+
+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: example minigzip
+
+test: all
+	./example
+	echo hello world | ./minigzip | ./minigzip -d 
+
+install: zlib.lib
+	-@mkdir $(prefix)/include
+	-@mkdir $(prefix)/lib
+	cp zlib.h zconf.h $(prefix)/include
+	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+	cp zlib.lib $(prefix)/lib
+	chmod 644 $(prefix)/lib/zlib.lib
+
+zlib.lib: $(OBJS)
+	cc -A $@ $(OBJS)
+#	ar rc $@ $(OBJS)
+#	$(RANLIB) $@
+
+example: example.o zlib.lib
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o zlib.lib
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+clean:
+	rm -f *.o example minigzip zlib.lib foo.gz
+
+zip:
+	zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+
+tgz:
+	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
+		zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+
+# 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

@@ -0,0 +1,105 @@
+# Makefile for zlib
+# 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. For example:
+#    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+# 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 -G -Z $(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+CFLAGS=-O2 -G -Z $(MODEL)
+CC=tcc -I\tc\include
+LD=tcc -L\tc\lib
+LIB=tlib
+LDFLAGS=$(MODEL) -f-
+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) -eexample.exe example.obj zlib.lib
+
+minigzip.exe: minigzip.obj zlib.lib
+	$(LD) $(LDFLAGS) -eminigzip.exe minigzip.obj zlib.lib
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d 
+
+#clean:
+#	del *.obj
+#	del *.exe

README

@@ -1,32 +1,40 @@
-zlib 0.71 is a beta version of a general purpose compression library.
+zlib 0.95 is a beta version of a general purpose compression library.
+This should be the last version before the first official
+version (1.0), so please test it now. (At least compile and run it with
+"make test"). This version has no known bugs.
 
 The data format used by the zlib library is described in the
-file zlib-3.1.doc, deflate-1.1.doc and gzip-4.1.doc, available
+files zlib-3.1.doc, deflate-1.1.doc and gzip-4.1.doc, available
 in ftp.uu.net:/pub/archiving/zip/doc.
 
 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.
+
 To compile all files and run the test program, just type: make test
+(For MSDOS, use one of the special makefiles such as Makefile.msc;
+for VMS, use Make_vms.com or descrip.mms.)
+To install the zlib library (libz.a) in /usr/local/lib, type: make install
+To install in a different directory, use for example:
+  make install prefix=$HOME
+This will install in $HOME/lib instead of /usr/local/lib.
 
-The changes made in version 0.71 are documented in the file ChangeLog.
+The changes made in version 0.95 are documented in the file ChangeLog.
-The main changes since 0.5 are:
+The main changes since 0.94 are:
-- added full inflate support
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
-- added minigzip.c
+- inlined send_bits
-- added gzdopen to reopen a file descriptor as gzFile
+- fix the final (:-) bug for deflate with flush (output was correct but
-- added transparent reading of non-gziped files in gzread.
+  not completely flushed in rare occasions).
-- fix some MSDOS problems. example and minigzip now work on MSDOS.
-- Simplified the crc32() interface. The pre- and post-conditioning
-  (one's complement) is now done inside crc32(). WARNING: this is
-  incompatible with previous versions; see zlib.h for the new usage.
 
-On MSDOS, this version works in large and small model with MSC; in
+For MSDOS, the small and medium models have been tested only with Microsoft C.
-small model only with TurboC (bug being investigated). For both
+(This should now work for Borland C also, but I don't have a recent Borland
-compilers, small model compression works only for small values of
+compiler to test with.) The small model was tested with Turbo C but only with
-MEM_LEVEL and WBITS (see zutil.h), and requires -DUSE_CALLOC.
+reduced performance to avoid any far allocation; it was tested with
+ -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
 
 
-  Copyright (C) 1995 Jean-loup Gailly and Mark Adler
+ (C) 1995 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
@@ -45,7 +53,7 @@ MEM_LEVEL and WBITS (see zutil.h), and requires -DUSE_CALLOC.
   3. This notice may not be removed or altered from any source distribution.
 
   Jean-loup Gailly        Mark Adler
-  gzip@prep.ai.mit.edu    madler@cco.caltech.edu
+  gzip@prep.ai.mit.edu    madler@alumni.caltech.edu
 
 If you use the zlib library in a product, we would appreciate *not*
 receiving lengthy legal documents to sign. The sources are provided

adler32.c

@@ -3,11 +3,11 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: adler32.c,v 1.5 1995/04/14 14:49:51 jloup Exp $ */
+/* $Id: adler32.c,v 1.6 1995/05/03 17:27:08 jloup 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 */
 
@@ -20,7 +20,7 @@
 /* ========================================================================= */
 uLong adler32(adler, buf, len)
     uLong adler;
-    Byte *buf;
+    Bytef *buf;
     uInt len;
 {
     unsigned long s1 = adler & 0xffff;

compress.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: compress.c,v 1.4 1995/04/10 15:52:04 jloup Exp $ */
+/* $Id: compress.c,v 1.6 1995/05/03 17:27:08 jloup Exp $ */
 
 #include "zlib.h"
 
@@ -20,9 +20,9 @@
    buffer.
 */
 int compress (dest, destLen, source, sourceLen)
-    Byte *dest;
+    Bytef *dest;
-    uLong *destLen;
+    uLongf *destLen;
-    Byte *source;
+    Bytef *source;
     uLong sourceLen;
 {
     z_stream stream;
@@ -44,9 +44,9 @@ int compress (dest, destLen, source, sourceLen)
     if (err != Z_OK) return err;
 
     err = deflate(&stream, Z_FINISH);
-    if (err != Z_OK) {
+    if (err != Z_STREAM_END) {
         deflateEnd(&stream);
-	return err;
+        return err == Z_OK ? Z_BUF_ERROR : err;
     }
     *destLen = stream.total_out;
 

crc32.c

@@ -7,47 +7,35 @@
 
 #include "zlib.h"
 
-extern uLong crc_table[];   /* crc table, defined below */
+#define local static
-
-/* ========================================================================= */
-uLong crc32(crc, buf, len)
-    uLong crc;
-    Byte *buf;
-    uInt len;
-{
-    if (buf == Z_NULL) return 0L;
-    crc = crc ^ 0xffffffffL;
-    if (len) do {
-	crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
-    } while (--len);
-    return crc ^ 0xffffffffL;
-}
 
+#ifdef DYNAMIC_CRC_TABLE
 /* =========================================================================
  * Make the crc table. This function is needed only if you want to compute
  * the table dynamically.
  */
-#ifdef DYNAMIC_CRC_TABLE
+local int crc_table_empty = 1;
+local uLong crc_table[256];
 
-void make_crc_table()
+local void make_crc_table()
 {
   uLong c;
   int n, k;
  
-  for (n = 0; n < 256; n++)
+  for (n = 0; n < 256; n++)
   {
     c = (uLong)n;
-    for (k = 0; k &lt; 8; k++)
+    for (k = 0; k < 8; k++)
       c = c & 1 ? 0xedb88320L ^ (c >> 1) : c >> 1;
     crc_table[n] = c;
   }
+  crc_table_empty = 0;
 }
-#endif
+#else
-
 /* ========================================================================
  * Table of CRC-32's of all single-byte values (made by make_crc_table)
  */
-uLong crc_table[] = {
+local uLong crc_table[] = {
   0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
   0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
   0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
@@ -101,3 +89,32 @@ uLong crc_table[] = {
   0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
   0x2d02ef8dL
 };
+#endif
+
+#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);
+#define DO8(buf)  DO4(buf); DO4(buf);
+
+/* ========================================================================= */
+uLong crc32(crc, buf, len)
+    uLong crc;
+    Bytef *buf;
+    uInt len;
+{
+    if (buf == Z_NULL) return 0L;
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+      make_crc_table();
+#endif
+    crc = crc ^ 0xffffffffL;
+    while (len >= 8)
+    {
+      DO8(buf);
+      len -= 8;
+    }
+    if (len) do {
+      DO1(buf);
+    } while (--len);
+    return crc ^ 0xffffffffL;
+}

deflate.c

@@ -47,7 +47,7 @@
  *
  */
 
-/* $Id: deflate.c,v 1.3 1995/04/10 16:03:45 jloup Exp $ */
+/* $Id: deflate.c,v 1.8 1995/05/03 17:27:08 jloup Exp $ */
 
 #include "deflate.h"
 
@@ -113,18 +113,20 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
  *  Prototypes for local functions.
  */
 
-local void fill_window   __P((deflate_state *s));
+local void fill_window   OF((deflate_state *s));
-local int  deflate_fast  __P((deflate_state *s, int flush));
+local int  deflate_fast  OF((deflate_state *s, int flush));
-local int  deflate_slow  __P((deflate_state *s, int flush));
+local int  deflate_slow  OF((deflate_state *s, int flush));
-local void lm_init       __P((deflate_state *s));
+local void lm_init       OF((deflate_state *s));
-
+local int longest_match  OF((deflate_state *s, IPos cur_match));
-local int  longest_match __P((deflate_state *s, IPos cur_match));
+local void putShortMSB   OF((deflate_state *s, uInt b));
+local void flush_pending OF((z_stream *strm));
+local int read_buf       OF((z_stream *strm, charf *buf, unsigned size));
 #ifdef ASMV
-      void match_init __P((void)); /* asm code initialization */
+      void match_init OF((void)); /* asm code initialization */
 #endif
 
 #ifdef DEBUG
-local  void check_match __P((deflate_state *s, IPos start, IPos match,
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
                             int length));
 #endif
 
@@ -137,6 +139,7 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
  */
 #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
 
+
 /* ===========================================================================
  * Insert string str in the dictionary and set match_head to the previous head
  * of the hash chain (the most recent string with same hash key). Return
@@ -146,16 +149,24 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
  *    (except for the last MIN_MATCH-1 bytes of the input file).
  */
 #define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + MIN_MATCH-1]), \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
     s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
     s->head[s->ins_h] = (str))
 
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((charf *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
 /* ========================================================================= */
 int deflateInit (strm, level)
     z_stream *strm;
     int level;
 {
-    return deflateInit2 (strm, level, DEFLATED, WBITS, MEM_LEVEL, 0);
+    return deflateInit2 (strm, level, DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, 0);
     /* To do: ignore strm->next_in if we use it as window */
 }
 
@@ -189,24 +200,26 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
     }
     s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
     if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state *)s;
+    strm->state = (struct internal_state FAR *)s;
     s->strm = strm;
 
     s->noheader = noheader;
     s->w_bits = windowBits;
     s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
 
     s->hash_bits = memLevel + 7;
     s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
     s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
 
-    s->window = (Byte*) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Pos*)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Pos*)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
 
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
-    s->pending_buf = (uch*) ZALLOC(strm, s->lit_bufsize, 2*sizeof(ush));
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 2*sizeof(ush));
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
@@ -214,8 +227,8 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
-    s->d_buf = (ush*) &(s->pending_buf[s->lit_bufsize]);
+    s->d_buf = (ushf *) &(s->pending_buf[s->lit_bufsize]);
-    s->l_buf = (uch*) &(s->pending_buf[3*s->lit_bufsize]);
+    s->l_buf = (uchf *) &(s->pending_buf[3*s->lit_bufsize]);
     /* We overlay pending_buf and d_buf+l_buf. This works since the average
      * output size for (length,distance) codes is <= 32 bits (worst case
      * is 15+15+13=33).
@@ -223,7 +236,7 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
 
     s->level = level;
     s->strategy = strategy;
-    s->method = method;
+    s->method = (Byte)method;
 
     return deflateReset(strm);
 }
@@ -245,6 +258,9 @@ int deflateReset (strm)
     s->pending = 0;
     s->pending_out = s->pending_buf;
 
+    if (s->noheader < 0) {
+        s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
+    }
     s->status = s->noheader ? BUSY_STATE : INIT_STATE;
     s->adler = 1;
 
@@ -255,16 +271,16 @@ int deflateReset (strm)
 }
 
 /* =========================================================================
- * Put a short the pending_out buffer. The 16-bit value is put in MSB order.
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
  * IN assertion: the stream state is correct and there is enough room in
- * the pending_out buffer.
+ * pending_buf.
  */
 local void putShortMSB (s, b)
     deflate_state *s;
     uInt b;
 {
-    put_byte(s, b >> 8);
+    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, b & 0xff);
+    put_byte(s, (Byte)(b & 0xff));
 }   
 
 /* =========================================================================
@@ -296,7 +312,8 @@ int deflate (strm, flush)
 {
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     
-    if (strm->next_out == Z_NULL || strm->next_in == Z_NULL) {
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0)) {
         ERR_RETURN(strm, Z_STREAM_ERROR);
     }
     if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
@@ -330,31 +347,56 @@ int deflate (strm, flush)
 
     /* Start a new block or continue the current one.
      */
-    if (strm->avail_in != 0 ||
+    if (strm->avail_in != 0 || strm->state->lookahead != 0 ||
-	(flush == Z_FINISH && strm->state->status != FINISH_STATE)) {
+        (flush != Z_NO_FLUSH && strm->state->status != FINISH_STATE)) {
+        int quit;
 
         if (flush == Z_FINISH) {
             strm->state->status = FINISH_STATE;
         }
         if (strm->state->level <= 3) {
-	    if (deflate_fast(strm->state, flush)) return Z_OK;
+            quit = deflate_fast(strm->state, flush);
         } else {
-	    if (deflate_slow(strm->state, flush)) return Z_OK;
+            quit = deflate_slow(strm->state, flush);
+        }
+        if (quit || strm->avail_out == 0) return Z_OK;
+        /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+         * of deflate should use the same flush parameter to make sure
+         * that the flush is complete. So we don't have to output an
+         * empty block here, this will be done at next call. This also
+         * ensures that for a very small output buffer, we emit at most
+         * one empty block.
+         */
+        if (flush != Z_OK && flush != Z_FINISH) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                ct_align(strm->state);
+            } else { /* FULL_FLUSH or SYNC_FLUSH */
+                ct_stored_block(strm->state, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(strm->state);             /* forget history */
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) return Z_OK;
         }
     }
     Assert(strm->avail_out > 0, "bug2");
 
-    if (flush != Z_FINISH || strm->state->noheader) return Z_OK;
+    if (flush != Z_FINISH) return Z_OK;
+    if (strm->state->noheader) return Z_STREAM_END;
 
     /* Write the zlib trailer (adler32) */
-    putShortMSB(strm->state, strm->state->adler >> 16);
+    putShortMSB(strm->state, (uInt)(strm->state->adler >> 16));
-    putShortMSB(strm->state, strm->state->adler & 0xffff);
+    putShortMSB(strm->state, (uInt)(strm->state->adler & 0xffff));
     flush_pending(strm);
     /* If avail_out is zero, the application will call deflate again
      * to flush the rest.
      */
-    strm->state->noheader = 1; /* write the trailer only once! */
+    strm->state->noheader = -1; /* write the trailer only once! */
-    return Z_OK;
+    return strm->state->pending != 0 ? Z_OK : Z_STREAM_END;
 }
 
 /* ========================================================================= */
@@ -385,7 +427,7 @@ int deflateCopy (dest, source)
     *dest = *source;
     return Z_STREAM_ERROR; /* to be implemented */
 #if 0
-    dest->state = (struct internal_state *)
+    dest->state = (struct internal_state FAR *)
         (*dest->zalloc)(1, sizeof(deflate_state));
     if (dest->state == Z_NULL) return Z_MEM_ERROR;
 
@@ -400,7 +442,7 @@ int deflateCopy (dest, source)
  */
 local int read_buf(strm, buf, size)
     z_stream *strm;
-    char *buf;
+    charf *buf;
     unsigned size;
 {
     unsigned len = strm->avail_in;
@@ -426,16 +468,9 @@ local int read_buf(strm, buf, size)
 local void lm_init (s)
     deflate_state *s;
 {
-    register unsigned j;
-
     s->window_size = (ulg)2L*s->w_size;
 
-
+    CLEAR_HASH(s);
-    /* Initialize the hash table (avoiding 64K overflow for 16 bit systems).
-     * prev[] will be initialized on the fly.
-     */
-    s->head[s->hash_size-1] = NIL;
-    zmemzero((char*)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 
     /* Set the default configuration parameters:
      */
@@ -449,15 +484,10 @@ local void lm_init (s)
     s->lookahead = 0;
     s->match_length = MIN_MATCH-1;
     s->match_available = 0;
+    s->ins_h = 0;
 #ifdef ASMV
     match_init(); /* initialize the asm code */
 #endif
-
-    s->ins_h = 0;
-    for (j=0; j<MIN_MATCH-1; j++) UPDATE_HASH(s, s->ins_h, s->window[j]);
-    /* If lookahead < MIN_MATCH, ins_h is garbage, but this is
-     * not important since only literal bytes will be emitted.
-     */
 }
 
 /* ===========================================================================
@@ -477,8 +507,8 @@ local int longest_match(s, cur_match)
     IPos cur_match;                             /* current match */
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Byte *scan = s->window + s->strstart; /* current string */
+    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Byte *match;                       /* matched string */
+    register Bytef *match;                       /* matched string */
     register int len;                           /* length of current match */
     int best_len = s->prev_length;              /* best match length so far */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
@@ -486,16 +516,18 @@ local int longest_match(s, cur_match)
     /* Stop when cur_match becomes <= limit. To simplify the code,
      * we prevent matches with the string of window index 0.
      */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
 
 #ifdef UNALIGNED_OK
     /* Compare two bytes at a time. Note: this is not always beneficial.
      * Try with and without -DUNALIGNED_OK to check.
      */
-    register Byte *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ush*)scan;
+    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ush*)(scan+best_len-1);
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
 #else
-    register Byte *strend = s->window + s->strstart + MAX_MATCH;
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
     register Byte scan_end1  = scan[best_len-1];
     register Byte scan_end   = scan[best_len];
 #endif
@@ -509,7 +541,7 @@ local int longest_match(s, cur_match)
     if (s->prev_length >= s->good_match) {
         chain_length >>= 2;
     }
-    Assert(s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
 
     do {
         Assert(cur_match < s->strstart, "no future");
@@ -522,8 +554,8 @@ local int longest_match(s, cur_match)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
          * UNALIGNED_OK if your compiler uses a different size.
          */
-        if (*(ush*)(match+best_len-1) != scan_end ||
+        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ush*)match != scan_start) continue;
+            *(ushf*)match != scan_start) continue;
 
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
@@ -534,12 +566,13 @@ local int longest_match(s, cur_match)
          * necessary to put more guard bytes at the end of the window, or
          * to check more often for insufficient lookahead.
          */
+        Assert(scan[2] == match[2], "scan[2]?");
         scan++, match++;
         do {
-        } while (*(ush*)(scan+=2) == *(ush*)(match+=2) &&
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ush*)(scan+=2) == *(ush*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ush*)(scan+=2) == *(ush*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ush*)(scan+=2) == *(ush*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
                  scan < strend);
         /* The funny "do {}" generates better code on most compilers */
 
@@ -564,6 +597,7 @@ local int longest_match(s, cur_match)
          * the hash keys are equal and that HASH_BITS >= 8.
          */
         scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
 
         /* We check for insufficient lookahead only every 8th comparison;
          * the 256th check will be made at strstart+258.
@@ -587,13 +621,13 @@ local int longest_match(s, cur_match)
             best_len = len;
             if (len >= s->nice_match) break;
 #ifdef UNALIGNED_OK
-            scan_end = *(ush*)(scan+best_len-1);
+            scan_end = *(ushf*)(scan+best_len-1);
 #else
             scan_end1  = scan[best_len-1];
             scan_end   = scan[best_len];
 #endif
         }
-    } while ((cur_match = s->prev[cur_match & s->w_mask]) > limit
+    } while ((cur_match = prev[cur_match & wmask]) > limit
              && --chain_length != 0);
 
     return best_len;
@@ -610,11 +644,13 @@ local void check_match(s, start, match, length)
     int length;
 {
     /* check that the match is indeed a match */
-    if (memcmp((char*)s->window + match,
+    if (memcmp((charf *)s->window + match,
-                (char*)s->window + start, length) != EQUAL) {
+                (charf *)s->window + start, length) != EQUAL) {
         fprintf(stderr,
-            " start %d, match %d, length %d\n",
+            " start %u, match %u, length %d\n",
             start, match, length);
+        do { fprintf(stderr, "%c%c", s->window[match++],
+                     s->window[start++]); } while (--length != 0);
         z_error("invalid match");
     }
     if (verbose > 1) {
@@ -640,14 +676,16 @@ local void fill_window(s)
     deflate_state *s;
 {
     register unsigned n, m;
+    register Posf *p;
     unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
 
     do {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
         /* Deal with !@#$% 64K limit: */
         if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-	    more = s->w_size;
+            more = wsize;
         } else if (more == (unsigned)(-1)) {
             /* Very unlikely, but possible on 16 bit machine if strstart == 0
              * and lookahead == 1 (input done one byte at time)
@@ -657,30 +695,39 @@ local void fill_window(s)
         /* If the window is almost full and there is insufficient lookahead,
          * move the upper half to the lower one to make room in the upper half.
          */
-        } else if (s->strstart >= s->w_size+MAX_DIST(s)) {
+        } else if (s->strstart >= wsize+MAX_DIST(s)) {
 
             /* By the IN assertion, the window is not empty so we can't confuse
              * more == 0 with more == 64K on a 16 bit machine.
              */
-            memcpy((char*)s->window, (char*)s->window+s->w_size,
+            zmemcpy((charf *)s->window, (charf *)s->window+wsize,
-		   (unsigned)s->w_size);
+                   (unsigned)wsize);
-            s->match_start -= s->w_size;
+            s->match_start -= wsize;
-            s->strstart    -= s->w_size; /* we now have strstart >= MAX_DIST */
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
 
-            s->block_start -= (long) s->w_size;
+            s->block_start -= (long) wsize;
 
-            for (n = 0; n < s->hash_size; n++) {
+            /* Slide the hash table (could be avoided with 32 bit values
-                m = s->head[n];
+               at the expense of memory usage):
-                s->head[n] = (Pos)(m >= s->w_size ? m-s->w_size : NIL);
+             */
-            }
+            n = s->hash_size;
-            for (n = 0; n < s->w_size; n++) {
+            p = &s->head[n];
-                m = s->prev[n];
+            do {
-                s->prev[n] = (Pos)(m >= s->w_size ? m-s->w_size : NIL);
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+            } while (--n);
+
+            n = wsize;
+            p = &s->prev[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
                 /* If n is not on any hash chain, prev[n] is garbage but
                  * its value will never be used.
                  */
-            }
+            } while (--n);
-            more += s->w_size;
+
+            more += wsize;
         }
         if (s->strm->avail_in == 0) return;
 
@@ -697,10 +744,22 @@ local void fill_window(s)
          */
         Assert(more >= 2, "more < 2");
 
-        n = read_buf(s->strm, (char*)s->window + s->strstart + s->lookahead,
+        n = read_buf(s->strm, (charf *)s->window + s->strstart + s->lookahead,
                      more);
         s->lookahead += n;
 
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead >= MIN_MATCH) {
+            s->ins_h = s->window[s->strstart];
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
     } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
 }
 
@@ -710,10 +769,11 @@ local void fill_window(s)
  */
 #define FLUSH_BLOCK_ONLY(s, eof) { \
    ct_flush_block(s, (s->block_start >= 0L ? \
-	       (char*)&s->window[(unsigned)s->block_start] : \
+               (charf *)&s->window[(unsigned)s->block_start] : \
-               (char*)Z_NULL), (long)s->strstart - s->block_start, (eof)); \
+               (charf *)Z_NULL), (long)s->strstart - s->block_start, (eof)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
 }
 
 /* Same but force premature exit if necessary. */
@@ -754,7 +814,9 @@ local int deflate_fast(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
+        if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
+        }
 
         /* Find the longest match, discarding those <= prev_length.
          * At this point we have always match_length < MIN_MATCH
@@ -782,15 +844,14 @@ local int deflate_fast(s, flush)
             /* Insert new strings in the hash table only if the match length
              * is not too large. This saves time but degrades compression.
              */
-            if (s->match_length <= s->max_insert_length) {
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
                 s->match_length--; /* string at strstart already in hash table */
                 do {
                     s->strstart++;
                     INSERT_STRING(s, s->strstart, hash_head);
                     /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
+                     * always MIN_MATCH bytes ahead.
-                     * these bytes are garbage, but it does not matter since
-                     * the next lookahead bytes will be emitted as literals.
                      */
                 } while (--s->match_length != 0);
                 s->strstart++; 
@@ -802,6 +863,9 @@ local int deflate_fast(s, flush)
 #if MIN_MATCH != 3
                 Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
             }
         } else {
             /* No match, output a literal byte */
@@ -845,7 +909,9 @@ local int deflate_slow(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
+        if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
+        }
 
         /* Find the longest match, discarding those <= prev_length.
          */
@@ -878,6 +944,8 @@ local int deflate_slow(s, flush)
          * match is not better, output the previous match:
          */
         if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
 
             check_match(s, s->strstart-1, s->prev_match, s->prev_length);
 
@@ -885,18 +953,16 @@ local int deflate_slow(s, flush)
                               s->prev_length - MIN_MATCH);
 
             /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
              */
             s->lookahead -= s->prev_length-1;
             s->prev_length -= 2;
             do {
-                s->strstart++;
+                if (++s->strstart <= max_insert) {
                     INSERT_STRING(s, s->strstart, hash_head);
-                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                }
-                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-                 * these bytes are garbage, but it does not matter since the
-                 * next lookahead bytes will always be emitted as literals.
-                 */
             } while (--s->prev_length != 0);
             s->match_available = 0;
             s->match_length = MIN_MATCH-1;
@@ -925,8 +991,13 @@ local int deflate_slow(s, flush)
             s->lookahead--;
         }
     }
-    if (s->match_available) ct_tally (s, 0, s->window[s->strstart-1]);
+    Assert (flush != Z_NO_FLUSH, "no flush?");
-
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        ct_tally (s, 0, s->window[s->strstart-1]);
+        s->match_available = 0;
+    }
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return 0;
 }
+

deflate.h

@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: deflate.h,v 1.3 1995/04/14 12:39:45 jloup Exp $ */
+/* $Id: deflate.h,v 1.5 1995/05/03 17:27:09 jloup Exp $ */
 
 #include "zutil.h"
 
@@ -58,7 +58,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 +71,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,8 +84,8 @@ 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 */
@@ -96,7 +98,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 +113,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 */
@@ -174,14 +176,14 @@ typedef struct internal_state {
      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 +199,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 +223,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 +233,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 +248,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,6 +267,9 @@ typedef struct internal_state {
  */
 
         /* in trees.c */
-void ct_init       __P((deflate_state *s));
+void ct_init       OF((deflate_state *s));
-int  ct_tally      __P((deflate_state *s, int dist, int lc));
+int  ct_tally      OF((deflate_state *s, int dist, int lc));
-ulg ct_flush_block __P((deflate_state *s, char *buf, ulg stored_len, int eof));
+ulg ct_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, int eof));
+void ct_align      OF((deflate_state *s));
+void ct_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));

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

@@ -3,11 +3,19 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: example.c,v 1.4 1995/04/14 13:32:49 jloup Exp $ */
+/* $Id: example.c,v 1.9 1995/05/03 17:27:09 jloup Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
 
+#ifdef STDC
+#  include <string.h>
+#endif
+
+#ifndef __GO32__
+extern void exit  OF((int));
+#endif
+
 #define BUFLEN 4096
 
 #define local static
@@ -23,7 +31,18 @@
     } \
 }
 
-char *hello = "hello world";
+char *hello = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */
+
+void test_compress OF((void));
+void test_gzio     OF((char *out, char *in));
+void test_deflate  OF((Byte compr[]));
+void test_inflate  OF((Byte compr[]));
+void test_flush    OF((Byte compr[]));
+void test_sync     OF((Byte compr[]));
+int  main          OF((int argc, char *argv[]));
 
 /* ===========================================================================
  * Test compress() and uncompress()
@@ -37,15 +56,15 @@ void test_compress()
     int err;
     uLong len = strlen(hello)+1;
 
-    err = compress(compr, &comprLen, hello, len);
+    err = compress(compr, &comprLen, (Byte*)hello, len);
     CHECK_ERR(err, "compress");
 
-    strcpy(uncompr, "garbage");
+    strcpy((char*)uncompr, "garbage");
 
     err = uncompress(uncompr, &uncomprLen, compr, comprLen);
     CHECK_ERR(err, "uncompress");
 
-    if (strcmp(uncompr, hello)) {
+    if (strcmp((char*)uncompr, hello)) {
         fprintf(stderr, "bad uncompress\n");
     } else {
         printf("uncompress(): %s\n", uncompr);
@@ -60,7 +79,7 @@ void test_gzio(out, in)
     char *in;  /* input file */
 {
     local Byte uncompr[BUFLEN];
-    uLong uncomprLen = sizeof(uncompr);
+    int uncomprLen = sizeof(uncompr);
     int err;
     int len = strlen(hello)+1;
     gzFile file;
@@ -80,7 +99,7 @@ void test_gzio(out, in)
     if (file == NULL) {
         fprintf(stderr, "gzopen error\n");
     }
-    strcpy(uncompr, "garbage");
+    strcpy((char*)uncompr, "garbage");
 
     uncomprLen = gzread(file, uncompr, uncomprLen);
     if (uncomprLen != len) {
@@ -88,7 +107,7 @@ void test_gzio(out, in)
     }
     gzclose(file);
 
-    if (strcmp(uncompr, hello)) {
+    if (strcmp((char*)uncompr, hello)) {
         fprintf(stderr, "bad gzread\n");
     } else {
         printf("gzread(): %s\n", uncompr);
@@ -96,9 +115,9 @@ void test_gzio(out, in)
 }
 
 /* ===========================================================================
- * Test deflate() with small buffers, return the compressed length.
+ * Test deflate() with small buffers
  */
-uLong test_deflate(compr)
+void test_deflate(compr)
     Byte compr[];
 {
     z_stream c_stream; /* compression stream */
@@ -114,22 +133,21 @@ uLong test_deflate(compr)
     c_stream.next_in  = (Byte*)hello;
     c_stream.next_out = compr;
 
-    while (c_stream.total_in != len) {
+    while (c_stream.total_in != (uLong)len) {
         c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
         err = deflate(&c_stream, Z_NO_FLUSH);
         CHECK_ERR(err, "deflate");
     }
     /* Finish the stream, still forcing small buffers: */
-    do {
+    for (;;) {
         c_stream.avail_out = 1;
         err = deflate(&c_stream, Z_FINISH);
+        if (err == Z_STREAM_END) break;
         CHECK_ERR(err, "deflate");
-    } while (c_stream.avail_out == 0);
+    }
 
     err = deflateEnd(&c_stream);
     CHECK_ERR(err, "deflateEnd");
-
-    return c_stream.total_out;
 }
 
 /* ===========================================================================
@@ -142,7 +160,7 @@ void test_inflate(compr)
     int err;
     z_stream d_stream; /* decompression stream */
 
-    strcpy(uncompr, "garbage");
+    strcpy((char*)uncompr, "garbage");
 
     d_stream.zalloc = (alloc_func)0;
     d_stream.zfree = (free_func)0;
@@ -163,23 +181,97 @@ void test_inflate(compr)
     err = inflateEnd(&d_stream);
     CHECK_ERR(err, "inflateEnd");
 
-    if (strcmp(uncompr, hello)) {
+    if (strcmp((char*)uncompr, hello)) {
         fprintf(stderr, "bad inflate\n");
     } else {
         printf("inflate(): %s\n", uncompr);
     }
 }
 
+/* ===========================================================================
+ * Test deflate() with full flush
+ */
+void test_flush(compr)
+    Byte compr[];
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    int len = strlen(hello)+1;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (Byte*)hello;
+    c_stream.next_out = compr;
+    c_stream.avail_in = 3;
+    c_stream.avail_out = BUFLEN;
+    err = deflate(&c_stream, Z_FULL_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    compr[3]++; /* force an error in first compressed block */
+    c_stream.avail_in = len - 3;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        CHECK_ERR(err, "deflate");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflateSync()
+ */
+void test_sync(compr)
+    Byte compr[];
+{
+    local Byte uncompr[BUFLEN];
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    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);
+
+    inflate(&d_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "inflate");
+
+    d_stream.avail_in = BUFLEN-2; /* let inflate read all compressed data */
+    err = inflateSync(&d_stream); /* skip the damaged part */
+    CHECK_ERR(err, "inflateSync");
+
+    err = inflate(&d_stream, Z_FINISH);
+    if (err != Z_DATA_ERROR) {
+        fprintf(stderr, "inflate should report DATA_ERROR\n");
+        /* Because of incorrect adler32 */
+    }
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    printf("after inflateSync(): hel%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];
-    uLong comprLen;
 
     if (zlib_version[0] != ZLIB_VERSION[0]) {
         fprintf(stderr, "incompatible zlib version\n");
@@ -193,9 +285,12 @@ void main(argc, argv)
     test_gzio((argc > 1 ? argv[1] : "foo.gz"),
               (argc > 2 ? argv[2] : "foo.gz"));
 
-    comprLen = test_deflate(compr);
+    test_deflate(compr);
-
     test_inflate(compr);
 
+    test_flush(compr);
+    test_sync(compr);
+
     exit(0);
+    return 0; /* to avoid warning */
 }

gzio.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* $Id: gzio.c,v 1.4 1995/04/14 14:50:52 jloup Exp $ */
+/* $Id: gzio.c,v 1.8 1995/05/03 17:27:09 jloup Exp $ */
 
 #include <stdio.h>
 
@@ -13,8 +13,8 @@ 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
 #define GZ_MAGIC_2 0x8b
@@ -46,6 +46,11 @@ typedef struct gz_stream {
 } gz_stream;
 
 
+local int    destroy OF((gz_stream *s));
+local gzFile gz_open OF((char *path, char *mode, int  fd));
+local void   putLong OF((FILE *file, uLong x));
+local uLong  getLong OF((Bytef *buf));
+
  /* ===========================================================================
  * Cleanup then free the given gz_stream. Return a zlib error code.
  */
@@ -71,8 +76,9 @@ local int destroy (s)
     if (s->file != NULL && fclose(s->file)) {
         err = Z_ERRNO;
     }
-    zcfree((voidp)0, s);
+    if (s->z_err < 0) err = s->z_err;
-    return s->z_err < 0 ? s->z_err : err;
+    TRYFREE(s);
+    return err;
 }
 
 /* ===========================================================================
@@ -90,6 +96,7 @@ local gzFile gz_open (path, mode, fd)
     int  fd;
 {
     int err;
+    int level = Z_DEFAULT_COMPRESSION; /* compression level */
     char *p = mode;
     gz_stream *s = (gz_stream *)ALLOC(sizeof(gz_stream));
 
@@ -117,22 +124,23 @@ local gzFile gz_open (path, mode, fd)
     do {
         if (*p == 'r') s->mode = 'r';
         if (*p == 'w') s->mode = 'w';
+        if (*p >= '1' && *p <= '9') level = *p - '0';
     } while (*p++);
     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, -WBITS, MEM_LEVEL, 0);
+                           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), -WBITS);
+        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;
@@ -215,7 +223,7 @@ gzFile gzdopen (fd, mode)
     char *mode;
 {
     char name[20];
-    sprintf(name, "_fd:%d_", fd); /* for debugging */
+    sprintf(name, "<fd:%d>", fd); /* for debugging */
 
     return gz_open (name, mode, fd);
 }
@@ -234,15 +242,16 @@ int gzread (file, buf, len)
     if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
 
     if (s->transparent) {
-	unsigned n = 0;
+        int n = 0;
+        Byte *b = (Byte*)buf;
         /* Copy the first two (non-magic) bytes if not done already */
         while (s->stream.avail_in > 0 && len > 0) {
-	    *((Byte*)buf)++ = *s->stream.next_in++;
+            *b++ = *s->stream.next_in++;
             s->stream.avail_in--;
             len--; n++;
         }
         if (len == 0) return n;
-	return n + fread(buf, 1, len, s->file);
+        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 */
@@ -274,7 +283,7 @@ int gzread (file, buf, len)
     }
     len -= s->stream.avail_out;
     s->crc = crc32(s->crc, buf, len);
-    return len;
+    return (int)len;
 }
 
 /* ===========================================================================
@@ -305,12 +314,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);
 }
 
 /* ===========================================================================
@@ -337,7 +345,7 @@ int gzflush (file, flush)
         if (len != 0) {
             if (fwrite(s->outbuf, 1, len, s->file) != len) {
                 s->z_err = Z_ERRNO;
-		break;
+                return Z_ERRNO;
             }
             s->stream.next_out = s->outbuf;
             s->stream.avail_out = Z_BUFSIZE;
@@ -345,14 +353,15 @@ int gzflush (file, flush)
         if (done) break;
         s->z_err = deflate(&(s->stream), flush);
 
-	if (s->z_err != Z_OK) break;
-
         /* deflate has finished flushing only when it hasn't used up
          * all the available space in the output buffer: 
          */
-	done = (s->stream.avail_out != 0);
+        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
+ 
+        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
     }
-    return s->z_err;
+    fflush(s->file);
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 
 /* ===========================================================================
@@ -364,7 +373,7 @@ local void putLong (file, x)
 {
     int n;
     for (n = 0; n < 4; n++) {
-	fputc(x & 0xff, file);
+        fputc((int)(x & 0xff), file);
         x >>= 8;
     }
 }
@@ -373,10 +382,10 @@ local void putLong (file, x)
    Reads a long in LSB order from the given buffer
 */
 local uLong getLong (buf)
-    Byte *buf;
+    Bytef *buf;
 {
     uLong x = 0;
-    Byte *p = buf+4;
+    Bytef *p = buf+4;
 
     do {
         x <<= 8;
@@ -393,12 +402,15 @@ int gzclose (file)
     gzFile file;
 {
     uInt n;
+    int err;
     gz_stream *s = (gz_stream*)file;
 
     if (s == NULL) return Z_STREAM_ERROR;
 
     if (s->mode == 'w') {
-	gzflush (file, Z_FINISH);
+        err = gzflush (file, Z_FINISH);
+        if (err != Z_OK) return destroy(file);
+
         putLong (s->file, s->crc);
         putLong (s->file, s->stream.total_in);
 
@@ -407,7 +419,7 @@ int gzclose (file)
         /* 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;
+	    Bytef *q = s->stream.next_in;
             while (n--) { *p++ = *q++; };
 
             n = s->stream.avail_in;

infblock.c

@@ -60,40 +60,67 @@ local uInt border[] = {	/* Order of the bit length code lengths */
       the two sets of lengths.
  */
 
-struct inflate_blocks_state *inflate_blocks_new(z,wsize)
-z_stream *z;
-uInt wsize;
-{
-  struct inflate_blocks_state *s;
 
-  if ((s = (struct inflate_blocks_state *)ZALLOC
+void inflate_blocks_reset(s, z, c)
+inflate_blocks_statef *s;
+z_stream *z;
+uLongf *c;
+{
+  if (s->checkfn != Z_NULL)
+    *c = s->check;
+  if (s->mode == BTREE || s->mode == DTREE)
+    ZFREE(z, s->sub.trees.blens);
+  if (s->mode == CODES)
+  {
+    inflate_codes_free(s->sub.decode.codes, z);
+    inflate_trees_free(s->sub.decode.td, z);
+    inflate_trees_free(s->sub.decode.tl, z);
+  }
+  s->mode = TYPE;
+  s->bitk = 0;
+  s->bitb = 0;
+  s->read = s->write = s->window;
+  if (s->checkfn != Z_NULL)
+    s->check = (*s->checkfn)(0L, Z_NULL, 0);
+  Trace((stderr, "inflate:   blocks reset\n"));
+}
+
+
+inflate_blocks_statef *inflate_blocks_new(z, c, w)
+z_stream *z;
+check_func c;
+uInt w;
+{
+  inflate_blocks_statef *s;
+
+  if ((s = (inflate_blocks_statef *)ZALLOC
        (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
     return s;
-  if ((s->window = (Byte *)ZALLOC(z,1,wsize)) == Z_NULL)
+  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
   {
     ZFREE(z, s);
     return Z_NULL;
   }
+  s->end = s->window + w;
+  s->checkfn = c;
   s->mode = TYPE;
-  s->bitk = 0;
+  Trace((stderr, "inflate:   blocks allocated\n"));
-  s->read = s->write = s->window;
+  inflate_blocks_reset(s, z, &s->check);
-  s->end = s->window + wsize;
-  s->check = 1;
   return s;
 }
 
 
 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) */
@@ -109,34 +136,42 @@ int r;
       switch (t >> 1)
       {
         case 0:                         /* stored */
+          Trace((stderr, "inflate:     stored block%s\n",
+                 s->last ? " (last)" : ""));
           DUMPBITS(3)
           t = k & 7;                    /* go to byte boundary */
           DUMPBITS(t)
           s->mode = LENS;               /* get length of stored block */
           break;
         case 1:                         /* fixed */
+          Trace((stderr, "inflate:     fixed codes block%s\n",
+                 s->last ? " (last)" : ""));
           {
             uInt bl, bd;
             inflate_huft *tl, *td;
 
             inflate_trees_fixed(&bl, &bd, &tl, &td);
-	    s->sub.codes = inflate_codes_new(bl, bd, tl, td, z);
+            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
-	    if (s->sub.codes == Z_NULL)
+            if (s->sub.decode.codes == Z_NULL)
             {
               r = Z_MEM_ERROR;
               LEAVE
             }
+            s->sub.decode.tl = Z_NULL;  /* don't try to free these */
+            s->sub.decode.td = Z_NULL;
           }
           DUMPBITS(3)
           s->mode = CODES;
           break;
         case 2:                         /* dynamic */
+          Trace((stderr, "inflate:     dynamic codes block%s\n",
+                 s->last ? " (last)" : ""));
           DUMPBITS(3)
           s->mode = TABLE;
           break;
         case 3:                         /* illegal */
           DUMPBITS(3)
-	  s->mode = ERROR;
+          s->mode = BAD;
           z->msg = "invalid block type";
           r = Z_DATA_ERROR;
           LEAVE
@@ -144,23 +179,33 @@ int r;
       break;
     case LENS:
       NEEDBITS(32)
-      if ((~b) >> 16 != (b & 0xffff))
+      if (((~b) >> 16) != (b & 0xffff))
       {
-        s->mode = ERROR;
+        s->mode = BAD;
         z->msg = "invalid stored block lengths";
         r = Z_DATA_ERROR;
         LEAVE
       }
-      k = 0;				/* dump bits */
       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;
       break;
     case STORED:
-      do {
+      if (n == 0)
-        NEEDBYTE
+        LEAVE
       NEEDOUT
-	OUTBYTE(NEXTBYTE)
+      t = s->sub.left;
-      } while (--s->sub.left);
+      if (t > n) t = n;
+      if (t > m) t = m;
+      zmemcpy(q, p, t);
+      p += t;  n -= t;
+      q += t;  m -= t;
+      if ((s->sub.left -= t) != 0)
+        break;
+      Tracev((stderr, "inflate:       stored end, %lu total out\n",
+              z->total_out + (q >= s->read ? q - s->read :
+              (s->end - s->read) + (q - s->window))));
       s->mode = s->last ? DRY : TYPE;
       break;
     case TABLE:
@@ -169,7 +214,7 @@ int r;
 #ifndef PKZIP_BUG_WORKAROUND
       if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
       {
-        s->mode = ERROR;
+        s->mode = BAD;
         z->msg = "too many length or distance symbols";
         r = Z_DATA_ERROR;
         LEAVE
@@ -178,13 +223,14 @@ 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
       }
       DUMPBITS(14)
       s->sub.trees.index = 0;
+      Tracev((stderr, "inflate:       table sizes ok\n"));
       s->mode = BTREE;
     case BTREE:
       while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
@@ -202,10 +248,11 @@ int r;
       {
         r = t;
         if (r == Z_DATA_ERROR)
-	  s->mode = ERROR;
+          s->mode = BAD;
         LEAVE
       }
       s->sub.trees.index = 0;
+      Tracev((stderr, "inflate:       bits tree ok\n"));
       s->mode = DTREE;
     case DTREE:
       while (t = s->sub.trees.table,
@@ -237,7 +284,7 @@ int r;
           if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
               (c == 16 && i < 1))
           {
-	    s->mode = ERROR;
+            s->mode = BAD;
             z->msg = "invalid bit length repeat";
             r = Z_DATA_ERROR;
             LEAVE
@@ -254,20 +301,21 @@ 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;
         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
                                   s->sub.trees.blens, &bl, &bd, &tl, &td, z);
         if (t != Z_OK)
         {
           if (t == (uInt)Z_DATA_ERROR)
-	    s->mode = ERROR;
+            s->mode = BAD;
           r = t;
           LEAVE
         }
+        Tracev((stderr, "inflate:       trees ok\n"));
         if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
         {
           inflate_trees_free(td, z);
@@ -276,7 +324,9 @@ int r;
           LEAVE
         }
         ZFREE(z, s->sub.trees.blens);
-	s->sub.codes = c;
+        s->sub.decode.codes = c;
+        s->sub.decode.tl = tl;
+        s->sub.decode.td = td;
       }
       s->mode = CODES;
     case CODES:
@@ -284,10 +334,26 @@ int r;
       if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
         return inflate_flush(s, z, r);
       r = Z_OK;
-      inflate_codes_free(s->sub.codes, z);
+      inflate_codes_free(s->sub.decode.codes, z);
+      inflate_trees_free(s->sub.decode.td, z);
+      inflate_trees_free(s->sub.decode.tl, z);
       LOAD
-      s->mode = s->last ? DRY : TYPE;
+      Tracev((stderr, "inflate:       codes end, %lu total out\n",
+              z->total_out + (q >= s->read ? q - s->read :
+              (s->end - s->read) + (q - s->window))));
+      if (!s->last)
+      {
+        s->mode = TYPE;
         break;
+      }
+      if (k > 7)              /* return unused byte, if any */
+      {
+        Assert(k < 16, "inflate_codes grabbed too many bytes")
+        k -= 8;
+        n++;
+        p--;                    /* can always return one */
+      }
+      s->mode = DRY;
     case DRY:
       FLUSH
       if (s->read != s->write)
@@ -296,7 +362,7 @@ int r;
     case DONE:
       r = Z_STREAM_END;
       LEAVE
-    case ERROR:
+    case BAD:
       r = Z_DATA_ERROR;
       LEAVE
     default:
@@ -306,19 +372,14 @@ int r;
 }
 
 
-int inflate_blocks_free(s, z, c, e)
+int inflate_blocks_free(s, z, c)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
-uLong *c;
+uLongf *c;
-int *e;
 {
-  *e = s->bitk > 7 ? (s->bitb >> (s->bitk & 7)) & 0xff : -1;
+  inflate_blocks_reset(s, z, c);
-  *c = s->check;
-  if (s->mode == BTREE || s->mode == DTREE)
-    ZFREE(z, s->sub.trees.blens);
-  if (s->mode == CODES)
-    inflate_codes_free(s->sub.codes, z);
   ZFREE(z, s->window);
   ZFREE(z, s);
+  Trace((stderr, "inflate:   blocks freed\n"));
   return Z_OK;
 }

infblock.h

@@ -9,18 +9,24 @@
  */
 
 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,
-    uInt));                     /* window size */
+    check_func c,               /* check function */
+    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 int inflate_blocks_free __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 */
-    int *));			/* possible leftover byte to return */
+
+extern int inflate_blocks_free OF((
+    inflate_blocks_statef *,
+    z_stream *,
+    uLongf *));                  /* check value on output */

infcodes.c

@@ -5,8 +5,10 @@
 
 #include "zutil.h"
 #include "inftrees.h"
-#include "infutil.h"
+#include "infblock.h"
 #include "infcodes.h"
+#include "infutil.h"
+#include "inffast.h"
 
 /* simplify the use of the inflate_huft type with some defines */
 #define base more.Base
@@ -28,7 +30,7 @@ struct inflate_codes_state {
       LIT,      /* o: got literal, waiting for output space */
       WASH,     /* o: got eob, possibly still output waiting */
       END,      /* x: got eob and all data flushed */
-      BAD}	/* x: got error */
+      BADCODE}  /* x: got error */
     mode;               /* current inflate_codes mode */
 
   /* mode dependent information */
@@ -54,14 +56,14 @@ 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;
 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;
@@ -69,27 +71,28 @@ z_stream *z;
     c->dbits = (Byte)bd;
     c->ltree = tl;
     c->dtree = td;
+    Tracev((stderr, "inflate:       codes new\n"));
   }
   return c;
 }
 
 
 int inflate_codes(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
   uInt j;               /* temporary storage */
   inflate_huft *t;      /* temporary pointer */
-  int e;		/* extra bits or operation */
+  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.codes;	/* codes state */
+  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
 
   /* copy input/output information to locals (UPDATE macro restores) */
   LOAD
@@ -98,7 +101,19 @@ int r;
   while (1) switch (c->mode)
   {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
     case START:         /* x: set up for LEN */
-      /* %%% check for avail in and out to do fast loop %%% */
+#ifndef SLOW
+      if (m >= 258 && n >= 10)
+      {
+        UPDATE
+        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
+        LOAD
+        if (r != Z_OK)
+        {
+          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
+          break;
+        }
+      }
+#endif /* !SLOW */
       c->sub.code.need = c->lbits;
       c->sub.code.tree = c->ltree;
       c->mode = LEN;
@@ -107,34 +122,39 @@ int r;
       NEEDBITS(j)
       t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
       DUMPBITS(t->bits)
-      if ((e = (int)(t->exop)) < 0)
+      e = (uInt)(t->exop);
+      if (e == 0)               /* literal */
       {
-        if (e == -128)		/* invalid code */
+        c->sub.lit = t->base;
-	{
+        Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-	  c->mode = BAD;
+                 "inflate:         literal '%c'\n" :
-	  z->msg = "invalid huffman code";
+                 "inflate:         literal 0x%02x\n", t->base));
-	  r = Z_DATA_ERROR;
+        c->mode = LIT;
-	  LEAVE
-	}
-	e = -e;
-	if (e & 64)		/* end of block */
-	{
-	  c->mode = END;
         break;
       }
+      if (e & 16)               /* length */
+      {
+        c->sub.copy.get = e & 15;
+        c->len = t->base;
+        c->mode = LENEXT;
+        break;
+      }
+      if ((e & 64) == 0)        /* next table */
+      {
         c->sub.code.need = e;
         c->sub.code.tree = t->next;
         break;
       }
-      if (e & 16)		/* literal */
+      if (e & 32)               /* end of block */
       {
-	c->sub.lit = t->base;
+        Tracevv((stderr, "inflate:         end of block\n"));
-	c->mode = LIT;
+        c->mode = WASH;
         break;
       }
-      c->sub.copy.get = e;
+      c->mode = BADCODE;        /* invalid code */
-      c->len = t->base;
+      z->msg = "invalid literal/length code";
-      c->mode = LENEXT;
+      r = Z_DATA_ERROR;
+      LEAVE
     case LENEXT:        /* i: getting length extra (have base) */
       j = c->sub.copy.get;
       NEEDBITS(j)
@@ -142,38 +162,48 @@ int r;
       DUMPBITS(j)
       c->sub.code.need = c->dbits;
       c->sub.code.tree = c->dtree;
+      Tracevv((stderr, "inflate:         length %u\n", c->len));
       c->mode = DIST;
     case DIST:          /* i: get distance next */
       j = c->sub.code.need;
       NEEDBITS(j)
       t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
       DUMPBITS(t->bits)
-      if ((e = (int)(t->exop)) < 0)
+      e = (uInt)(t->exop);
+      if (e & 16)               /* distance */
       {
-        if (e == -128)
+        c->sub.copy.get = e & 15;
-	{
+        c->sub.copy.dist = t->base;
-	  c->mode = BAD;
+        c->mode = DISTEXT;
-	  z->msg = "invalid huffman code";
+        break;
-	  r = Z_DATA_ERROR;
-	  LEAVE
       }
-	c->sub.code.need = -e;
+      if ((e & 64) == 0)        /* next table */
+      {
+        c->sub.code.need = e;
         c->sub.code.tree = t->next;
         break;
       }
-      c->sub.copy.dist = t->base;
+      c->mode = BADCODE;        /* invalid code */
-      c->sub.copy.get = e;
+      z->msg = "invalid distance code";
-      c->mode = DISTEXT;
+      r = Z_DATA_ERROR;
+      LEAVE
     case DISTEXT:       /* i: getting distance extra */
       j = c->sub.copy.get;
       NEEDBITS(j)
       c->sub.copy.dist += (uInt)b & inflate_mask[j];
       DUMPBITS(j)
+      Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
       c->mode = COPY;
     case COPY:          /* o: copying bytes in window, waiting for space */
-      f = q - s->window < c->sub.copy.dist ?
+#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 - (q - s->window));
+#endif
       while (c->len)
       {
         NEEDOUT
@@ -197,7 +227,7 @@ int r;
     case END:
       r = Z_STREAM_END;
       LEAVE
-    case BAD:		/* x: got error */
+    case BADCODE:       /* x: got error */
       r = Z_DATA_ERROR;
       LEAVE
     default:
@@ -208,10 +238,9 @@ int r;
 
 
 void inflate_codes_free(c, z)
-struct inflate_codes_state *c;
+inflate_codes_statef *c;
 z_stream *z;
 {
-  inflate_trees_free(c->dtree, z);
-  inflate_trees_free(c->ltree, z);
   ZFREE(z, c);
+  Tracev((stderr, "inflate:       codes free\n"));
 }

infcodes.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

@@ -0,0 +1,167 @@
+/* inffast.c -- process literals and length/distance pairs fast
+ * Copyright (C) 1995 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"
+
+struct inflate_codes_state {int dummy;}; /* for buggy compilers */
+
+/* simplify the use of the inflate_huft type with some defines */
+#define base more.Base
+#define next more.Next
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+/* macros for bit input with no checking and for returning unused bytes */
+#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
+#define UNGRAB {n+=(c=k>>3);p-=c;k&=7;}
+
+/* Called with number of bytes left to write in window at least 258
+   (the maximum string length) and number of input bytes available
+   at least ten.  The ten bytes are six bytes for the longest length/
+   distance pair plus four bytes for overloading the bit buffer. */
+
+int inflate_fast(bl, bd, tl, td, s, z)
+uInt bl, bd;
+inflate_huft *tl, *td;
+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 */
+  Bytef *p;             /* input data pointer */
+  uInt n;               /* bytes available there */
+  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 */
+  Bytef *r;             /* copy source pointer */
+
+  /* load input, output, bit values */
+  LOAD
+
+  /* initialize masks */
+  ml = inflate_mask[bl];
+  md = inflate_mask[bd];
+
+  /* do until not enough input or output space for fast loop */
+  do {                          /* assume called with m >= 258 && n >= 10 */
+    /* get literal/length code */
+    GRABBITS(20)                /* max bits for literal/length code */
+    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
+    {
+      DUMPBITS(t->bits)
+      Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+                "inflate:         * literal '%c'\n" :
+                "inflate:         * literal 0x%02x\n", t->base));
+      *q++ = (Byte)t->base;
+      m--;
+      continue;
+    }
+    do {
+      DUMPBITS(t->bits)
+      if (e & 16)
+      {
+        /* get extra bits for length */
+        e &= 15;
+        c = t->base + ((uInt)b & inflate_mask[e]);
+        DUMPBITS(e)
+        Tracevv((stderr, "inflate:         * length %u\n", c));
+
+        /* decode distance base of block to copy */
+        GRABBITS(15);           /* max bits for distance code */
+        e = (t = td + ((uInt)b & md))->exop;
+        do {
+          DUMPBITS(t->bits)
+          if (e & 16)
+          {
+            /* get extra bits to add to distance base */
+            e &= 15;
+            GRABBITS(e)         /* get extra bits (up to 13) */
+            d = t->base + ((uInt)b & inflate_mask[e]);
+            DUMPBITS(e)
+            Tracevv((stderr, "inflate:         * distance %u\n", d));
+
+            /* do the copy */
+            m -= c;
+            if ((uInt)(q - s->window) >= d)     /* offset before dest */
+            {                                   /*  just copy */
+              r = q - d;
+              *q++ = *r++;  c--;        /* minimum count is three, */
+              *q++ = *r++;  c--;        /*  so unroll loop a little */
+            }
+            else                        /* else offset after destination */
+            {
+              e = d - (q - s->window);  /* bytes from offset to end */
+              r = s->end - e;           /* pointer to offset */
+              if (c > e)                /* if source crosses, */
+              {
+                c -= e;                 /* copy to end of window */
+                do {
+                  *q++ = *r++;
+                } while (--e);
+                r = s->window;          /* copy rest from start of window */
+              }
+            }
+            do {                        /* copy all or what's left */
+              *q++ = *r++;
+            } while (--c);
+            break;
+          }
+          else if ((e & 64) == 0)
+            e = (t = t->next + ((uInt)b & inflate_mask[e]))->exop;
+          else
+          {
+            z->msg = "invalid distance code";
+            UNGRAB
+            UPDATE
+            return Z_DATA_ERROR;
+          }
+        } while (1);
+        break;
+      }
+      if ((e & 64) == 0)
+      {
+        if ((e = (t = t->next + ((uInt)b & inflate_mask[e]))->exop) == 0)
+        {
+          DUMPBITS(t->bits)
+          Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+                    "inflate:         * literal '%c'\n" :
+                    "inflate:         * literal 0x%02x\n", t->base));
+          *q++ = (Byte)t->base;
+          m--;
+          break;
+        }
+      }
+      else if (e & 32)
+      {
+        Tracevv((stderr, "inflate:         * end of block\n"));
+        UNGRAB
+        UPDATE
+        return Z_STREAM_END;
+      }
+      else
+      {
+        z->msg = "invalid literal/length code";
+        UNGRAB
+        UPDATE
+        return Z_DATA_ERROR;
+      }
+    } while (1);
+  } while (m >= 258 && n >= 10);
+
+  /* not enough input or output--restore pointers and return */
+  UNGRAB
+  UPDATE
+  return Z_OK;
+}

inffast.h

@@ -0,0 +1,17 @@
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h 
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+extern int inflate_fast OF((
+    uInt,
+    uInt,
+    inflate_huft *,
+    inflate_huft *,
+    inflate_blocks_statef *,
+    z_stream *));

inflate.c

@@ -15,168 +15,47 @@ struct internal_state {
   enum {
       METHOD,   /* waiting for method byte */
       FLAG,     /* waiting for flag byte */
-      START,	/* make new blocks state */
       BLOCKS,   /* decompressing blocks */
       CHECK4,   /* four check bytes to go */
       CHECK3,   /* three check bytes to go */
       CHECK2,   /* two check bytes to go */
       CHECK1,   /* one check byte to go */
       DONE,     /* finished check, done */
-      ERROR}	/* got an error--stay here */
+      BAD}      /* got an error--stay here */
     mode;               /* current inflate mode */
 
-  int  no_header;
-  uInt w_size;  /* LZ77 window size (32K by default) */
-  uInt w_bits;  /* log2(w_size)  (8..16) */
-
   /* mode dependent information */
   union {
     uInt method;        /* if FLAGS, method byte */
-    struct inflate_blocks_state
-      *blocks;		/* if BLOCKS, current state */
     struct {
       uLong was;                /* computed check value */
       uLong need;               /* stream check value */
     } check;            /* if CHECK, check values to compare */
+    uInt marker;        /* if BAD, inflateSync's marker bytes count */
   } sub;        /* submode */
+
+  /* mode independent information */
+  int  nowrap;          /* flag for no wrapper */
+  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
+  inflate_blocks_statef 
+    *blocks;            /* current inflate_blocks state */
+
 };
 
 
-int inflateInit (strm)
+int inflateReset(z)
-z_stream *strm;
-{
-    return inflateInit2(strm, WBITS);
-}
-
-int inflateInit2(z, windowBits)
 z_stream *z;
-int windowBits;
 {
-  if (z == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->zalloc == Z_NULL) z->zalloc = zcalloc;
-  if (z->zfree == Z_NULL) z->zfree = zcfree;
-  z->total_in = z->total_out = 0;
-  z->msg = Z_NULL;
-  if ((z->state = (struct internal_state *)
-       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
-    return Z_MEM_ERROR;
-  z->state->mode = METHOD;
-
-  z->state->no_header = 0;
-  if (windowBits < 0) { /* undocumented feature: no zlib header */
-    windowBits = - windowBits;
-    z->state->no_header = 1;
-    z->state->sub.method = DEFLATED;
-    z->state->mode = START;
-  }
-  if (windowBits < 8 || windowBits > 15) {
-    inflateEnd(z);
-    return Z_STREAM_ERROR;
-  }
-  z->state->w_bits = windowBits;
-  z->state->w_size = 1<<windowBits;
-  return Z_OK;
-}
-
-
-#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
-
-int inflate(z, f)
-z_stream *z;
-int f;
-{
-  int r;
-  uInt b;
   uLong c;
 
-  if (z == Z_NULL || z->next_in == Z_NULL)
+  if (z == Z_NULL || z->state == Z_NULL)
     return Z_STREAM_ERROR;
-  r = Z_BUF_ERROR;
+  z->total_in = z->total_out = 0;
-  while (1) switch (z->state->mode)
+  z->msg = Z_NULL;
-  {
+  z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
-    case METHOD:
+  inflate_blocks_reset(z->state->blocks, z, &c);
-      if (z->avail_in == 0) return r;  r = Z_OK;
+  Trace((stderr, "inflate: reset\n"));
-      if (((z->state->sub.method = NEXTBYTE) & 0xf != DEFLATED))
+  return Z_OK;
-      {
-        z->state->mode = ERROR;
-	z->msg = "unknown compression method";
-	return Z_DATA_ERROR;
-      }
-      if ((z->state->sub.method >> 4) > z->state->w_bits)
-      {
-        z->state->mode = ERROR;
-	z->msg = "invalid window size";
-	return Z_DATA_ERROR;
-      }
-      z->state->mode = FLAG;
-    case FLAG:
-      if (z->avail_in == 0) return r;  r = Z_OK;
-      if ((b = NEXTBYTE) & 0x20)
-      {
-        z->state->mode = ERROR;
-	z->msg = "invalid reserved bit";
-	return Z_DATA_ERROR;
-      }
-      if (((z->state->sub.method << 8) + b) % 31)
-      {
-        z->state->mode = ERROR;
-	z->msg = "incorrect header check";
-	return Z_DATA_ERROR;
-      }
-      z->state->mode = START;
-    case START:
-      if ((z->state->sub.blocks = inflate_blocks_new(z,z->state->w_size))
-	  == Z_NULL)
-        return Z_MEM_ERROR;
-      z->state->mode = BLOCKS;
-    case BLOCKS:
-      if ((r = inflate_blocks(z->state->sub.blocks, z, r)) != Z_STREAM_END)
-        return r;
-      inflate_blocks_free(z->state->sub.blocks, z, &c, &r);
-      if (z->state->no_header) {
-	z->state->mode = DONE;
-	return Z_STREAM_END;
-      }
-      z->state->sub.check.was = c;
-      if (r != -1)
-      {
-	z->state->sub.check.need = (uLong)r << 24;
-        z->state->mode = CHECK3;
-        r = Z_OK;
-	break;
-      }
-      r = Z_OK;
-      z->state->mode = CHECK4;
-    case CHECK4:
-      if (z->avail_in == 0) return r;  r = Z_OK;
-      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
-      z->state->mode = CHECK3;
-    case CHECK3:
-      if (z->avail_in == 0) return r;  r = Z_OK;
-      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
-      z->state->mode = CHECK2;
-    case CHECK2:
-      if (z->avail_in == 0) return r;  r = Z_OK;
-      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
-      z->state->mode = CHECK1;
-    case CHECK1:
-      if (z->avail_in == 0) return r;  r = Z_OK;
-      z->state->sub.check.need += (uLong)NEXTBYTE;
-      if (z->state->sub.check.was != z->state->sub.check.need)
-      {
-        z->state->mode = ERROR;
-        z->msg = "incorrect data check";
-	return Z_DATA_ERROR;
-      }
-      z->state->mode = DONE;
-    case DONE:
-      return Z_STREAM_END;
-    case ERROR:
-      return Z_DATA_ERROR;
-    default:
-      return Z_STREAM_ERROR;
-  }
 }
 
 
@@ -184,38 +63,219 @@ int inflateEnd(z)
 z_stream *z;
 {
   uLong c;
-  int e;
 
   if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
     return Z_STREAM_ERROR;
-  if (z->state->mode == BLOCKS)
+  if (z->state->blocks != Z_NULL)
-    inflate_blocks_free(z->state->sub.blocks, z, &c, &e);
+    inflate_blocks_free(z->state->blocks, z, &c);
   ZFREE(z, z->state);
   z->state = Z_NULL;
+  Trace((stderr, "inflate: end\n"));
   return Z_OK;
 }
 
 
-/* inflateSync not implemented yet--this just consumes input */
+int inflateInit2(z, w)
+z_stream *z;
+int w;
+{
+  /* initialize state */
+  if (z == Z_NULL)
+    return Z_STREAM_ERROR;
+  if (z->zalloc == Z_NULL) z->zalloc = zcalloc;
+  if (z->zfree == Z_NULL) z->zfree = zcfree;
+  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;
+
+  /* handle undocumented nowrap option (no zlib header or check) */
+  z->state->nowrap = 0;
+  if (w < 0)
+  {
+    w = - w;
+    z->state->nowrap = 1;
+  }
+
+  /* set window size */
+  if (w < 8 || w > 15)
+  {
+    inflateEnd(z);
+    return Z_STREAM_ERROR;
+  }
+  z->state->wbits = (uInt)w;
+
+  /* create inflate_blocks state */
+  if ((z->state->blocks =
+       inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, 1 << w))
+      == Z_NULL)
+  {
+    inflateEnd(z);
+    return Z_MEM_ERROR;
+  }
+  Trace((stderr, "inflate: allocated\n"));
+
+  /* reset state */
+  inflateReset(z);
+  return Z_OK;
+}
+
+
+int inflateInit(z)
+z_stream *z;
+{
+  return inflateInit2(z, DEF_WBITS);
+}
+
+
+#define NEEDBYTE {if(z->avail_in==0)return r;r=Z_OK;}
+#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
+
+int inflate(z, f)
+z_stream *z;
+int f;
+{
+  int r = f;    /* to avoid warning about unused f */
+  uInt b;
+
+  if (z == Z_NULL || z->next_in == Z_NULL)
+    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)
+      {
+        z->state->mode = BAD;
+        z->msg = "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->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
+      }
+      z->state->mode = FLAG;
+    case FLAG:
+      NEEDBYTE
+      if ((b = NEXTBYTE) & 0x20)
+      {
+        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->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
+      }
+      Trace((stderr, "inflate: zlib header ok\n"));
+      z->state->mode = BLOCKS;
+    case BLOCKS:
+      r = inflate_blocks(z->state->blocks, z, r);
+      if (r == Z_DATA_ERROR)
+      {
+        z->state->mode = BAD;
+        z->state->sub.marker = 0;       /* can try inflateSync */
+        break;
+      }
+      if (r != Z_STREAM_END)
+        return r;
+      r = Z_OK;
+      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
+      if (z->state->nowrap)
+      {
+        z->state->mode = DONE;
+        break;
+      }
+      z->state->mode = CHECK4;
+    case CHECK4:
+      NEEDBYTE
+      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
+      z->state->mode = CHECK3;
+    case CHECK3:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
+      z->state->mode = CHECK2;
+    case CHECK2:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
+      z->state->mode = CHECK1;
+    case CHECK1:
+      NEEDBYTE
+      z->state->sub.check.need += (uLong)NEXTBYTE;
+
+      if (z->state->sub.check.was != z->state->sub.check.need)
+      {
+        z->state->mode = BAD;
+        z->msg = "incorrect data check";
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
+      }
+      Trace((stderr, "inflate: zlib check ok\n"));
+      z->state->mode = DONE;
+    case DONE:
+      return Z_STREAM_END;
+    case BAD:
+      return Z_DATA_ERROR;
+    default:
+      return Z_STREAM_ERROR;
+  }
+}
+
+
 int inflateSync(z)
 z_stream *z;
 {
-  if (z == Z_NULL) return Z_STREAM_ERROR;
+  uInt n;       /* number of bytes to look at */
-  if (z->avail_in == 0) return Z_BUF_ERROR;
+  Bytef *p;     /* pointer to bytes */
-  do {
+  uInt m;       /* number of marker bytes found in a row */
-    z->total_in++;
+  uLong r, w;   /* temporaries to save total_in and total_out */
-  } while (--z->avail_in);
-  return Z_DATA_ERROR;
-}
 
-
+  /* set up */
-/* inflateReset not fully implemented yet--this frees and reallocates */
+  if (z == Z_NULL || z->state == Z_NULL)
-int inflateReset(z)
+    return Z_STREAM_ERROR;
-z_stream *z;
+  if (z->state->mode != BAD)
   {
-  int r;
+    z->state->mode = BAD;
-
+    z->state->sub.marker = 0;
-  if ((r = inflateEnd(z)) != Z_OK)
+  }
-    return r;
+  if ((n = z->avail_in) == 0)
-  return inflateInit(z);
+    return Z_BUF_ERROR;
+  p = z->next_in;
+  m = z->state->sub.marker;
+
+  /* search */
+  while (n && m < 4)
+  {
+    if (*p == (Byte)(m < 2 ? 0 : 0xff))
+      m++;
+    else if (*p)
+      m = 0;
+    else
+      m = 4 - m;
+    p++, n--;
+  }
+
+  /* restore */
+  z->total_in += p - z->next_in;
+  z->next_in = p;
+  z->avail_in = n;
+  z->state->sub.marker = m;
+
+  /* return no joy or set up to restart on a new block */
+  if (m != 4)
+    return Z_DATA_ERROR;
+  r = z->total_in;  w = z->total_out;
+  inflateReset(z);
+  z->total_in = r;  z->total_out = w;
+  z->state->mode = BLOCKS;
+  return Z_OK;
 }

inflate.h

@@ -1,22 +0,0 @@
-/* temporary kludge assuming single pass decompression */
-
-/* $Id: inflate.h,v 1.2 1995/04/11 14:47:32 jloup Exp $ */
-
-#include <stdio.h>
-
-#define NEXTBYTE \
-   (istrm->total_in++, istrm->avail_in-- == 0 ? \
-      (z_error("too small"), 0) : *istrm->next_in++)
-
-#define FLUSH(n) { \
-   if (istrm->avail_out < n) z_error("too big"); \
-   istrm->avail_out -= n; \
-   memcpy(istrm->next_out, slide, n); \
-   istrm->next_out += n; \
-   istrm->total_out += n; \
-}
-#define WSIZE istrm->state->w_size
-#define slide istrm->state->window
-#define memzero(a,s) memset((a),0,(s))
-#define inflate z_inflate
-#define qflag 1

inftest.c

@@ -1,67 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "zutil.h"
-
-/* This test is in honor of Ed Hamrick who suggested that the interface
-   to inflate be a byte at a time--this implements that, and is, of course,
-   monumentally slow.  It has the virtue though of stressing the push-pull
-   interface for testing purposes. */
-
-void main()
-{
-  int a, r;
-  char c;
-  z_stream z;
-
-  z.zalloc = Z_NULL;
-  z.zfree = Z_NULL;
-  r = inflateInit(&z);
-  if (r != Z_OK)
-    fprintf(stderr, "init error: %s\n", z_errmsg[1 - r]);
-  while ((a = getchar()) != EOF)
-  {
-    /* feed one byte of input */
-    z.avail_out = 0;
-    c = (char)a;
-    z.next_in = (Byte*)&c;
-    z.avail_in = 1;
-    r = inflate(&z, 0);
-    if (r == Z_STREAM_END)
-      break;
-    if (r != Z_OK)
-    {
-      fprintf(stderr, "inflate error: %s\n", z_errmsg[1 - r]);
-      break;
-    }
-    if (z.avail_in != 0)
-    {
-      fprintf(stderr, "inflate didn't eat byte and didn't say buf err!\n");
-      break;
-    }
-
-    /* empty output one byte at a time */
-    while (1)
-    {
-      z.next_out = (Byte*)&c;
-      z.avail_out = 1;
-      r = inflate(&z, 0);
-      if (r == Z_STREAM_END)
-	break;
-      if (r != Z_OK && r != Z_BUF_ERROR)
-      {
-	fprintf(stderr, "inflate error: %s\n", z_errmsg[1 - r]);
-	break;
-      }
-      if (z.avail_out == 0)
-        putchar(c);
-      else
-        break;
-    }
-    if (r != Z_OK && r != Z_BUF_ERROR)
-      break;
-  }
-  inflateEnd(&z);
-  fprintf(stderr, "%d bytes in, %d bytes out\n", z.total_in, z.total_out);
-  if (z.msg != NULL)
-    fprintf(stderr, "msg is <%s>\n", z.msg);
-}

inftrees.c

@@ -15,24 +15,24 @@ 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((
+local void ffree OF((
-    voidp q,		/* opaque pointer (not used) */
+    voidpf q,            /* opaque pointer (not used) */
-    voidp p));		/* what to free (not used) */
+    voidpf p));          /* what to free (not used) */
 
 /* Tables for deflate from PKZIP's appnote.txt. */
 local uInt cplens[] = { /* Copy lengths for literal codes 257..285 */
@@ -41,7 +41,7 @@ local uInt cplens[] = {	/* Copy lengths for literal codes 257..285 */
         /* actually lengths - 2; also see note #13 above about 258 */
 local uInt cplext[] = { /* 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, 128, 128}; /* 128==invalid */
+        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 */
         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,
@@ -93,13 +93,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 +107,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 +117,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 */
 
@@ -238,15 +239,15 @@ 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 */
         if (h)
         {
           x[h] = i;             /* save pattern for backing up */
-          r.bits = (char)l;     /* bits to dump before this table */
+          r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = (char)(-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 */
@@ -254,17 +255,17 @@ z_stream *zs;		/* for zalloc function */
       }
 
       /* set up table entry in r */
-      r.bits = (char)(k - w);
+      r.bits = (Byte)(k - w);
       if (p >= v + n)
-        r.exop = -128;          /* out of values--invalid code */
+        r.exop = 128 + 64;      /* out of values--invalid code */
       else if (*p < s)
       {
-        r.exop = (char)(*p < 256 ? 16 : -64);   /* 256 is end-of-block code */
+        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 = (char)e[*p - s];       /* 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,14 +295,14 @@ 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";
   else if (r == Z_BUF_ERROR)
@@ -317,11 +318,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;
@@ -376,31 +377,33 @@ 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 (not used) */
 uInt n;         /* number of items */
 uInt s;         /* size of item */
 {
   Assert(s == sizeof(inflate_huft) && n <= fixed_left,
          "inflate_trees falloc overflow");
+  if (q) s++; /* to make some compilers happy */
   fixed_left -= n;
-  return (voidp)(fixed_mem + fixed_left);
+  return (voidpf)(fixed_mem + fixed_left);
 }
 
 
 local void ffree(q, p)
-voidp q;
+voidpf q;
-voidp p;
+voidpf 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 */
   while (++fixed_lock > 1)
@@ -455,10 +458,6 @@ z_stream *z;		/* for zfree function */
 {
   register inflate_huft *p, *q;
 
-  /* Don't free fixed trees */
-  if (t >= fixed_mem && t <= fixed_mem + FIXEDH)
-    return Z_OK;
-
   /* Go through linked list, freeing from the malloced (t[-1]) address. */
   p = t;
   while (p != Z_NULL)

inftrees.h

@@ -9,21 +9,17 @@
  */
 
 /* 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).
+   that have 16-bit pointers (e.g. PC's in the small or medium model). */
-   Valid extra bits (exop) are 0..13.  exop == -64 is EOB (end of block),
+
-   exop == 16 means that v is a literal, exop < 0 means that v is a pointer
+typedef struct inflate_huft_s FAR inflate_huft;
-   to the next table, which codes -exop bits, and lastly exop == -128
-   indicates an unused code.  If a code with exop == -128 is looked up,
-   this implies an error in the data. */
 
-typedef struct inflate_huft_s inflate_huft;
 struct inflate_huft_s {
   union {
     struct {
-      char Exop;        /* number of extra bits or operation */
+      Byte Exop;        /* number of extra bits or operation */
-      char Bits;        /* number of bits in this code or subcode */
+      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 */
@@ -35,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

@@ -4,7 +4,9 @@
  */
 
 #include "zutil.h"
+#include "infblock.h"
 #include "inftrees.h"
+#include "infcodes.h"
 #include "infutil.h"
 
 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
@@ -19,19 +21,19 @@ 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;
   q = s->read;
 
   /* compute number of bytes to copy as far as end of window */
-  n = (q <= s->write ? s->write : s->end) - q;
+  n = (uInt)((q <= s->write ? s->write : s->end) - q);
   if (n > z->avail_out) n = z->avail_out;
   if (n && r == Z_BUF_ERROR) r = Z_OK;
 
@@ -40,19 +42,24 @@ int r;
   z->total_out += n;
 
   /* update check information */
-  s->check = adler32(s->check, q, n);
+  if (s->checkfn != Z_NULL)
+    s->check = (*s->checkfn)(s->check, q, n);
 
   /* copy as far as end of window */
-  while (n--) *p++ = *q++;
+  zmemcpy(p, q, n);
+  p += n;
+  q += n;
 
   /* see if more to copy at beginning of window */
   if (q == s->end)
   {
-    /* wrap source pointer */
+    /* wrap pointers */
     q = s->window;
+    if (s->write == s->end)
+      s->write = s->window;
 
     /* compute bytes to copy */
-    n = s->write - q;
+    n = (uInt)(s->write - q);
     if (n > z->avail_out) n = z->avail_out;
     if (n && r == Z_BUF_ERROR) r = Z_OK;
 
@@ -61,10 +68,13 @@ int r;
     z->total_out += n;
 
     /* update check information */
-    s->check = adler32(s->check, q, n);
+    if (s->checkfn != Z_NULL)
+      s->check = (*s->checkfn)(s->check, q, n);
 
     /* copy */
-    while (n--) *p++ = *q++;
+    zmemcpy(p, q, n);
+    p += n;
+    q += n;
   }
 
   /* update pointers */

infutil.h

@@ -22,7 +22,7 @@ struct inflate_blocks_state {
       CODES,    /* processing fixed or dynamic block */
       DRY,      /* output remaining window bytes */
       DONE,     /* finished last block, done */
-      ERROR}	/* got a data error--stuck here */
+      BAD}      /* got a data error--stuck here */
     mode;               /* current inflate_block mode */
 
   /* mode dependent information */
@@ -31,26 +31,31 @@ 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_codes_state
+    struct {
-      *codes;		/* if CODES, current state */
+      inflate_huft *tl, *td;    /* trees to free */
+      inflate_codes_statef 
+         *codes;
+    } decode;           /* if CODES, current state */
   } sub;                /* submode */
   uInt last;            /* true if this block is the last block */
 
   /* 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;}
@@ -78,8 +83,8 @@ struct inflate_blocks_state {
 extern uInt inflate_mask[];
 
 /* 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));
 

minigzip.c

@@ -13,18 +13,35 @@
  * or in pipe mode.
  */
 
-/* $Id: minigzip.c,v 1.1 1995/04/14 13:35:59 jloup Exp $ */
+/* $Id: minigzip.c,v 1.5 1995/05/03 17:27:11 jloup Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
 
-#ifdef MSDOS
+#ifndef __GO32__
+extern void exit  OF((int));
+#endif
+extern int unlink OF((const char *));
+
+#ifdef STDC
+#  include <string.h>
+#endif
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32)
 #  include <fcntl.h>
+#  include <io.h>
 #  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
 #else
 #  define SET_BINARY_MODE(file)
 #endif
 
+#ifdef VMS
+#  define GZ_SUFFIX "-gz"
+#else
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN sizeof(GZ_SUFFIX)
+
 #define BUFLEN 4096
 #define MAX_NAME_LEN 1024
 
@@ -36,6 +53,13 @@
 
 char *prog;
 
+void error           OF((char *msg));
+void gz_compress     OF((FILE   *in, gzFile out));
+void gz_uncompress   OF((gzFile in, FILE   *out));
+void file_compress   OF((char  *file));
+void file_uncompress OF((char  *file));
+int  main            OF((int argc, char *argv[]));
+
 /* ===========================================================================
  * Display error message and exit
  */
@@ -87,7 +111,7 @@ void gz_uncompress(in, out)
         if (len < 0) error (gzerror(in, &err));
         if (len == 0) break;
 
-	if (fwrite(buf, 1, len, out) != len) error("failed fwrite");
+        if (fwrite(buf, 1, len, out) != (uInt)len) error("failed fwrite");
     }
     if (fclose(out)) error("failed fclose");
 
@@ -107,14 +131,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);
@@ -139,14 +163,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) {
@@ -169,7 +193,7 @@ void file_uncompress(file)
  * Usage:  minigzip [-d] [files...]
  */
 
-void main(argc, argv)
+int main(argc, argv)
     int argc;
     char *argv[];
 {
@@ -193,7 +217,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);
         }
@@ -207,4 +231,5 @@ void main(argc, argv)
         } while (argv++, --argc);
     }
     exit(0);
+    return 0; /* to avoid warning */
 }

trees.c

@@ -29,7 +29,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* $Id: trees.c,v 1.2 1995/04/10 16:21:44 jloup Exp $ */
+/* $Id: trees.c,v 1.5 1995/05/03 17:27:12 jloup Exp $ */
 
 #include "deflate.h"
 
@@ -110,7 +110,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,24 +129,24 @@ local static_tree_desc  static_bl_desc =
  * Local (static) routines in this file.
  */
 
-local void ct_static_init __P((void));
+local void ct_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));
 
 #ifndef DEBUG
@@ -166,6 +166,63 @@ 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 */
+{
+    Tracev((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 */
 
@@ -259,6 +316,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 +414,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 +497,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 */
@@ -487,8 +545,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 +568,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 +584,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 */
@@ -722,6 +780,50 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
     Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
+/* ===========================================================================
+ * Send a stored block
+ */
+void ct_stored_block(s, buf, stored_len, eof)
+    deflate_state *s;
+    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 += (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.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the EOB
+ * code for the previous block was coded on 5 bits or less, inflate
+ * may have only 5+3 bits of lookahead to decode this EOB.
+ * (There are no problems if the previous block is stored or fixed.)
+ */
+void ct_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 EOB of the previous
+     * block was thus its length plus what we have just sent.
+     */
+    if (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;
+}
+
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and output the encoded block to the zip file. This function
@@ -729,7 +831,7 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
  */
 ulg ct_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 */
 {
@@ -771,13 +873,13 @@ ulg ct_flush_block(s, buf, stored_len, eof)
      * the whole file is transformed into a stored file:
      */
 #ifdef STORED_FILE_OK
-#  ifdef FORCE_METHOD
+#  ifdef FORCE_STORED_FILE
-    if (level == 1 && eof && compressed_len == 0L) { /* force stored file */
+    if (eof && 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;
@@ -785,8 +887,8 @@ ulg ct_flush_block(s, buf, stored_len, eof)
     } else
 #endif /* STORED_FILE_OK */
 
-#ifdef FORCE_METHOD
+#ifdef FORCE_STORED
-    if (level == 2 && buf != (char*)0) { /* force stored block */
+    if (buf != (char*)0) { /* force stored block */
 #else
     if (stored_len+4 <= opt_lenb && buf != (char*)0) {
                        /* 4: two words for the lengths */
@@ -797,14 +899,10 @@ 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.
          */
-        send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
+        ct_stored_block(s, buf, stored_len, eof);
-        s->compressed_len = (s->compressed_len + 3 + 7) & ~7L;
-        s->compressed_len += (stored_len + 4) << 3;
 
-        copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+#ifdef FORCE_STATIC
-
+    } else if (static_lenb >= 0) { /* force static trees */
-#ifdef FORCE_METHOD
-    } else if (level == 3) { /* force static trees */
 #else
     } else if (static_lenb == opt_lenb) {
 #endif
@@ -927,6 +1025,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;
 }
 
 /* ===========================================================================
@@ -944,45 +1043,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 = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII;
+    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? BINARY : 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;
-    }
 }
 
 /* ===========================================================================
@@ -1003,7 +1064,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;
@@ -1011,7 +1089,7 @@ local void bi_windup(s)
     if (s->bi_valid > 8) {
         put_short(s, s->bi_buf);
     } else if (s->bi_valid > 0) {
-        put_byte(s, s->bi_buf);
+        put_byte(s, (Byte)s->bi_buf);
     }
     s->bi_buf = 0;
     s->bi_valid = 0;
@@ -1026,11 +1104,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 */
+    s->last_eob_len = 8; /* enough lookahead for inflate */
 
     if (header) {
         put_short(s, (ush)len);   

uncompr.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: uncompr.c,v 1.4 1995/04/10 16:22:22 jloup Exp $ */
+/* $Id: uncompr.c,v 1.5 1995/05/03 17:27:12 jloup Exp $ */
 
 #include "zlib.h"
 
@@ -23,9 +23,9 @@
    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;
+    Bytef *source;
     uLong sourceLen;
 {
     z_stream stream;

zconf.h

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: zconf.h,v 1.7 1995/04/12 20:42:28 jloup Exp $ */
+/* $Id: zconf.h,v 1.12 1995/05/03 17:27:12 jloup Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
@@ -28,39 +28,99 @@
 #if defined(MSDOS) && !defined(__32BIT__)
 #  define MAXSEG_64K
 #endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
 
+#ifndef STDC
+#  if defined(MSDOS) || defined(__STDC__) || defined(__cplusplus)
+#    define STDC
+#  endif
+#endif
+
+#ifndef STDC
+#  ifndef const
+#    define const
+#  endif
+#endif
+
+#ifdef	__MWERKS__ /* Metrowerks CodeWarrior declares fileno() in unix.h */
+#  include <unix.h>
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
 #  ifdef MAXSEG_64K
 #    define MAX_MEM_LEVEL 8
 #  else
 #    define MAX_MEM_LEVEL 9
 #  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2 */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            1 << (windowBits+2)   +  1 << (memLevel+9)
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
 
                         /* Type declarations */
 
-#ifndef __P /* function prototypes */
+#ifndef OF /* function prototypes */
-#  if defined(__STDC__) || defined(MSDOS)
+#  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
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#if defined(M_I86SM) || defined(M_I86MM) /* MSC small or medium model */
+#  ifdef _MSC_VER
+#    define FAR __far
+#  else
+#    define FAR far
+#  endif
+#endif
+#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
+#    define FAR __far /* completely untested, just a best guess */
+#endif
+#ifndef FAR
+#   define FAR
+#endif
+
 typedef unsigned char  Byte;  /* 8 bits */
-#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
-#ifndef uInt
-  typedef unsigned int   uInt;  /* may be 16 or 32 bits */
-#endif
-#ifndef uLong
 typedef unsigned long  uLong; /* 32 bits or more */
-#endif
+
-#ifndef voidp
+typedef Byte FAR Bytef;
-#  if defined(__STDC__) || defined(MSDOS)
+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
 
 #endif /* _ZCONF_H */
-

zlib.h

@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 0.7  April 14th, 1995.
+  version 0.95, Aug 16th, 1995.
 
   Copyright (C) 1995 Jean-loup Gailly and Mark Adler
 
@@ -20,7 +20,7 @@
   3. This notice may not be removed or altered from any source distribution.
 
   Jean-loup Gailly        Mark Adler
-  gzip@prep.ai.mit.edu    madler@cco.caltech.edu
+  gzip@prep.ai.mit.edu    madler@alumni.caltech.edu
  */
 
 #ifndef _ZLIB_H
@@ -28,7 +28,7 @@
 
 #include "zconf.h"
 
-#define ZLIB_VERSION "0.7"
+#define ZLIB_VERSION "0.95"
 
 /* 
      The 'zlib' compression library provides in-memory compression and
@@ -49,22 +49,22 @@
   (providing more output space) before each call.
 */
 
-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 */
@@ -81,15 +81,20 @@ typedef struct z_stream_s {
    opaque before calling the init function. All other fields are set by the
    compression library and must not be updated by the application.
 
-   The opaque value provided by the application will be passed as first
+   The opaque value provided by the application will be passed as the first
    parameter for calls of zalloc and zfree. This can be useful for custom
    memory management. The compression library attaches no meaning to the
    opaque value.
 
    zalloc must return Z_NULL if there is not enough memory for the object.
    On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be require to allocate more than this
+   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h).
+   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+   pointers returned by zalloc for objects of exactly 65536 bytes *must*
+   have their offset normalized to zero. The default allocation function
+   provided by this library ensures this (see zutil.c). To reduce memory
+   requirements and avoid any allocation of 64K objects, at the expense of
+   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
 
    The fields total_in and total_out can be used for statistics or
    progress reports. After compression, total_in holds the total size of
@@ -103,6 +108,7 @@ typedef struct z_stream_s {
 #define Z_NO_FLUSH      0
 #define Z_PARTIAL_FLUSH 1
 #define Z_FULL_FLUSH    2
+#define Z_SYNC_FLUSH    3 /* experimental: partial_flush + byte align */
 #define Z_FINISH        4
 /* See deflate() below for the usage of these constants */
 
@@ -139,7 +145,7 @@ 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.
@@ -152,20 +158,20 @@ extern int deflateInit __P((z_stream *strm, int level));
    to level 6).
 
      deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the stream state was inconsistent (such
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level.
-   as zalloc being NULL). msg is set to null if there is no error message.
+   msg is set to null if there is no error message.  deflateInit does not
-   deflateInit does not perform any compression: this will be done by
+   perform any compression: this will be done by deflate().
-   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:
 
   - Compress more input starting at next_in and update next_in and avail_in
     accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
+    enough room in the output buffer), next_in and avail_in are updated and
-    will resume at this point for the next call of deflate().
+    processing will resume at this point for the next call of deflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
     accordingly. This action is forced if the parameter flush is non zero.
@@ -175,44 +181,52 @@ extern int deflate __P((z_stream *strm, int flush));
 
   Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly.
+  more output, and updating avail_in or avail_out accordingly; avail_out
-  The application can consume the compressed output when the output
+  should never be zero before the call. The application can consume the
-  buffer is full (avail_out == 0), or after each call of deflate().
+  compressed output when it wants, for example when the output buffer is full
+  (avail_out == 0), or after each call of deflate().
 
     If the parameter flush is set to Z_PARTIAL_FLUSH, the current compression
-  block is byte aligned and flushed to the output buffer so that the
+  block is terminated and flushed to the output buffer so that the
-  decompressor can get all input data available so far; if the compression
+  decompressor can get all input data available so far. For method 9, a future
-  method is 8 (deflate without partial flush capability), the current block
+  variant on method 8, the current block will be flushed but not terminated.
-  is terminated. If flush is set to Z_FULL_FLUSH, the compression block is
+  If flush is set to Z_FULL_FLUSH, the compression block is terminated, a
-  terminated, a special marker is output and the compression dictionary is
+  special marker is output and the compression dictionary is discarded; this
-  discarded; this is useful to allow the decompressor to synchronize if one
+  is useful to allow the decompressor to synchronize if one compressed block
-  compressed block has been damaged.
+  has been damaged (see inflateSync below).  Flushing degrades compression and
-    Flushing degrades compression and so should be used only when necessary.
+  so should be used only when necessary.  Using Z_FULL_FLUSH too often can
-  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
+    If the parameter flush is set to Z_FINISH, all pending input is processed,
-  processed and all pending output is flushed. The next operation on this
+  all pending output is flushed and deflate returns with Z_STREAM_END if there
-  stream must be another call of deflate with Z_FINISH but no more input data
+  was enough output space; if deflate returns with Z_OK, this function must be
-  (unchanged avail_in) if this call returned with avail_out equal to zero,
+  called again with Z_FINISH and more output space (updated avail_out) but no
-  or a call of deflateEnd to deallocate the compression state. Z_FINISH can
+  more input data, until it returns with Z_STREAM_END or an error. After
-  be used immediately after deflateInit if all the compression is to be
+  deflate has returned Z_STREAM_END, the only possible operations on the
-  done in a single step. In this case, avail_out must be at least 0.1%
+  stream are deflateReset or deflateEnd.
-  larger than avail_in plus 8 bytes.
   
-    deflate() may update strm->data_type if it can make a good guess about
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step. In this case, avail_out must be at least
+  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
+  Z_STREAM_END, then it must be called again as described above.
+
+    deflate() may update data_type if it can make a good guess about
   the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
   binary. This field is only for information purposes and does not affect
   the compression algorithm in any manner.
 
-    deflate() return Z_OK if some progress has been made (more input processed
+    deflate() returns Z_OK if some progress has been made (more input
-  or more output produced), Z_STREAM_ERROR if the stream state was
+  processed or more output produced), Z_STREAM_END if all input has been
-  inconsistent (for example if next_in or next_out was NULL), Z_BUF_ERROR if
+  consumed and all output has been produced (only when flush is set to
-  no progress is possible or if there was not enough room in the output buffer
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  when Z_FINISH is used.
+  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible.
 */
 
 
-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
@@ -224,22 +238,21 @@ extern int deflateEnd __P((z_stream *strm));
 */
 
 
-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
-   zfree are set to Z_NULL, deflateInit updates them to use default allocation
+   zfree are set to Z_NULL, inflateInit updates them to use default allocation
    functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the stream state was inconsistent (such
+   enough memory.  msg is set to null if there is no error message.
-   as zalloc being NULL). msg is set to null if there is no 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:
 
@@ -250,17 +263,18 @@ extern int inflate __P((z_stream *strm, int flush));
 
   - Provide more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() always provides as much output as possible
-    (until no more input data or no more space in the output buffer).
+    (until there is no more input data or no more space in the output buffer).
 
   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 the output
+  The application can consume the uncompressed output when it wants, for
-  buffer is full (avail_out == 0), or after each call of inflate().
+  example when the output buffer is full (avail_out == 0), or after each
+  call of inflate().
 
     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
-  not specified for values of the flush paramater other than Z_PARTIAL_FLUSH
+  not specified for values of the flush parameter other than Z_PARTIAL_FLUSH
   and Z_FINISH, but the current implementation actually flushes as much output
   as possible anyway.
 
@@ -271,21 +285,23 @@ 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, Z_DATA_ERROR if the input data was
+  compressed data has been reached and all uncompressed output has been
-  corrupted, Z_STREAM_ERROR if the stream structure was inconsistent (for
+  produced, Z_DATA_ERROR if the input data was corrupted, Z_STREAM_ERROR if
-  example if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough
+  the stream structure was inconsistent (for example if next_in or next_out
-  memory, Z_BUF_ERROR if no progress is possible or if there was not enough
+  was NULL), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if no
-  room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR case,
+  progress is possible or if there was not enough room in the output buffer
-  the application may then call inflateSync to look for a good compression
+  when Z_FINISH is used. In the Z_DATA_ERROR case, the application may then
-  block.
+  call inflateSync to look for a good compression block.
 */
 
 
-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
@@ -302,7 +318,7 @@ extern int inflateEnd __P((z_stream *strm));
     The following functions are needed only in some special applications.
 */
 
-extern int deflateInit2 __P((z_stream *strm,
+extern int deflateInit2 OF((z_stream *strm,
                             int  level,
                             int  method,
                             int  windowBits,
@@ -318,14 +334,15 @@ extern int deflateInit2 __P((z_stream *strm,
 
      The windowBits parameter is the base two logarithm of the window size
    (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library (the value 16 will be allowed soon). Larger values
+   version of the library (the value 16 will be allowed for method 9). Larger
-   of this parameter result in better compression at the expense of memory
+   values of this parameter result in better compression at the expense of
-   usage. The default value is 15 if deflateInit is used instead.
+   memory usage. The default value is 15 if deflateInit is used instead.
 
     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.
+   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 value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data
@@ -338,8 +355,8 @@ extern int deflateInit2 __P((z_stream *strm,
 
      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
-   data, or have at least (1<<windowBits) bytes and be writable. If next_in is
+   data, or have at least 1<<(windowBits+1) bytes and be writable. If next_in
-   null, the library will allocate its own history buffer (and leave next_in
+   is null, the library will allocate its own history buffer (and leave next_in
    null). next_out need not be provided here but must be provided by the
    application for the next call of deflate().
 
@@ -350,20 +367,19 @@ extern int deflateInit2 __P((z_stream *strm,
    reset by the library in this case.
 
       deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
-   not enough memory, Z_STREAM_ERROR if the stream state was inconsistent
+   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
-   (such as zalloc being NULL) or the parameters are 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().
 */
                             
-extern int deflateCopy __P((z_stream *dest,
+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
    buffer is allocated for the destination stream.  The compressed output
-   buffer is always application-supplied. It's the responsability of the
+   buffer is always application-supplied. It's the responsibility of the
    application to provide the correct values of next_out and avail_out for the
    next call of deflate.
 
@@ -380,7 +396,7 @@ extern int deflateCopy __P((z_stream *dest,
    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.
@@ -391,7 +407,7 @@ 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 inflateInit2 OF((z_stream *strm,
                             int  windowBits));
 /*   
      This is another version of inflateInit with more compression options. The
@@ -406,7 +422,7 @@ extern int inflateInit2 __P((z_stream *strm,
 
      If next_out is not null, the library will use this buffer for the history
    buffer; the buffer must either be large enough to hold the entire output
-   data, or have at least 1<<(windowBits-1) bytes.  If next_out is null, the
+   data, or have at least 1<<windowBits bytes.  If next_out is null, the
    library will allocate its own buffer (and leave next_out null). next_in
    need not be provided here but must be provided by the application for the
    next call of inflate().
@@ -418,28 +434,28 @@ extern int inflateInit2 __P((z_stream *strm,
    avail_out is zero and all output has been consumed.
 
       inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
-   not enough memory, Z_STREAM_ERROR if the stream state was inconsistent
+   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
-   (such as zalloc being NULL) or the parameters are invalid (such as
+   windowBits < 8). msg is set to null if there is no error message.
-   windowBits < 9). msg is set to null if there is no error message.
+   inflateInit2 does not perform any decompression: this will be done by
-   inflateInit2 does not perform any compression: this will be done by
    inflate().
 */
 
-extern int inflateSync __P((z_stream *strm));
+extern int inflateSync OF((z_stream *strm));
 /* 
-    Skips invalid compressed data until the special marker and a valid block
+    Skips invalid compressed data until the special marker (see deflate()
-  can be found, or until all available input is skipped. No output is provided.
+  above) can be found, or until all available input is skipped. No output
+  is provided.
 
-    inflateSync returns Z_OK if a valid block has been found, Z_BUF_ERROR if
+    inflateSync returns Z_OK if the special marker has been found, Z_BUF_ERROR
-  no more input was provided, Z_DATA_ERROR if not valid block has been found,
+  if no more input was provided, Z_DATA_ERROR if no marker has been found,
-  Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
   case, the application may save the current current value of total_in which
   indicates where valid compressed data was found. In the error case, the
   application may repeatedly call inflateSync, providing more input each time,
   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.
@@ -460,13 +476,13 @@ 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));
+                        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
    size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 8 bytes. Upon exit, destLen is the actual size of the
+   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
    compressed buffer.
      This function can be used to compress a whole file at once if the
    input file is mmap'ed.
@@ -475,8 +491,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));
+                          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
@@ -496,28 +512,28 @@ extern int uncompress __P((Byte *dest,   uLong *destLen,
 
 typedef voidp gzFile;
 
-extern gzFile gzopen  __P((char *path, char *mode));
+extern gzFile gzopen  OF((char *path, 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 return NULL if the file could not be opened or if there was
+     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, char *mode));
 /*
      gzdopen() associates a gzFile with the file descriptor fd.  File
    descriptors are obtained from calls like open, dup, creat, or pipe.
    The mode parameter is as in fopen ("rb" or "wb").
-     gzdopen return NULL if there was insufficient memory to allocate
+     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
@@ -525,30 +541,31 @@ 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, 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
-   error number (see function gzerror below).
+   error number (see function gzerror below). gzflush returns Z_OK if
+   the flush parameter is Z_FINISH and all output could be flushed.
      gzflush should be called only when strictly necessary because it can
    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
@@ -565,12 +582,13 @@ 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, 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
    the required initial value for the checksum.
-   An Adler-32 cheksum is almost as reliable as a CRC32 but can be computed
+   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
    much faster. Usage example:
 
      uLong adler = adler32(0L, Z_NULL, 0);
@@ -581,11 +599,11 @@ 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, 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
-   for the crc (0). Pre- and post-conditioning (one's complement) is performed
+   for the crc. Pre- and post-conditioning (one's complement) is performed
    within this function so it shouldn't be done by the application.
    Usage example:
 

zutil.c

@@ -3,12 +3,18 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: zutil.c,v 1.3 1995/04/10 09:52:26 jloup Exp $ */
+/* $Id: zutil.c,v 1.8 1995/05/03 17:27:12 jloup Exp $ */
 
 #include <stdio.h>
 
 #include "zutil.h"
 
+struct internal_state      {int dummy;}; /* for buggy compilers */
+
+#ifndef __GO32__
+extern void exit OF((int));
+#endif
+
 char *zlib_version = ZLIB_VERSION;
 
 char *z_errmsg[] = {
@@ -32,8 +38,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;
@@ -43,7 +49,7 @@ void zmemcpy(dest, source, len)
 }
 
 void zmemzero(dest, len)
-    Byte* dest;
+    Bytef* dest;
     uInt  len;
 {
     if (len == 0) return;
@@ -53,8 +59,11 @@ void zmemzero(dest, len)
 }
 #endif
 
-#if defined(MSDOS) && !defined(USE_CALLOC)
+#if defined( __TURBOC__) && !defined(__SMALL__) && !defined(__MEDIUM__)
-#  ifdef __TURBOC__
+/* Small and medium model 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
  * and farmalloc(64K) returns a pointer with an offset of 8, so we
@@ -68,8 +77,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];
@@ -80,9 +89,9 @@ 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;
+    voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
 
     if (bsize < 65536L) {
@@ -101,7 +110,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 */
@@ -119,46 +128,56 @@ void  zcfree (voidp opaque, voidp ptr)
         next_ptr--;
         return;
     }
+    ptr = opaque; /* just to make some compilers happy */
     z_error("zcfree: ptr not found");
 }
+#endif /* __TURBOC__ */
 
-#  else /* MSC */
+#if defined(M_I86SM)||defined(M_I86MM)||defined(M_I86CM)||defined(M_I86LM)
+/* Microsoft C */
+
+#  define MY_ZCALLOC
 
 #if (!defined(_MSC_VER) || (_MSC_VER < 600))
 #  define _halloc  halloc
 #  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)
 {
-    return _hfree(ptr);
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
 }
 
-#  endif /* __TURBOC__ ? */
+#endif /* MSC */
 
-#else /* !MSDOS */
 
-extern voidp calloc __P((uInt items, uInt size));
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-extern void  free   __P((voidp ptr));
 
-voidp zcalloc (opaque, items, size)
+#ifndef __GO32__
-    voidp opaque;
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf zcalloc (opaque, items, size)
+    voidpf opaque;
     unsigned items;
     unsigned size;
 {
-    return calloc(items, size);
+    return (voidpf)calloc(items, size);
 }
 
 void  zcfree (opaque, ptr)
-    voidp opaque;
+    voidpf opaque;
-    voidp ptr;
+    voidpf ptr;
 {
     free(ptr);
 }
 
-#endif /* MSDOS */
+#endif /* MY_ZCALLOC */

zutil.h

@@ -8,18 +8,22 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: zutil.h,v 1.4 1995/04/14 10:22:17 jloup Exp $ */
+/* $Id: zutil.h,v 1.9 1995/05/03 17:27:12 jloup Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 
 #include "zlib.h"
 
-#ifdef MSDOS
+#if defined(MSDOS) || defined(VMS)
 #   include <stddef.h>
+#   include <errno.h>
 #else
     extern int errno;
 #endif
+#ifdef STDC
+#  include <string.h>
+#endif
 
 #ifndef local
 #  define local static
@@ -27,7 +31,9 @@
 /* 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 */
@@ -39,13 +45,17 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 
 #define DEFLATED   8
 
-#ifndef WBITS
+#ifndef DEF_WBITS
-# define WBITS   15 /* 32K window */
+#  define DEF_WBITS MAX_WBITS
 #endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
 
-#ifndef MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
-# define MEM_LEVEL  8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
 #endif
+/* default memLevel */
 
 #define STORED_BLOCK 0
 #define STATIC_TREES 1
@@ -62,8 +72,7 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #  define OS_CODE  0x00
 #  ifdef __TURBOC__
 #    include <alloc.h>
-#    define exit(n) _exit(n)
+#  else /* MSC or DJGPP */
-#  else /* MSC */
 #    include <malloc.h>
 #  endif
 #endif
@@ -115,21 +124,35 @@ 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(__STDC__) && !defined(HAVE_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
+#  if defined(M_I86SM) || defined(M_I86MM) /* MSC small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
 #    define zmemcpy memcpy
 #    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 */
@@ -154,13 +177,16 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #endif
 
 
-extern void z_error    __P((char *m));
+typedef uLong (*check_func) OF((uLong check, Bytef *buf, uInt len));
 
-voidp zcalloc __P((voidp opaque, unsigned items, unsigned size));
+extern void z_error    OF((char *m));
-void  zcfree  __P((voidp opaque, voidp ptr));
 
-#define ZALLOC(strm, items, size) (*strm->zalloc)(strm->opaque, items, size)
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-#define ZFREE(strm, addr)         (*strm->zfree) (strm->opaque, (voidp)addr)
+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, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
 #endif /* _Z_UTIL_H */