zlib 0.93

ChangeLog

@@ -1,9 +1,53 @@
 		ChangeLog file for zlib
 
-Changes in 0.79 (28 April 95)
+Changes in 0.93 (25 June 95)
-- add fast inflate (inffast.c)
+- 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

Makefile

@@ -1,21 +1,37 @@
+# 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
 
 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 inftest.o
+TEST_OBJS = example.o minigzip.o
 
-all: example minigzip inftest
+all: example minigzip
 
 test: all
 	./example
 	echo hello world | ./minigzip | ./minigzip -d 
 
+install: libgz.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 libgz.a $(prefix)/lib
+	chmod 644 $(prefix)/lib/libgz.a
+
 libgz.a: $(OBJS)
 	ar rc $@ $(OBJS)
 	$(RANLIB) $@
@@ -26,18 +42,15 @@ example: example.o libgz.a
 minigzip: minigzip.o libgz.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 libgz.a foo.gz
 
 zip:
-	zip -ul9 zlib README ChangeLog Makefile *.[ch]
+	zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
 
 tgz:
 	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-		zlib/*.[ch]
+		zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
@@ -51,7 +64,6 @@ 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
-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,101 @@
+# Makefile for zlib
+# Borland C++   ************ UNTESTED ***********
+
+# To use, do "make -fmakefile.bor"
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# 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)
+	$(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,98 @@
+# Makefile for zlib
+# Microsoft C 5.1 or later
+
+# To use, do "make makefile.msc"
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# 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)
+	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.tc

@@ -0,0 +1,100 @@
+# Makefile for zlib
+# TurboC 2.0
+
+# To use, do "make -fmakefile.tc"
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# requirements (default 256K for big objects plus a few K), you can add
+# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------- Turbo C 2.0 -------------
+MODEL=-ml
+CFLAGS=-O2 -Z $(MODEL)
+CC=tcc
+LD=tcc
+LIB=tlib
+LDFLAGS=$(MODEL)
+O=.obj
+
+# variables
+OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+  trees$(O)
+OBJP1 = adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)+\
+  trees$(O)
+OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
+  infutil$(O) inffast$(O)
+OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\
+  infutil$(O)+inffast$(O)
+
+all: test
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
+   infcodes.h infutil.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
+   infcodes.h inffast.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+	$(CC) -c $(CFLAGS) $*.c
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+example.obj: example.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+# we must cut the command line to fit in the MS/DOS 128 byte limit:
+zlib.lib: $(OBJ1) $(OBJ2)
+	$(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,23 +1,37 @@
-zlib 0.79 is a beta version of a general purpose compression library.
+zlib 0.93 is a beta version of a general purpose compression library.
 
 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.
+
 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.)
+To install the zlib library (libgz.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.79 are documented in the file ChangeLog.
+The changes made in version 0.93 are documented in the file ChangeLog.
-The main changes since 0.71 are:
+The main changes since 0.9 are:
-- add fast inflate (inffast.c)
+- temporarily disable inline functions
-- In gzio destroy(), don't reference a freed structure
+- make deflate deterministic
+- don't use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- added support for DJGPP and Pyramid
+- fix an inflate bug for stored blocks.
+- various speedups
 
-On MSDOS, this version works in large and small model with MSC; in
+On MSDOS, this version works in both large and small model. However
-small model only with TurboC (bug being investigated). For both
+small model compression works only for small values of MAX_MEM_LEVEL
-compilers, small model compression works only for small values of
+and MAX_WBITS (see zconf.h). Small model decompression should work up
-MEM_LEVEL and WBITS (see zutil.h), and requires -DUSE_CALLOC.
+to MAX_WBITS=15.  This version of zlib does not support small or
+medium model with far allocation of big objects.
 
 
   Copyright (C) 1995 Jean-loup Gailly and Mark Adler
@@ -39,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,7 +3,7 @@
  * 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"
 
@@ -30,17 +30,17 @@ uLong adler32(adler, buf, len)
     if (buf == Z_NULL) return 1L;
 
     while (len > 0) {
-	k = len < NMAX ? len : NMAX;
+        k = len < NMAX ? len : NMAX;
-	len -= k;
+        len -= k;
-	while (k >= 16) {
+        while (k >= 16) {
-	    DO16(buf);
+            DO16(buf);
-	    k -= 16;
+            k -= 16;
-	}
+        }
-	if (k != 0) do {
+        if (k != 0) do {
-	    DO1(buf);
+            DO1(buf);
-	} while (--k);
+        } while (--k);
-	s1 %= BASE;
+        s1 %= BASE;
-	s2 %= BASE;
+        s2 %= BASE;
     }
     return (s2 << 16) | s1;
 }

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"
 
@@ -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);
+        deflateEnd(&stream);
-	return err;
+        return err == Z_OK ? Z_BUF_ERROR : err;
     }
     *destLen = stream.total_out;
 

crc32.c

@@ -3,51 +3,39 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: crc32.c,v 1.4 1995/04/14 14:55:12 jloup Exp $ */
+/* $Id: crc32.c,v 1.5 1995/05/01 13:55:46 jloup Exp $ */
 
 #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;
+    Byte *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.4 1995/04/14 19:49:46 jloup Exp $ */
+/* $Id: deflate.c,v 1.8 1995/05/03 17:27:08 jloup Exp $ */
 
 #include "deflate.h"
 
@@ -117,15 +117,17 @@ local void fill_window   __P((deflate_state *s));
 local int  deflate_fast  __P((deflate_state *s, int flush));
 local int  deflate_slow  __P((deflate_state *s, int flush));
 local void lm_init       __P((deflate_state *s));
-
+local inline int longest_match __P((deflate_state *s, IPos cur_match));
-local int  longest_match __P((deflate_state *s, IPos cur_match));
+local void putShortMSB   __P((deflate_state *s, uInt b));
+local void flush_pending __P((z_stream *strm));
+local int read_buf       __P((z_stream *strm, char *buf, unsigned size));
 #ifdef ASMV
       void match_init __P((void)); /* asm code initialization */
 #endif
 
 #ifdef DEBUG
 local  void check_match __P((deflate_state *s, IPos start, IPos match,
-			     int length));
+                             int length));
 #endif
 
 
@@ -150,12 +152,20 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
     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((char*)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 */
 }
 
@@ -180,12 +190,12 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
     if (level == Z_DEFAULT_COMPRESSION) level = 6;
 
     if (windowBits < 0) { /* undocumented feature: suppress zlib header */
-	noheader = 1;
+        noheader = 1;
-	windowBits = -windowBits;
+        windowBits = -windowBits;
     }
     if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != DEFLATED ||
-	windowBits < 8 || windowBits > 15 || level < 1 || level > 9) {
+        windowBits < 8 || windowBits > 15 || level < 1 || level > 9) {
-	return Z_STREAM_ERROR;
+        return Z_STREAM_ERROR;
     }
     s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
     if (s == Z_NULL) return Z_MEM_ERROR;
@@ -211,10 +221,10 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
     s->pending_buf = (uch*) 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) {
+        s->pending_buf == Z_NULL) {
-	strm->msg = z_errmsg[1-Z_MEM_ERROR];
+        strm->msg = z_errmsg[1-Z_MEM_ERROR];
-	deflateEnd (strm);
+        deflateEnd (strm);
-	return Z_MEM_ERROR;
+        return Z_MEM_ERROR;
     }
     s->d_buf = (ush*) &(s->pending_buf[s->lit_bufsize]);
     s->l_buf = (uch*) &(s->pending_buf[3*s->lit_bufsize]);
@@ -225,7 +235,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);
 }
@@ -237,7 +247,7 @@ int deflateReset (strm)
     deflate_state *s;
     
     if (strm == Z_NULL || strm->state == Z_NULL ||
-	strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR;
+        strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR;
 
     strm->total_in = strm->total_out = 0;
     strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
@@ -265,8 +275,8 @@ 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));
 }   
 
 /* =========================================================================
@@ -287,7 +297,7 @@ local void flush_pending(strm)
     strm->avail_out  -= len;
     strm->state->pending -= len;
     if (strm->state->pending == 0) {
-	strm->state->pending_out = strm->state->pending_buf;
+        strm->state->pending_out = strm->state->pending_buf;
     }
 }
 
@@ -299,7 +309,7 @@ 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) {
-	ERR_RETURN(strm, Z_STREAM_ERROR);
+        ERR_RETURN(strm, Z_STREAM_ERROR);
     }
     if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
 
@@ -308,55 +318,68 @@ int deflate (strm, flush)
     /* Write the zlib header */
     if (strm->state->status == INIT_STATE) {
 
-	uInt header = (DEFLATED + ((strm->state->w_bits-8)<<4)) << 8;
+        uInt header = (DEFLATED + ((strm->state->w_bits-8)<<4)) << 8;
         uInt level_flags = (strm->state->level-1) >> 1;
 
-	if (level_flags > 3) level_flags = 3;
+        if (level_flags > 3) level_flags = 3;
-	header |= (level_flags << 6);
+        header |= (level_flags << 6);
-	header += 31 - (header % 31);
+        header += 31 - (header % 31);
 
-	strm->state->status = BUSY_STATE;
+        strm->state->status = BUSY_STATE;
-	putShortMSB(strm->state, header);
+        putShortMSB(strm->state, header);
     }
 
     /* Flush as much pending output as possible */
     if (strm->state->pending != 0) {
-	flush_pending(strm);
+        flush_pending(strm);
-	if (strm->avail_out == 0) return Z_OK;
+        if (strm->avail_out == 0) return Z_OK;
     }
 
     /* User must not provide more input after the first FINISH: */
     if (strm->state->status == FINISH_STATE && strm->avail_in != 0) {
-	ERR_RETURN(strm, Z_BUF_ERROR);
+        ERR_RETURN(strm, Z_BUF_ERROR);
     }
 
     /* Start a new block or continue the current one.
      */
     if (strm->avail_in != 0 ||
-	(flush == Z_FINISH && strm->state->status != FINISH_STATE)) {
+        (flush == Z_FINISH && strm->state->status != FINISH_STATE)) {
-	
+        int quit;
-	if (flush == Z_FINISH) {
+        
-	    strm->state->status = FINISH_STATE;
+        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 {
+        } else {
-	    if (deflate_slow(strm->state, flush)) return Z_OK;
+            quit = deflate_slow(strm->state, flush);
-	}
+        }
+        if (flush == Z_FULL_FLUSH || flush == Z_SYNC_FLUSH) {
+            ct_stored_block(strm->state, (char*)0, 0L, 0); /* special marker */
+            flush_pending(strm);
+	    if (flush == Z_FULL_FLUSH) {
+		CLEAR_HASH(strm->state);             /* forget history */
+	    }
+        } else if (flush == Z_PARTIAL_FLUSH) {
+            ct_align(strm->state);
+            flush_pending(strm);
+        }
+        if (quit || 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! */
-    return Z_OK;
+    return strm->state->pending != 0 ? Z_OK : Z_STREAM_END;
 }
 
 /* ========================================================================= */
@@ -382,13 +405,13 @@ int deflateCopy (dest, source)
     z_stream *source;
 {
     if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-	return Z_STREAM_ERROR;
+        return Z_STREAM_ERROR;
     }
     *dest = *source;
     return Z_STREAM_ERROR; /* to be implemented */
 #if 0
     dest->state = (struct internal_state *)
-	(*dest->zalloc)(1, sizeof(deflate_state));
+        (*dest->zalloc)(1, sizeof(deflate_state));
     if (dest->state == Z_NULL) return Z_MEM_ERROR;
 
     *(dest->state) = *(source->state);
@@ -413,7 +436,7 @@ local int read_buf(strm, buf, size)
     strm->avail_in  -= len;
 
     if (!strm->state->noheader) {
-	strm->state->adler = adler32(strm->state->adler, strm->next_in, len);
+        strm->state->adler = adler32(strm->state->adler, strm->next_in, len);
     }
     zmemcpy(buf, strm->next_in, len);
     strm->next_in  += len;
@@ -428,16 +451,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:
      */
@@ -451,15 +467,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.
-     */
 }
 
 /* ===========================================================================
@@ -474,7 +485,7 @@ local void lm_init (s)
 /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
  * match.S. The code will be functionally equivalent.
  */
-local int longest_match(s, cur_match)
+local inline int longest_match(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
 {
@@ -484,10 +495,12 @@ local int longest_match(s, cur_match)
     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) ?
-	s->strstart - (IPos)MAX_DIST(s) : NIL;
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
     /* Stop when cur_match becomes <= limit. To simplify the code,
      * we prevent matches with the string of window index 0.
      */
+    Pos *prev = s->prev;
+    uInt wmask = s->w_mask;
 
 #ifdef UNALIGNED_OK
     /* Compare two bytes at a time. Note: this is not always beneficial.
@@ -595,7 +608,7 @@ local int longest_match(s, cur_match)
             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;
@@ -620,8 +633,8 @@ local void check_match(s, start, match, length)
         z_error("invalid match");
     }
     if (verbose > 1) {
-	fprintf(stderr,"\\[%d,%d]", start-match, length);
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
-	do { putc(s->window[start++], stderr); } while (--length != 0);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
     }
 }
 #else
@@ -642,14 +655,16 @@ local void fill_window(s)
     deflate_state *s;
 {
     register unsigned n, m;
+    register Pos *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);
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
-	/* Deal with !@#$% 64K limit: */
+        /* Deal with !@#$% 64K limit: */
-	if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+        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)
@@ -659,30 +674,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((char*)s->window, (char*)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-1];
-                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-1];
+            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;
 
