zlib 1.1.3v1.1.3

3 files changed, 193 insertions, 60 deletions

diff --git a/Makefile b/Makefile
index c8bb6e9..3a3b116 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,9 @@ CFLAGS=-O
 
 LDFLAGS=-L. -lz
 LDSHARED=$(CC)
+CPP=$(CC) -E
 
-VER=1.1.2
+VER=1.1.3
 LIBS=libz.a
 SHAREDLIB=libz.so
 
@@ -34,21 +35,27 @@ SHELL=/bin/sh
 
 prefix = /usr/local
 exec_prefix = ${prefix}
+libdir = ${exec_prefix}/lib
+includedir = ${prefix}/include
 
 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
 
+OBJA =
+# to use the asm code: make OBJA=match.o
+
 TEST_OBJS = example.o minigzip.o
 
-DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
+DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \
   algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
-  nt/Makefile.nt nt/zlib.dnt amiga/Make*.??? contrib/README.contrib \
-  contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \
-  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
+  nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \
+  contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \
+  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \
+  contrib/asm[56]86/*.S contrib/iostream/*.cpp \
   contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
   contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \
-  contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]??
-
+  contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \
+  contrib/delphi*/*.???
 
 all: example minigzip
 
@@ -62,10 +69,16 @@ test: all
           echo '                *** zlib test FAILED ***'; \
         fi
 
-libz.a: $(OBJS)
-        $(AR) $@ $(OBJS)
+libz.a: $(OBJS) $(OBJA)
+        $(AR) $@ $(OBJS) $(OBJA)
         -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
+match.o: match.S
+        $(CPP) match.S > _match.s
+        $(CC) -c _match.s
+        mv _match.o match.o
+        rm -f _match.s
+
 $(SHAREDLIB).$(VER): $(OBJS)
         $(LDSHARED) -o $@ $(OBJS)
         rm -f $(SHAREDLIB) $(SHAREDLIB).1
@@ -79,14 +92,14 @@ minigzip: minigzip.o $(LIBS)
         $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
 install: $(LIBS)