@@ -700,8 +724,18 @@ local void fill_window(s)
         Assert(more >= 2, "more < 2");
 
         n = read_buf(s->strm, (char*)s->window + s->strstart + s->lookahead,
-		     more);
+                     more);
-	s->lookahead += n;
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->strstart == 0 && s->lookahead >= MIN_MATCH-1) {
+            for (n=0; n<MIN_MATCH-1; n++) {
+                UPDATE_HASH(s, s->ins_h, s->window[n]);
+            }
+        }
+        /* 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);
 }
@@ -712,7 +746,7 @@ 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] : \
+               (char*)&s->window[(unsigned)s->block_start] : \
                (char*)Z_NULL), (long)s->strstart - s->block_start, (eof)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
@@ -747,11 +781,11 @@ local int deflate_fast(s, flush)
          * string following the next match.
          */
         if (s->lookahead < MIN_LOOKAHEAD) {
-	    fill_window(s);
+            fill_window(s);
-	    if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) return 1;
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) return 1;
 
-	    if (s->lookahead == 0) break; /* flush the current block */
+            if (s->lookahead == 0) break; /* flush the current block */
-	}
+        }
 
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
@@ -766,9 +800,9 @@ local int deflate_fast(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-	    if (s->strategy != Z_HUFFMAN_ONLY) {
+            if (s->strategy != Z_HUFFMAN_ONLY) {
-		s->match_length = longest_match (s, hash_head);
+                s->match_length = longest_match (s, hash_head);
-	    }
+            }
             /* longest_match() sets match_start */
 
             if (s->match_length > s->lookahead) s->match_length = s->lookahead;
@@ -777,7 +811,7 @@ local int deflate_fast(s, flush)
             check_match(s, s->strstart, s->match_start, s->match_length);
 
             bflush = ct_tally(s, s->strstart - s->match_start,
-		 	      s->match_length - MIN_MATCH);
+                              s->match_length - MIN_MATCH);
 
             s->lookahead -= s->match_length;
 
@@ -838,11 +872,11 @@ local int deflate_slow(s, flush)
          * string following the next match.
          */
         if (s->lookahead < MIN_LOOKAHEAD) {
-	    fill_window(s);
+            fill_window(s);
-	    if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) return 1;
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) return 1;
 
-	    if (s->lookahead == 0) break; /* flush the current block */
+            if (s->lookahead == 0) break; /* flush the current block */
-	}
+        }
 
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
@@ -860,15 +894,15 @@ local int deflate_slow(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-	    if (s->strategy != Z_HUFFMAN_ONLY) {
+            if (s->strategy != Z_HUFFMAN_ONLY) {
-		s->match_length = longest_match (s, hash_head);
+                s->match_length = longest_match (s, hash_head);
-	    }
+            }
             /* longest_match() sets match_start */
             if (s->match_length > s->lookahead) s->match_length = s->lookahead;
 
             if (s->match_length <= 5 && (s->strategy == Z_FILTERED ||
-	         (s->match_length == MIN_MATCH &&
+                 (s->match_length == MIN_MATCH &&
-		  s->strstart - s->match_start > TOO_FAR))) {
+                  s->strstart - s->match_start > TOO_FAR))) {
 
                 /* If prev_match is also MIN_MATCH, match_start is garbage
                  * but we will ignore the current match anyway.
@@ -884,7 +918,7 @@ local int deflate_slow(s, flush)
             check_match(s, s->strstart-1, s->prev_match, s->prev_length);
 
             bflush = ct_tally(s, s->strstart -1 - s->prev_match,
-			      s->prev_length - MIN_MATCH);
+                              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.
@@ -913,11 +947,11 @@ local int deflate_slow(s, flush)
              */
             Tracevv((stderr,"%c", s->window[s->strstart-1]));
             if (ct_tally (s, 0, s->window[s->strstart-1])) {
-	        FLUSH_BLOCK_ONLY(s, 0);
+                FLUSH_BLOCK_ONLY(s, 0);
             }
             s->strstart++;
             s->lookahead--;
-	    if (s->strm->avail_out == 0) return 1;
+            if (s->strm->avail_out == 0) return 1;
         } else {
             /* There is no previous match to compare with, wait for
              * the next step to decide.
@@ -927,8 +961,10 @@ local int deflate_slow(s, flush)
             s->lookahead--;
         }
     }
-    if (s->match_available) ct_tally (s, 0, s->window[s->strstart-1]);
+    if (s->match_available) {
-
+        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"
 
@@ -90,7 +90,7 @@ typedef struct internal_state {
     Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
     Byte  method;        /* STORED (for zip only) or DEFLATED */
 
-    		/* used by deflate.c: */
+                /* used by deflate.c: */
 
     uInt  w_size;        /* LZ77 window size (32K by default) */
     uInt  w_bits;        /* log2(w_size)  (8..16) */
@@ -173,7 +173,7 @@ typedef struct internal_state {
 
      int nice_match; /* Stop searching when current match exceeds this */
 
-    		/* used by trees.c: */
+                /* used by trees.c: */
 
     ct_data dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     ct_data dyn_dtree[2*D_CODES+1]; /* distance tree */
@@ -264,7 +264,10 @@ typedef struct internal_state {
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
-	/* in trees.c */
+        /* in trees.c */
 void ct_init       __P((deflate_state *s));
 int  ct_tally      __P((deflate_state *s, int dist, int lc));
 ulg ct_flush_block __P((deflate_state *s, char *buf, ulg stored_len, int eof));
+void ct_align      __P((deflate_state *s));
+void ct_stored_block __P((deflate_state *s, char *buf, ulg stored_len,
+                          int eof));

example.c

@@ -3,11 +3,19 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: example.c,v 1.5 1995/04/14 20:35:56 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  __P((int));
+#endif
+
 #define BUFLEN 4096
 
 #define local static
@@ -19,12 +27,18 @@
 #define CHECK_ERR(err, msg) { \
     if (err != Z_OK) { \
         fprintf(stderr, "%s error: %d\n", msg, err); \
-	exit(1); \
+        exit(1); \
     } \
 }
 
 char *hello = "hello world";
 
+void test_compress __P((void));
+void test_gzio     __P((char *out, char *in));
+void test_deflate  __P((Byte compr[]));
+void test_inflate  __P((Byte compr[]));
+void main          __P((int argc, char *argv[]));
+
 /* ===========================================================================
  * Test compress() and uncompress()
  */
@@ -37,18 +51,18 @@ 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");
+        fprintf(stderr, "bad uncompress\n");
     } else {
-	printf("uncompress(): %s\n", uncompr);
+        printf("uncompress(): %s\n", uncompr);
     }
 }
 
@@ -67,38 +81,38 @@ void test_gzio(out, in)
 
     file = gzopen(out, "wb");
     if (file == NULL) {
-	fprintf(stderr, "gzopen error\n");
+        fprintf(stderr, "gzopen error\n");
-	exit(1);
+        exit(1);
     }
 
     if (gzwrite(file, hello, len) != len) {
-	fprintf(stderr, "gzwrite err: %s\n", gzerror(file, &err));
+        fprintf(stderr, "gzwrite err: %s\n", gzerror(file, &err));
     }
     gzclose(file);
 
     file = gzopen(in, "rb");
     if (file == NULL) {
-	fprintf(stderr, "gzopen error\n");
+        fprintf(stderr, "gzopen error\n");
     }
-    strcpy(uncompr, "garbage");
+    strcpy((char*)uncompr, "garbage");
 
     uncomprLen = gzread(file, uncompr, uncomprLen);
     if (uncomprLen != len) {
-	fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
+        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
     }
     gzclose(file);
 
-    if (strcmp(uncompr, hello)) {
+    if (strcmp((char*)uncompr, hello)) {
-	fprintf(stderr, "bad gzread\n");
+        fprintf(stderr, "bad gzread\n");
     } else {
-	printf("gzread(): %s\n", uncompr);
+        printf("gzread(): %s\n", uncompr);
     }
 }
 
 /* ===========================================================================
- * 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 */
@@ -115,21 +129,20 @@ uLong test_deflate(compr)
     c_stream.next_out = compr;
 
     while (c_stream.total_in != (uLong)len) {
-	c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
+        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-	err = deflate(&c_stream, Z_NO_FLUSH);
+        err = deflate(&c_stream, Z_NO_FLUSH);
-	CHECK_ERR(err, "deflate");
+        CHECK_ERR(err, "deflate");
     }
     /* Finish the stream, still forcing small buffers: */
-    do {
+    for (;;) {
-	c_stream.avail_out = 1;
+        c_stream.avail_out = 1;
-	err = deflate(&c_stream, Z_FINISH);
+        err = deflate(&c_stream, Z_FINISH);
-	CHECK_ERR(err, "deflate");
+        if (err == Z_STREAM_END) break;
-    } while (c_stream.avail_out == 0);
+        CHECK_ERR(err, "deflate");
+    }
 
     err = deflateEnd(&c_stream);
     CHECK_ERR(err, "deflateEnd");
-
-    return c_stream.total_out;
 }
 
 /* ===========================================================================
@@ -142,7 +155,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;
@@ -154,22 +167,97 @@ void test_inflate(compr)
     d_stream.next_out = uncompr;
 
     for (;;) {
-	d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
+        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-	err = inflate(&d_stream, Z_NO_FLUSH);
+        err = inflate(&d_stream, Z_NO_FLUSH);
-	if (err == Z_STREAM_END) break;
+        if (err == Z_STREAM_END) break;
-	CHECK_ERR(err, "inflate");
+        CHECK_ERR(err, "inflate");
     }
 
     err = inflateEnd(&d_stream);
     CHECK_ERR(err, "inflateEnd");
 
-    if (strcmp(uncompr, hello)) {
+    if (strcmp((char*)uncompr, hello)) {
-	fprintf(stderr, "bad inflate\n");
+        fprintf(stderr, "bad inflate\n");
     } else {
-	printf("inflate(): %s\n", uncompr);
+        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]]
  */
@@ -179,23 +267,24 @@ void main(argc, argv)
     char *argv[];
 {
     local Byte compr[BUFLEN];
-    uLong comprLen;
 
     if (zlib_version[0] != ZLIB_VERSION[0]) {
-	fprintf(stderr, "incompatible zlib version\n");
+        fprintf(stderr, "incompatible zlib version\n");
-	exit(1);
+        exit(1);
 
     } else if (strcmp(zlib_version, ZLIB_VERSION) != 0) {
-	fprintf(stderr, "warning: different zlib version\n");
+        fprintf(stderr, "warning: different zlib version\n");
     }
     test_compress();
 
     test_gzio((argc > 1 ? argv[1] : "foo.gz"),
-	      (argc > 2 ? argv[2] : "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);
 }

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>
 
@@ -46,7 +46,12 @@ typedef struct gz_stream {
 } gz_stream;
 
 
-/* ===========================================================================
+local int    destroy __P((gz_stream *s));
+local gzFile gz_open __P((char *path, char *mode, int  fd));
+local void   putLong __P((FILE *file, uLong x));
+local uLong  getLong __P((Byte *buf));
+
+ /* ===========================================================================
  * Cleanup then free the given gz_stream. Return a zlib error code.
  */
 local int destroy (s)
@@ -63,13 +68,13 @@ local int destroy (s)
 
     if (s->stream.state != NULL) {
        if (s->mode == 'w') {
-	   err = deflateEnd(&(s->stream));
+           err = deflateEnd(&(s->stream));
        } else if (s->mode == 'r') {
-	   err = inflateEnd(&(s->stream));
+           err = inflateEnd(&(s->stream));
        }
     }
     if (s->file != NULL && fclose(s->file)) {
-	err = Z_ERRNO;
+        err = Z_ERRNO;
     }
     if (s->z_err < 0) err = s->z_err;
     zcfree((voidp)0, s);
@@ -110,34 +115,34 @@ local gzFile gz_open (path, mode, fd)
 
     s->path = (char*)ALLOC(strlen(path)+1);
     if (s->path == NULL) {
-	return destroy(s), (gzFile)Z_NULL;
+        return destroy(s), (gzFile)Z_NULL;
     }
     strcpy(s->path, path); /* do this early for debugging */
 
     s->mode = '\0';
     do {
-	if (*p == 'r') s->mode = 'r';
+        if (*p == 'r') s->mode = 'r';
-	if (*p == 'w') s->mode = 'w';
+        if (*p == 'w') s->mode = 'w';
     } 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), Z_DEFAULT_COMPRESSION,
-			   DEFLATED, -WBITS, MEM_LEVEL, 0);
+                           DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
-	/* windowBits is passed < 0 to suppress zlib header */
+        /* windowBits is passed < 0 to suppress zlib header */
 
-	s->stream.next_out = s->outbuf = ALLOC(Z_BUFSIZE);
+        s->stream.next_out = s->outbuf = ALLOC(Z_BUFSIZE);
 
-	if (err != Z_OK || s->outbuf == Z_NULL) {
+        if (err != Z_OK || s->outbuf == Z_NULL) {
-	    return destroy(s), (gzFile)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 = ALLOC(Z_BUFSIZE);
 
-	if (err != Z_OK || s->inbuf == Z_NULL) {
+        if (err != Z_OK || s->inbuf == Z_NULL) {
-	    return destroy(s), (gzFile)Z_NULL;
+            return destroy(s), (gzFile)Z_NULL;
-	}
+        }
     }
     s->stream.avail_out = Z_BUFSIZE;
 
@@ -145,55 +150,55 @@ local gzFile gz_open (path, mode, fd)
     s->file = fd < 0 ? FOPEN(path, mode) : fdopen(fd, mode);
 
     if (s->file == NULL) {
-	return destroy(s), (gzFile)Z_NULL;
+        return destroy(s), (gzFile)Z_NULL;
     }
     if (s->mode == 'w') {
-	/* Write a very simple .gz header:
+        /* Write a very simple .gz header:
-	 */
-	fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", GZ_MAGIC_1, GZ_MAGIC_2,
-	       DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-    } else {
-	/* Check and skip the header:
          */
-	Byte c1 = 0, c2 = 0;
+        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", GZ_MAGIC_1, GZ_MAGIC_2,
-	Byte method = 0;
+               DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-	Byte flags = 0;
+    } else {
-	Byte xflags = 0;
+        /* Check and skip the header:
-	Byte time[4];
+         */
-	Byte osCode;
+        Byte c1 = 0, c2 = 0;
-	int c;
+        Byte method = 0;
+        Byte flags = 0;
+        Byte xflags = 0;
+        Byte time[4];
+        Byte osCode;
+        int c;
 
-	s->stream.avail_in = fread(s->inbuf, 1, 2, s->file);
+        s->stream.avail_in = fread(s->inbuf, 1, 2, s->file);
-	if (s->stream.avail_in != 2 || s->inbuf[0] != GZ_MAGIC_1
+        if (s->stream.avail_in != 2 || s->inbuf[0] != GZ_MAGIC_1
-	    || s->inbuf[1] != GZ_MAGIC_2) {
+            || s->inbuf[1] != GZ_MAGIC_2) {
-	    s->transparent = 1;
+            s->transparent = 1;
-	    return (gzFile)s;
+            return (gzFile)s;
-	}
+        }
-	s->stream.avail_in = 0;
+        s->stream.avail_in = 0;
-	fscanf(s->file,"%c%c%4c%c%c", &method, &flags, time, &xflags, &osCode);
+        fscanf(s->file,"%c%c%4c%c%c", &method, &flags, time, &xflags, &osCode);
 
-	if (method != DEFLATED || feof(s->file) || (flags & RESERVED) != 0) {
+        if (method != DEFLATED || feof(s->file) || (flags & RESERVED) != 0) {
-	    s->z_err = Z_DATA_ERROR;
+            s->z_err = Z_DATA_ERROR;
-	    return (gzFile)s;
+            return (gzFile)s;
-	}
+        }
-	if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
+        if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-	    long len;
+            long len;
-	    fscanf(s->file, "%c%c", &c1, &c2);
+            fscanf(s->file, "%c%c", &c1, &c2);
-	    len = c1 + ((long)c2<<8);
+            len = c1 + ((long)c2<<8);
-	    fseek(s->file, len, SEEK_CUR);
+            fseek(s->file, len, SEEK_CUR);
-	}
+        }
-	if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
+        if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-	    while ((c = getc(s->file)) != 0 && c != EOF) ;
+            while ((c = getc(s->file)) != 0 && c != EOF) ;
-	}
+        }
-	if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
+        if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-	    while ((c = getc(s->file)) != 0 && c != EOF) ;
+            while ((c = getc(s->file)) != 0 && c != EOF) ;
-	}
+        }
-	if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
+        if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-	    fscanf(s->file, "%c%c", &c1, &c2);
+            fscanf(s->file, "%c%c", &c1, &c2);
-	}
+        }
-	if (feof(s->file)) {
+        if (feof(s->file)) {
-	    s->z_err = Z_DATA_ERROR;
+            s->z_err = Z_DATA_ERROR;
-	}
+        }
     }
     return (gzFile)s;
 }
@@ -216,7 +221,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);
 }
@@ -235,16 +240,16 @@ int gzread (file, buf, len)
     if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
 
     if (s->transparent) {
-	unsigned n = 0;
+        unsigned n = 0;
-	Byte *b = (Byte*)buf;
+        Byte *b = (Byte*)buf;
-	/* Copy the first two (non-magic) bytes if not done already */
+        /* Copy the first two (non-magic) bytes if not done already */
-	while (s->stream.avail_in > 0 && len > 0) {
+        while (s->stream.avail_in > 0 && len > 0) {
-	    *b++ = *s->stream.next_in++;
+            *b++ = *s->stream.next_in++;
-	    s->stream.avail_in--;
+            s->stream.avail_in--;
-	    len--; n++;
+            len--; n++;
-	}
+        }
-	if (len == 0) return 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 */
@@ -254,24 +259,24 @@ int gzread (file, buf, len)
 
     while (s->stream.avail_out != 0) {
 
-	if (s->stream.avail_in == 0 && !s->z_eof) {
+        if (s->stream.avail_in == 0 && !s->z_eof) {
 
-	    errno = 0;
+            errno = 0;
-	    s->stream.avail_in =
+            s->stream.avail_in =
-		fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+                fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-	    if (s->stream.avail_in == 0) {
+            if (s->stream.avail_in == 0) {
-		s->z_eof = 1;
+                s->z_eof = 1;
-	    } else if (s->stream.avail_in == (uInt)EOF) {
+            } else if (s->stream.avail_in == (uInt)EOF) {
-		s->stream.avail_in = 0;
+                s->stream.avail_in = 0;
-		s->z_eof = 1;
+                s->z_eof = 1;
-		s->z_err = Z_ERRNO;
+                s->z_err = Z_ERRNO;
-		break;
+                break;
-	    }
+            }
-	    s->stream.next_in = s->inbuf;
+            s->stream.next_in = s->inbuf;
-	}
+        }
-	s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
+        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
 
-	if (s->z_err == Z_STREAM_END ||
+        if (s->z_err == Z_STREAM_END ||
             s->z_err != Z_OK  || s->z_eof) break;
     }
     len -= s->stream.avail_out;
@@ -297,18 +302,18 @@ int gzwrite (file, buf, len)
 
     while (s->stream.avail_in != 0) {
 
-	if (s->stream.avail_out == 0) {
+        if (s->stream.avail_out == 0) {
 
-	    s->stream.next_out = s->outbuf;
+            s->stream.next_out = s->outbuf;
-	    if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-		s->z_err = Z_ERRNO;
+                s->z_err = Z_ERRNO;
-		break;
+                break;
-	    }
+            }
-	    s->stream.avail_out = Z_BUFSIZE;
+            s->stream.avail_out = Z_BUFSIZE;
-	}
+        }
-	s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
+        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
 
-	if (s->z_err != Z_OK) break;
+        if (s->z_err != Z_OK) break;
     }
     s->crc = crc32(s->crc, buf, len);
 
@@ -334,27 +339,27 @@ int gzflush (file, flush)
     s->stream.avail_in = 0; /* should be zero already anyway */
 
     for (;;) {
-	len = Z_BUFSIZE - s->stream.avail_out;
+        len = Z_BUFSIZE - s->stream.avail_out;
 
-	if (len != 0) {
+        if (len != 0) {
-	    if (fwrite(s->outbuf, 1, len, s->file) != len) {
+            if (fwrite(s->outbuf, 1, len, s->file) != len) {
-		s->z_err = Z_ERRNO;
+                s->z_err = Z_ERRNO;
-		break;
+                return Z_ERRNO;
-	    }
+            }
-	    s->stream.next_out = s->outbuf;
+            s->stream.next_out = s->outbuf;
-	    s->stream.avail_out = Z_BUFSIZE;
+            s->stream.avail_out = Z_BUFSIZE;
-	}
+        }
-	if (done) break;
+        if (done) break;
-	s->z_err = deflate(&(s->stream), flush);
+        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
-
-	/* 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;
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 
 /* ===========================================================================
@@ -366,8 +371,8 @@ local void putLong (file, x)
 {
     int n;
     for (n = 0; n < 4; n++) {
-	fputc((int)(x & 0xff), file);
+        fputc((int)(x & 0xff), file);
-	x >>= 8;
+        x >>= 8;
     }
 }
 
@@ -381,8 +386,8 @@ local uLong getLong (buf)
     Byte *p = buf+4;
 
     do {
-	x <<= 8;
+        x <<= 8;
-	x |= *--p; 
+        x |= *--p; 
     } while (p != buf);
     return x;
 }
@@ -395,34 +400,37 @@ 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);
-	putLong (s->file, s->crc);
+        if (err != Z_OK) return destroy(file);
-	putLong (s->file, s->stream.total_in);
+
+        putLong (s->file, s->crc);
+        putLong (s->file, s->stream.total_in);
 
     } else if (s->mode == 'r' && s->z_err == Z_STREAM_END) {
 
-	/* slide CRC and original size if they are at the end of inbuf */
+        /* slide CRC and original size if they are at the end of inbuf */
-	if ((n = s->stream.avail_in) < 8  && !s->z_eof) {
+        if ((n = s->stream.avail_in) < 8  && !s->z_eof) {
-	    Byte *p = s->inbuf;
+            Byte *p = s->inbuf;
-	    Byte *q = s->stream.next_in;
+            Byte *q = s->stream.next_in;
-	    while (n--) { *p++ = *q++; };
+            while (n--) { *p++ = *q++; };
 
-	    n = s->stream.avail_in;
+            n = s->stream.avail_in;
-	    n += fread(p, 1, 8, s->file);
+            n += fread(p, 1, 8, s->file);
-	    s->stream.next_in = s->inbuf;
+            s->stream.next_in = s->inbuf;
-	}
+        }
-	/* check CRC and original size */
+        /* check CRC and original size */
-	if (n < 8 ||
+        if (n < 8 ||
-	    getLong(s->stream.next_in) != s->crc ||
+            getLong(s->stream.next_in) != s->crc ||
-	    getLong(s->stream.next_in + 4) != s->stream.total_out) {
+            getLong(s->stream.next_in + 4) != s->stream.total_out) {
 
-	    s->z_err = Z_DATA_ERROR;
+            s->z_err = Z_DATA_ERROR;
-	}
+        }
     }
     return destroy(file);
 }
@@ -442,8 +450,8 @@ char*  gzerror (file, errnum)
     gz_stream *s = (gz_stream*)file;
 
     if (s == NULL) {
-	*errnum = Z_STREAM_ERROR;
+        *errnum = Z_STREAM_ERROR;
-	return z_errmsg[1-Z_STREAM_ERROR];
+        return z_errmsg[1-Z_STREAM_ERROR];
     }
     *errnum = s->z_err;
     if (*errnum == Z_OK) return "";

infblock.c

@@ -12,7 +12,7 @@
 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 
 /* Table for deflate from PKZIP's appnote.txt. */
-local uInt border[] = {	/* Order of the bit length code lengths */
+local uInt border[] = { /* Order of the bit length code lengths */
         16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
 /*
@@ -60,6 +60,32 @@ local uInt border[] = {	/* Order of the bit length code lengths */
       the two sets of lengths.
  */
 
+
+void inflate_blocks_reset(s, z, c)
+struct inflate_blocks_state *s;
+z_stream *z;
+uLong *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"));
+}
+
+
 struct inflate_blocks_state *inflate_blocks_new(z, c, w)
 z_stream *z;
 check_func c;
@@ -75,13 +101,11 @@ uInt w;
     ZFREE(z, s);
     return Z_NULL;
   }
-  s->mode = TYPE;
-  s->bitk = 0;
-  s->read = s->write = s->window;
   s->end = s->window + w;
   s->checkfn = c;
-  if (s->checkfn != Z_NULL)
+  s->mode = TYPE;
-    s->check = (*s->checkfn)(0L, Z_NULL, 0);
+  Trace((stderr, "inflate:   blocks allocated\n"));
+  inflate_blocks_reset(s, z, &s->check);
   return s;
 }
 
@@ -91,13 +115,13 @@ struct inflate_blocks_state *s;
 z_stream *z;
 int r;
 {
-  uInt t;		/* temporary storage */
+  uInt t;               /* temporary storage */
-  uLong b;		/* bit buffer */
+  uLong b;              /* bit buffer */
-  uInt k;		/* bits in bit buffer */
+  uInt k;               /* bits in bit buffer */
-  Byte *p;		/* input data pointer */
+  Byte *p;              /* input data pointer */
-  uInt n;		/* bytes available there */
+  uInt n;               /* bytes available there */
-  Byte *q;		/* output window write pointer */
+  Byte *q;              /* output window write pointer */
-  uInt m;		/* bytes to end of window or read pointer */
+  uInt m;               /* bytes to end of window or read pointer */
 
   /* copy input/output information to locals (UPDATE macro restores) */
   LOAD
@@ -111,59 +135,77 @@ int r;
       s->last = t & 1;
       switch (t >> 1)
       {
-        case 0:				/* stored */
+        case 0:                         /* stored */
-	  DUMPBITS(3)
+          Trace((stderr, "inflate:     stored block%s\n",
-	  t = k & 7;			/* go to byte boundary */
+                 s->last ? " (last)" : ""));
-	  DUMPBITS(t)
+          DUMPBITS(3)
-	  s->mode = LENS;		/* get length of stored block */
+          t = k & 7;                    /* go to byte boundary */
-	  break;
+          DUMPBITS(t)
-	case 1:				/* fixed */
+          s->mode = LENS;               /* get length of stored block */
-	  {
+          break;
-	    uInt bl, bd;
+        case 1:                         /* fixed */
-	    inflate_huft *tl, *td;
+          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);
+            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;
+              r = Z_MEM_ERROR;
-	      LEAVE
+              LEAVE
-	    }
+            }
-	  }
+            s->sub.decode.tl = Z_NULL;  /* don't try to free these */
-	  DUMPBITS(3)
+            s->sub.decode.td = Z_NULL;
-	  s->mode = CODES;
+          }
-	  break;
+          DUMPBITS(3)
-	case 2:				/* dynamic */
+          s->mode = CODES;
-	  DUMPBITS(3)
+          break;
-	  s->mode = TABLE;
+        case 2:                         /* dynamic */
-	  break;
+          Trace((stderr, "inflate:     dynamic codes block%s\n",
-	case 3:				/* illegal */
+                 s->last ? " (last)" : ""));
-	  DUMPBITS(3)
+          DUMPBITS(3)
-	  s->mode = ERROR;
+          s->mode = TABLE;
-	  z->msg = "invalid block type";
+          break;
-	  r = Z_DATA_ERROR;
+        case 3:                         /* illegal */
-	  LEAVE
+          DUMPBITS(3)
+          s->mode = BAD;
+          z->msg = "invalid block type";
+          r = Z_DATA_ERROR;
+          LEAVE
       }
       break;
     case LENS:
       NEEDBITS(32)
       if ((~b) >> 16 != (b & 0xffff))
       {
-        s->mode = ERROR;
+        s->mode = BAD;
-	z->msg = "invalid stored block lengths";
+        z->msg = "invalid stored block lengths";
-	r = Z_DATA_ERROR;
+        r = Z_DATA_ERROR;
-	LEAVE
+        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
+      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:
@@ -172,10 +214,10 @@ 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;
+        r = Z_DATA_ERROR;
-	LEAVE
+        LEAVE
       }
 #endif
       t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