-        -@if [ ! -d $(prefix)/include  ]; then mkdir $(prefix)/include; fi
-        -@if [ ! -d $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
-        cp zlib.h zconf.h $(prefix)/include
-        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-        cp $(LIBS) $(exec_prefix)/lib
-        cd $(exec_prefix)/lib; chmod 755 $(LIBS)
-        -@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
-        cd $(exec_prefix)/lib; if test -f $(SHAREDLIB).$(VER); then \
+        -@if [ ! -d $(includedir)  ]; then mkdir $(includedir); fi
+        -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi
+        cp zlib.h zconf.h $(includedir)
+        chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+        cp $(LIBS) $(libdir)
+        cd $(libdir); chmod 755 $(LIBS)
+        -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+        cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \
           rm -f $(SHAREDLIB) $(SHAREDLIB).1; \
           ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \
           ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \
@@ -96,19 +109,20 @@ install: $(LIBS)
 # ldconfig is for Linux
 
 uninstall:
-        cd $(prefix)/include; \
+        cd $(includedir); \
         v=$(VER); \
         if test -f zlib.h; then \
           v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \
           rm -f zlib.h zconf.h; \
         fi; \
-        cd $(exec_prefix)/lib; rm -f libz.a; \
+        cd $(libdir); rm -f libz.a; \
         if test -f $(SHAREDLIB).$$v; then \
           rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \
         fi
 
 clean:
-        rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
+        rm -f *.o *~ example minigzip libz.a libz.so* foo.gz so_locations \
+           _match.s maketree
 
 distclean:      clean
 
diff --git a/Makefile.in b/Makefile.in
index c8bb6e9..3a3b116 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,8 +22,9 @@ CFLAGS=-O
 
 LDFLAGS=-L. -lz
 LDSHARED=$(CC)
+CPP=$(CC) -E
 
-VER=1.1.2
+VER=1.1.3
 LIBS=libz.a
 SHAREDLIB=libz.so
 
@@ -34,21 +35,27 @@ SHELL=/bin/sh
 
 prefix = /usr/local
 exec_prefix = ${prefix}
+libdir = ${exec_prefix}/lib
+includedir = ${prefix}/include
 
 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
 
+OBJA =
+# to use the asm code: make OBJA=match.o
+
 TEST_OBJS = example.o minigzip.o
 
-DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
+DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \
   algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
-  nt/Makefile.nt nt/zlib.dnt amiga/Make*.??? contrib/README.contrib \
-  contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \
-  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
+  nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \
+  contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \
+  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \
+  contrib/asm[56]86/*.S contrib/iostream/*.cpp \
   contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
   contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \
-  contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]??
-
+  contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \
+  contrib/delphi*/*.???
 
 all: example minigzip
 
@@ -62,10 +69,16 @@ test: all
           echo '                *** zlib test FAILED ***'; \
         fi
 
-libz.a: $(OBJS)
-        $(AR) $@ $(OBJS)
+libz.a: $(OBJS) $(OBJA)
+        $(AR) $@ $(OBJS) $(OBJA)
         -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
+match.o: match.S
+        $(CPP) match.S > _match.s
+        $(CC) -c _match.s
+        mv _match.o match.o
+        rm -f _match.s
+
 $(SHAREDLIB).$(VER): $(OBJS)
         $(LDSHARED) -o $@ $(OBJS)
         rm -f $(SHAREDLIB) $(SHAREDLIB).1
@@ -79,14 +92,14 @@ minigzip: minigzip.o $(LIBS)
         $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
 install: $(LIBS)
-        -@if [ ! -d $(prefix)/include  ]; then mkdir $(prefix)/include; fi
-        -@if [ ! -d $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
-        cp zlib.h zconf.h $(prefix)/include
-        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-        cp $(LIBS) $(exec_prefix)/lib
-        cd $(exec_prefix)/lib; chmod 755 $(LIBS)
-        -@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
-        cd $(exec_prefix)/lib; if test -f $(SHAREDLIB).$(VER); then \
+        -@if [ ! -d $(includedir)  ]; then mkdir $(includedir); fi
+        -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi
+        cp zlib.h zconf.h $(includedir)
+        chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+        cp $(LIBS) $(libdir)
+        cd $(libdir); chmod 755 $(LIBS)
+        -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+        cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \
           rm -f $(SHAREDLIB) $(SHAREDLIB).1; \
           ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \
           ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \
@@ -96,19 +109,20 @@ install: $(LIBS)
 # ldconfig is for Linux
 
 uninstall:
-        cd $(prefix)/include; \
+        cd $(includedir); \
         v=$(VER); \
         if test -f zlib.h; then \
           v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \
           rm -f zlib.h zconf.h; \
         fi; \
-        cd $(exec_prefix)/lib; rm -f libz.a; \
+        cd $(libdir); rm -f libz.a; \
         if test -f $(SHAREDLIB).$$v; then \
           rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \
         fi
 
 clean:
-        rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
+        rm -f *.o *~ example minigzip libz.a libz.so* foo.gz so_locations \
+           _match.s maketree
 
 distclean:      clean
 
diff --git a/Makefile.riscos b/Makefile.riscos
index 0f10aa8..d97f449 100644
--- a/Makefile.riscos
+++ b/Makefile.riscos
@@ -1,8 +1,9 @@
 # Project:   zlib_1_03
-
+# Patched for zlib 1.1.2 rw@shadow.org.uk 19980430
+# test works out-of-the-box, installs `somewhere' on demand
 
 # Toolflags:
-CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fnah 
+CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fah 
 C++flags = -c -depend !Depend -IC: -throwback
 Linkflags = -aif -c++ -o $@ 
 ObjAsmflags = -throwback -NoCache -depend !Depend
@@ -10,37 +11,141 @@ CMHGflags =
 LibFileflags = -c -l -o $@ 
 Squeezeflags = -o $@
 
+# change the line below to where _you_ want the library installed.
+libdest = lib:zlib
 
 # Final targets:
-@.zlib_lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
+@.lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
         @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \
-        @.o.uncompress @.o.zutil 
+        @.o.uncompr @.o.zutil 
         LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \
         @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \
-        @.o.trees @.o.uncompress @.o.zutil 
-@.test:   @.tests.minigzip @.tests.example 
-        echo Please run "Test" in directory tests 
-@.tests.minigzip:   @.o.minigzip @.zlib_lib C:o.Stubs 
-        Link $(Linkflags) @.o.minigzip @.zlib_lib C:o.Stubs 
-@.tests.example:   @.o.example @.zlib_lib C:o.Stubs 
-        Link $(Linkflags) @.o.example @.zlib_lib C:o.Stubs 
+        @.o.trees @.o.uncompr @.o.zutil 
+test:   @.minigzip @.example @.lib
+        @copy @.lib @.libc  A~C~DF~L~N~P~Q~RS~TV
+        @echo running tests: hang on.
+        @/@.minigzip -f -9 libc
+        @/@.minigzip -d libc-gz
+        @/@.minigzip -f -1 libc
+        @/@.minigzip -d libc-gz
+        @/@.minigzip -h -9 libc
+        @/@.minigzip -d libc-gz
+        @/@.minigzip -h -1 libc
+        @/@.minigzip -d libc-gz
+        @/@.minigzip -9 libc
+        @/@.minigzip -d libc-gz
+        @/@.minigzip -1 libc
+        @/@.minigzip -d libc-gz
+        @diff @.lib @.libc
+        @echo that should have reported '@.lib and @.libc identical' if you have diff.
+        @/@.example @.fred @.fred
+        @echo that will have given lots of hello!'s.
+
+@.minigzip:   @.o.minigzip @.lib C:o.Stubs 
+        Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs 
+@.example:   @.o.example @.lib C:o.Stubs 
+        Link $(Linkflags) @.o.example @.lib C:o.Stubs
 
+install: @.lib
+        cdir $(libdest)
+        cdir $(libdest).h
+        @copy @.h.zlib $(libdest).h.zlib A~C~DF~L~N~P~Q~RS~TV
+        @copy @.h.zconf $(libdest).h.zconf A~C~DF~L~N~P~Q~RS~TV
+        @copy @.lib $(libdest).lib  A~C~DF~L~N~P~Q~RS~TV
+        @echo okay, installed zlib in $(libdest)
+
+clean:; remove @.minigzip
+        remove @.example
+        remove @.libc
+        -wipe @.o.* F~r~cV
+        remove @.fred
 
 # User-editable dependencies:
 .c.o:
         cc $(ccflags) -o $@ $<
 
 # Static dependencies:
-@.o.example:   @.tests.c.example
-        cc $(ccflags) -o @.o.example @.tests.c.example 
-@.o.minigzip:   @.tests.c.minigzip
-        cc $(ccflags) -o @.o.minigzip @.tests.c.minigzip 
-
 
 # Dynamic dependencies:
-o.minigzip:     tests.c.minigzip
-o.minigzip:     h.zlib
-o.minigzip:     h.zconf
-o.example:      tests.c.example
+o.example:      c.example
 o.example:      h.zlib
 o.example:      h.zconf
+o.minigzip:     c.minigzip
+o.minigzip:     h.zlib
+o.minigzip:     h.zconf
+o.adler32:      c.adler32
+o.adler32:      h.zlib
+o.adler32:      h.zconf
+o.compress:     c.compress
+o.compress:     h.zlib
+o.compress:     h.zconf
+o.crc32:        c.crc32
+o.crc32:        h.zlib
+o.crc32:        h.zconf
+o.deflate:      c.deflate
+o.deflate:      h.deflate
+o.deflate:      h.zutil
+o.deflate:      h.zlib
+o.deflate:      h.zconf
+o.gzio: c.gzio
+o.gzio: h.zutil
+o.gzio: h.zlib
+o.gzio: h.zconf
+o.infblock:     c.infblock
+o.infblock:     h.zutil
+o.infblock:     h.zlib
+o.infblock:     h.zconf
+o.infblock:     h.infblock
+o.infblock:     h.inftrees
+o.infblock:     h.infcodes
+o.infblock:     h.infutil
+o.infcodes:     c.infcodes
+o.infcodes:     h.zutil
+o.infcodes:     h.zlib
+o.infcodes:     h.zconf
+o.infcodes:     h.inftrees
+o.infcodes:     h.infblock
+o.infcodes:     h.infcodes
+o.infcodes:     h.infutil
+o.infcodes:     h.inffast
+o.inffast:      c.inffast
+o.inffast:      h.zutil
+o.inffast:      h.zlib
+o.inffast:      h.zconf
+o.inffast:      h.inftrees
+o.inffast:      h.infblock
+o.inffast:      h.infcodes
+o.inffast:      h.infutil
+o.inffast:      h.inffast
+o.inflate:      c.inflate
+o.inflate:      h.zutil
+o.inflate:      h.zlib
+o.inflate:      h.zconf
+o.inflate:      h.infblock
+o.inftrees:     c.inftrees
+o.inftrees:     h.zutil
+o.inftrees:     h.zlib
+o.inftrees:     h.zconf
+o.inftrees:     h.inftrees
+o.inftrees:     h.inffixed
+o.infutil:      c.infutil
+o.infutil:      h.zutil
+o.infutil:      h.zlib
+o.infutil:      h.zconf
+o.infutil:      h.infblock
+o.infutil:      h.inftrees
+o.infutil:      h.infcodes
+o.infutil:      h.infutil
+o.trees:        c.trees
+o.trees:        h.deflate
+o.trees:        h.zutil
+o.trees:        h.zlib
+o.trees:        h.zconf
+o.trees:        h.trees
+o.uncompr:      c.uncompr
+o.uncompr:      h.zlib
+o.uncompr:      h.zconf
+o.zutil:        c.zutil
+o.zutil:        h.zutil
+o.zutil:        h.zlib
+o.zutil:        h.zconf