@@ -184,113 +226,134 @@ int r;
       if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
       {
         r = Z_MEM_ERROR;
-	LEAVE
+        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))
       {
         NEEDBITS(3)
-	s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
+        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
-	DUMPBITS(3)
+        DUMPBITS(3)
       }
       while (s->sub.trees.index < 19)
         s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
       s->sub.trees.bb = 7;
       t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-			     &s->sub.trees.tb, z);
+                             &s->sub.trees.tb, z);
       if (t != Z_OK)
       {
         r = t;
-	if (r == Z_DATA_ERROR)
+        if (r == Z_DATA_ERROR)
-	  s->mode = ERROR;
+          s->mode = BAD;
-	LEAVE
+        LEAVE
       }
       s->sub.trees.index = 0;
+      Tracev((stderr, "inflate:       bits tree ok\n"));
       s->mode = DTREE;
     case DTREE:
       while (t = s->sub.trees.table,
-      	     s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
+             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
       {
         inflate_huft *h;
-	uInt i, j, c;
+        uInt i, j, c;
 
         t = s->sub.trees.bb;
         NEEDBITS(t)
-	h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
+        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
-	t = h->word.what.Bits;
+        t = h->word.what.Bits;
-	c = h->more.Base;
+        c = h->more.Base;
-	if (c < 16)
+        if (c < 16)
-	{
+        {
-	  DUMPBITS(t)
+          DUMPBITS(t)
-	  s->sub.trees.blens[s->sub.trees.index++] = c;
+          s->sub.trees.blens[s->sub.trees.index++] = c;
-	}
+        }
-	else /* c == 16..18 */
+        else /* c == 16..18 */
-	{
+        {
-	  i = c == 18 ? 7 : c - 14;
+          i = c == 18 ? 7 : c - 14;
-	  j = c == 18 ? 11 : 3;
+          j = c == 18 ? 11 : 3;
-	  NEEDBITS(t + i)
+          NEEDBITS(t + i)
-	  DUMPBITS(t)
+          DUMPBITS(t)
-	  j += (uInt)b & inflate_mask[i];
+          j += (uInt)b & inflate_mask[i];
-	  DUMPBITS(i)
+          DUMPBITS(i)
-	  i = s->sub.trees.index;
+          i = s->sub.trees.index;
-	  t = s->sub.trees.table;
+          t = s->sub.trees.table;
-	  if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
+          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-	      (c == 16 && i < 1))
+              (c == 16 && i < 1))
-	  {
+          {
-	    s->mode = ERROR;
+            s->mode = BAD;
-	    z->msg = "invalid bit length repeat";
+            z->msg = "invalid bit length repeat";
-	    r = Z_DATA_ERROR;
+            r = Z_DATA_ERROR;
-	    LEAVE
+            LEAVE
-	  }
+          }
-	  c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
+          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
-	  do {
+          do {
-	    s->sub.trees.blens[i++] = c;
+            s->sub.trees.blens[i++] = c;
-	  } while (--j);
+          } while (--j);
-	  s->sub.trees.index = i;
+          s->sub.trees.index = i;
-	}
+        }
       }
       inflate_trees_free(s->sub.trees.tb, z);
       s->sub.trees.tb = Z_NULL;
       {
-	uInt bl, bd;
+        uInt bl, bd;
-	inflate_huft *tl, *td;
+        inflate_huft *tl, *td;
-	struct inflate_codes_state *c;
+        struct inflate_codes_state *c;
 
-	bl = 9;
+        bl = 9;
-	bd = 6;
+        bd = 6;
-	t = s->sub.trees.table;
+        t = s->sub.trees.table;
-	t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
+        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-				  s->sub.trees.blens, &bl, &bd, &tl, &td, z);
+                                  s->sub.trees.blens, &bl, &bd, &tl, &td, z);
-	if (t != Z_OK)
+        if (t != Z_OK)
-	{
+        {
-	  if (t == (uInt)Z_DATA_ERROR)
+          if (t == (uInt)Z_DATA_ERROR)
-	    s->mode = ERROR;
+            s->mode = BAD;
-	  r = t;
+          r = t;
-	  LEAVE
+          LEAVE
-	}
+        }
-	if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
+        Tracev((stderr, "inflate:       trees ok\n"));
-	{
+        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
-	  inflate_trees_free(td, z);
+        {
-	  inflate_trees_free(tl, z);
+          inflate_trees_free(td, z);
-	  r = Z_MEM_ERROR;
+          inflate_trees_free(tl, z);
-	  LEAVE
+          r = Z_MEM_ERROR;
-	}
+          LEAVE
-	ZFREE(z, s->sub.trees.blens);
+        }
-	s->sub.codes = c;
+        ZFREE(z, s->sub.trees.blens);
+        s->sub.decode.codes = c;
+        s->sub.decode.tl = tl;
+        s->sub.decode.td = td;
       }
       s->mode = CODES;
     case CODES:
       UPDATE
       if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
-	return inflate_flush(s, z, r);
+        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",
-      break;
+              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)
@@ -299,7 +362,7 @@ int r;
     case DONE:
       r = Z_STREAM_END;
       LEAVE
-    case ERROR:
+    case BAD:
       r = Z_DATA_ERROR;
       LEAVE
     default:
@@ -309,20 +372,14 @@ int r;
 }
 
 
-int inflate_blocks_free(s, z, c, e)
+int inflate_blocks_free(s, z, c)
 struct inflate_blocks_state *s;
 z_stream *z;
 uLong *c;
-int *e;
 {
-  *e = (int)(s->bitk > 7 ? (s->bitb >> (s->bitk & 7)) & 0xff : -1);
+  inflate_blocks_reset(s, z, 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.codes, z);
   ZFREE(z, s->window);
   ZFREE(z, s);
+  Trace((stderr, "inflate:   blocks freed\n"));
   return Z_OK;
 }

infblock.h

@@ -12,16 +12,20 @@ struct inflate_blocks_state;
 
 extern struct inflate_blocks_state * inflate_blocks_new __P((
     z_stream *,
-    check_func checkfn,               /* check function */
+    check_func,                 /* check function */
     uInt));                     /* window size */
 
 extern int inflate_blocks __P((
     struct inflate_blocks_state *,
     z_stream *,
-    int));			/* initial return code */
+    int));                      /* initial return code */
+
+extern void inflate_blocks_reset __P((
+    struct inflate_blocks_state *,
+    z_stream *,
+    uLong *));                  /* check value on output */
 
 extern int inflate_blocks_free __P((
     struct inflate_blocks_state *,
     z_stream *,
-    uLong *,			/* check value on output */
+    uLong *));                  /* check value on output */
-    int *));			/* possible leftover byte to return */

infcodes.c

@@ -19,38 +19,38 @@
 struct inflate_codes_state {
 
   /* mode */
-  enum {	/* waiting for "i:"=input, "o:"=output, "x:"=nothing */
+  enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-      START,	/* x: set up for LEN */
+      START,    /* x: set up for LEN */
-      LEN,	/* i: get length/literal/eob next */
+      LEN,      /* i: get length/literal/eob next */
-      LENEXT,	/* i: getting length extra (have base) */
+      LENEXT,   /* i: getting length extra (have base) */
-      DIST,	/* i: get distance next */
+      DIST,     /* i: get distance next */
-      DISTEXT,	/* i: getting distance extra */
+      DISTEXT,  /* i: getting distance extra */
-      COPY,	/* o: copying bytes in window, waiting for space */
+      COPY,     /* o: copying bytes in window, waiting for space */
-      LIT,	/* o: got literal, waiting for output space */
+      LIT,      /* o: got literal, waiting for output space */
-      WASH,	/* o: got eob, possibly still output waiting */
+      WASH,     /* o: got eob, possibly still output waiting */
-      END,	/* x: got eob and all data flushed */
+      END,      /* x: got eob and all data flushed */
-      BAD}	/* x: got error */
+      BADCODE}  /* x: got error */
-    mode;		/* current inflate_codes mode */
+    mode;               /* current inflate_codes mode */
 
   /* mode dependent information */
   uInt len;
   union {
     struct {
-      inflate_huft *tree;	/* pointer into tree */
+      inflate_huft *tree;       /* pointer into tree */
-      uInt need;		/* bits needed */
+      uInt need;                /* bits needed */
-    } code;		/* if LEN or DIST, where in tree */
+    } code;             /* if LEN or DIST, where in tree */
-    uInt lit;		/* if LIT, literal */
+    uInt lit;           /* if LIT, literal */
     struct {
-      uInt get;			/* bits to get for extra */
+      uInt get;                 /* bits to get for extra */
-      uInt dist;		/* distance back to copy from */
+      uInt dist;                /* distance back to copy from */
-    } copy;		/* if EXT or COPY, where and how much */
+    } copy;             /* if EXT or COPY, where and how much */
-  } sub;		/* submode */
+  } sub;                /* submode */
 
   /* mode independent information */
-  Byte lbits;		/* ltree bits decoded per branch */
+  Byte lbits;           /* ltree bits decoded per branch */
-  Byte dbits;		/* dtree bits decoder per branch */
+  Byte dbits;           /* dtree bits decoder per branch */
-  inflate_huft *ltree;		/* literal/length/eob tree */
+  inflate_huft *ltree;          /* literal/length/eob tree */
-  inflate_huft *dtree;		/* distance tree */
+  inflate_huft *dtree;          /* distance tree */
 
 };
 
@@ -70,6 +70,7 @@ z_stream *z;
     c->dbits = (Byte)bd;
     c->ltree = tl;
     c->dtree = td;
+    Tracev((stderr, "inflate:       codes new\n"));
   }
   return c;
 }
@@ -80,129 +81,138 @@ struct inflate_blocks_state *s;
 z_stream *z;
 int r;
 {
-  uInt j;		/* temporary storage */
+  uInt j;               /* temporary storage */
-  inflate_huft *t;	/* temporary pointer */
+  inflate_huft *t;      /* temporary pointer */
-  int e;		/* extra bits or operation */
+  uInt e;               /* extra bits or operation */
-  uLong b;		/* bit buffer */
+  uLong b;              /* bit buffer */
-  uInt k;		/* bits in bit buffer */
+  uInt k;               /* bits in bit buffer */
-  Byte *p;		/* input data pointer */
+  Byte *p;              /* input data pointer */
-  uInt n;		/* bytes available there */
+  uInt n;               /* bytes available there */
-  Byte *q;		/* output window write pointer */
+  Byte *q;              /* output window write pointer */
-  uInt m;		/* bytes to end of window or read pointer */
+  uInt m;               /* bytes to end of window or read pointer */
-  Byte *f;		/* pointer to copy strings from */
+  Byte *f;              /* pointer to copy strings from */
-  struct inflate_codes_state *c = s->sub.codes;	/* codes state */
+  struct inflate_codes_state *c = s->sub.decode.codes;  /* codes state */
 
   /* copy input/output information to locals (UPDATE macro restores) */
   LOAD
 
   /* process input and output based on current state */
   while (1) switch (c->mode)
-  {		/* waiting for "i:"=input, "o:"=output, "x:"=nothing */
+  {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-    case START:		/* x: set up for LEN */
+    case START:         /* x: set up for LEN */
 #ifndef SLOW
       if (m >= 258 && n >= 10)
       {
         UPDATE
-	r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
+        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
-	LOAD
+        LOAD
-	if (r != Z_OK)
+        if (r != Z_OK)
-	{
+        {
-	  c->mode = r == Z_STREAM_END ? WASH : BAD;
+          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
-	  break;
+          break;
-	}
+        }
       }
 #endif /* !SLOW */
       c->sub.code.need = c->lbits;
       c->sub.code.tree = c->ltree;
       c->mode = LEN;
-    case LEN:		/* i: get length/literal/eob next */
+    case LEN:           /* i: get length/literal/eob 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 == 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 literal/length code";
+                 "inflate:         literal 0x%02x\n", t->base));
-	  r = Z_DATA_ERROR;
+        c->mode = LIT;
-	  LEAVE
+        break;
-	}
-	e = -e;
-	if (e & 64)		/* end of block */
-	{
-	  c->mode = WASH;
-	  break;
-	}
-	c->sub.code.need = e;
-	c->sub.code.tree = t->next;
-	break;
       }
-      if (e & 16)		/* literal */
+      if (e & 16)               /* length */
       {
-	c->sub.lit = t->base;
+        c->sub.copy.get = e & 15;
-	c->mode = LIT;
+        c->len = t->base;
-	break;
+        c->mode = LENEXT;
+        break;
       }
-      c->sub.copy.get = e;
+      if ((e & 64) == 0)        /* next table */
-      c->len = t->base;
+      {
-      c->mode = LENEXT;
+        c->sub.code.need = e;
-    case LENEXT:	/* i: getting length extra (have base) */
+        c->sub.code.tree = t->next;
+        break;
+      }
+      if (e & 32)               /* end of block */
+      {
+        Tracevv((stderr, "inflate:         end of block\n"));
+        c->mode = WASH;
+        break;
+      }
+      c->mode = BADCODE;        /* invalid code */
+      z->msg = "invalid literal/length code";
+      r = Z_DATA_ERROR;
+      LEAVE
+    case LENEXT:        /* i: getting length extra (have base) */
       j = c->sub.copy.get;
       NEEDBITS(j)
       c->len += (uInt)b & inflate_mask[j];
       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 */
+    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 distance code";
+        break;
-	  r = Z_DATA_ERROR;
-	  LEAVE
-	}
-	c->sub.code.need = -e;
-	c->sub.code.tree = t->next;
-	break;
       }
-      c->sub.copy.dist = t->base;
+      if ((e & 64) == 0)        /* next table */
-      c->sub.copy.get = e;
+      {
-      c->mode = DISTEXT;
+        c->sub.code.need = e;
-    case DISTEXT:	/* i: getting distance extra */
+        c->sub.code.tree = t->next;
+        break;
+      }
+      c->mode = BADCODE;        /* invalid code */
+      z->msg = "invalid distance code";
+      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 */
+    case COPY:          /* o: copying bytes in window, waiting for space */
       f = (uInt)(q - s->window) < c->sub.copy.dist ?
-	  s->end - (c->sub.copy.dist - (q - s->window)) :
+          s->end - (c->sub.copy.dist - (q - s->window)) :
-	  q - c->sub.copy.dist;
+          q - c->sub.copy.dist;
       while (c->len)
       {
-	NEEDOUT
+        NEEDOUT
-	OUTBYTE(*f++)
+        OUTBYTE(*f++)
-	if (f == s->end)
+        if (f == s->end)
-	  f = s->window;
+          f = s->window;
-	c->len--;
+        c->len--;
       }
       c->mode = START;
       break;
-    case LIT:		/* o: got literal, waiting for output space */
+    case LIT:           /* o: got literal, waiting for output space */
       NEEDOUT
       OUTBYTE(c->sub.lit)
       c->mode = START;
       break;
-    case WASH:		/* o: got eob, possibly more output */
+    case WASH:          /* o: got eob, possibly more output */
       FLUSH
       if (s->read != s->write)
         LEAVE
@@ -210,7 +220,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:
@@ -224,7 +234,6 @@ void inflate_codes_free(c, z)
 struct inflate_codes_state *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"));
 }

inffast.c

@@ -8,6 +8,8 @@
 #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
@@ -15,10 +17,6 @@
 #define bits word.what.Bits
 
 /* macros for bit input with no checking and for returning unused bytes */
-#ifdef DEBUG
-#  undef NEXTBYTE
-#  define NEXTBYTE (n--?0:fprintf(stderr,"inffast underrun\n"),*p++)
-#endif
 #define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
 #define UNGRAB {n+=(c=k>>3);p-=c;k&=7;}
 
@@ -33,112 +31,131 @@ inflate_huft *tl, *td;
 struct inflate_blocks_state *s;
 z_stream *z;
 {
-  inflate_huft *t;	/* temporary pointer */
+  inflate_huft *t;      /* temporary pointer */
-  int e;		/* extra bits or operation */
+  uInt e;               /* extra bits or operation */
-  uLong b;		/* bit buffer */
+  uLong b;              /* bit buffer */
-  uInt k;		/* bits in bit buffer */
+  uInt k;               /* bits in bit buffer */
-  Byte *p;		/* input data pointer */
+  Byte *p;              /* input data pointer */
-  uInt n;		/* bytes available there */
+  uInt n;               /* bytes available there */
-  Byte *q;		/* output window write pointer */
+  Byte *q;              /* output window write pointer */
-  uInt m;		/* bytes to end of window or read pointer */
+  uInt m;               /* bytes to end of window or read pointer */
-  uInt ml;		/* mask for literal/length tree */
+  uInt ml;              /* mask for literal/length tree */
-  uInt md;		/* mask for distance tree */
+  uInt md;              /* mask for distance tree */
-  uInt c;		/* bytes to copy */
+  uInt c;               /* bytes to copy */
-  uInt d;		/* distance back to copy from */
+  uInt d;               /* distance back to copy from */
-  Byte *r;		/* copy source pointer */
+  Byte *r;              /* copy source pointer */
 
   /* load input, output, bit values */
   LOAD
 
-  /* initialize masks in registers */
+  /* 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 */
+  do {                          /* assume called with m >= 258 && n >= 10 */
     /* get literal/length code */
-    GRABBITS(20)		/* max bits for literal/length code */
+    GRABBITS(20)                /* max bits for literal/length code */
-    if ((e = (t = tl + ((uInt)b & ml))->exop) < 0)
+    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
-      do {
-	if (e == -128)
-	{
-	  z->msg = "invalid literal/length code";
-          UNGRAB
-	  UPDATE
-	  return Z_DATA_ERROR;
-	}
-	DUMPBITS(t->bits)
-	e = -e;
-	if (e & 64)		/* end of block */
-	{
-          UNGRAB
-	  UPDATE
-	  return Z_STREAM_END;
-	}
-      } while ((e = (t = t->next + ((uInt)b & inflate_mask[e]))->exop) < 0);
-    DUMPBITS(t->bits)
-
-    /* process literal or length (end of block already trapped) */
-    if (e & 16)			/* then it's a literal */
     {
+      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;
     }
-    else			/* it's a length */
+    do {
-    {
-      /* get length of block to copy (already have extra bits) */
-      c = t->base + ((uInt)b & inflate_mask[e]);
-      DUMPBITS(e);
-
-      /* decode distance base of block to copy */
-      GRABBITS(15);		/* max bits for distance code */
-      if ((e = (t = td + ((uInt)b & md))->exop) < 0)
-	do {
-	  if (e == -128)
-	  {
-	    z->msg = "invalid distance code";
-	    UNGRAB
-	    UPDATE
-	    return Z_DATA_ERROR;
-	  }
-	  DUMPBITS(t->bits)
-	  e = -e;
-	} while ((e = (t = t->next + ((uInt)b & inflate_mask[e]))->exop) < 0);
       DUMPBITS(t->bits)
-
+      if (e & 16)
-      /* get extra bits to add to distance base */
-      GRABBITS(e)           /* get extra bits (up to 13) */
-      d = t->base + ((uInt)b & inflate_mask[e]);
-      DUMPBITS(e)
-
-      /* do the copy */
-      m -= c;
-      if (q - s->window >= d)		/* if offset before destination, */
-      {					/*  just copy */
-	r = q - d;
-	*q++ = *r++;  c--;		/* minimum count is three, */
-	*q++ = *r++;  c--;		/*  so unroll loop a little */
-	do {
-	  *q++ = *r++;
-	} while (--c);
-      }
-      else				/* else offset after destination */
       {
-	e = d - (q - s->window);	/* bytes from offset to end */
+        /* get extra bits for length */
-	r = s->end - e;			/* pointer to offset */
+        e &= 15;
-	if (c > e)			/* if source crosses, */
+        c = t->base + ((uInt)b & inflate_mask[e]);
-	{
+        DUMPBITS(e)
-	  c -= e;			/* copy to end of window */
+        Tracevv((stderr, "inflate:         * length %u\n", c));
-	  do {
+
-	    *q++ = *r++;
+        /* decode distance base of block to copy */
-	  } while (--e);
+        GRABBITS(15);           /* max bits for distance code */
-	  r = s->window;		/* copy rest from start of window */
+        e = (t = td + ((uInt)b & md))->exop;
-	}
+        do {
-	do {				/* copy all or what's left */
+          DUMPBITS(t->bits)
-	  *q++ = *r++;
+          if (e & 16)
-	} while (--c);
+          {
+            /* 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 */

inflate-0.72.c

@@ -1,230 +0,0 @@
-/* inflate.c -- zlib interface to inflate modules
- * Copyright (C) 1995 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "infblock.h"
-
-struct inflate_blocks_state {int dummy;}; /* for buggy compilers */
-
-/* inflate private state */
-struct internal_state {
-
-  /* mode */
-  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 */
-    mode;		/* current inflate mode */
-
-  /* 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 */
-  } sub;	/* submode */
-
-  /* mode independent information */
-  int  nowrap;		/* flag for no wrapper */
-  uInt wbits;  		/* log2(window size)  (8..15, defaults to 15) */
-
-};
-
-
-int inflateInit(z)
-z_stream *z;
-{
-    return inflateInit2(z, WBITS);
-}
-
-
-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;
-  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;
-
-  /* handle undocumented nowrap option (no zlib header or check) */
-  z->state->nowrap = 0;
-  if (w < 0)
-  {
-    w = - w;
-    z->state->nowrap = 1;
-    z->state->mode = START;
-  }
-
-  /* set window size */
-  if (w < 8 || w > 15)
-  {
-    inflateEnd(z);
-    return Z_STREAM_ERROR;
-  }
-  z->state->wbits = w;
-  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)
-    return Z_STREAM_ERROR;
-  r = Z_BUF_ERROR;
-  while (1) switch (z->state->mode)
-  {
-    case METHOD:
-      if (z->avail_in == 0) return r;  r = Z_OK;
-      if (((z->state->sub.method = NEXTBYTE) & 0xf != DEFLATED))
-      {
-        z->state->mode = ERROR;
-	z->msg = "unknown compression method";
-	return Z_DATA_ERROR;
-      }
-      if ((z->state->sub.method >> 4) > z->state->wbits)
-      {
-        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,1<< z->state->wbits)) == 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->nowrap)
-      {
-        if (r != -1)
-	  z->msg = "inflate bug--took one too many bytes";
-	z->state->mode = r == -1 ? DONE : ERROR;
-	break;
-      }
-      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;
-  }
-}
-
-
-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)
-    inflate_blocks_free(z->state->sub.blocks, z, &c, &e);
-  ZFREE(z, z->state);
-  z->state = Z_NULL;
-  return Z_OK;
-}
-
-
-/* inflateSync not implemented yet--this just consumes input */
-int inflateSync(z)
-z_stream *z;
-{
-  if (z == Z_NULL) return Z_STREAM_ERROR;
-  if (z->avail_in == 0) return Z_BUF_ERROR;
-  do {
-    z->total_in++;
-  } while (--z->avail_in);
-  return Z_DATA_ERROR;
-}
-
-
-/* inflateReset not fully implemented yet--this frees and reallocates */
-int inflateReset(z)
-z_stream *z;
-{
-  int r;
-
-  if ((r = inflateEnd(z)) != Z_OK)
-    return r;
-  return inflateInit(z);
-}

inflate.c

@@ -13,40 +13,65 @@ struct internal_state {
 
   /* mode */
   enum {
-      METHOD,	/* waiting for method byte */
+      METHOD,   /* waiting for method byte */
-      FLAG,	/* waiting for flag byte */
+      FLAG,     /* waiting for flag byte */
-      START,	/* make new blocks state */
+      BLOCKS,   /* decompressing blocks */
-      BLOCKS,	/* decompressing blocks */
+      CHECK4,   /* four check bytes to go */
-      CHECK4,	/* four check bytes to go */
+      CHECK3,   /* three check bytes to go */
-      CHECK3,	/* three check bytes to go */
+      CHECK2,   /* two check bytes to go */
-      CHECK2,	/* two check bytes to go */
+      CHECK1,   /* one check byte to go */
-      CHECK1,	/* one check byte to go */
+      DONE,     /* finished check, done */
-      DONE,	/* finished check, done */
+      BAD}      /* got an error--stay here */
-      ERROR}	/* got an error--stay here */
+    mode;               /* current inflate mode */
-    mode;		/* current inflate mode */
 
   /* mode dependent information */
   union {
-    uInt method;	/* if FLAGS, method byte */
+    uInt method;        /* if FLAGS, method byte */
-    struct inflate_blocks_state
-      *blocks;		/* if BLOCKS, current state */
     struct {
-      uLong was;		/* computed check value */
+      uLong was;                /* computed check value */
-      uLong need;		/* stream check value */
+      uLong need;               /* stream check value */
-    } check;		/* if CHECK, check values to compare */
+    } check;            /* if CHECK, check values to compare */
-  } sub;	/* submode */
+    uInt marker;        /* if BAD, inflateSync's marker bytes count */
+  } sub;        /* submode */
 
   /* mode independent information */
-  int  nowrap;		/* flag for no wrapper */
+  int  nowrap;          /* flag for no wrapper */
-  uInt wbits;  		/* log2(window size)  (8..15, defaults to 15) */
+  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
+  struct inflate_blocks_state
+    *blocks;            /* current inflate_blocks state */
 
 };
 
 
-int inflateInit(z)
+int inflateReset(z)
 z_stream *z;
 {
-    return inflateInit2(z, WBITS);
+  uLong c;
+
+  if (z == Z_NULL || z->state == Z_NULL)
+    return Z_STREAM_ERROR;
+  z->total_in = z->total_out = 0;
+  z->msg = Z_NULL;
+  z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
+  inflate_blocks_reset(z->state->blocks, z, &c);
+  Trace((stderr, "inflate: reset\n"));
+  return Z_OK;
+}
+
+
+int inflateEnd(z)
+z_stream *z;
+{
+  uLong c;
+
+  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
+    return Z_STREAM_ERROR;
+  if (z->state->blocks != Z_NULL)
+    inflate_blocks_free(z->state->blocks, z, &c);
+  ZFREE(z, z->state);
+  z->state = Z_NULL;
+  Trace((stderr, "inflate: end\n"));
+  return Z_OK;
 }
 
 
@@ -59,12 +84,10 @@ int w;
     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->blocks = Z_NULL;
 
   /* handle undocumented nowrap option (no zlib header or check) */
   z->state->nowrap = 0;
@@ -72,7 +95,6 @@ int w;
   {
     w = - w;
     z->state->nowrap = 1;
-    z->state->mode = START;
   }
 
   /* set window size */
@@ -81,20 +103,40 @@ int w;
     inflateEnd(z);
     return Z_STREAM_ERROR;
   }
-  z->state->wbits = w;
+  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;
+  int r = f;    /* to avoid warning about unused f */
   uInt b;
-  uLong c;
 
   if (z == Z_NULL || z->next_in == Z_NULL)
     return Z_STREAM_ERROR;
@@ -102,87 +144,86 @@ int f;
   while (1) switch (z->state->mode)
   {
     case METHOD:
-      if (z->avail_in == 0) return r;  r = Z_OK;
+      NEEDBYTE
-      if (((z->state->sub.method = NEXTBYTE) & 0xf != DEFLATED))
+      if (((z->state->sub.method = NEXTBYTE) & 0xf) != DEFLATED)
       {
-        z->state->mode = ERROR;
+        z->state->mode = BAD;
-	z->msg = "unknown compression method";
+        z->msg = "unknown compression method";
-	return Z_DATA_ERROR;
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
       }
       if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
       {
-        z->state->mode = ERROR;
+        z->state->mode = BAD;
-	z->msg = "invalid window size";
+        z->msg = "invalid window size";
-	return Z_DATA_ERROR;
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
       }
       z->state->mode = FLAG;
     case FLAG:
-      if (z->avail_in == 0) return r;  r = Z_OK;
+      NEEDBYTE
       if ((b = NEXTBYTE) & 0x20)
       {
-        z->state->mode = ERROR;
+        z->state->mode = BAD;
-	z->msg = "invalid reserved bit";
+        z->msg = "invalid reserved bit";
-	return Z_DATA_ERROR;
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
       }
       if (((z->state->sub.method << 8) + b) % 31)
       {
-        z->state->mode = ERROR;
+        z->state->mode = BAD;
-	z->msg = "incorrect header check";
+        z->msg = "incorrect header check";
-	return Z_DATA_ERROR;
+        z->state->sub.marker = 5;       /* can't try inflateSync */
+        break;
       }
-      z->state->mode = START;
+      Trace((stderr, "inflate: zlib header ok\n"));
-    case START:
-      if ((z->state->sub.blocks = inflate_blocks_new(z,
-         z->state->nowrap ? Z_NULL : adler32,
-         1<< z->state->wbits)) == 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)
+      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;
-      inflate_blocks_free(z->state->sub.blocks, z, &c, &r);
+      r = Z_OK;
+      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
       if (z->state->nowrap)
       {
-        if (r != -1)
+        z->state->mode = DONE;
-	  z->msg = "inflate bug--took one too many bytes";
+        break;
-	z->state->mode = r == -1 ? DONE : ERROR;
-	break;
       }
-      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;
+      NEEDBYTE
       z->state->sub.check.need = (uLong)NEXTBYTE << 24;
       z->state->mode = CHECK3;
     case CHECK3:
-      if (z->avail_in == 0) return r;  r = Z_OK;
+      NEEDBYTE
       z->state->sub.check.need += (uLong)NEXTBYTE << 16;
       z->state->mode = CHECK2;
     case CHECK2:
-      if (z->avail_in == 0) return r;  r = Z_OK;
+      NEEDBYTE
       z->state->sub.check.need += (uLong)NEXTBYTE << 8;
       z->state->mode = CHECK1;
     case CHECK1:
-      if (z->avail_in == 0) return r;  r = Z_OK;
+      NEEDBYTE
       z->state->sub.check.need += (uLong)NEXTBYTE;
+
       if (z->state->sub.check.was != z->state->sub.check.need)
       {
-        z->state->mode = ERROR;
+        z->state->mode = BAD;
         z->msg = "incorrect data check";
-	return Z_DATA_ERROR;
+        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 ERROR:
+    case BAD:
       return Z_DATA_ERROR;
     default:
       return Z_STREAM_ERROR;
@@ -190,42 +231,51 @@ int f;
 }
 
 
-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)
-    inflate_blocks_free(z->state->sub.blocks, z, &c, &e);
-  ZFREE(z, z->state);
-  z->state = Z_NULL;
-  return Z_OK;
-}
-
-
-/* inflateSync not implemented yet--this just consumes input */
 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;
+  Byte *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 */
-}
+  if (z == Z_NULL || z->state == Z_NULL)
-
+    return Z_STREAM_ERROR;
-
+  if (z->state->mode != BAD)
-/* inflateReset not fully implemented yet--this frees and reallocates */
+  {
-int inflateReset(z)
+    z->state->mode = BAD;
-z_stream *z;
+    z->state->sub.marker = 0;
-{
+  }
-  int r;
+  if ((n = z->avail_in) == 0)
-
+    return Z_BUF_ERROR;
-  if ((r = inflateEnd(z)) != Z_OK)
+  p = z->next_in;
-    return r;
+  m = z->state->sub.marker;
-  return inflateInit(z);
+
+  /* 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;
 }

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

@@ -16,37 +16,37 @@ struct internal_state  {int dummy;}; /* for buggy compilers */
 
 
 local int huft_build __P((
-    uInt *,		/* code lengths in bits */
+    uInt *,             /* code lengths in bits */
-    uInt,		/* number of codes */
+    uInt,               /* number of codes */
-    uInt,		/* number of "simple" codes */
+    uInt,               /* number of "simple" codes */
-    uInt *,		/* list of base values for non-simple codes */
+    uInt *,             /* list of base values for non-simple codes */
-    uInt *,		/* list of extra bits for non-simple codes */
+    uInt *,             /* list of extra bits for non-simple codes */
-    inflate_huft **,	/* result: starting table */
+    inflate_huft **,    /* result: starting table */
-    uInt *,		/* maximum lookup bits (returns actual) */
+    uInt *,             /* maximum lookup bits (returns actual) */
-    z_stream *));	/* for zalloc function */
+    z_stream *));       /* for zalloc function */
 
 local voidp falloc __P((
-    voidp,		/* opaque pointer (not used) */
+    voidp,              /* opaque pointer (not used) */
-    uInt,		/* number of items */
+    uInt,               /* number of items */
-    uInt));		/* size of item */
+    uInt));             /* size of item */
 
 local void ffree __P((
-    voidp q,		/* opaque pointer (not used) */
+    voidp q,            /* opaque pointer (not used) */
-    voidp p));		/* what to free (not used) */
+    voidp p));          /* what to free (not used) */
 
 /* Tables for deflate from PKZIP's appnote.txt. */
-local uInt cplens[] = {	/* Copy lengths for literal codes 257..285 */
+local uInt cplens[] = { /* Copy lengths for literal codes 257..285 */
         3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
         /* actually lengths - 2; also see note #13 above about 258 */
-local uInt cplext[] = {	/* Extra bits for literal codes 257..285 */
+local uInt cplext[] = { /* 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 */
+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,
         8193, 12289, 16385, 24577};
-local uInt cpdext[] = {	/* Extra bits for distance codes */
+local uInt cpdext[] = { /* Extra bits for distance codes */
         0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
         7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
         12, 12, 13, 13};
@@ -100,32 +100,32 @@ uInt *d;                /* list of base values for non-simple codes */
 uInt *e;                /* list of extra bits for non-simple codes */
 inflate_huft **t;       /* result: starting table */
 uInt *m;                /* maximum lookup bits, returns actual */
-z_stream *zs;		/* for zalloc function */
+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
    if the given code set is incomplete (the tables are still built in this
    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 a;                       /* counter for codes of length k */
-  uInt c[BMAX+1];		/* bit length count table */
+  uInt c[BMAX+1];               /* bit length count table */
-  uInt f;			/* i repeats in table every f entries */
+  uInt f;                       /* i repeats in table every f entries */
-  int g;			/* maximum code length */
+  int g;                        /* maximum code length */
-  int h;			/* table level */
+  int h;                        /* table level */
-  register uInt i;		/* counter, current code */
+  register uInt i;              /* counter, current code */
-  register uInt j;		/* counter */
+  register uInt j;              /* counter */
-  register int k;		/* number of bits in current code */
+  register int k;               /* number of bits in current code */
-  int l;			/* bits per table (returned in m) */
+  int l;                        /* bits per table (returned in m) */
-  register uInt *p;		/* pointer into c[], b[], or v[] */
+  register uInt *p;             /* pointer into c[], b[], or v[] */
-  register inflate_huft *q;	/* points to current table */
+  register inflate_huft *q;     /* points to current table */
-  inflate_huft r;		/* table entry for structure assignment */
+  inflate_huft r;               /* table entry for structure assignment */
-  inflate_huft *u[BMAX];	/* table stack */
+  inflate_huft *u[BMAX];        /* table stack */
-  uInt v[N_MAX];		/* values in order of bit length */
+  uInt v[N_MAX];                /* values in order of bit length */
-  register int w;		/* bits before this table == (l * h) */
+  register int w;               /* bits before this table == (l * h) */
-  uInt x[BMAX+1];		/* bit offsets, then code stack */
+  uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uInt *xp;			/* pointer into x */
+  uInt *xp;                     /* pointer into x */
-  int y;			/* number of dummy codes added */
+  int y;                        /* number of dummy codes added */
-  uInt z;			/* number of entries in current table */
+  uInt z;                       /* number of entries in current table */
 
 
   /* Generate counts for each bit length */
@@ -133,7 +133,7 @@ z_stream *zs;		/* for zalloc function */
 #define C0 *p++ = 0;
 #define C2 C0 C0 C0 C0
 #define C4 C2 C2 C2 C2
-  C4				/* clear c[]--assume BMAX+1 is 16 */
+  C4                            /* clear c[]--assume BMAX+1 is 16 */
   p = b;  i = n;
   do {
     c[*p++]++;                  /* assume all entries <= BMAX */
@@ -193,8 +193,8 @@ z_stream *zs;		/* for zalloc function */
   p = v;                        /* grab values in bit order */
   h = -1;                       /* no tables yet--level -1 */
   w = -l;                       /* bits decoded == (l * h) */
-  u[0] = (inflate_huft *)Z_NULL;	/* just to keep compilers happy */
+  u[0] = (inflate_huft *)Z_NULL;        /* just to keep compilers happy */
-  q = (inflate_huft *)Z_NULL;	/* ditto */
+  q = (inflate_huft *)Z_NULL;   /* ditto */
   z = 0;                        /* ditto */
 
   /* go through the bit lengths (k already is bits in shortest code) */
@@ -217,25 +217,25 @@ z_stream *zs;		/* for zalloc function */
           f -= a + 1;           /* deduct codes from patterns left */
           xp = c + k;
           if (j < z)
-	    while (++j < z)	/* try smaller tables up to z bits */
+            while (++j < z)     /* try smaller tables up to z bits */
-	    {
+            {
-	      if ((f <<= 1) <= *++xp)
+              if ((f <<= 1) <= *++xp)
-		break;		/* enough codes to use up j bits */
+                break;          /* enough codes to use up j bits */
-	      f -= *xp;		/* else deduct codes from patterns */
+              f -= *xp;         /* else deduct codes from patterns */
-	    }
+            }
         }
         z = 1 << j;             /* table entries for j-bit table */
 
         /* allocate and link in new table */
         if ((q = (inflate_huft *)ZALLOC
-	     (zs,z + 1,sizeof(inflate_huft))) == Z_NULL)
+             (zs,z + 1,sizeof(inflate_huft))) == Z_NULL)
         {
           if (h)
             inflate_trees_free(u[0], zs);
-          return Z_MEM_ERROR;	/* not enough memory */
+          return Z_MEM_ERROR;   /* not enough memory */
         }
 #ifdef DEBUG
-	inflate_hufts += z + 1;
+        inflate_hufts += z + 1;
 #endif
         *t = q + 1;             /* link to list for huft_free() */
         *(t = &(q->next)) = (inflate_huft *)Z_NULL;
@@ -245,8 +245,8 @@ z_stream *zs;		/* for zalloc function */
         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 = 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 +254,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 = (*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 = e[*p - s] + 16 + 64;   /* non-simple--look up in lists */
         r.base = d[*p++ - s];
       }
 
@@ -294,10 +294,10 @@ z_stream *zs;		/* for zalloc function */
 
 
 int inflate_trees_bits(c, bb, tb, z)
-uInt *c;		/* 19 code lengths */
+uInt *c;                /* 19 code lengths */
-uInt *bb;		/* bits tree desired/actual depth */
+uInt *bb;               /* bits tree desired/actual depth */
-inflate_huft **tb;	/* bits tree result */
+inflate_huft **tb;      /* bits tree result */
-z_stream *z;		/* for zfree function */
+z_stream *z;            /* for zfree function */
 {
   int r;
 
@@ -315,14 +315,14 @@ 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 nl;                /* number of literal/length codes */
-uInt nd;		/* number of distance codes */
+uInt nd;                /* number of distance codes */
-uInt *c;		/* that many (total) code lengths */
+uInt *c;                /* that many (total) code lengths */
-uInt *bl;		/* literal desired/actual bit depth */
+uInt *bl;               /* literal desired/actual bit depth */
-uInt *bd;		/* distance desired/actual bit depth */
+uInt *bd;               /* distance desired/actual bit depth */
-inflate_huft **tl;	/* literal/length tree result */
+inflate_huft **tl;      /* literal/length tree result */
-inflate_huft **td;	/* distance tree result */
+inflate_huft **td;      /* distance tree result */
-z_stream *z;		/* for zfree function */
+z_stream *z;            /* for zfree function */
 {
   int r;
 
@@ -367,7 +367,7 @@ z_stream *z;		/* for zfree function */
 /* build fixed tables only once--keep them here */
 local int fixed_lock = 0;
 local int fixed_built = 0;
-#define FIXEDH 530	/* number of hufts used by fixed tables */
+#define FIXEDH 530      /* number of hufts used by fixed tables */
 local uInt fixed_left = FIXEDH;
 local inflate_huft fixed_mem[FIXEDH];
 local uInt fixed_bl;
@@ -377,12 +377,13 @@ local inflate_huft *fixed_td;
 
 
 local voidp falloc(q, n, s)
-voidp q;	/* opaque pointer (not used) */
+voidp q;        /* opaque pointer (not used) */
-uInt n;		/* number of items */
+uInt n;         /* number of items */
-uInt s;		/* size of item */
+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);
 }
@@ -393,23 +394,24 @@ voidp q;
 voidp p;
 {
   Assert(0, "inflate_trees ffree called!");
+  if (q) q = p; /* to make some compilers happy */
 }
 
 
 int inflate_trees_fixed(bl, bd, tl, td)
-uInt *bl;		/* literal desired/actual bit depth */
+uInt *bl;               /* literal desired/actual bit depth */
-uInt *bd;		/* distance desired/actual bit depth */
+uInt *bd;               /* distance desired/actual bit depth */
-inflate_huft **tl;	/* literal/length tree result */
+inflate_huft **tl;      /* literal/length tree result */
-inflate_huft **td;	/* distance tree result */
+inflate_huft **td;      /* distance tree result */
 {
   /* build fixed tables if not built already--lock out other instances */
   while (++fixed_lock > 1)
     fixed_lock--;
   if (!fixed_built)
   {
-    int k;		/* temporary variable */
+    int k;              /* temporary variable */
-    unsigned c[288];	/* length list for huft_build */
+    unsigned c[288];    /* length list for huft_build */
-    z_stream z;		/* for falloc function */
+    z_stream z;         /* for falloc function */
 
     /* set up fake z_stream for memory routines */
     z.zalloc = falloc;
@@ -447,18 +449,14 @@ inflate_huft **td;	/* distance tree result */
 
 
 int inflate_trees_free(t, z)
-inflate_huft *t;	/* table to free */
+inflate_huft *t;        /* table to free */
-z_stream *z;		/* for zfree function */
+z_stream *z;            /* for zfree function */
 /* Free the malloc'ed tables built by huft_build(), which makes a linked
    list of the tables it made, with the links in a dummy first entry of
    each table. */
 {
   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,19 +9,14 @@
  */
 
 /* 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
-   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 */
   } word;               /*  16-bit, 8 bytes for 32-bit machines) */
@@ -36,27 +31,27 @@ struct inflate_huft_s {
 #endif
 
 extern int inflate_trees_bits __P((
-    uInt *,			/* 19 code lengths */
+    uInt *,                     /* 19 code lengths */
-    uInt *,			/* bits tree desired/actual depth */
+    uInt *,                     /* bits tree desired/actual depth */
-    inflate_huft **,		/* bits tree result */
+    inflate_huft **,            /* bits tree result */
-    z_stream *));		/* for zalloc, zfree functions */
+    z_stream *));               /* for zalloc, zfree functions */
 
 extern int inflate_trees_dynamic __P((
-    uInt,			/* number of literal/length codes */
+    uInt,                       /* number of literal/length codes */
-    uInt,			/* number of distance codes */
+    uInt,                       /* number of distance codes */
-    uInt *,			/* that many (total) code lengths */
+    uInt *,                     /* that many (total) code lengths */
-    uInt *,			/* literal desired/actual bit depth */
+    uInt *,                     /* literal desired/actual bit depth */
-    uInt *,			/* distance desired/actual bit depth */
+    uInt *,                     /* distance desired/actual bit depth */
-    inflate_huft **,		/* literal/length tree result */
+    inflate_huft **,            /* literal/length tree result */
-    inflate_huft **,		/* distance tree result */
+    inflate_huft **,            /* distance tree result */
-    z_stream *));		/* for zalloc, zfree functions */
+    z_stream *));               /* for zalloc, zfree functions */
 
 extern int inflate_trees_fixed __P((
-    uInt *,			/* literal desired/actual bit depth */
+    uInt *,                     /* literal desired/actual bit depth */
-    uInt *,			/* distance desired/actual bit depth */
+    uInt *,                     /* distance desired/actual bit depth */
-    inflate_huft **,		/* literal/length tree result */
+    inflate_huft **,            /* literal/length tree result */
-    inflate_huft **));		/* distance tree result */
+    inflate_huft **));          /* distance tree result */
 
 extern int inflate_trees_free __P((
-    inflate_huft *,		/* tables to free */
+    inflate_huft *,             /* tables to free */
-    z_stream *));		/* for zfree function */
+    z_stream *));               /* for zfree function */

infutil.c

@@ -31,7 +31,7 @@ int r;
   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;
 
@@ -44,7 +44,9 @@ int r;
     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)
@@ -55,7 +57,7 @@ int r;
       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;
 
@@ -68,7 +70,9 @@ int r;
       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

@@ -13,42 +13,45 @@ struct inflate_blocks_state {
 
   /* mode */
   enum {
-      TYPE,	/* get type bits (3, including end bit) */
+      TYPE,     /* get type bits (3, including end bit) */
-      LENS,	/* get lengths for stored */
+      LENS,     /* get lengths for stored */
-      STORED,	/* processing stored block */
+      STORED,   /* processing stored block */
-      TABLE,	/* get table lengths */
+      TABLE,    /* get table lengths */
-      BTREE,	/* get bit lengths tree for a dynamic block */
+      BTREE,    /* get bit lengths tree for a dynamic block */
-      DTREE,	/* get length, distance trees for a dynamic block */
+      DTREE,    /* get length, distance trees for a dynamic block */
-      CODES,	/* processing fixed or dynamic block */
+      CODES,    /* processing fixed or dynamic block */
-      DRY,	/* output remaining window bytes */
+      DRY,      /* output remaining window bytes */
-      DONE,	/* finished last block, done */
+      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;               /* current inflate_block mode */
 
   /* mode dependent information */
   union {
-    uInt left;		/* if STORED, bytes left to copy */
+    uInt left;          /* if STORED, bytes left to copy */
     struct {
-      uInt table;		/* table lengths (14 bits) */
+      uInt table;               /* table lengths (14 bits) */
-      uInt index;		/* index into blens (or border) */
+      uInt index;               /* index into blens (or border) */
-      uInt *blens;		/* bit lengths of codes */
+      uInt *blens;              /* bit lengths of codes */
-      uInt bb;			/* bit length tree depth */
+      uInt bb;                  /* bit length tree depth */
-      inflate_huft *tb;		/* bit length decoding tree */
+      inflate_huft *tb;         /* bit length decoding tree */
-    } trees;		/* if DTREE, decoding info for trees */
+    } trees;            /* if DTREE, decoding info for trees */
-    struct inflate_codes_state
+    struct {
-      *codes;		/* if CODES, current state */
+      inflate_huft *tl, *td;    /* trees to free */
-  } sub;		/* submode */
+      struct inflate_codes_state
-  uInt last;		/* true if this block is the last block */
+        *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 */
+  uInt bitk;            /* bits in bit buffer */
-  uLong bitb;		/* bit buffer */
+  uLong bitb;           /* bit buffer */
-  Byte *window;		/* sliding window */
+  Byte *window;         /* sliding window */
-  Byte *end;		/* one byte after sliding window */
+  Byte *end;            /* one byte after sliding window */
-  Byte *read;		/* window read pointer */
+  Byte *read;           /* window read pointer */
-  Byte *write;		/* window write pointer */
+  Byte *write;          /* window write pointer */
   check_func checkfn;   /* check function */
-  uLong check;		/* check on output */
+  uLong check;          /* check on output */
 
 };
 

minigzip.c

@@ -13,15 +13,23 @@
  * or in pipe mode.
  */
 
-/* $Id: minigzip.c,v 1.2 1995/04/14 20:03:12 jloup Exp $ */
+/* $Id: minigzip.c,v 1.5 1995/05/03 17:27:11 jloup Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
 
-extern void exit __P((int));
+#ifndef __GO32__
+extern void exit  __P((int));
+#endif
+extern int unlink __P((const char *));
 
-#ifdef MSDOS
+#ifdef STDC
-#  include <fcntl.h> /* ??? find where setmode declared */
+#  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)
@@ -38,6 +46,13 @@ extern void exit __P((int));
 
 char *prog;
 
+void error           __P((char *msg));
+void gz_compress     __P((FILE   *in, gzFile out));
+void gz_uncompress   __P((gzFile in, FILE   *out));
+void file_compress   __P((char  *file));
+void file_uncompress __P((char  *file));
+void main            __P((int argc, char *argv[]));
+
 /* ===========================================================================
  * Display error message and exit
  */
@@ -60,14 +75,14 @@ void gz_compress(in, out)
     int err;
 
     for (;;) {
-	len = fread(buf, 1, sizeof(buf), in);
+        len = fread(buf, 1, sizeof(buf), in);
-	if (ferror(in)) {
+        if (ferror(in)) {
-	    perror("fread");
+            perror("fread");
-	    exit(1);
+            exit(1);
-	}
+        }
-	if (len == 0) break;
+        if (len == 0) break;
 
-	if (gzwrite(out, buf, len) != len) error(gzerror(out, &err));
+        if (gzwrite(out, buf, len) != len) error(gzerror(out, &err));
     }
     fclose(in);
     if (gzclose(out) != Z_OK) error("failed gzclose");
@@ -85,11 +100,11 @@ void gz_uncompress(in, out)
     int err;
 
     for (;;) {
-	len = gzread(in, buf, sizeof(buf));
+        len = gzread(in, buf, sizeof(buf));
-	if (len < 0) error (gzerror(in, &err));
+        if (len < 0) error (gzerror(in, &err));
-	if (len == 0) break;
+        if (len == 0) break;
 
-	if (fwrite(buf, 1, len, out) != (uInt)len) error("failed fwrite");
+        if (fwrite(buf, 1, len, out) != (uInt)len) error("failed fwrite");
     }
     if (fclose(out)) error("failed fclose");
 
@@ -113,13 +128,13 @@ void file_compress(file)
 
     in = fopen(file, "rb");
     if (in == NULL) {
-	perror(file);
+        perror(file);
-	exit(1);
+        exit(1);
     }
     out = gzopen(outfile, "wb");
     if (out == NULL) {
-	fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
-	exit(1);
+        exit(1);
     }
     gz_compress(in, out);
 
@@ -142,23 +157,23 @@ void file_uncompress(file)
     strcpy(buf, file);
 
     if (len > 3 && strcmp(file+len-3, ".gz") == 0) {
-	infile = file;
+        infile = file;
-	outfile = buf;
+        outfile = buf;
-	outfile[len-3] = '\0';
+        outfile[len-3] = '\0';
     } else {
-	outfile = file;
+        outfile = file;
-	infile = buf;
+        infile = buf;
-	strcat(infile, ".gz");
+        strcat(infile, ".gz");
     }
     in = gzopen(infile, "rb");
     if (in == NULL) {
-	fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
-	exit(1);
+        exit(1);
     }
     out = fopen(outfile, "wb");
     if (out == NULL) {
-	perror(file);
+        perror(file);
-	exit(1);
+        exit(1);
     }
 
     gz_uncompress(in, out);
@@ -182,31 +197,31 @@ void main(argc, argv)
     argc--, argv++;
 
     if (argc > 0) {
-	uncompr = (strcmp(*argv, "-d") == 0);
+        uncompr = (strcmp(*argv, "-d") == 0);
-	if (uncompr) {
+        if (uncompr) {
-	    argc--, argv++;
+            argc--, argv++;
-	}
+        }
     }
     if (argc == 0) {
         SET_BINARY_MODE(stdin);
         SET_BINARY_MODE(stdout);
-	if (uncompr) {
+        if (uncompr) {
-	    file = gzdopen(fileno(stdin), "rb");
+            file = gzdopen(fileno(stdin), "rb");
             if (file == NULL) error("can't gzdopen stdin");
-	    gz_uncompress(file, stdout);
+            gz_uncompress(file, stdout);
-	} else {
+        } else {
-	    file = gzdopen(fileno(stdout), "wb");
+            file = gzdopen(fileno(stdout), "wb");
             if (file == NULL) error("can't gzdopen stdout");
-	    gz_compress(stdin, file);
+            gz_compress(stdin, file);
-	}
+        }
     } else {
-	do {
+        do {
-	    if (uncompr) {
+            if (uncompr) {
-		file_uncompress(*argv);
+                file_uncompress(*argv);
-	    } else {
+            } else {
-		file_compress(*argv);
+                file_compress(*argv);
-	    }
+            }
-	} while (argv++, --argc);
+        } while (argv++, --argc);
     }
     exit(0);
 }

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"
 
@@ -139,15 +139,15 @@ local void scan_tree      __P((deflate_state *s, ct_data *tree, int max_code));
 local void send_tree      __P((deflate_state *s, ct_data *tree, int max_code));
 local int  build_bl_tree  __P((deflate_state *s));
 local void send_all_trees __P((deflate_state *s, int lcodes, int dcodes,
-			      int blcodes));
+                              int blcodes));
 local void compress_block __P((deflate_state *s, ct_data *ltree,
-			      ct_data *dtree));
+                              ct_data *dtree));
 local void set_data_type  __P((deflate_state *s));
 local void send_bits      __P((deflate_state *s, int value, int length));
 local unsigned bi_reverse __P((unsigned value, int length));
 local void bi_windup      __P((deflate_state *s));
 local void copy_block     __P((deflate_state *s, char *buf, unsigned len,
-			       int header));
+                               int header));
 
 #ifndef DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
@@ -243,7 +243,7 @@ void ct_init(s)
     deflate_state *s;
 {
     if (static_dtree[0].Len == 0) {
-	ct_static_init();              /* To do: at compile time */
+        ct_static_init();              /* To do: at compile time */
     }
 
     s->compressed_len = 0L;
@@ -324,9 +324,9 @@ local void pqdownheap(s, tree, k)
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-	    smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-	    j++;
+            j++;
-	}
+        }
         /* Exit if v is smaller than both sons */
         if (smaller(tree, v, s->heap[j], s->depth)) break;
 
@@ -420,7 +420,7 @@ local void gen_bitlen(s, desc)
             if (tree[m].Len != (unsigned) bits) {
                 Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
                 s->opt_len += ((long)bits - (long)tree[m].Len)
-		              *(long)tree[m].Freq;
+                              *(long)tree[m].Freq;
                 tree[m].Len = (ush)bits;
             }
             n--;
@@ -686,7 +686,7 @@ local int build_bl_tree(s)
     /* Update opt_len to include the bit length tree and counts */
     s->opt_len += 3*(max_blindex+1) + 5+5+4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-	    s->opt_len, s->static_len));
+            s->opt_len, s->static_len));
 
     return max_blindex;
 }
@@ -722,6 +722,33 @@ 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;
+    char *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
+ */
+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 */
+}
+
 /* ===========================================================================
  * 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
@@ -742,11 +769,11 @@ ulg ct_flush_block(s, buf, stored_len, eof)
     /* Construct the literal and distance trees */
     build_tree(s, (tree_desc *)(&(s->l_desc)));
     Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-	    s->static_len));
+            s->static_len));
 
     build_tree(s, (tree_desc *)(&(s->d_desc)));
     Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-	    s->static_len));
+            s->static_len));
     /* At this point, opt_len and static_len are the total bit lengths of
      * the compressed block data, excluding the tree representations.
      */
@@ -771,8 +798,8 @@ 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
@@ -785,8 +812,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 +824,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
@@ -814,7 +837,7 @@ ulg ct_flush_block(s, buf, stored_len, eof)
     } else {
         send_bits(s, (DYN_TREES<<1)+eof, 3);
         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-		       max_blindex+1);
+                       max_blindex+1);
         compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
         s->compressed_len += 3 + s->opt_len;
     }
@@ -846,7 +869,7 @@ int ct_tally (s, dist, lc)
         /* lc is the unmatched char */
         s->dyn_ltree[lc].Freq++;
     } else {
-	s->matches++;
+        s->matches++;
         /* Here, lc is the match length - MIN_MATCH */
         dist--;             /* dist = match distance - 1 */
         Assert((ush)dist < (ush)MAX_DIST(s) &&
@@ -865,7 +888,7 @@ int ct_tally (s, dist, lc)
         int dcode;
         for (dcode = 0; dcode < D_CODES; dcode++) {
             out_length += (ulg)s->dyn_dtree[dcode].Freq *
-		(5L+extra_dbits[dcode]);
+                (5L+extra_dbits[dcode]);
         }
         out_length >>= 3;
         Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
@@ -895,7 +918,7 @@ local void compress_block(s, ltree, dtree)
     int extra;          /* number of extra bits to send */
 
     if (s->last_lit != 0) do {
-	dist = s->d_buf[lx];
+        dist = s->d_buf[lx];
         lc = s->l_buf[lx++];
         if (dist == 0) {
             send_code(s, lc, ltree); /* send a literal byte */
@@ -909,7 +932,7 @@ local void compress_block(s, ltree, dtree)
                 lc -= base_length[code];
                 send_bits(s, lc, extra);       /* send the extra length bits */
             }
-	    dist--; /* dist is now the match distance - 1 */
+            dist--; /* dist is now the match distance - 1 */
             code = d_code(dist);
             Assert (code < D_CODES, "bad d_code");
 
@@ -921,8 +944,8 @@ local void compress_block(s, ltree, dtree)
             }
         } /* literal or match pair ? */
 
-	/* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-	Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow");
+        Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow");
 
     } while (lx < s->last_lit);
 
@@ -944,7 +967,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);
 }
 
 /* ===========================================================================
@@ -1043,6 +1066,6 @@ local void copy_block(s, buf, len, header)
     s->bits_sent += (ulg)len<<3;
 #endif
     while (len--) {
-	put_byte(s, *buf++);
+        put_byte(s, *buf++);
     }
 }

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"
 
@@ -48,8 +48,8 @@ int uncompress (dest, destLen, source, sourceLen)
 
     err = inflate(&stream, Z_FINISH);
     if (err != Z_STREAM_END) {
-	inflateEnd(&stream);
+        inflateEnd(&stream);
-	return err;
+        return err;
     }
     *destLen = stream.total_out;
 

zconf.h

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: zconf.h,v 1.8 1995/04/14 20:59:22 jloup Exp $ */
+/* $Id: zconf.h,v 1.12 1995/05/03 17:27:12 jloup Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
@@ -28,17 +28,47 @@
 #if defined(MSDOS) && !defined(__32BIT__)
 #  define MAXSEG_64K
 #endif
-
+#ifndef STDC
-#ifdef MAXSEG_64K
+#  if defined(MSDOS) || defined(__STDC__) || defined(__cplusplus)
-#  define MAX_MEM_LEVEL 8
+#    define STDC
-#else
+#  endif
-#  define MAX_MEM_LEVEL 9
 #endif
 
-			/* Type declarations */
+#if !defined(STDC) && !defined(const)
+#  define const
+#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 */
-#  if defined(__STDC__) || defined(MSDOS)
+#  ifdef STDC
 #    define __P(args)  args
 #  else
 #    define __P(args)  ()
@@ -49,13 +79,13 @@
   typedef unsigned char  Byte;  /* 8 bits */
 #endif
 #ifndef uInt
-  typedef unsigned int   uInt;  /* may be 16 or 32 bits */
+  typedef unsigned int   uInt;  /* 16 bits or more */
 #endif
 #ifndef uLong
   typedef unsigned long  uLong; /* 32 bits or more */
 #endif
 #ifndef voidp
-#  if defined(__STDC__) || defined(MSDOS)
+#  ifdef STDC
      typedef void *voidp;
 #  else
      typedef Byte *voidp;

zlib.h

@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 0.79  April 28th, 1995.
+  version 0.93 June 25th, 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.79"
+#define ZLIB_VERSION "0.93"
 
 /* 
      The 'zlib' compression library provides in-memory compression and
@@ -81,7 +81,7 @@ 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.
@@ -89,7 +89,12 @@ typedef struct z_stream_s {
    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 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
@@ -98,11 +103,12 @@ typedef struct z_stream_s {
    a single step).
 */
 
-			/* constants */
+                        /* constants */
 
 #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 */
 
@@ -137,7 +143,7 @@ extern char *zlib_version;
    not compatible with the zlib.h header file used by the application.
  */
 
-			/* basic functions */
+                        /* basic functions */
 
 extern int deflateInit __P((z_stream *strm, int level));
 /* 
@@ -191,25 +197,30 @@ extern int deflate __P((z_stream *strm, int flush));
   so should be used only when necessary.  Using Z_FULL_FLUSH too often can
   seriously degrade the compression.
 
-    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 12 bytes.
+  
+    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() returns 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. ??? to be changed (use Z_STEAM_END) */
+  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible.
+*/
 
 
 extern int deflateEnd __P((z_stream *strm));
@@ -260,7 +271,7 @@ extern int inflate __P((z_stream *strm, int flush));
 
     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.
 
@@ -303,8 +314,8 @@ extern int inflateEnd __P((z_stream *strm));
 */
 
 extern int deflateInit2 __P((z_stream *strm,
-			     int  level,
+                             int  level,
-			     int  method,
+                             int  method,
                              int  windowBits,
                              int  memLevel,
                              int  strategy));
@@ -325,7 +336,8 @@ extern int deflateInit2 __P((z_stream *strm,
     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
@@ -362,7 +374,7 @@ extern int deflateCopy __P((z_stream *dest,
      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.
 
@@ -425,12 +437,13 @@ extern int inflateInit2 __P((z_stream *strm,
 
 extern int inflateSync __P((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,
@@ -464,7 +477,7 @@ extern int compress __P((Byte *dest,   uLong *destLen,
      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.
@@ -500,7 +513,7 @@ extern gzFile gzopen  __P((char *path, char *mode));
    is as in fopen ("rb" or "wb"). gzopen can also be used to read a file
    which is not in gzip format; 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).
@@ -511,7 +524,7 @@ extern gzFile gzdopen  __P((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.
 */
 
@@ -534,7 +547,8 @@ extern int    gzflush __P((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.
 */
@@ -568,7 +582,7 @@ extern uLong adler32 __P((uLong adler, Byte *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);

zutil.c

@@ -3,13 +3,15 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: zutil.c,v 1.5 1995/04/14 21:30:23 jloup Exp $ */
+/* $Id: zutil.c,v 1.8 1995/05/03 17:27:12 jloup Exp $ */
 
 #include <stdio.h>
 
 #include "zutil.h"
 
+#ifndef __GO32__
 extern void exit __P((int));
+#endif
 
 char *zlib_version = ZLIB_VERSION;
 
@@ -40,7 +42,7 @@ void zmemcpy(dest, source, len)
 {
     if (len == 0) return;
     do {
-	*dest++ = *source++; /* ??? to be unrolled */
+        *dest++ = *source++; /* ??? to be unrolled */
     } while (--len != 0);
 }
 
@@ -50,13 +52,14 @@ void zmemzero(dest, len)
 {
     if (len == 0) return;
     do {
-	*dest++ = 0;  /* ??? to be unrolled */
+        *dest++ = 0;  /* ??? to be unrolled */
     } while (--len != 0);
 }
 #endif
 
-#if defined(MSDOS) && !defined(USE_CALLOC)
+#if defined(__TURBOC__) && !defined(__SMALL__)
-#  ifdef __TURBOC__
+
+#  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
@@ -84,14 +87,14 @@ local ptr_table table[MAX_PTR];
 
 voidp zcalloc (voidp opaque, unsigned items, unsigned size)
 {
-    voidp buf;
+    voidp buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
 
     if (bsize < 65536L) {
-	buf = farmalloc(bsize);
+        buf = farmalloc(bsize);
-	if (*(ush*)&buf != 0) return buf;
+        if (*(ush*)&buf != 0) return buf;
     } else {
-	buf = farmalloc(bsize + 16L);
+        buf = farmalloc(bsize + 16L);
     }
     if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
     table[next_ptr].org_ptr = buf;
@@ -107,24 +110,28 @@ void  zcfree (voidp opaque, voidp ptr)
 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */
-	farfree(ptr);
+        farfree(ptr);
-	return;
+        return;
     }
     /* Find the original pointer */
     for (n = 0; n < next_ptr; n++) {
-	if (ptr != table[n].new_ptr) continue;
+        if (ptr != table[n].new_ptr) continue;
 
-	farfree(table[n].org_ptr);
+        farfree(table[n].org_ptr);
-	while (++n < next_ptr) {
+        while (++n < next_ptr) {
-	    table[n-1] = table[n];
+            table[n-1] = table[n];
-	}
+        }
-	next_ptr--;
+        next_ptr--;
-	return;
+        return;
     }
+    ptr = opaque; /* just to make some compilers happy */
     z_error("zcfree: ptr not found");
 }
+#endif /* __TURBOC__ */
 
-#  else /* MSC */
+#if defined(M_I86CM) || defined(M_I86LM) /* MSC compact or large model */
+
+#  define MY_ZCALLOC
 
 #if (!defined(_MSC_VER) || (_MSC_VER < 600))
 #  define _halloc  halloc
@@ -133,20 +140,25 @@ void  zcfree (voidp opaque, voidp ptr)
 
 voidp zcalloc (voidp opaque, unsigned items, unsigned size)
 {
+    if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
 void  zcfree (voidp opaque, voidp ptr)
 {
+    if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
 }
 
-#  endif /* __TURBOC__ ? */
+#endif /* defined(M_I86CM) || defined(M_I86LM) */
 
-#else /* !MSDOS */
 
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef __GO32__
 extern voidp calloc __P((uInt items, uInt size));
 extern void  free   __P((voidp ptr));
+#endif
 
 voidp zcalloc (opaque, items, size)
     voidp opaque;
@@ -163,4 +175,4 @@ void  zcfree (opaque, ptr)
     free(ptr);
 }
 
-#endif /* MSDOS */
+#endif /* MY_ZCALLOC */

zutil.h

@@ -8,21 +8,25 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: zutil.h,v 1.5 1995/04/14 21:22:38 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"
 
+/* #ifndef __GNUC__   disable inline for now */
+#  define inline
+/* #endif */
+
 #ifdef MSDOS
 #   include <stddef.h>
+#   include <errno.h>
 #else
     extern int errno;
 #endif
-#ifdef __STDC__
+#ifdef STDC
 #  include <string.h>
-#  include <memory.h>
 #endif
 
 #ifndef local
@@ -39,17 +43,19 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #define ERR_RETURN(strm,err) return (strm->msg=z_errmsg[1-err], err)
 /* To be used only when the state is known to be valid */
 
-	/* common constants */
+        /* common constants */
 
 #define DEFLATED   8
 
-#ifndef WBITS
+#define DEF_WBITS 15
-# define WBITS   15 /* 32K window */
+/* default windowBits for decompression. MAX_WBITS is for compression only */
-#endif
 
-#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
@@ -60,13 +66,12 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #define MAX_MATCH  258
 /* The minimum and maximum match lengths */
 
-	/* target dependencies */
+        /* target dependencies */
 
 #ifdef MSDOS
 #  define OS_CODE  0x00
 #  ifdef __TURBOC__
 #    include <alloc.h>
-#    define exit(n) _exit(n)
 #  else /* MSC */
 #    include <malloc.h>
 #  endif
@@ -106,7 +111,7 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #  define OS_CODE  0x0a
 #endif
 
-	/* Common defaults */
+        /* Common defaults */
 
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */
@@ -125,7 +130,10 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #  define zstrerror(errnum) ""
 #endif
 
-#if defined(__STDC__) && !defined(HAVE_MEMCPY)
+#if defined(pyr) && !defined(NO_MEMCPY)
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
 #  define HAVE_MEMCPY
 #endif
 #ifdef HAVE_MEMCPY