Initial revision
This commit is contained in:
curt
commit
5173d709e0
32
Makefile.am
Normal file
32
Makefile.am
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
if ENABLE_UNIX_SERIAL
|
||||||
|
SERIAL_DIRS = serial
|
||||||
|
else
|
||||||
|
SERIAL_DIRS =
|
||||||
|
endif
|
||||||
|
|
||||||
|
if HAVE_ZLIB
|
||||||
|
ZLIB_DIRS =
|
||||||
|
else
|
||||||
|
ZLIB_DIRS = zlib
|
||||||
|
endif
|
||||||
|
|
||||||
|
METAR_DIRS =
|
||||||
|
# METAR_DIRS = metar
|
||||||
|
|
||||||
|
EXTRA_DIST = mksymlinks.sh
|
||||||
|
|
||||||
|
dist-hook:
|
||||||
|
tar cf - metar | (cd $(distdir); tar xvf -)
|
||||||
|
|
||||||
|
SUBDIRS = \
|
||||||
|
include \
|
||||||
|
bucket \
|
||||||
|
debug \
|
||||||
|
math \
|
||||||
|
$(METAR_DIRS) \
|
||||||
|
misc \
|
||||||
|
screen \
|
||||||
|
$(SERIAL_DIRS) \
|
||||||
|
xgl \
|
||||||
|
$(ZLIB_DIRS)
|
||||||
|
|
||||||
322
Makefile.in
Normal file
322
Makefile.in
Normal file
@ -0,0 +1,322 @@
|
|||||||
|
# Makefile.in generated automatically by automake 1.3 from Makefile.am
|
||||||
|
|
||||||
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
|
||||||
|
# This Makefile.in is free software; the Free Software Foundation
|
||||||
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||||
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
|
||||||
|
SHELL = /bin/sh
|
||||||
|
|
||||||
|
srcdir = @srcdir@
|
||||||
|
top_srcdir = @top_srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
prefix = @prefix@
|
||||||
|
exec_prefix = @exec_prefix@
|
||||||
|
|
||||||
|
bindir = @bindir@
|
||||||
|
sbindir = @sbindir@
|
||||||
|
libexecdir = @libexecdir@
|
||||||
|
datadir = @datadir@
|
||||||
|
sysconfdir = @sysconfdir@
|
||||||
|
sharedstatedir = @sharedstatedir@
|
||||||
|
localstatedir = @localstatedir@
|
||||||
|
libdir = @libdir@
|
||||||
|
infodir = @infodir@
|
||||||
|
mandir = @mandir@
|
||||||
|
includedir = @includedir@
|
||||||
|
oldincludedir = /usr/include
|
||||||
|
|
||||||
|
DISTDIR =
|
||||||
|
|
||||||
|
pkgdatadir = $(datadir)/@PACKAGE@
|
||||||
|
pkglibdir = $(libdir)/@PACKAGE@
|
||||||
|
pkgincludedir = $(includedir)/@PACKAGE@
|
||||||
|
|
||||||
|
top_builddir = .
|
||||||
|
|
||||||
|
ACLOCAL = @ACLOCAL@
|
||||||
|
AUTOCONF = @AUTOCONF@
|
||||||
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
AUTOHEADER = @AUTOHEADER@
|
||||||
|
|
||||||
|
INSTALL = @INSTALL@
|
||||||
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
|
transform = @program_transform_name@
|
||||||
|
|
||||||
|
NORMAL_INSTALL = :
|
||||||
|
PRE_INSTALL = :
|
||||||
|
POST_INSTALL = :
|
||||||
|
NORMAL_UNINSTALL = :
|
||||||
|
PRE_UNINSTALL = :
|
||||||
|
POST_UNINSTALL = :
|
||||||
|
CC = @CC@
|
||||||
|
CXX = @CXX@
|
||||||
|
LN_S = @LN_S@
|
||||||
|
MAKEINFO = @MAKEINFO@
|
||||||
|
PACKAGE = @PACKAGE@
|
||||||
|
RANLIB = @RANLIB@
|
||||||
|
VERSION = @VERSION@
|
||||||
|
base_LIBS = @base_LIBS@
|
||||||
|
opengl_LIBS = @opengl_LIBS@
|
||||||
|
|
||||||
|
@ENABLE_UNIX_SERIAL_TRUE@SERIAL_DIRS = serial
|
||||||
|
@ENABLE_UNIX_SERIAL_FALSE@SERIAL_DIRS =
|
||||||
|
|
||||||
|
@HAVE_ZLIB_TRUE@ZLIB_DIRS =
|
||||||
|
@HAVE_ZLIB_FALSE@ZLIB_DIRS = zlib
|
||||||
|
|
||||||
|
METAR_DIRS =
|
||||||
|
# METAR_DIRS = metar
|
||||||
|
|
||||||
|
EXTRA_DIST = mksymlinks.sh
|
||||||
|
|
||||||
|
SUBDIRS = \
|
||||||
|
include \
|
||||||
|
bucket \
|
||||||
|
debug \
|
||||||
|
math \
|
||||||
|
$(METAR_DIRS) \
|
||||||
|
misc \
|
||||||
|
screen \
|
||||||
|
$(SERIAL_DIRS) \
|
||||||
|
xgl \
|
||||||
|
$(ZLIB_DIRS)
|
||||||
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
|
CONFIG_HEADER = ./include/config.h
|
||||||
|
CONFIG_CLEAN_FILES = VERSION
|
||||||
|
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
|
||||||
|
Makefile.in NEWS VERSION.in aclocal.m4 configure configure.in \
|
||||||
|
install-sh missing mkinstalldirs
|
||||||
|
|
||||||
|
|
||||||
|
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
|
|
||||||
|
TAR = tar
|
||||||
|
GZIP = --best
|
||||||
|
DIST_SUBDIRS = include bucket debug math misc screen serial xgl zlib
|
||||||
|
all: all-recursive all-am
|
||||||
|
|
||||||
|
.SUFFIXES:
|
||||||
|
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||||
|
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
|
||||||
|
|
||||||
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||||
|
cd $(top_builddir) \
|
||||||
|
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||||
|
|
||||||
|
$(ACLOCAL_M4): configure.in
|
||||||
|
cd $(srcdir) && $(ACLOCAL)
|
||||||
|
|
||||||
|
config.status: $(srcdir)/configure
|
||||||
|
$(SHELL) ./config.status --recheck
|
||||||
|
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
|
||||||
|
cd $(srcdir) && $(AUTOCONF)
|
||||||
|
VERSION: $(top_builddir)/config.status VERSION.in
|
||||||
|
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
|
||||||
|
|
||||||
|
# This directory's subdirectories are mostly independent; you can cd
|
||||||
|
# into them and run `make' without going through this Makefile.
|
||||||
|
# To change the values of `make' variables: instead of editing Makefiles,
|
||||||
|
# (1) if the variable is set in `config.status', edit `config.status'
|
||||||
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
||||||
|
# (2) otherwise, pass the desired values on the `make' command line.
|
||||||
|
|
||||||
|
@SET_MAKE@
|
||||||
|
|
||||||
|
all-recursive install-data-recursive install-exec-recursive \
|
||||||
|
installdirs-recursive install-recursive uninstall-recursive \
|
||||||
|
check-recursive installcheck-recursive info-recursive dvi-recursive:
|
||||||
|
@set fnord $(MAKEFLAGS); amf=$$2; \
|
||||||
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||||
|
target=`echo $@ | sed s/-recursive//`; \
|
||||||
|
echo "Making $$target in $$subdir"; \
|
||||||
|
(cd $$subdir && $(MAKE) $$target) \
|
||||||
|
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||||
|
done && test -z "$$fail"
|
||||||
|
|
||||||
|
mostlyclean-recursive clean-recursive distclean-recursive \
|
||||||
|
maintainer-clean-recursive:
|
||||||
|
@set fnord $(MAKEFLAGS); amf=$$2; \
|
||||||
|
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||||
|
rev="$$subdir $$rev"; \
|
||||||
|
done; \
|
||||||
|
for subdir in $$rev; do \
|
||||||
|
target=`echo $@ | sed s/-recursive//`; \
|
||||||
|
echo "Making $$target in $$subdir"; \
|
||||||
|
(cd $$subdir && $(MAKE) $$target) \
|
||||||
|
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
||||||
|
done && test -z "$$fail"
|
||||||
|
tags-recursive:
|
||||||
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||||
|
(cd $$subdir && $(MAKE) tags); \
|
||||||
|
done
|
||||||
|
|
||||||
|
tags: TAGS
|
||||||
|
|
||||||
|
ID: $(HEADERS) $(SOURCES) $(LISP)
|
||||||
|
here=`pwd` && cd $(srcdir) \
|
||||||
|
&& mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
|
||||||
|
|
||||||
|
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
|
||||||
|
tags=; \
|
||||||
|
here=`pwd`; \
|
||||||
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||||
|
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
|
||||||
|
done; \
|
||||||
|
list='$(SOURCES) $(HEADERS)'; \
|
||||||
|
unique=`for i in $$list; do echo $$i; done | \
|
||||||
|
awk ' { files[$$0] = 1; } \
|
||||||
|
END { for (i in files) print i; }'`; \
|
||||||
|
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|
||||||
|
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
|
||||||
|
|
||||||
|
mostlyclean-tags:
|
||||||
|
|
||||||
|
clean-tags:
|
||||||
|
|
||||||
|
distclean-tags:
|
||||||
|
-rm -f TAGS ID
|
||||||
|
|
||||||
|
maintainer-clean-tags:
|
||||||
|
|
||||||
|
distdir = $(PACKAGE)-$(VERSION)
|
||||||
|
top_distdir = $(distdir)
|
||||||
|
|
||||||
|
# This target untars the dist file and tries a VPATH configuration. Then
|
||||||
|
# it guarantees that the distribution is self-contained by making another
|
||||||
|
# tarfile.
|
||||||
|
distcheck: dist
|
||||||
|
-rm -rf $(distdir)
|
||||||
|
GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
|
||||||
|
mkdir $(distdir)/=build
|
||||||
|
mkdir $(distdir)/=inst
|
||||||
|
dc_install_base=`cd $(distdir)/=inst && pwd`; \
|
||||||
|
cd $(distdir)/=build \
|
||||||
|
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
|
||||||
|
&& $(MAKE) \
|
||||||
|
&& $(MAKE) dvi \
|
||||||
|
&& $(MAKE) check \
|
||||||
|
&& $(MAKE) install \
|
||||||
|
&& $(MAKE) installcheck \
|
||||||
|
&& $(MAKE) dist
|
||||||
|
-rm -rf $(distdir)
|
||||||
|
@echo "========================"; \
|
||||||
|
echo "$(distdir).tar.gz is ready for distribution"; \
|
||||||
|
echo "========================"
|
||||||
|
dist: distdir
|
||||||
|
-chmod -R a+r $(distdir)
|
||||||
|
GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
|
||||||
|
-rm -rf $(distdir)
|
||||||
|
dist-all: distdir
|
||||||
|
-chmod -R a+r $(distdir)
|
||||||
|
GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
|
||||||
|
-rm -rf $(distdir)
|
||||||
|
distdir: $(DISTFILES)
|
||||||
|
-rm -rf $(distdir)
|
||||||
|
mkdir $(distdir)
|
||||||
|
-chmod 777 $(distdir)
|
||||||
|
here=`cd $(top_builddir) && pwd`; \
|
||||||
|
top_distdir=`cd $(distdir) && pwd`; \
|
||||||
|
distdir=`cd $(distdir) && pwd`; \
|
||||||
|
cd $(top_srcdir) \
|
||||||
|
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
|
||||||
|
@for file in $(DISTFILES); do \
|
||||||
|
d=$(srcdir); \
|
||||||
|
test -f $(distdir)/$$file \
|
||||||
|
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
||||||
|
|| cp -p $$d/$$file $(distdir)/$$file; \
|
||||||
|
done
|
||||||
|
for subdir in $(DIST_SUBDIRS); do \
|
||||||
|
test -d $(distdir)/$$subdir \
|
||||||
|
|| mkdir $(distdir)/$$subdir \
|
||||||
|
|| exit 1; \
|
||||||
|
chmod 777 $(distdir)/$$subdir; \
|
||||||
|
(cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|
||||||
|
|| exit 1; \
|
||||||
|
done
|
||||||
|
$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
|
||||||
|
info: info-recursive
|
||||||
|
dvi: dvi-recursive
|
||||||
|
check: all-am
|
||||||
|
$(MAKE) check-recursive
|
||||||
|
installcheck: installcheck-recursive
|
||||||
|
all-am: Makefile
|
||||||
|
|
||||||
|
install-exec: install-exec-recursive
|
||||||
|
@$(NORMAL_INSTALL)
|
||||||
|
|
||||||
|
install-data: install-data-recursive
|
||||||
|
@$(NORMAL_INSTALL)
|
||||||
|
|
||||||
|
install: install-recursive
|
||||||
|
@:
|
||||||
|
|
||||||
|
uninstall: uninstall-recursive
|
||||||
|
|
||||||
|
install-strip:
|
||||||
|
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||||
|
installdirs: installdirs-recursive
|
||||||
|
|
||||||
|
|
||||||
|
mostlyclean-generic:
|
||||||
|
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
|
||||||
|
|
||||||
|
clean-generic:
|
||||||
|
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||||
|
|
||||||
|
distclean-generic:
|
||||||
|
-rm -f Makefile $(DISTCLEANFILES)
|
||||||
|
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
|
||||||
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||||
|
|
||||||
|
maintainer-clean-generic:
|
||||||
|
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||||
|
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
|
||||||
|
mostlyclean-am: mostlyclean-tags mostlyclean-generic
|
||||||
|
|
||||||
|
clean-am: clean-tags clean-generic mostlyclean-am
|
||||||
|
|
||||||
|
distclean-am: distclean-tags distclean-generic clean-am
|
||||||
|
|
||||||
|
maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
|
||||||
|
distclean-am
|
||||||
|
|
||||||
|
mostlyclean: mostlyclean-recursive mostlyclean-am
|
||||||
|
|
||||||
|
clean: clean-recursive clean-am
|
||||||
|
|
||||||
|
distclean: distclean-recursive distclean-am
|
||||||
|
-rm -f config.status
|
||||||
|
|
||||||
|
maintainer-clean: maintainer-clean-recursive maintainer-clean-am
|
||||||
|
@echo "This command is intended for maintainers to use;"
|
||||||
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
-rm -f config.status
|
||||||
|
|
||||||
|
.PHONY: install-data-recursive uninstall-data-recursive \
|
||||||
|
install-exec-recursive uninstall-exec-recursive installdirs-recursive \
|
||||||
|
uninstalldirs-recursive all-recursive check-recursive \
|
||||||
|
installcheck-recursive info-recursive dvi-recursive \
|
||||||
|
mostlyclean-recursive distclean-recursive clean-recursive \
|
||||||
|
maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
|
||||||
|
distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
|
||||||
|
installcheck all-am install-exec install-data install uninstall all \
|
||||||
|
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||||
|
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||||
|
|
||||||
|
|
||||||
|
dist-hook:
|
||||||
|
tar cf - metar | (cd $(distdir); tar xvf -)
|
||||||
|
|
||||||
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
.NOEXPORT:
|
||||||
1
VERSION.in
Normal file
1
VERSION.in
Normal file
@ -0,0 +1 @@
|
|||||||
|
@VERSION@
|
||||||
324
acconfig.h
Normal file
324
acconfig.h
Normal file
@ -0,0 +1,324 @@
|
|||||||
|
/* acconfig.h
|
||||||
|
This file is in the public domain.
|
||||||
|
|
||||||
|
Descriptive text for the C preprocessor macros that
|
||||||
|
the distributed Autoconf macros can define.
|
||||||
|
No software package will use all of them; autoheader copies the ones
|
||||||
|
your configure.in uses into your configuration header file templates.
|
||||||
|
|
||||||
|
The entries are in sort -df order: alphabetical, case insensitive,
|
||||||
|
ignoring punctuation (such as underscores). Although this order
|
||||||
|
can split up related entries, it makes it easier to check whether
|
||||||
|
a given entry is in the file.
|
||||||
|
|
||||||
|
Leave the following blank line there!! Autoheader needs it. */
|
||||||
|
|
||||||
|
|
||||||
|
/* Define if on AIX 3.
|
||||||
|
System headers sometimes define this.
|
||||||
|
We just want to avoid a redefinition error message. */
|
||||||
|
#ifndef _ALL_SOURCE
|
||||||
|
#undef _ALL_SOURCE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Define if using alloca.c. */
|
||||||
|
#undef C_ALLOCA
|
||||||
|
|
||||||
|
/* Define if type char is unsigned and you are not using gcc. */
|
||||||
|
#ifndef __CHAR_UNSIGNED__
|
||||||
|
#undef __CHAR_UNSIGNED__
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Define if the closedir function returns void instead of int. */
|
||||||
|
#undef CLOSEDIR_VOID
|
||||||
|
|
||||||
|
/* Define to empty if the keyword does not work. */
|
||||||
|
#undef const
|
||||||
|
|
||||||
|
/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
|
||||||
|
This function is required for alloca.c support on those systems. */
|
||||||
|
#undef CRAY_STACKSEG_END
|
||||||
|
|
||||||
|
/* Define for DGUX with <sys/dg_sys_info.h>. */
|
||||||
|
#undef DGUX
|
||||||
|
|
||||||
|
/* Define if you have <dirent.h>. */
|
||||||
|
#undef DIRENT
|
||||||
|
|
||||||
|
/* Define to enable audio support */
|
||||||
|
#undef ENABLE_AUDIO_SUPPORT
|
||||||
|
|
||||||
|
/* Define to enable GLUT joystick support (limited to 3 axes) */
|
||||||
|
#undef ENABLE_GLUT_JOYSTICK
|
||||||
|
|
||||||
|
/* Define to enable plib joystick support (recommended) */
|
||||||
|
#undef ENABLE_PLIB_JOYSTICK
|
||||||
|
|
||||||
|
/* Define to eliminate all trace of debugging messages such as for a
|
||||||
|
release build */
|
||||||
|
#undef FG_NDEBUG
|
||||||
|
|
||||||
|
/* Define to include Oliver's networking support */
|
||||||
|
#undef FG_NETWORK_OLK
|
||||||
|
|
||||||
|
/* Define to avoid Christian's new weather code */
|
||||||
|
#undef FG_OLD_WEATHER
|
||||||
|
|
||||||
|
/* Define if we are building FGFS (should always be defined) */
|
||||||
|
#undef FGFS
|
||||||
|
|
||||||
|
/* Define to enable 3dfx/glide render in a window hack under unix.
|
||||||
|
This probably won't work under windows. */
|
||||||
|
#undef XMESA
|
||||||
|
#undef FX
|
||||||
|
|
||||||
|
/* Define to the type of elements in the array set by `getgroups'.
|
||||||
|
Usually this is either `int' or `gid_t'. */
|
||||||
|
#undef GETGROUPS_T
|
||||||
|
|
||||||
|
/* Define if the `getloadavg' function needs to be run setuid or setgid. */
|
||||||
|
#undef GETLOADAVG_PRIVILEGED
|
||||||
|
|
||||||
|
/* Define if the `getpgrp' function takes no argument. */
|
||||||
|
#undef GETPGRP_VOID
|
||||||
|
|
||||||
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||||
|
#undef gid_t
|
||||||
|
|
||||||
|
/* Define if you have alloca, as a function or macro. */
|
||||||
|
#undef HAVE_ALLOCA
|
||||||
|
|
||||||
|
/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
|
||||||
|
#undef HAVE_ALLOCA_H
|
||||||
|
|
||||||
|
/* Define if you external variables daylight. */
|
||||||
|
#undef HAVE_DAYLIGHT
|
||||||
|
|
||||||
|
/* Define if you don't have vprintf but do have _doprnt. */
|
||||||
|
#undef HAVE_DOPRNT
|
||||||
|
|
||||||
|
/* Define if your system has a working fnmatch function. */
|
||||||
|
#undef HAVE_FNMATCH
|
||||||
|
|
||||||
|
/* Define if your system has its own `getloadavg' function. */
|
||||||
|
#undef HAVE_GETLOADAVG
|
||||||
|
|
||||||
|
/* Define if you have getrusage() */
|
||||||
|
#undef HAVE_GETRUSAGE
|
||||||
|
|
||||||
|
/* Define if you have the getmntent function. */
|
||||||
|
#undef HAVE_GETMNTENT
|
||||||
|
|
||||||
|
/* Define if you have the gpc library and headers installed. */
|
||||||
|
#undef HAVE_GPC_H
|
||||||
|
|
||||||
|
/* Define if the `long double' type works. */
|
||||||
|
#undef HAVE_LONG_DOUBLE
|
||||||
|
|
||||||
|
/* Define if you support file names longer than 14 characters. */
|
||||||
|
#undef HAVE_LONG_FILE_NAMES
|
||||||
|
|
||||||
|
/* Define if you have a working `mmap' system call. */
|
||||||
|
#undef HAVE_MMAP
|
||||||
|
|
||||||
|
/* Define if system calls automatically restart after interruption
|
||||||
|
by a signal. */
|
||||||
|
#undef HAVE_RESTARTABLE_SYSCALLS
|
||||||
|
|
||||||
|
/* Define if you have rint() which rounds to closest int but returns
|
||||||
|
result as a double data type. */
|
||||||
|
#undef HAVE_RINT
|
||||||
|
|
||||||
|
/* Define if your struct stat has st_blksize. */
|
||||||
|
#undef HAVE_ST_BLKSIZE
|
||||||
|
|
||||||
|
/* Define if your struct stat has st_blocks. */
|
||||||
|
#undef HAVE_ST_BLOCKS
|
||||||
|
|
||||||
|
/* Define if you have the strcoll function and it is properly defined. */
|
||||||
|
#undef HAVE_STRCOLL
|
||||||
|
|
||||||
|
/* Define if your struct stat has st_rdev. */
|
||||||
|
#undef HAVE_ST_RDEV
|
||||||
|
|
||||||
|
/* Define if you have the strftime function. */
|
||||||
|
#undef HAVE_STRFTIME
|
||||||
|
|
||||||
|
/* Define if you have <sys/param.h> */
|
||||||
|
#undef HAVE_SYS_PARAM_H
|
||||||
|
|
||||||
|
/* Define if you have <sys/stat.h> that is POSIX.1 compatible. */
|
||||||
|
#undef HAVE_SYS_STAT_H
|
||||||
|
|
||||||
|
/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
|
||||||
|
#undef HAVE_SYS_WAIT_H
|
||||||
|
|
||||||
|
/* Define if you have timegm() */
|
||||||
|
#undef HAVE_TIMEGM
|
||||||
|
|
||||||
|
/* Define if you external variables timezone. */
|
||||||
|
#undef HAVE_TIMEZONE
|
||||||
|
|
||||||
|
/* Define if your struct tm has tm_zone. */
|
||||||
|
#undef HAVE_TM_ZONE
|
||||||
|
|
||||||
|
/* Define if you don't have tm_zone but do have the external array
|
||||||
|
tzname. */
|
||||||
|
#undef HAVE_TZNAME
|
||||||
|
|
||||||
|
/* Define if you have <unistd.h>. */
|
||||||
|
#undef HAVE_UNISTD_H
|
||||||
|
|
||||||
|
/* Define if utime(file, NULL) sets file's timestamp to the present. */
|
||||||
|
#undef HAVE_UTIME_NULL
|
||||||
|
|
||||||
|
/* Define if you have <vfork.h>. */
|
||||||
|
#undef HAVE_VFORK_H
|
||||||
|
|
||||||
|
/* Define if you have the vprintf function. */
|
||||||
|
#undef HAVE_VPRINTF
|
||||||
|
|
||||||
|
/* Define if you have the wait3 system call. */
|
||||||
|
#undef HAVE_WAIT3
|
||||||
|
|
||||||
|
/* Define as __inline if that's what the C compiler calls it. */
|
||||||
|
#undef inline
|
||||||
|
|
||||||
|
/* Define if int is 16 bits instead of 32. */
|
||||||
|
#undef INT_16_BITS
|
||||||
|
|
||||||
|
/* Define if long int is 64 bits. */
|
||||||
|
#undef LONG_64_BITS
|
||||||
|
|
||||||
|
/* Define if major, minor, and makedev are declared in <mkdev.h>. */
|
||||||
|
#undef MAJOR_IN_MKDEV
|
||||||
|
|
||||||
|
/* Define if major, minor, and makedev are declared in <sysmacros.h>. */
|
||||||
|
#undef MAJOR_IN_SYSMACROS
|
||||||
|
|
||||||
|
/* Define if on MINIX. */
|
||||||
|
#undef _MINIX
|
||||||
|
|
||||||
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||||
|
#undef mode_t
|
||||||
|
|
||||||
|
/* Define if you don't have <dirent.h>, but have <ndir.h>. */
|
||||||
|
#undef NDIR
|
||||||
|
|
||||||
|
/* Define if you have <memory.h>, and <string.h> doesn't declare the
|
||||||
|
mem* functions. */
|
||||||
|
#undef NEED_MEMORY_H
|
||||||
|
|
||||||
|
/* Define if your struct nlist has an n_un member. */
|
||||||
|
#undef NLIST_NAME_UNION
|
||||||
|
|
||||||
|
/* Define if you have <nlist.h>. */
|
||||||
|
#undef NLIST_STRUCT
|
||||||
|
|
||||||
|
/* Define if your C compiler doesn't accept -c and -o together. */
|
||||||
|
#undef NO_MINUS_C_MINUS_O
|
||||||
|
|
||||||
|
/* Define to `long' if <sys/types.h> doesn't define. */
|
||||||
|
#undef off_t
|
||||||
|
|
||||||
|
/* Define to package name */
|
||||||
|
#undef PACKAGE
|
||||||
|
|
||||||
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||||
|
#undef pid_t
|
||||||
|
|
||||||
|
/* Define if the system does not provide POSIX.1 features except
|
||||||
|
with this defined. */
|
||||||
|
#undef _POSIX_1_SOURCE
|
||||||
|
|
||||||
|
/* Define if you need to in order for stat and other things to work. */
|
||||||
|
#undef _POSIX_SOURCE
|
||||||
|
|
||||||
|
/* Define as the return type of signal handlers (int or void). */
|
||||||
|
#undef RETSIGTYPE
|
||||||
|
|
||||||
|
/* Define if the `setpgrp' function takes no argument. */
|
||||||
|
#undef SETPGRP_VOID
|
||||||
|
|
||||||
|
/* Define if the setvbuf function takes the buffering type as its second
|
||||||
|
argument and the buffer pointer as the third, as on System V
|
||||||
|
before release 3. */
|
||||||
|
#undef SETVBUF_REVERSED
|
||||||
|
|
||||||
|
/* Define to `unsigned' if <sys/types.h> doesn't define. */
|
||||||
|
#undef size_t
|
||||||
|
|
||||||
|
/* If using the C implementation of alloca, define if you know the
|
||||||
|
direction of stack growth for your system; otherwise it will be
|
||||||
|
automatically deduced at run-time.
|
||||||
|
STACK_DIRECTION > 0 => grows toward higher addresses
|
||||||
|
STACK_DIRECTION < 0 => grows toward lower addresses
|
||||||
|
STACK_DIRECTION = 0 => direction of growth unknown
|
||||||
|
*/
|
||||||
|
#undef STACK_DIRECTION
|
||||||
|
|
||||||
|
/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
|
||||||
|
#undef STAT_MACROS_BROKEN
|
||||||
|
|
||||||
|
/* Define if you have the ANSI C header files. */
|
||||||
|
#undef STDC_HEADERS
|
||||||
|
|
||||||
|
/* Define on System V Release 4. */
|
||||||
|
#undef SVR4
|
||||||
|
|
||||||
|
/* Define if you don't have <dirent.h>, but have <sys/dir.h>. */
|
||||||
|
#undef SYSDIR
|
||||||
|
|
||||||
|
/* Define if you don't have <dirent.h>, but have <sys/ndir.h>. */
|
||||||
|
#undef SYSNDIR
|
||||||
|
|
||||||
|
/* Define if `sys_siglist' is declared by <signal.h>. */
|
||||||
|
#undef SYS_SIGLIST_DECLARED
|
||||||
|
|
||||||
|
/* Define if you can safely include both <sys/time.h> and <time.h>. */
|
||||||
|
#undef TIME_WITH_SYS_TIME
|
||||||
|
|
||||||
|
/* Define if your <sys/time.h> declares struct tm. */
|
||||||
|
#undef TM_IN_SYS_TIME
|
||||||
|
|
||||||
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||||
|
#undef uid_t
|
||||||
|
|
||||||
|
/* Define for Encore UMAX. */
|
||||||
|
#undef UMAX
|
||||||
|
|
||||||
|
/* Define for Encore UMAX 4.3 that has <inq_status/cpustats.h>
|
||||||
|
instead of <sys/cpustats.h>. */
|
||||||
|
#undef UMAX4_3
|
||||||
|
|
||||||
|
/* Define if you do not have <strings.h>, index, bzero, etc.. */
|
||||||
|
#undef USG
|
||||||
|
|
||||||
|
/* Define to version number */
|
||||||
|
#undef VERSION
|
||||||
|
|
||||||
|
/* Define vfork as fork if vfork does not work. */
|
||||||
|
#undef vfork
|
||||||
|
|
||||||
|
/* Define if the closedir function returns void instead of int. */
|
||||||
|
#undef VOID_CLOSEDIR
|
||||||
|
|
||||||
|
/* Define if compiling on a Winbloze (95, NT, etc.) platform */
|
||||||
|
#undef WIN32
|
||||||
|
|
||||||
|
/* Define if your processor stores words with the most significant
|
||||||
|
byte first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||||
|
#undef WORDS_BIGENDIAN
|
||||||
|
|
||||||
|
/* Define if the X Window System is missing or not being used. */
|
||||||
|
#undef X_DISPLAY_MISSING
|
||||||
|
|
||||||
|
/* Define if lex declares yytext as a char * by default, not a char[]. */
|
||||||
|
#undef YYTEXT_POINTER
|
||||||
|
|
||||||
|
|
||||||
|
/* Leave that blank line there!! Autoheader needs it.
|
||||||
|
If you're adding to this file, keep in mind:
|
||||||
|
The entries are in sort -df order: alphabetical, case insensitive,
|
||||||
|
ignoring punctuation (such as underscores). */
|
||||||
|
|
||||||
149
aclocal.m4
vendored
Normal file
149
aclocal.m4
vendored
Normal file
@ -0,0 +1,149 @@
|
|||||||
|
dnl aclocal.m4 generated automatically by aclocal 1.3
|
||||||
|
|
||||||
|
dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
|
||||||
|
dnl This Makefile.in is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
dnl This program is distributed in the hope that it will be useful,
|
||||||
|
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||||
|
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
dnl PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
# Do all the work for Automake. This macro actually does too much --
|
||||||
|
# some checks are only needed if your package does certain things.
|
||||||
|
# But this isn't really a big deal.
|
||||||
|
|
||||||
|
# serial 1
|
||||||
|
|
||||||
|
dnl Usage:
|
||||||
|
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||||
|
|
||||||
|
AC_DEFUN(AM_INIT_AUTOMAKE,
|
||||||
|
[AC_REQUIRE([AM_PROG_INSTALL])
|
||||||
|
PACKAGE=[$1]
|
||||||
|
AC_SUBST(PACKAGE)
|
||||||
|
VERSION=[$2]
|
||||||
|
AC_SUBST(VERSION)
|
||||||
|
dnl test to see if srcdir already configured
|
||||||
|
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
||||||
|
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
||||||
|
fi
|
||||||
|
ifelse([$3],,
|
||||||
|
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
|
||||||
|
AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
|
||||||
|
AC_REQUIRE([AM_SANITY_CHECK])
|
||||||
|
AC_REQUIRE([AC_ARG_PROGRAM])
|
||||||
|
dnl FIXME This is truly gross.
|
||||||
|
missing_dir=`cd $ac_aux_dir && pwd`
|
||||||
|
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
|
||||||
|
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
|
||||||
|
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
|
||||||
|
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
|
||||||
|
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
|
||||||
|
AC_REQUIRE([AC_PROG_MAKE_SET])])
|
||||||
|
|
||||||
|
|
||||||
|
# serial 1
|
||||||
|
|
||||||
|
AC_DEFUN(AM_PROG_INSTALL,
|
||||||
|
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||||
|
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
|
||||||
|
AC_SUBST(INSTALL_SCRIPT)dnl
|
||||||
|
])
|
||||||
|
|
||||||
|
#
|
||||||
|
# Check to make sure that the build environment is sane.
|
||||||
|
#
|
||||||
|
|
||||||
|
AC_DEFUN(AM_SANITY_CHECK,
|
||||||
|
[AC_MSG_CHECKING([whether build environment is sane])
|
||||||
|
# Just in case
|
||||||
|
sleep 1
|
||||||
|
echo timestamp > conftestfile
|
||||||
|
# Do `set' in a subshell so we don't clobber the current shell's
|
||||||
|
# arguments. Must try -L first in case configure is actually a
|
||||||
|
# symlink; some systems play weird games with the mod time of symlinks
|
||||||
|
# (eg FreeBSD returns the mod time of the symlink's containing
|
||||||
|
# directory).
|
||||||
|
if (
|
||||||
|
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
|
||||||
|
if test "[$]*" = "X"; then
|
||||||
|
# -L didn't work.
|
||||||
|
set X `ls -t $srcdir/configure conftestfile`
|
||||||
|
fi
|
||||||
|
if test "[$]*" != "X $srcdir/configure conftestfile" \
|
||||||
|
&& test "[$]*" != "X conftestfile $srcdir/configure"; then
|
||||||
|
|
||||||
|
# If neither matched, then we have a broken ls. This can happen
|
||||||
|
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
||||||
|
# broken ls alias from the environment. This has actually
|
||||||
|
# happened. Such a system could not be considered "sane".
|
||||||
|
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
|
||||||
|
alias in your environment])
|
||||||
|
fi
|
||||||
|
|
||||||
|
test "[$]2" = conftestfile
|
||||||
|
)
|
||||||
|
then
|
||||||
|
# Ok.
|
||||||
|
:
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([newly created file is older than distributed files!
|
||||||
|
Check your system clock])
|
||||||
|
fi
|
||||||
|
rm -f conftest*
|
||||||
|
AC_MSG_RESULT(yes)])
|
||||||
|
|
||||||
|
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
||||||
|
dnl The program must properly implement --version.
|
||||||
|
AC_DEFUN(AM_MISSING_PROG,
|
||||||
|
[AC_MSG_CHECKING(for working $2)
|
||||||
|
# Run test in a subshell; some versions of sh will print an error if
|
||||||
|
# an executable is not found, even if stderr is redirected.
|
||||||
|
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||||
|
if ($2 --version) < /dev/null > /dev/null 2>&1; then
|
||||||
|
$1=$2
|
||||||
|
AC_MSG_RESULT(found)
|
||||||
|
else
|
||||||
|
$1="$3/missing $2"
|
||||||
|
AC_MSG_RESULT(missing)
|
||||||
|
fi
|
||||||
|
AC_SUBST($1)])
|
||||||
|
|
||||||
|
# Define a conditional.
|
||||||
|
|
||||||
|
AC_DEFUN(AM_CONDITIONAL,
|
||||||
|
[AC_SUBST($1_TRUE)
|
||||||
|
AC_SUBST($1_FALSE)
|
||||||
|
if $2; then
|
||||||
|
$1_TRUE=
|
||||||
|
$1_FALSE='#'
|
||||||
|
else
|
||||||
|
$1_TRUE='#'
|
||||||
|
$1_FALSE=
|
||||||
|
fi])
|
||||||
|
|
||||||
|
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||||
|
|
||||||
|
AC_DEFUN(AM_CONFIG_HEADER,
|
||||||
|
[AC_PREREQ([2.12])
|
||||||
|
AC_CONFIG_HEADER([$1])
|
||||||
|
dnl When config.status generates a header, we must update the stamp-h file.
|
||||||
|
dnl This file resides in the same directory as the config header
|
||||||
|
dnl that is generated. We must strip everything past the first ":",
|
||||||
|
dnl and everything past the last "/".
|
||||||
|
AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
|
||||||
|
ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
|
||||||
|
<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
|
||||||
|
<<am_indx=1
|
||||||
|
for am_file in <<$1>>; do
|
||||||
|
case " <<$>>CONFIG_HEADERS " in
|
||||||
|
*" <<$>>am_file "*<<)>>
|
||||||
|
echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
am_indx=`expr "<<$>>am_indx" + 1`
|
||||||
|
done<<>>dnl>>)
|
||||||
|
changequote([,]))])
|
||||||
|
|
||||||
394
acsite.m4
Normal file
394
acsite.m4
Normal file
@ -0,0 +1,394 @@
|
|||||||
|
dnl
|
||||||
|
dnl originally from ncftp 2.3.0
|
||||||
|
dnl added wi_EXTRA_PDIR and wi_ANSI_C
|
||||||
|
dnl $Id$
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_EXTRA_IDIR, [
|
||||||
|
incdir="$1"
|
||||||
|
if test -r $incdir ; then
|
||||||
|
case "$CPPFLAGS" in
|
||||||
|
*-I${incdir}*)
|
||||||
|
# echo " + already had $incdir" 1>&6
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if test "$CPPFLAGS" = "" ; then
|
||||||
|
CPPFLAGS="-I$incdir"
|
||||||
|
else
|
||||||
|
CPPFLAGS="$CPPFLAGS -I$incdir"
|
||||||
|
fi
|
||||||
|
echo " + found $incdir" 1>&6
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_EXTRA_LDIR, [
|
||||||
|
mylibdir="$1"
|
||||||
|
if test -r $mylibdir ; then
|
||||||
|
case "$LDFLAGS" in
|
||||||
|
*-L${mylibdir}*)
|
||||||
|
# echo " + already had $mylibdir" 1>&6
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if test "$LDFLAGS" = "" ; then
|
||||||
|
LDFLAGS="-L$mylibdir"
|
||||||
|
else
|
||||||
|
LDFLAGS="$LDFLAGS -L$mylibdir"
|
||||||
|
fi
|
||||||
|
echo " + found $mylibdir" 1>&6
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl __FP__
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_EXTRA_PDIR, [
|
||||||
|
progdir="$1"
|
||||||
|
if test -r $progdir ; then
|
||||||
|
case "$PATH" in
|
||||||
|
*:${progdir}*)
|
||||||
|
# echo " + already had $progdir" 1>&6
|
||||||
|
;;
|
||||||
|
*${progdir}:*)
|
||||||
|
# echo " + already had $progdir" 1>&6
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if test "$PATH" = "" ; then
|
||||||
|
PATH="$progdir"
|
||||||
|
else
|
||||||
|
PATH="$PATH:$progdir"
|
||||||
|
fi
|
||||||
|
echo " + found $progdir" 1>&6
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl If you want to also look for include and lib subdirectories in the
|
||||||
|
dnl $HOME tree, you supply "yes" as the first argument to this macro.
|
||||||
|
dnl
|
||||||
|
dnl If you want to look for subdirectories in include/lib directories,
|
||||||
|
dnl you pass the names in argument 3, otherwise pass a dash.
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_EXTRA_DIRS, [echo "checking for extra include and lib directories..." 1>&6
|
||||||
|
ifelse([$1], yes, [dnl
|
||||||
|
b1=`cd .. ; pwd`
|
||||||
|
b2=`cd ../.. ; pwd`
|
||||||
|
exdirs="$HOME $j $b1 $b2 $prefix $2"
|
||||||
|
],[dnl
|
||||||
|
exdirs="$prefix $2"
|
||||||
|
])
|
||||||
|
subexdirs="$3"
|
||||||
|
if test "$subexdirs" = "" ; then
|
||||||
|
subexdirs="-"
|
||||||
|
fi
|
||||||
|
for subexdir in $subexdirs ; do
|
||||||
|
if test "$subexdir" = "-" ; then
|
||||||
|
subexdir=""
|
||||||
|
else
|
||||||
|
subexdir="/$subexdir"
|
||||||
|
fi
|
||||||
|
for exdir in $exdirs ; do
|
||||||
|
if test "$exdir" != "/usr" || test "$subexdir" != ""; then
|
||||||
|
incdir="${exdir}/include${subexdir}"
|
||||||
|
wi_EXTRA_IDIR($incdir)
|
||||||
|
|
||||||
|
mylibdir="${exdir}/lib${subexdir}"
|
||||||
|
wi_EXTRA_LDIR($mylibdir)
|
||||||
|
|
||||||
|
progdir="${exdir}/bin${subexdirr}"
|
||||||
|
wi_EXTRA_PDIR($progdir)
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_HPUX_CFLAGS,
|
||||||
|
[AC_MSG_CHECKING(if HP-UX ansi C compiler flags are needed)
|
||||||
|
AC_REQUIRE([AC_PROG_CC])
|
||||||
|
os=`uname -s | tr '[A-Z]' '[a-z]'`
|
||||||
|
ac_cv_hpux_flags=no
|
||||||
|
if test "$os" = hp-ux ; then
|
||||||
|
if test "$ac_cv_prog_gcc" = yes ; then
|
||||||
|
if test "$CFLAGS" != "" ; then
|
||||||
|
# Shouldn't be in there.
|
||||||
|
CFLAGS=`echo "$CFLAGS" | sed 's/-Aa//g'`
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# If you're not using gcc, then you better have a cc/c89
|
||||||
|
# that is usable. If you have the barebones compiler, it
|
||||||
|
# won't work. The good compiler uses -Aa for the ANSI
|
||||||
|
# compatible stuff.
|
||||||
|
x=`echo $CFLAGS | grep 'Aa' 2>/dev/null`
|
||||||
|
if test "$x" = "" ; then
|
||||||
|
CFLAGS="$CFLAGS -Aa"
|
||||||
|
fi
|
||||||
|
ac_cv_hpux_flags=yes
|
||||||
|
fi
|
||||||
|
# Also add _HPUX_SOURCE to get the extended namespace.
|
||||||
|
x=`echo $CFLAGS | grep '_HPUX_SOURCE' 2>/dev/null`
|
||||||
|
if test "$x" = "" ; then
|
||||||
|
CFLAGS="$CFLAGS -D_HPUX_SOURCE"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AC_MSG_RESULT($ac_cv_hpux_flags)
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_CFLAGS, [AC_REQUIRE([AC_PROG_CC])
|
||||||
|
wi_HPUX_CFLAGS
|
||||||
|
if test "$CFLAGS" = "" ; then
|
||||||
|
CFLAGS="-O"
|
||||||
|
elif test "$ac_cv_prog_gcc" = "yes" ; then
|
||||||
|
case "$CFLAGS" in
|
||||||
|
*"-g -O"*)
|
||||||
|
#echo "using -g as default gcc CFLAGS" 1>&6
|
||||||
|
CFLAGS=`echo $CFLAGS | sed 's/-g\ -O/-O/'`
|
||||||
|
;;
|
||||||
|
*"-O -g"*)
|
||||||
|
# Leave the -g, but remove all -O options.
|
||||||
|
#echo "using -g as default gcc CFLAGS" 1>&6
|
||||||
|
CFLAGS=`echo $CFLAGS | sed 's/-O\ -g/-O/'`
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_PROTOTYPES, [
|
||||||
|
AC_MSG_CHECKING(if the compiler supports function prototypes)
|
||||||
|
AC_TRY_COMPILE(,[extern void exit(int status);],[wi_cv_prototypes=yes
|
||||||
|
AC_DEFINE(PROTOTYPES)],wi_cv_prototypes=no)
|
||||||
|
AC_MSG_RESULT($wi_cv_prototypes)
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_ANSI_C, [
|
||||||
|
AC_MSG_CHECKING(ANSI-style function definitions)
|
||||||
|
AC_TRY_COMPILE(,[int blubb(int x) { return 0; }],[wi_cv_ansi_funcs=yes
|
||||||
|
AC_DEFINE(ANSI_FUNCS)],wi_cv_ansi_funcs=no)
|
||||||
|
AC_MSG_RESULT($wi_cv_ansi_funcs)
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_HEADER_SYS_SELECT_H, [
|
||||||
|
# See if <sys/select.h> is includable after <sys/time.h>
|
||||||
|
if test "$ac_cv_header_sys_time_h" = no ; then
|
||||||
|
AC_CHECK_HEADERS(sys/time.h sys/select.h)
|
||||||
|
else
|
||||||
|
AC_CHECK_HEADERS(sys/select.h)
|
||||||
|
fi
|
||||||
|
if test "$ac_cv_header_sys_select_h" = yes ; then
|
||||||
|
AC_MSG_CHECKING([if <sys/select.h> is compatible with <sys/time.h>])
|
||||||
|
selecth=yes
|
||||||
|
if test "$ac_cv_header_sys_time_h" = yes ; then
|
||||||
|
AC_TRY_COMPILE([#include <sys/time.h>
|
||||||
|
#include <sys/select.h>],[
|
||||||
|
fd_set a;
|
||||||
|
struct timeval tmval;
|
||||||
|
|
||||||
|
tmval.tv_sec = 0;],selecth=yes,selecth=no)
|
||||||
|
|
||||||
|
if test "$selecth" = yes ; then
|
||||||
|
AC_DEFINE(CAN_USE_SYS_SELECT_H)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AC_MSG_RESULT($selecth)
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_LIB_RESOLV, [
|
||||||
|
# See if we could access two well-known sites without help of any special
|
||||||
|
# libraries, like resolv.
|
||||||
|
|
||||||
|
AC_TRY_RUN([
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
struct hostent *hp1, *hp2;
|
||||||
|
int result;
|
||||||
|
|
||||||
|
hp1 = gethostbyname("gatekeeper.dec.com");
|
||||||
|
hp2 = gethostbyname("ftp.ncsa.uiuc.edu");
|
||||||
|
result = ((hp1 != (struct hostent *) 0) && (hp2 != (struct hostent *) 0));
|
||||||
|
exit(! result);
|
||||||
|
}],look_for_resolv=no,look_for_resolv=yes,look_for_resolv=yes)
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([if we need to look for -lresolv])
|
||||||
|
AC_MSG_RESULT($look_for_resolv)
|
||||||
|
if test "$look_for_resolv" = yes ; then
|
||||||
|
AC_CHECK_LIB(resolv,main)
|
||||||
|
else
|
||||||
|
ac_cv_lib_resolv=no
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_DEFUN(wi_LIB_NSL, [
|
||||||
|
AC_MSG_CHECKING(if we can use -lnsl)
|
||||||
|
ac_save_LIBS="$LIBS";
|
||||||
|
LIBS="$LIBS -lnsl";
|
||||||
|
AC_CACHE_VAL(r_cv_use_libnsl, [
|
||||||
|
AC_TRY_RUN(
|
||||||
|
main() { if (getpwuid(getuid())) exit(0); exit(-1); },
|
||||||
|
nc_cv_use_libnsl=yes, nc_cv_use_libnsl=no, nc_cv_use_libnsl=no)
|
||||||
|
])
|
||||||
|
if test "$nc_cv_use_libnsl" = "no"; then LIBS="$ac_save_LIBS"; fi
|
||||||
|
AC_MSG_RESULT($nc_cv_use_libnsl)
|
||||||
|
])dnl
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_DEFUN(nc_PATH_PROG_ZCAT, [
|
||||||
|
AC_PATH_PROG(GZCAT,gzcat)
|
||||||
|
AC_PATH_PROG(ZCAT,zcat)
|
||||||
|
if test "x$GZCAT" = x ; then
|
||||||
|
if test "x$ZCAT" != x ; then
|
||||||
|
# See if zcat is really gzcat. gzcat has a --version option, regular
|
||||||
|
# zcat does not.
|
||||||
|
AC_MSG_CHECKING(if zcat is really gzcat in disguise)
|
||||||
|
if $ZCAT --version 2> /dev/null ; then
|
||||||
|
AC_DEFINE_UNQUOTED(GZCAT, "$ZCAT")
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
AC_DEFINE_UNQUOTED(GZCAT, "$GZCAT")
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$ZCAT" != x ; then
|
||||||
|
AC_DEFINE_UNQUOTED(ZCAT, "$ZCAT")
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_SYSV_EXTRA_DIRS, [
|
||||||
|
# Use System V because their curses extensions are required. This must
|
||||||
|
# be done early so we use the -I and -L in the library checks also.
|
||||||
|
# This is mostly a Solaris/SunOS hack. Note that doing this will also
|
||||||
|
# use all of the other System V libraries and headers.
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(for alternative System V libraries)
|
||||||
|
if test -f /usr/5include/curses.h ; then
|
||||||
|
CPPFLAGS="$CPPFLAGS -I/usr/5include"
|
||||||
|
LDFLAGS="$LDFLAGS -L/usr/5lib"
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_DEFINE_UNAME, [
|
||||||
|
# Get first 127 chars of all uname information. Some folks have
|
||||||
|
# way too much stuff there, so grab only the first 127.
|
||||||
|
unam=`uname -a 2>/dev/null | cut -c1-127`
|
||||||
|
if test "$unam" != "" ; then
|
||||||
|
AC_DEFINE_UNQUOTED(UNAME, "$unam")
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(wi_READLINE_WITH_NCURSES, [
|
||||||
|
# Readline and Ncurses could both define "backspace".
|
||||||
|
# Warn about this if we have both things in our definitions list.
|
||||||
|
|
||||||
|
if test "$ac_cv_lib_readline" = yes && test "$ac_cv_lib_ncurses" = yes ; then
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(if readline and ncurses will link together)
|
||||||
|
j="$LIBS"
|
||||||
|
LIBS="-lreadline -lncurses"
|
||||||
|
AC_TRY_LINK(,[
|
||||||
|
readline("prompt");
|
||||||
|
endwin();
|
||||||
|
],k=yes,k=no)
|
||||||
|
if test "$k" = no ; then
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
# Remove '-lreadline' from LIBS.
|
||||||
|
LIBS=`echo $j | sed s/-lreadline//g`
|
||||||
|
ac_cv_lib_readline=no
|
||||||
|
AC_WARN([The versions of GNU readline and ncurses you have installed on this system
|
||||||
|
can't be used together, because they use the same symbol, backspace. If
|
||||||
|
possible, recompile one of the libraries with -Dbackspace=back_space, then
|
||||||
|
re-run configure.])
|
||||||
|
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
LIBS="$j"
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
|
||||||
|
dnl AC_EXT_DAYLIGHT
|
||||||
|
dnl Check for an external variable daylight. Stolen from w3c-libwww.
|
||||||
|
AC_DEFUN(AC_EXT_DAYLIGHT,
|
||||||
|
[ AC_MSG_CHECKING(int daylight variable)
|
||||||
|
AC_TRY_COMPILE([#include <time.h>], [return daylight;],
|
||||||
|
have_daylight=yes,
|
||||||
|
have_daylight=no)
|
||||||
|
AC_MSG_RESULT($have_daylight)
|
||||||
|
])dnl
|
||||||
|
|
||||||
|
dnl AC_EXT_TIMEZONE
|
||||||
|
dnl Check for an external variable timezone. Stolen from tcl-8.0.
|
||||||
|
AC_DEFUN(AC_EXT_TIMEZONE,
|
||||||
|
[
|
||||||
|
#
|
||||||
|
# Its important to include time.h in this check, as some systems (like convex)
|
||||||
|
# have timezone functions, etc.
|
||||||
|
#
|
||||||
|
have_timezone=no
|
||||||
|
AC_MSG_CHECKING([long timezone variable])
|
||||||
|
AC_TRY_COMPILE([#include <time.h>],
|
||||||
|
[extern long timezone;
|
||||||
|
timezone += 1;
|
||||||
|
exit (0);],
|
||||||
|
[have_timezone=yes
|
||||||
|
AC_MSG_RESULT(yes)],
|
||||||
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
|
#
|
||||||
|
# On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
|
||||||
|
#
|
||||||
|
if test "$have_timezone" = no; then
|
||||||
|
AC_MSG_CHECKING([time_t timezone variable])
|
||||||
|
AC_TRY_COMPILE([#include <time.h>],
|
||||||
|
[extern time_t timezone;
|
||||||
|
timezone += 1;
|
||||||
|
exit (0);],
|
||||||
|
[have_timezone=yes
|
||||||
|
AC_MSG_RESULT(yes)],
|
||||||
|
AC_MSG_RESULT(no))
|
||||||
|
fi
|
||||||
|
])dnl
|
||||||
258
configure.in
Normal file
258
configure.in
Normal file
@ -0,0 +1,258 @@
|
|||||||
|
dnl Process this file with aclocal ; automake -a ; autoconf to produce a
|
||||||
|
dnl working configure script.
|
||||||
|
dnl
|
||||||
|
dnl $Id$
|
||||||
|
|
||||||
|
AC_INIT(bucket/newbucket.cxx)
|
||||||
|
|
||||||
|
dnl Initialize the automake stuff
|
||||||
|
AM_INIT_AUTOMAKE(SimGear, 0.0.0)
|
||||||
|
|
||||||
|
dnl Checks for programs.
|
||||||
|
AC_PROG_MAKE_SET
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_CXX
|
||||||
|
AC_PROG_RANLIB
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_LN_S
|
||||||
|
|
||||||
|
if echo $includedir | egrep "simgear$" > /dev/null; then
|
||||||
|
echo "includedir is" $includedir "libdir is" $libdir
|
||||||
|
else
|
||||||
|
includedir="${includedir}/simgear"
|
||||||
|
echo "includedir changed to" $includedir "libdir is" $libdir
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
dnl Specify if we want logging (testing build) or not (release build)
|
||||||
|
# set logging default value
|
||||||
|
# with_logging=yes
|
||||||
|
AC_ARG_WITH(logging, [ --with-logging Include logging output (default)])
|
||||||
|
if test "x$with_logging" = "xno" ; then
|
||||||
|
AC_DEFINE(FG_NDEBUG)
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl specify if we are building with "checker"
|
||||||
|
AC_ARG_WITH(efence, [ --with-efence Specify if we are building with "electric-fence"])
|
||||||
|
|
||||||
|
if test "x$with_efence" = "xyes" ; then
|
||||||
|
echo "Building with efence"
|
||||||
|
LIBS= "$LIBS -lefence"
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl Check for MS Windows environment
|
||||||
|
AC_CHECK_HEADER(windows.h)
|
||||||
|
|
||||||
|
dnl extra library and include directories
|
||||||
|
EXTRA_DIRS="/usr/local /usr/local/plib /usr/X11R6"
|
||||||
|
|
||||||
|
if test -d /opt/X11R6 ; then
|
||||||
|
EXTRA_DIRS="$EXTRA_DIRS /opt/X11R6"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$ac_cv_header_windows_h" = "xyes" ; then
|
||||||
|
EXTRA_DIRS="${EXTRA_DIRS} `pwd`/Win32"
|
||||||
|
# elif test `uname -s` = "SunOS" ; then
|
||||||
|
# EXTRA_DIRS="${EXTRA_DIRS} `pwd`/SunOS"
|
||||||
|
fi
|
||||||
|
wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
|
||||||
|
|
||||||
|
dnl Using AM_CONDITIONAL is a step out of the protected little
|
||||||
|
dnl automake fold so it is potentially dangerous. But, we are
|
||||||
|
dnl beginning to run into cases where the standard checks are not
|
||||||
|
dnl enough. AM_CONDITIONALS are then referenced to conditionally
|
||||||
|
dnl build a Makefile.in from a Makefile.am which lets us define custom
|
||||||
|
dnl includes, compile alternative source files, etc.
|
||||||
|
|
||||||
|
dnl Enable serial support on Unix type systems
|
||||||
|
AM_CONDITIONAL(ENABLE_UNIX_SERIAL, true)
|
||||||
|
|
||||||
|
dnl Check for X11 (fancy)
|
||||||
|
AC_PATH_XTRA
|
||||||
|
|
||||||
|
dnl Checks for libraries.
|
||||||
|
|
||||||
|
null_LIBS="$LIBS"
|
||||||
|
|
||||||
|
AC_CHECK_LIB(m, cos)
|
||||||
|
|
||||||
|
base_LIBS="$LIBS"
|
||||||
|
|
||||||
|
AC_CHECK_LIB(socket, socket)
|
||||||
|
AC_CHECK_LIB(X11, XCreateWindow)
|
||||||
|
AC_CHECK_LIB(Xext, XShmCreateImage)
|
||||||
|
AC_CHECK_LIB(Xi, XGetExtensionVersion)
|
||||||
|
AC_CHECK_LIB(ICE, IceOpenConnection)
|
||||||
|
AC_CHECK_LIB(SM, SmcOpenConnection)
|
||||||
|
AC_CHECK_LIB(Xt, XtMalloc)
|
||||||
|
AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
|
||||||
|
|
||||||
|
dnl check for OpenGL related libraries
|
||||||
|
|
||||||
|
if test "x$ac_cv_header_windows_h" != "xyes" ; then
|
||||||
|
dnl Reasonable stuff for non-windoze variants ... :-)
|
||||||
|
|
||||||
|
AC_CHECK_LIB(GLcore, glNewList)
|
||||||
|
if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then
|
||||||
|
dnl if no GLcore, check for GL
|
||||||
|
AC_CHECK_LIB(GL, glNewList)
|
||||||
|
if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
|
||||||
|
dnl if no GL, check for MesaGL
|
||||||
|
AC_CHECK_LIB(MesaGL, glNewList)
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
dnl if GLcore found, then also check for GL
|
||||||
|
AC_CHECK_LIB(GL, glXCreateContext)
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl if using mesa, check for xmesa.h
|
||||||
|
if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
|
||||||
|
AC_CHECK_HEADER(GL/xmesa.h)
|
||||||
|
if test "x$ac_cv_header_GL_xmesa_h" = "xyes"; then
|
||||||
|
AC_DEFINE( XMESA )
|
||||||
|
AC_DEFINE( FX )
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_LIB(GLU, gluLookAt)
|
||||||
|
if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
|
||||||
|
dnl if no GLU, check for MesaGLU
|
||||||
|
AC_CHECK_LIB(MesaGLU, gluLookAt)
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl check for glut
|
||||||
|
AC_CHECK_LIB(glut, glutGetModifiers)
|
||||||
|
|
||||||
|
dnl test for glutGameModeString, but avoid adding glut a second time into
|
||||||
|
dnl the list of libraries
|
||||||
|
save_LIBS="$LIBS"
|
||||||
|
AC_CHECK_LIB(glut, glutGameModeString)
|
||||||
|
LIBS="$save_LIBS"
|
||||||
|
else
|
||||||
|
dnl Win32 is a little wierd because it has to try to handle the various
|
||||||
|
dnl winbloze-isms. We'll just do this manually for now.
|
||||||
|
|
||||||
|
echo Win32 specific hacks...
|
||||||
|
AC_DEFINE(WIN32)
|
||||||
|
|
||||||
|
dnl force a failed check since we will be building under windoze
|
||||||
|
AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
|
||||||
|
|
||||||
|
dnl just define these to true and hope for the best
|
||||||
|
ac_cv_lib_glut_glutGetModifiers="yes"
|
||||||
|
ac_cv_lib_glut_glutGameModeString="yes"
|
||||||
|
|
||||||
|
if test "x$with_sgi_opengl" = "xyes" ; then
|
||||||
|
echo "Building with glut.dll, glu.dll, and opengl.dll"
|
||||||
|
WIN32_GLUT=glut
|
||||||
|
WIN32_GLU=glu
|
||||||
|
WIN32_OPENGL=opengl
|
||||||
|
else
|
||||||
|
echo "Building with glut32.dll, glu32.dll, and opengl32.dll"
|
||||||
|
WIN32_GLUT=glut32
|
||||||
|
WIN32_GLU=glu32
|
||||||
|
WIN32_OPENGL=opengl32
|
||||||
|
fi
|
||||||
|
|
||||||
|
LIBS="$LIBS -l${WIN32_GLUT} -l${WIN32_GLU} -l${WIN32_OPENGL}"
|
||||||
|
LIBS="$LIBS -luser32 -lgdi32"
|
||||||
|
echo "Will link apps with $LIBS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then
|
||||||
|
echo
|
||||||
|
echo "Unable to find the necessary OpenGL or GLUT libraries."
|
||||||
|
echo "See config.log for automated test details and results ..."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then
|
||||||
|
echo
|
||||||
|
echo "Your version of glut doesn't support game mode."
|
||||||
|
echo "You need to fetch and install the latest version of glut from:"
|
||||||
|
echo
|
||||||
|
echo " http://reality.sgi.com/opengl/glut3/glut3.html"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
opengl_LIBS="$LIBS"
|
||||||
|
LIBS="$base_LIBS"
|
||||||
|
|
||||||
|
AC_SUBST(base_LIBS)
|
||||||
|
AC_SUBST(opengl_LIBS)
|
||||||
|
|
||||||
|
AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" )
|
||||||
|
|
||||||
|
dnl Check for "plib" without which we cannot go on
|
||||||
|
AC_CHECK_HEADER(plib/pu.h)
|
||||||
|
if test "x$ac_cv_header_plib_pu_h" != "xyes"; then
|
||||||
|
echo
|
||||||
|
echo "You *must* have the plib library installed on your system to build"
|
||||||
|
echo "the FGFS simulator!"
|
||||||
|
echo
|
||||||
|
echo "Please see README.plib for more details."
|
||||||
|
echo
|
||||||
|
echo "configure aborted."
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl Check for system installed zlib
|
||||||
|
AC_CHECK_HEADER(zlib.h)
|
||||||
|
if test "x$ac_cv_header_zlib_h" != "xyes"; then
|
||||||
|
echo "no zlib found, building."
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(HAVE_ZLIB, test "x$ac_cv_header_zlib_h" = "xyes" )
|
||||||
|
|
||||||
|
dnl Checks for header files.
|
||||||
|
AC_HEADER_STDC
|
||||||
|
AC_CHECK_HEADERS( \
|
||||||
|
fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \
|
||||||
|
sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h )
|
||||||
|
|
||||||
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||||
|
AC_C_CONST
|
||||||
|
AC_TYPE_SIZE_T
|
||||||
|
AC_HEADER_TIME
|
||||||
|
AC_STRUCT_TM
|
||||||
|
|
||||||
|
dnl Checks for library functions.
|
||||||
|
AC_TYPE_SIGNAL
|
||||||
|
AC_FUNC_VPRINTF
|
||||||
|
AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
|
||||||
|
random setitimer getitimer signal GetLocalTime rint getrusage )
|
||||||
|
|
||||||
|
AM_CONFIG_HEADER(include/config.h)
|
||||||
|
|
||||||
|
AC_OUTPUT( \
|
||||||
|
VERSION \
|
||||||
|
Makefile \
|
||||||
|
include/Makefile \
|
||||||
|
bucket/Makefile \
|
||||||
|
debug/Makefile \
|
||||||
|
math/Makefile \
|
||||||
|
misc/Makefile \
|
||||||
|
screen/Makefile \
|
||||||
|
serial/Makefile \
|
||||||
|
xgl/Makefile \
|
||||||
|
zlib/Makefile \
|
||||||
|
)
|
||||||
|
|
||||||
|
AC_OUTPUT_COMMANDS([./mksymlinks.sh])
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Configure Summary"
|
||||||
|
echo "================="
|
||||||
|
|
||||||
|
echo "Prefix: $prefix"
|
||||||
|
|
||||||
|
if test "x$with_logging" != "x"; then
|
||||||
|
echo "Debug messages: $with_logging"
|
||||||
|
else
|
||||||
|
echo "Debug messages: yes"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$with_efence" != "x"; then
|
||||||
|
echo "Electric fence: $with_efence"
|
||||||
|
else
|
||||||
|
echo "Electric fence: no"
|
||||||
|
fi
|
||||||
@ -1,14 +0,0 @@
|
|||||||
if ENABLE_UNIX_SERIAL
|
|
||||||
SERIAL_DIRS = Serial
|
|
||||||
else
|
|
||||||
SERIAL_DIRS =
|
|
||||||
endif
|
|
||||||
|
|
||||||
SUBDIRS = \
|
|
||||||
Bucket \
|
|
||||||
Debug \
|
|
||||||
Math \
|
|
||||||
Misc \
|
|
||||||
$(SERIAL_DIRS) \
|
|
||||||
XGL\
|
|
||||||
zlib
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
noinst_LIBRARIES = libBucket.a
|
|
||||||
|
|
||||||
libBucket_a_SOURCES = newbucket.cxx newbucket.hxx
|
|
||||||
|
|
||||||
# bin_PROGRAMS = testbucket
|
|
||||||
|
|
||||||
# testbucket_SOURCES = testbucket.cxx
|
|
||||||
|
|
||||||
# testbucket_LDADD = \
|
|
||||||
# $(top_builddir)/Lib/Bucket/libBucket.a \
|
|
||||||
# $(top_builddir)/Lib/Misc/libMisc.a
|
|
||||||
|
|
||||||
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
// test new bucket routines
|
|
||||||
|
|
||||||
#include "newbucket.cxx"
|
|
||||||
|
|
||||||
main() {
|
|
||||||
double lat = 21.9625;
|
|
||||||
double lon = -110.0 + 0.0625;
|
|
||||||
|
|
||||||
/*
|
|
||||||
while ( lon < 180 ) {
|
|
||||||
FGBucket b1( lon, lat );
|
|
||||||
long int index = b1.gen_index();
|
|
||||||
FGBucket b2( index );
|
|
||||||
|
|
||||||
cout << lon << "," << lat << " ";
|
|
||||||
cout << b2 << " " << b2.get_center_lon() << ","
|
|
||||||
<< b2.get_center_lat() << endl;
|
|
||||||
|
|
||||||
lon += 0.125;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
FGBucket b1;
|
|
||||||
|
|
||||||
for ( int j = 2; j >= -2; j-- ) {
|
|
||||||
for ( int i = -2; i < 3; i++ ) {
|
|
||||||
b1 = fgBucketOffset(lon, lat, i, j);
|
|
||||||
cout << "(" << i << "," << j << ")" << b1 << "\t";
|
|
||||||
}
|
|
||||||
cout << endl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
EXTRA_DIST = logtest.cxx
|
|
||||||
|
|
||||||
noinst_LIBRARIES = libDebug.a
|
|
||||||
|
|
||||||
libDebug_a_SOURCES = \
|
|
||||||
debug_types.h \
|
|
||||||
logstream.cxx logstream.hxx
|
|
||||||
|
|
||||||
# fg_debug.c fg_debug.h \
|
|
||||||
|
|
||||||
INCLUDES += -I$(top_builddir)
|
|
||||||
@ -1,282 +0,0 @@
|
|||||||
/* -*- Mode: C++ -*-
|
|
||||||
*
|
|
||||||
* fg_debug.c -- Flight Gear debug utility functions
|
|
||||||
*
|
|
||||||
* Written by Paul Bleisch, started January 1998.
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 Paul Bleisch, pbleisch@acm.org
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
*
|
|
||||||
* $Id$
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#include <Include/cmdargs.h> // Line to command line arguments
|
|
||||||
|
|
||||||
#include "fg_debug.h"
|
|
||||||
|
|
||||||
|
|
||||||
static int fg_DebugSem = 1;
|
|
||||||
fgDebugClass fg_DebugClass = FG_NONE; // Need visibility for
|
|
||||||
fgDebugPriority fg_DebugPriority = FG_INFO; // command line processing.
|
|
||||||
static fgDebugCallback fg_DebugCallback = NULL;
|
|
||||||
|
|
||||||
FILE *fg_DebugOutput = NULL; // Visibility needed for command line processor.
|
|
||||||
// This can be set to a FILE from the command
|
|
||||||
// line. If not, it will be set to stderr.
|
|
||||||
|
|
||||||
/* TODO: Actually make this thing thread safe */
|
|
||||||
#ifdef USETHREADS
|
|
||||||
#define FG_GRABDEBUGSEM while( --fg_DebugSem < 0 ) { fg_DebugSem++; }
|
|
||||||
#define FG_RELEASEDEBUGSEM fg_DebugSem++;
|
|
||||||
#else
|
|
||||||
#define FG_GRABDEBUGSEM
|
|
||||||
#define FG_RELEASEDEBUGSEM
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Used for convienence initialization from env variables.
|
|
||||||
*/
|
|
||||||
static struct {
|
|
||||||
char *str;
|
|
||||||
fgDebugClass dbg_class;
|
|
||||||
} fg_DebugClasses[] = {
|
|
||||||
{ "FG_NONE", 0x00000000 },
|
|
||||||
{ "FG_TERRAIN", 0x00000001 },
|
|
||||||
{ "FG_ASTRO", 0x00000002 },
|
|
||||||
{ "FG_FLIGHT", 0x00000004 },
|
|
||||||
{ "FG_INPUT", 0x00000008 },
|
|
||||||
{ "FG_GL", 0x00000010 },
|
|
||||||
{ "FG_VIEW", 0x00000020 },
|
|
||||||
{ "FG_COCKPIT", 0x00000040 },
|
|
||||||
{ "FG_GENERAL", 0x00000080 },
|
|
||||||
{ "FG_MATH", 0x00000100 },
|
|
||||||
{ "FG_EVENT", 0x00000200 },
|
|
||||||
{ "FG_AIRCRAFT", 0x00000400 },
|
|
||||||
{ "FG_AUTOPILOT", 0x00000800 },
|
|
||||||
|
|
||||||
/* Do not edit below here, last entry should be null */
|
|
||||||
{ "FG_ALL", 0xFFFFFFFF },
|
|
||||||
{ NULL, 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
static fgDebugClass fgDebugStrToClass( char *str );
|
|
||||||
|
|
||||||
|
|
||||||
/* fgInitDebug =============================================================*/
|
|
||||||
void fgInitDebug( void ) {
|
|
||||||
char *pszClass, *pszPrio, *pszFile;
|
|
||||||
|
|
||||||
// Support for log file/alt debug output via command line, environment or
|
|
||||||
// reasonable default.
|
|
||||||
|
|
||||||
/*
|
|
||||||
if( strlen( logArgbuf ) > 3) { // First check for command line option
|
|
||||||
// Assumed that we will append.
|
|
||||||
fg_DebugOutput = fopen(logArgbuf, "a+" );
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
if( !fg_DebugOutput ) { // If not set on command line, environment?
|
|
||||||
pszFile = getenv( "FG_DEBUGFILE" );
|
|
||||||
if( pszFile ) { // There is such an environmental variable.
|
|
||||||
fg_DebugOutput = fopen( pszFile, "a+" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !fg_DebugOutput ) { // If neither command line nor environment
|
|
||||||
fg_DebugOutput = stderr; // then we use the fallback position
|
|
||||||
}
|
|
||||||
|
|
||||||
FG_GRABDEBUGSEM;
|
|
||||||
fg_DebugSem = fg_DebugSem; /* shut up GCC */
|
|
||||||
|
|
||||||
// Test command line option overridge of debug priority. If the value
|
|
||||||
// is in range (properly optioned) the we will override both defaults
|
|
||||||
// and the environmental value.
|
|
||||||
|
|
||||||
/*
|
|
||||||
if ((priorityArgValue >= FG_BULK) && (priorityArgValue <= FG_ABORT)) {
|
|
||||||
fg_DebugPriority = priorityArgValue;
|
|
||||||
} else { // Either not set or out of range. We will not warn the user.
|
|
||||||
*/
|
|
||||||
pszPrio = getenv( "FG_DEBUGPRIORITY" );
|
|
||||||
if( pszPrio ) {
|
|
||||||
fg_DebugPriority = atoi( pszPrio );
|
|
||||||
fprintf( stderr,
|
|
||||||
"fg_debug.c: Environment overrides default debug priority (%d)\n",
|
|
||||||
fg_DebugPriority );
|
|
||||||
}
|
|
||||||
/* } */
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
if ((debugArgValue >= FG_ALL) && (debugArgValue < FG_UNDEFD)) {
|
|
||||||
fg_DebugPriority = priorityArgValue;
|
|
||||||
} else { // Either not set or out of range. We will not warn the user.
|
|
||||||
*/
|
|
||||||
pszClass = getenv( "FG_DEBUGCLASS" );
|
|
||||||
if( pszClass ) {
|
|
||||||
fg_DebugClass = fgDebugStrToClass( pszClass );
|
|
||||||
fprintf( stderr,
|
|
||||||
"fg_debug.c: Environment overrides default debug class (0x%08X)\n",
|
|
||||||
fg_DebugClass );
|
|
||||||
}
|
|
||||||
/* } */
|
|
||||||
|
|
||||||
FG_RELEASEDEBUGSEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fgDebugStrToClass ======================================================*/
|
|
||||||
fgDebugClass fgDebugStrToClass( char *str ) {
|
|
||||||
char *hex = "0123456789ABCDEF";
|
|
||||||
char *hexl = "0123456789abcdef";
|
|
||||||
char *pt, *p, *ph, ps = 1;
|
|
||||||
unsigned int val = 0, i;
|
|
||||||
|
|
||||||
if( str == NULL ) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check for 0xXXXXXX notation */
|
|
||||||
p = strstr( str, "0x");
|
|
||||||
if( p ) {
|
|
||||||
p++; p++;
|
|
||||||
while (*p) {
|
|
||||||
ph = strchr(hex,*p);
|
|
||||||
if ( ph ) {
|
|
||||||
val <<= 4;
|
|
||||||
val += ph-hex;
|
|
||||||
p++;
|
|
||||||
} else {
|
|
||||||
ph = strchr(hexl,*p);
|
|
||||||
if ( ph ) {
|
|
||||||
val <<= 4;
|
|
||||||
val += ph-hex;
|
|
||||||
p++;
|
|
||||||
} else {
|
|
||||||
// fprintf( stderr, "Error in hex string '%s'\n", str );
|
|
||||||
return FG_NONE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
/* Must be in string format */
|
|
||||||
p = str;
|
|
||||||
ps = 1;
|
|
||||||
while( ps ) {
|
|
||||||
while( *p && (*p==' ' || *p=='\t') ) p++; /* remove whitespace */
|
|
||||||
pt = p; /* mark token */
|
|
||||||
while( *p && (*p!='|') ) p++; /* find OR or EOS */
|
|
||||||
ps = *p; /* save value at p so we can attempt to be bounds safe */
|
|
||||||
*p++ = 0; /* terminate token */
|
|
||||||
/* determine value for token */
|
|
||||||
i=0;
|
|
||||||
while( fg_DebugClasses[i].str &&
|
|
||||||
strncmp( fg_DebugClasses[i].str, pt,
|
|
||||||
strlen(fg_DebugClasses[i].str)) ) i++;
|
|
||||||
if( fg_DebugClasses[i].str == NULL ) {
|
|
||||||
fprintf( stderr,
|
|
||||||
"fg_debug.c: Could not find message class '%s'\n",
|
|
||||||
pt );
|
|
||||||
} else {
|
|
||||||
val |= fg_DebugClasses[i].dbg_class;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (fgDebugClass)val;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* fgSetDebugOutput =======================================================*/
|
|
||||||
void fgSetDebugOutput( FILE *out ) {
|
|
||||||
FG_GRABDEBUGSEM;
|
|
||||||
fflush( fg_DebugOutput );
|
|
||||||
fg_DebugOutput = out;
|
|
||||||
FG_RELEASEDEBUGSEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* fgSetDebugLevels =======================================================*/
|
|
||||||
void fgSetDebugLevels( fgDebugClass dbg_class, fgDebugPriority prio ) {
|
|
||||||
FG_GRABDEBUGSEM;
|
|
||||||
fg_DebugClass = dbg_class;
|
|
||||||
fg_DebugPriority = prio;
|
|
||||||
FG_RELEASEDEBUGSEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* fgRegisterDebugCallback ================================================*/
|
|
||||||
fgDebugCallback fgRegisterDebugCallback( fgDebugCallback callback ) {
|
|
||||||
fgDebugCallback old;
|
|
||||||
FG_GRABDEBUGSEM;
|
|
||||||
old = fg_DebugCallback;
|
|
||||||
fg_DebugCallback = callback;
|
|
||||||
FG_RELEASEDEBUGSEM;
|
|
||||||
return old;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* fgPrintf ===============================================================*/
|
|
||||||
int fgPrintf( fgDebugClass dbg_class, fgDebugPriority prio, char *fmt, ... ) {
|
|
||||||
char szOut[1024+1];
|
|
||||||
va_list ap;
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
// If no action to take, then don't bother with the semaphore
|
|
||||||
// activity Slight speed benefit.
|
|
||||||
|
|
||||||
// printf("dbg_class = %d fg_DebugClass = %d\n", dbg_class, fg_DebugClass);
|
|
||||||
// printf("prio = %d fg_DebugPriority = %d\n", prio, fg_DebugPriority);
|
|
||||||
|
|
||||||
if( !(dbg_class & fg_DebugClass) ) {
|
|
||||||
// Failed to match a specific debug class
|
|
||||||
if ( prio < fg_DebugPriority ) {
|
|
||||||
// priority is less than requested
|
|
||||||
|
|
||||||
// "ret" is zero anyway. But we might think about changing
|
|
||||||
// it upon some error condition?
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FG_GRABDEBUGSEM;
|
|
||||||
|
|
||||||
/* ret = vsprintf( szOut, fmt, (&fmt+1)); (but it didn't work, thus ... */
|
|
||||||
va_start (ap, fmt);
|
|
||||||
ret = vsprintf( szOut, fmt, ap);
|
|
||||||
va_end (ap);
|
|
||||||
|
|
||||||
if( fg_DebugCallback!=NULL && fg_DebugCallback(dbg_class, prio, szOut) ) {
|
|
||||||
FG_RELEASEDEBUGSEM;
|
|
||||||
return ret;
|
|
||||||
} else {
|
|
||||||
fprintf( fg_DebugOutput, szOut );
|
|
||||||
FG_RELEASEDEBUGSEM;
|
|
||||||
if( prio == FG_EXIT ) {
|
|
||||||
exit(0);
|
|
||||||
} else if( prio == FG_ABORT ) {
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,155 +0,0 @@
|
|||||||
/* -*- Mode: C++ -*-
|
|
||||||
*
|
|
||||||
* fg_debug.h -- Flight Gear debug utility functions
|
|
||||||
*
|
|
||||||
* Written by Paul Bleisch, started January 1998.
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 Paul Bleisch, pbleisch@acm.org
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
*
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
#error "use logstream"
|
|
||||||
|
|
||||||
#ifndef _FG_DEBUG_H
|
|
||||||
#define _FG_DEBUG_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
/* NB: To add a dbg_class, add it here, and add it to the structure in
|
|
||||||
fg_debug.c */
|
|
||||||
typedef enum {
|
|
||||||
FG_NONE = 0x00000000,
|
|
||||||
|
|
||||||
FG_TERRAIN = 0x00000001,
|
|
||||||
FG_ASTRO = 0x00000002,
|
|
||||||
FG_FLIGHT = 0x00000004,
|
|
||||||
FG_INPUT = 0x00000008,
|
|
||||||
FG_GL = 0x00000010,
|
|
||||||
FG_VIEW = 0x00000020,
|
|
||||||
FG_COCKPIT = 0x00000040,
|
|
||||||
FG_GENERAL = 0x00000080,
|
|
||||||
FG_MATH = 0x00000100,
|
|
||||||
FG_EVENT = 0x00000200,
|
|
||||||
FG_AIRCRAFT = 0x00000400,
|
|
||||||
FG_AUTOPILOT = 0x00000800,
|
|
||||||
FG_UNDEFD = 0x00001000, // For range checking
|
|
||||||
|
|
||||||
FG_ALL = 0xFFFFFFFF
|
|
||||||
} fgDebugClass;
|
|
||||||
|
|
||||||
/* NB: To add a priority, add it here. */
|
|
||||||
typedef enum {
|
|
||||||
FG_BULK, /* For frequent messages */
|
|
||||||
FG_DEBUG, /* Less frequent debug type messages */
|
|
||||||
FG_INFO, /* Informatory messages */
|
|
||||||
FG_WARN, /* Possible impending problem */
|
|
||||||
FG_ALERT, /* Very possible impending problem */
|
|
||||||
FG_EXIT, /* Problem (no core) */
|
|
||||||
FG_ABORT /* Abandon ship (core) */
|
|
||||||
} fgDebugPriority;
|
|
||||||
|
|
||||||
|
|
||||||
/* Initialize the debuggin stuff. */
|
|
||||||
void fgInitDebug( void );
|
|
||||||
|
|
||||||
|
|
||||||
/* fgPrintf
|
|
||||||
|
|
||||||
Expects:
|
|
||||||
class fgDebugClass mask for this message.
|
|
||||||
prio fgDebugPriority of this message.
|
|
||||||
fmt printf like string format
|
|
||||||
... var args for fmt
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
number of items in fmt handled.
|
|
||||||
|
|
||||||
This function works like the standard C library function printf() with
|
|
||||||
the addition of message classes and priorities (see fgDebugClasses
|
|
||||||
and fgDebugPriorities). These additions allow us to classify messages
|
|
||||||
and disable sets of messages at runtime. Only messages with a prio
|
|
||||||
greater than or equal to fg_DebugPriority and in the current debug class
|
|
||||||
(fg_DebugClass) are printed.
|
|
||||||
*/
|
|
||||||
int fgPrintf( fgDebugClass dbg_class, fgDebugPriority prio, char *fmt, ... );
|
|
||||||
|
|
||||||
|
|
||||||
/* fgSetDebugLevels()
|
|
||||||
|
|
||||||
Expects:
|
|
||||||
dbg_class Bitmask representing classes to display.
|
|
||||||
prio Minimum priority of messages to display.
|
|
||||||
*/
|
|
||||||
void fgSetDebugLevels( fgDebugClass dbg_class, fgDebugPriority prio );
|
|
||||||
|
|
||||||
/* fgSetDebugOutput()
|
|
||||||
|
|
||||||
Expects:
|
|
||||||
file A FILE* to a stream to send messages to.
|
|
||||||
|
|
||||||
It is assumed the file stream is open and writable. The system
|
|
||||||
defaults to stderr. The current stream is flushed but not
|
|
||||||
closed.
|
|
||||||
*/
|
|
||||||
void fgSetDebugOutput( FILE *out );
|
|
||||||
|
|
||||||
|
|
||||||
/* fgRegisterDebugCallback
|
|
||||||
|
|
||||||
Expects:
|
|
||||||
callback A function that takes parameters as defined by the
|
|
||||||
fgDebugCallback type.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
a pointer to the previously registered callback (if any)
|
|
||||||
|
|
||||||
Install a user defined debug log callback. This callback is called w
|
|
||||||
whenever fgPrintf is called. The parameters passed to the callback are
|
|
||||||
defined above by fgDebugCallback. outstr is the string that is to be
|
|
||||||
printed. If callback returns nonzero, it is assumed that the message
|
|
||||||
was handled fully by the callback and **fgPrintf need do no further
|
|
||||||
processing of the message.** Only one callback may be installed at a
|
|
||||||
time.
|
|
||||||
*/
|
|
||||||
|
|
||||||
//typedef int (*fgDebugCallback)(fgDebugClass, fgDebugPriority, char *outstr);
|
|
||||||
//fgDebugCallback fgRegisterDebugCallback( fgDebugCallback callback );
|
|
||||||
|
|
||||||
typedef int (*fgDebugCallback)( int DebugClass, int DebugPriority, char *outstr);
|
|
||||||
fgDebugCallback fgRegisterDebugCallback( fgDebugCallback callback );
|
|
||||||
|
|
||||||
|
|
||||||
// Leave these alone. Access intended for fg_debug and command line processing.
|
|
||||||
//
|
|
||||||
extern fgDebugClass fg_DebugClass;
|
|
||||||
extern fgDebugPriority fg_DebugPriority;
|
|
||||||
|
|
||||||
extern FILE * fg_DebugOutput;
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* _FG_DEBUG_H */
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
noinst_LIBRARIES = libMath.a
|
|
||||||
|
|
||||||
libMath_a_SOURCES = \
|
|
||||||
MAT3geom.c \
|
|
||||||
MAT3inv.c \
|
|
||||||
MAT3mat.c \
|
|
||||||
MAT3vec.c \
|
|
||||||
fg_geodesy.cxx fg_geodesy.hxx \
|
|
||||||
fg_random.c fg_random.h \
|
|
||||||
interpolater.cxx interpolater.hxx \
|
|
||||||
leastsqs.cxx leastsqs.hxx \
|
|
||||||
mat3.h mat3defs.h mat3err.h \
|
|
||||||
point3d.hxx \
|
|
||||||
polar3d.cxx polar3d.hxx \
|
|
||||||
vector.cxx vector.hxx
|
|
||||||
|
|
||||||
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
|
|
||||||
@ -1,211 +0,0 @@
|
|||||||
// fg_geodesy.cxx -- routines to convert between geodetic and geocentric
|
|
||||||
// coordinate systems.
|
|
||||||
//
|
|
||||||
// Copied and adapted directly from LaRCsim/ls_geodesy.c
|
|
||||||
//
|
|
||||||
// See below for the complete original LaRCsim comments.
|
|
||||||
//
|
|
||||||
// $Id$
|
|
||||||
|
|
||||||
#include "Include/compiler.h"
|
|
||||||
#ifdef FG_HAVE_STD_INCLUDES
|
|
||||||
# include <cmath>
|
|
||||||
# include <cerrno>
|
|
||||||
#else
|
|
||||||
# include <math.h>
|
|
||||||
# include <errno.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <Debug/logstream.hxx>
|
|
||||||
#include <Include/fg_constants.h>
|
|
||||||
#include <Math/fg_geodesy.hxx>
|
|
||||||
#include <Math/point3d.hxx>
|
|
||||||
|
|
||||||
#ifndef FG_HAVE_NATIVE_SGI_COMPILERS
|
|
||||||
FG_USING_STD(cout);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator
|
|
||||||
#define ONE_SECOND 4.848136811E-6
|
|
||||||
|
|
||||||
|
|
||||||
// fgGeocToGeod(lat_geoc, radius, *lat_geod, *alt, *sea_level_r)
|
|
||||||
// INPUTS:
|
|
||||||
// lat_geoc Geocentric latitude, radians, + = North
|
|
||||||
// radius C.G. radius to earth center (meters)
|
|
||||||
//
|
|
||||||
// OUTPUTS:
|
|
||||||
// lat_geod Geodetic latitude, radians, + = North
|
|
||||||
// alt C.G. altitude above mean sea level (meters)
|
|
||||||
// sea_level_r radius from earth center to sea level at
|
|
||||||
// local vertical (surface normal) of C.G. (meters)
|
|
||||||
|
|
||||||
|
|
||||||
void fgGeocToGeod( double lat_geoc, double radius, double
|
|
||||||
*lat_geod, double *alt, double *sea_level_r )
|
|
||||||
{
|
|
||||||
double t_lat, x_alpha, mu_alpha, delt_mu, r_alpha, l_point, rho_alpha;
|
|
||||||
double sin_mu_a, denom,delt_lambda, lambda_sl, sin_lambda_sl;
|
|
||||||
|
|
||||||
if( ( (FG_PI_2 - lat_geoc) < ONE_SECOND ) // near North pole
|
|
||||||
|| ( (FG_PI_2 + lat_geoc) < ONE_SECOND ) ) // near South pole
|
|
||||||
{
|
|
||||||
*lat_geod = lat_geoc;
|
|
||||||
*sea_level_r = EQUATORIAL_RADIUS_M*E;
|
|
||||||
*alt = radius - *sea_level_r;
|
|
||||||
} else {
|
|
||||||
t_lat = tan(lat_geoc);
|
|
||||||
x_alpha = E*EQUATORIAL_RADIUS_M/sqrt(t_lat*t_lat + E*E);
|
|
||||||
double tmp = RESQ_M - x_alpha * x_alpha;
|
|
||||||
if ( tmp < 0.0 ) { tmp = 0.0; }
|
|
||||||
mu_alpha = atan2(sqrt(tmp),E*x_alpha);
|
|
||||||
if (lat_geoc < 0) mu_alpha = - mu_alpha;
|
|
||||||
sin_mu_a = sin(mu_alpha);
|
|
||||||
delt_lambda = mu_alpha - lat_geoc;
|
|
||||||
r_alpha = x_alpha/cos(lat_geoc);
|
|
||||||
l_point = radius - r_alpha;
|
|
||||||
*alt = l_point*cos(delt_lambda);
|
|
||||||
|
|
||||||
// check for domain error
|
|
||||||
if ( errno == EDOM ) {
|
|
||||||
FG_LOG( FG_GENERAL, FG_ALERT, "Domain ERROR in fgGeocToGeod!!!!" );
|
|
||||||
*alt = 0.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
denom = sqrt(1-EPS*EPS*sin_mu_a*sin_mu_a);
|
|
||||||
rho_alpha = EQUATORIAL_RADIUS_M*(1-EPS)/
|
|
||||||
(denom*denom*denom);
|
|
||||||
delt_mu = atan2(l_point*sin(delt_lambda),rho_alpha + *alt);
|
|
||||||
*lat_geod = mu_alpha - delt_mu;
|
|
||||||
lambda_sl = atan( E*E * tan(*lat_geod) ); // SL geoc. latitude
|
|
||||||
sin_lambda_sl = sin( lambda_sl );
|
|
||||||
*sea_level_r =
|
|
||||||
sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
|
|
||||||
|
|
||||||
// check for domain error
|
|
||||||
if ( errno == EDOM ) {
|
|
||||||
FG_LOG( FG_GENERAL, FG_ALERT, "Domain ERROR in fgGeocToGeod!!!!" );
|
|
||||||
*sea_level_r = 0.0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// fgGeodToGeoc( lat_geod, alt, *sl_radius, *lat_geoc )
|
|
||||||
// INPUTS:
|
|
||||||
// lat_geod Geodetic latitude, radians, + = North
|
|
||||||
// alt C.G. altitude above mean sea level (meters)
|
|
||||||
//
|
|
||||||
// OUTPUTS:
|
|
||||||
// sl_radius SEA LEVEL radius to earth center (meters)
|
|
||||||
// (add Altitude to get true distance from earth center.
|
|
||||||
// lat_geoc Geocentric latitude, radians, + = North
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
void fgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
|
|
||||||
double *lat_geoc )
|
|
||||||
{
|
|
||||||
double lambda_sl, sin_lambda_sl, cos_lambda_sl, sin_mu, cos_mu, px, py;
|
|
||||||
|
|
||||||
lambda_sl = atan( E*E * tan(lat_geod) ); // sea level geocentric latitude
|
|
||||||
sin_lambda_sl = sin( lambda_sl );
|
|
||||||
cos_lambda_sl = cos( lambda_sl );
|
|
||||||
sin_mu = sin(lat_geod); // Geodetic (map makers') latitude
|
|
||||||
cos_mu = cos(lat_geod);
|
|
||||||
*sl_radius =
|
|
||||||
sqrt(RESQ_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
|
|
||||||
py = *sl_radius*sin_lambda_sl + alt*sin_mu;
|
|
||||||
px = *sl_radius*cos_lambda_sl + alt*cos_mu;
|
|
||||||
*lat_geoc = atan2( py, px );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
|
||||||
|
|
||||||
TITLE: ls_geodesy
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
FUNCTION: Converts geocentric coordinates to geodetic positions
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
MODULE STATUS: developmental
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
GENEALOGY: Written as part of LaRCSim project by E. B. Jackson
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
DESIGNED BY: E. B. Jackson
|
|
||||||
|
|
||||||
CODED BY: E. B. Jackson
|
|
||||||
|
|
||||||
MAINTAINED BY: E. B. Jackson
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
MODIFICATION HISTORY:
|
|
||||||
|
|
||||||
DATE PURPOSE BY
|
|
||||||
|
|
||||||
930208 Modified to avoid singularity near polar region. EBJ
|
|
||||||
930602 Moved backwards calcs here from ls_step. EBJ
|
|
||||||
931214 Changed erroneous Latitude and Altitude variables to
|
|
||||||
*lat_geod and *alt in routine ls_geoc_to_geod. EBJ
|
|
||||||
940111 Changed header files from old ls_eom.h style to ls_types,
|
|
||||||
and ls_constants. Also replaced old DATA type with new
|
|
||||||
SCALAR type. EBJ
|
|
||||||
|
|
||||||
CURRENT RCS HEADER:
|
|
||||||
|
|
||||||
$Header$
|
|
||||||
* Revision 1.5 1994/01/11 18:47:05 bjax
|
|
||||||
* Changed include files to use types and constants, not ls_eom.h
|
|
||||||
* Also changed DATA type to SCALAR type.
|
|
||||||
*
|
|
||||||
* Revision 1.4 1993/12/14 21:06:47 bjax
|
|
||||||
* Removed global variable references Altitude and Latitude. EBJ
|
|
||||||
*
|
|
||||||
* Revision 1.3 1993/06/02 15:03:40 bjax
|
|
||||||
* Made new subroutine for calculating geodetic to geocentric; changed name
|
|
||||||
* of forward conversion routine from ls_geodesy to ls_geoc_to_geod.
|
|
||||||
*
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
REFERENCES:
|
|
||||||
|
|
||||||
[ 1] Stevens, Brian L.; and Lewis, Frank L.: "Aircraft
|
|
||||||
Control and Simulation", Wiley and Sons, 1992.
|
|
||||||
ISBN 0-471-61397-5
|
|
||||||
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
CALLED BY: ls_aux
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
CALLS TO:
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
INPUTS:
|
|
||||||
lat_geoc Geocentric latitude, radians, + = North
|
|
||||||
radius C.G. radius to earth center, ft
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
OUTPUTS:
|
|
||||||
lat_geod Geodetic latitude, radians, + = North
|
|
||||||
alt C.G. altitude above mean sea level, ft
|
|
||||||
sea_level_r radius from earth center to sea level at
|
|
||||||
local vertical (surface normal) of C.G.
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
#include <Include/fg_constants.h>
|
|
||||||
#include <Math/fg_geodesy.h>
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
void
|
|
||||||
main( void )
|
|
||||||
{
|
|
||||||
double Lon, Alt, sl_radius;
|
|
||||||
double geodetic_Lat;
|
|
||||||
double geocentric_Lat;
|
|
||||||
|
|
||||||
Lon = -87.75 * DEG_TO_RAD;
|
|
||||||
geodetic_Lat = 41.83 * DEG_TO_RAD;
|
|
||||||
Alt = 1.5; /* km */
|
|
||||||
|
|
||||||
printf("Geodetic position = (%.8f, %.8f, %.8f)\n", Lon, geodetic_Lat, Alt);
|
|
||||||
|
|
||||||
fgGeodToGeoc( geodetic_Lat, Alt, &sl_radius, &geocentric_Lat );
|
|
||||||
|
|
||||||
printf("Geocentric position = (%.8f, %.8f, %.8f)\n", Lon, geocentric_Lat,
|
|
||||||
sl_radius + Alt);
|
|
||||||
printf("new sl_radius = %.8f\n", sl_radius);
|
|
||||||
|
|
||||||
fgGeocToGeod( geocentric_Lat, sl_radius + Alt, &geodetic_Lat,
|
|
||||||
&Alt, &sl_radius );
|
|
||||||
|
|
||||||
printf("Geodetic position = (%.8f, %.8f, %.8f)\n", Lon, geodetic_Lat, Alt);
|
|
||||||
printf("new sl_radius = %.8f\n", sl_radius);
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
#include <stdio.h>
|
|
||||||
#include <Debug/fg_debug.h>
|
|
||||||
|
|
||||||
#include "interpolater.hxx"
|
|
||||||
|
|
||||||
main() {
|
|
||||||
fgINTERPTABLE test("test.table");
|
|
||||||
|
|
||||||
fgInitDebug();
|
|
||||||
|
|
||||||
printf("-1.0 = %.2f\n", test.interpolate(-1.0));
|
|
||||||
printf("0.0 = %.2f\n", test.interpolate(0.0));
|
|
||||||
printf("2.9 = %.2f\n", test.interpolate(2.9));
|
|
||||||
printf("3.0 = %.2f\n", test.interpolate(3.0));
|
|
||||||
printf("3.5 = %.2f\n", test.interpolate(3.5));
|
|
||||||
printf("4.0 = %.2f\n", test.interpolate(4.0));
|
|
||||||
printf("4.5 = %.2f\n", test.interpolate(4.5));
|
|
||||||
printf("5.2 = %.2f\n", test.interpolate(5.2));
|
|
||||||
printf("8.0 = %.2f\n", test.interpolate(8.0));
|
|
||||||
printf("8.5 = %.2f\n", test.interpolate(8.5));
|
|
||||||
printf("9.0 = %.2f\n", test.interpolate(9.0));
|
|
||||||
printf("10.0 = %.2f\n", test.interpolate(10.0));
|
|
||||||
}
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
// vector.hxx -- additional vector routines
|
|
||||||
//
|
|
||||||
// Written by Curtis Olson, started December 1997.
|
|
||||||
//
|
|
||||||
// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
|
|
||||||
//
|
|
||||||
// This program is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU General Public License as
|
|
||||||
// published by the Free Software Foundation; either version 2 of the
|
|
||||||
// License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful, but
|
|
||||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
// General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU General Public License
|
|
||||||
// along with this program; if not, write to the Free Software
|
|
||||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
//
|
|
||||||
// $Id$
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _VECTOR_HXX
|
|
||||||
#define _VECTOR_HXX
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __cplusplus
|
|
||||||
# error This library requires C++
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#include "mat3.h"
|
|
||||||
|
|
||||||
|
|
||||||
// Map a vector onto the plane specified by normal
|
|
||||||
#if defined( USE_XTRA_MAT3_INLINES )
|
|
||||||
# define map_vec_onto_cur_surface_plane(normal, v0, vec, result) { \
|
|
||||||
double scale = ((normal[0]*vec[0]+normal[1]*vec[1]+normal[2]*vec[2]) / \
|
|
||||||
(normal[0]*normal[0]+normal[1]*normal[1]+normal[2]*normal[2])); \
|
|
||||||
result[0] = vec[0]-normal[0]*scale; \
|
|
||||||
result[1] = vec[1]-normal[1]*scale; \
|
|
||||||
result[2] = vec[2]-normal[2]*scale; \
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
void map_vec_onto_cur_surface_plane(MAT3vec normal, MAT3vec v0, MAT3vec vec,
|
|
||||||
MAT3vec result);
|
|
||||||
#endif //defined( USE_XTRA_MAT3_INLINES )
|
|
||||||
|
|
||||||
|
|
||||||
// Given a point p, and a line through p0 with direction vector d,
|
|
||||||
// find the shortest distance from the point to the line
|
|
||||||
double fgPointLine(MAT3vec p, MAT3vec p0, MAT3vec d);
|
|
||||||
|
|
||||||
|
|
||||||
// Given a point p, and a line through p0 with direction vector d,
|
|
||||||
// find the shortest distance (squared) from the point to the line
|
|
||||||
double fgPointLineSquared(MAT3vec p, MAT3vec p0, MAT3vec d);
|
|
||||||
|
|
||||||
|
|
||||||
#endif // _VECTOR_HXX
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
The following files were unashamedly borrowed from other projects:
|
|
||||||
|
|
||||||
zfstream.hxx
|
|
||||||
zfstream.cxx
|
|
||||||
zlib/contrib/iostream
|
|
||||||
|
|
||||||
stopwatch.hxx was (blitz/time.h)
|
|
||||||
blitz
|
|
||||||
|
|
||||||
Some modifications have been made to fit in with the FlightGear scheme of things.
|
|
||||||
|
|
||||||
As far as I'm aware they are all covered by GNU's licensing agreements.
|
|
||||||
|
|
||||||
Many thanks to their respective authors.
|
|
||||||
|
|
||||||
Bernie Bright (bbright@c031.aone.net.au)
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
## Process this file with automake to produce Makefile.in
|
|
||||||
|
|
||||||
noinst_LIBRARIES = libMisc.a
|
|
||||||
|
|
||||||
libMisc_a_SOURCES = \
|
|
||||||
fgpath.cxx fgpath.hxx \
|
|
||||||
fgstream.cxx fgstream.hxx \
|
|
||||||
stopwatch.hxx \
|
|
||||||
strutils.cxx strutils.hxx \
|
|
||||||
zfstream.cxx zfstream.hxx
|
|
||||||
|
|
||||||
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
bin_PROGRAMS = testserial
|
|
||||||
|
|
||||||
noinst_LIBRARIES = libSerial.a
|
|
||||||
|
|
||||||
libSerial_a_SOURCES = serial.cxx serial.hxx
|
|
||||||
|
|
||||||
testserial_SOURCES = testserial.cxx
|
|
||||||
|
|
||||||
testserial_LDADD = \
|
|
||||||
$(top_builddir)/Lib/Serial/libSerial.a \
|
|
||||||
$(top_builddir)/Lib/Debug/libDebug.a
|
|
||||||
|
|
||||||
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
lib_LIBRARIES = libXGL.a
|
|
||||||
|
|
||||||
libXGL_a_SOURCES = xgl.c xgl.h xglUtils.c
|
|
||||||
|
|
||||||
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator
|
|
||||||
@ -1,471 +0,0 @@
|
|||||||
|
|
||||||
ChangeLog file for zlib
|
|
||||||
|
|
||||||
Changes in 1.1.3 (9 July 1998)
|
|
||||||
- fix "an inflate input buffer bug that shows up on rare but persistent
|
|
||||||
occasions" (Mark)
|
|
||||||
- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
|
|
||||||
- fix gzseek(..., SEEK_SET) in write mode
|
|
||||||
- fix crc check after a gzeek (Frank Faubert)
|
|
||||||
- fix miniunzip when the last entry in a zip file is itself a zip file
|
|
||||||
(J Lillge)
|
|
||||||
- add contrib/asm586 and contrib/asm686 (Brian Raiter)
|
|
||||||
See http://www.muppetlabs.com/~breadbox/software/assembly.html
|
|
||||||
- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
|
|
||||||
- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
|
|
||||||
- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
|
|
||||||
- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
|
|
||||||
- added a FAQ file
|
|
||||||
|
|
||||||
- Support gzdopen on Mac with Metrowerks (Jason Linhart)
|
|
||||||
- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
|
|
||||||
- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
|
|
||||||
- avoid some warnings with Borland C (Tom Tanner)
|
|
||||||
- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
|
|
||||||
- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant)
|
|
||||||
- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
|
|
||||||
- use libdir and includedir in Makefile.in (Tim Mooney)
|
|
||||||
- support shared libraries on OSF1 V4 (Tim Mooney)
|
|
||||||
- remove so_locations in "make clean" (Tim Mooney)
|
|
||||||
- fix maketree.c compilation error (Glenn, Mark)
|
|
||||||
- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
|
|
||||||
- new Makefile.riscos (Rich Walker)
|
|
||||||
- initialize static descriptors in trees.c for embedded targets (Nick Smith)
|
|
||||||
- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
|
|
||||||
- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
|
|
||||||
- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
|
|
||||||
- fix maketree.c to allow clean compilation of inffixed.h (Mark)
|
|
||||||
- fix parameter check in deflateCopy (Gunther Nikl)
|
|
||||||
- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
|
|
||||||
- Many portability patches by Christian Spieler:
|
|
||||||
. zutil.c, zutil.h: added "const" for zmem*
|
|
||||||
. Make_vms.com: fixed some typos
|
|
||||||
. Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
|
|
||||||
. msdos/Makefile.msc: remove "default rtl link library" info from obj files
|
|
||||||
. msdos/Makefile.*: use model-dependent name for the built zlib library
|
|
||||||
. msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
|
|
||||||
new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
|
|
||||||
- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
|
|
||||||
- replace __far with _far for better portability (Christian Spieler, Tom Lane)
|
|
||||||
- fix test for errno.h in configure (Tim Newsham)
|
|
||||||
|
|
||||||
Changes in 1.1.2 (19 March 98)
|
|
||||||
- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
|
|
||||||
See http://www.winimage.com/zLibDll/unzip.html
|
|
||||||
- preinitialize the inflate tables for fixed codes, to make the code
|
|
||||||
completely thread safe (Mark)
|
|
||||||
- some simplifications and slight speed-up to the inflate code (Mark)
|
|
||||||
- fix gzeof on non-compressed files (Allan Schrum)
|
|
||||||
- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
|
|
||||||
- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
|
|
||||||
- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
|
|
||||||
- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
|
|
||||||
- do not wrap extern "C" around system includes (Tom Lane)
|
|
||||||
- mention zlib binding for TCL in README (Andreas Kupries)
|
|
||||||
- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
|
|
||||||
- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
|
|
||||||
- allow "configure --prefix $HOME" (Tim Mooney)
|
|
||||||
- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
|
|
||||||
- move Makefile.sas to amiga/Makefile.sas
|
|
||||||
|
|
||||||
Changes in 1.1.1 (27 Feb 98)
|
|
||||||
- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson)
|
|
||||||
- remove block truncation heuristic which had very marginal effect for zlib
|
|
||||||
(smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
|
|
||||||
compression ratio on some files. This also allows inlining _tr_tally for
|
|
||||||
matches in deflate_slow.
|
|
||||||
- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
|
|
||||||
|
|
||||||
Changes in 1.1.0 (24 Feb 98)
|
|
||||||
- do not return STREAM_END prematurely in inflate (John Bowler)
|
|
||||||
- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
|
|
||||||
- compile with -DFASTEST to get compression code optimized for speed only
|
|
||||||
- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
|
|
||||||
- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
|
|
||||||
on Sun but significant on HP)
|
|
||||||
|
|
||||||
- add a pointer to experimental unzip library in README (Gilles Vollant)
|
|
||||||
- initialize variable gcc in configure (Chris Herborth)
|
|
||||||
|
|
||||||
Changes in 1.0.9 (17 Feb 1998)
|
|
||||||
- added gzputs and gzgets functions
|
|
||||||
- do not clear eof flag in gzseek (Mark Diekhans)
|
|
||||||
- fix gzseek for files in transparent mode (Mark Diekhans)
|
|
||||||
- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
|
|
||||||
- replace EXPORT with ZEXPORT to avoid conflict with other programs
|
|
||||||
- added compress2 in zconf.h, zlib.def, zlib.dnt
|
|
||||||
- new asm code from Gilles Vollant in contrib/asm386
|
|
||||||
- simplify the inflate code (Mark):
|
|
||||||
. Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
|
|
||||||
. ZALLOC the length list in inflate_trees_fixed() instead of using stack
|
|
||||||
. ZALLOC the value area for huft_build() instead of using stack
|
|
||||||
. Simplify Z_FINISH check in inflate()
|
|
||||||
|
|
||||||
- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
|
|
||||||
- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
|
|
||||||
- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
|
|
||||||
the declaration of FAR (Gilles VOllant)
|
|
||||||
- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
|
|
||||||
- read_buf buf parameter of type Bytef* instead of charf*
|
|
||||||
- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
|
|
||||||
- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
|
|
||||||
- fix check for presence of directories in "make install" (Ian Willis)
|
|
||||||
|
|
||||||
Changes in 1.0.8 (27 Jan 1998)
|
|
||||||
- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
|
|
||||||
- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
|
|
||||||
- added compress2() to allow setting the compression level
|
|
||||||
- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
|
|
||||||
- use constant arrays for the static trees in trees.c instead of computing
|
|
||||||
them at run time (thanks to Ken Raeburn for this suggestion). To create
|
|
||||||
trees.h, compile with GEN_TREES_H and run "make test".
|
|
||||||
- check return code of example in "make test" and display result
|
|
||||||
- pass minigzip command line options to file_compress
|
|
||||||
- simplifying code of inflateSync to avoid gcc 2.8 bug
|
|
||||||
|
|
||||||
- support CC="gcc -Wall" in configure -s (QingLong)
|
|
||||||
- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
|
|
||||||
- fix test for shared library support to avoid compiler warnings
|
|
||||||
- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
|
|
||||||
- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
|
|
||||||
- do not use fdopen for Metrowerks on Mac (Brad Pettit))
|
|
||||||
- add checks for gzputc and gzputc in example.c
|
|
||||||
- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
|
|
||||||
- use const for the CRC table (Ken Raeburn)
|
|
||||||
- fixed "make uninstall" for shared libraries
|
|
||||||
- use Tracev instead of Trace in infblock.c
|
|
||||||
- in example.c use correct compressed length for test_sync
|
|
||||||
- suppress +vnocompatwarnings in configure for HPUX (not always supported)
|
|
||||||
|
|
||||||
Changes in 1.0.7 (20 Jan 1998)
|
|
||||||
- fix gzseek which was broken in write mode
|
|
||||||
- return error for gzseek to negative absolute position
|
|
||||||
- fix configure for Linux (Chun-Chung Chen)
|
|
||||||
- increase stack space for MSC (Tim Wegner)
|
|
||||||
- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
|
|
||||||
- define EXPORTVA for gzprintf (Gilles Vollant)
|
|
||||||
- added man page zlib.3 (Rick Rodgers)
|
|
||||||
- for contrib/untgz, fix makedir() and improve Makefile
|
|
||||||
|
|
||||||
- check gzseek in write mode in example.c
|
|
||||||
- allocate extra buffer for seeks only if gzseek is actually called
|
|
||||||
- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
|
|
||||||
- add inflateSyncPoint in zconf.h
|
|
||||||
- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
|
|
||||||
|
|
||||||
Changes in 1.0.6 (19 Jan 1998)
|
|
||||||
- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
|
|
||||||
gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
|
|
||||||
- Fix a deflate bug occuring only with compression level 0 (thanks to
|
|
||||||
Andy Buckler for finding this one).
|
|
||||||
- In minigzip, pass transparently also the first byte for .Z files.
|
|
||||||
- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
|
|
||||||
- check Z_FINISH in inflate (thanks to Marc Schluper)
|
|
||||||
- Implement deflateCopy (thanks to Adam Costello)
|
|
||||||
- make static libraries by default in configure, add --shared option.
|
|
||||||
- move MSDOS or Windows specific files to directory msdos
|
|
||||||
- suppress the notion of partial flush to simplify the interface
|
|
||||||
(but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
|
|
||||||
- suppress history buffer provided by application to simplify the interface
|
|
||||||
(this feature was not implemented anyway in 1.0.4)
|
|
||||||
- next_in and avail_in must be initialized before calling inflateInit or
|
|
||||||
inflateInit2
|
|
||||||
- add EXPORT in all exported functions (for Windows DLL)
|
|
||||||
- added Makefile.nt (thanks to Stephen Williams)
|
|
||||||
- added the unsupported "contrib" directory:
|
|
||||||
contrib/asm386/ by Gilles Vollant <info@winimage.com>
|
|
||||||
386 asm code replacing longest_match().
|
|
||||||
contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
|
|
||||||
A C++ I/O streams interface to the zlib gz* functions
|
|
||||||
contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
|
|
||||||
Another C++ I/O streams interface
|
|
||||||
contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
|
|
||||||
A very simple tar.gz file extractor using zlib
|
|
||||||
contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
|
|
||||||
How to use compress(), uncompress() and the gz* functions from VB.
|
|
||||||
- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
|
|
||||||
level) in minigzip (thanks to Tom Lane)
|
|
||||||
|
|
||||||
- use const for rommable constants in deflate
|
|
||||||
- added test for gzseek and gztell in example.c
|
|
||||||
- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
|
|
||||||
- add undocumented function zError to convert error code to string
|
|
||||||
(for Tim Smithers)
|
|
||||||
- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
|
|
||||||
- Use default memcpy for Symantec MSDOS compiler.
|
|
||||||
- Add EXPORT keyword for check_func (needed for Windows DLL)
|
|
||||||
- add current directory to LD_LIBRARY_PATH for "make test"
|
|
||||||
- create also a link for libz.so.1
|
|
||||||
- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
|
|
||||||
- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
|
|
||||||
- added -soname for Linux in configure (Chun-Chung Chen,
|
|
||||||
- assign numbers to the exported functions in zlib.def (for Windows DLL)
|
|
||||||
- add advice in zlib.h for best usage of deflateSetDictionary
|
|
||||||
- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
|
|
||||||
- allow compilation with ANSI keywords only enabled for TurboC in large model
|
|
||||||
- avoid "versionString"[0] (Borland bug)
|
|
||||||
- add NEED_DUMMY_RETURN for Borland
|
|
||||||
- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
|
|
||||||
- allow compilation with CC
|
|
||||||
- defined STDC for OS/2 (David Charlap)
|
|
||||||
- limit external names to 8 chars for MVS (Thomas Lund)
|
|
||||||
- in minigzip.c, use static buffers only for 16-bit systems
|
|
||||||
- fix suffix check for "minigzip -d foo.gz"
|
|
||||||
- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
|
|
||||||
- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
|
|
||||||
- added makelcc.bat for lcc-win32 (Tom St Denis)
|
|
||||||
- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
|
|
||||||
- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
|
|
||||||
- check for unistd.h in configure (for off_t)
|
|
||||||
- remove useless check parameter in inflate_blocks_free
|
|
||||||
- avoid useless assignment of s->check to itself in inflate_blocks_new
|
|
||||||
- do not flush twice in gzclose (thanks to Ken Raeburn)
|
|
||||||
- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
|
|
||||||
- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
|
|
||||||
- work around buggy fclose on pipes for HP/UX
|
|
||||||
- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
|
|
||||||
- fix configure if CC is already equal to gcc
|
|
||||||
|
|
||||||
Changes in 1.0.5 (3 Jan 98)
|
|
||||||
- Fix inflate to terminate gracefully when fed corrupted or invalid data
|
|
||||||
- Use const for rommable constants in inflate
|
|
||||||
- Eliminate memory leaks on error conditions in inflate
|
|
||||||
- Removed some vestigial code in inflate
|
|
||||||
- Update web address in README
|
|
||||||
|
|
||||||
Changes in 1.0.4 (24 Jul 96)
|
|
||||||
- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
|
|
||||||
bit, so the decompressor could decompress all the correct data but went
|
|
||||||
on to attempt decompressing extra garbage data. This affected minigzip too.
|
|
||||||
- zlibVersion and gzerror return const char* (needed for DLL)
|
|
||||||
- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
|
|
||||||
- use z_error only for DEBUG (avoid problem with DLLs)
|
|
||||||
|
|
||||||
Changes in 1.0.3 (2 Jul 96)
|
|
||||||
- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
|
|
||||||
small and medium models; this makes the library incompatible with previous
|
|
||||||
versions for these models. (No effect in large model or on other systems.)
|
|
||||||
- return OK instead of BUF_ERROR if previous deflate call returned with
|
|
||||||
avail_out as zero but there is nothing to do
|
|
||||||
- added memcmp for non STDC compilers
|
|
||||||
- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
|
|
||||||
- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
|
|
||||||
- better check for 16-bit mode MSC (avoids problem with Symantec)
|
|
||||||
|
|
||||||
Changes in 1.0.2 (23 May 96)
|
|
||||||
- added Windows DLL support
|
|
||||||
- added a function zlibVersion (for the DLL support)
|
|
||||||
- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
|
|
||||||
- Bytef is define's instead of typedef'd only for Borland C
|
|
||||||
- avoid reading uninitialized memory in example.c
|
|
||||||
- mention in README that the zlib format is now RFC1950
|
|
||||||
- updated Makefile.dj2
|
|
||||||
- added algorithm.doc
|
|
||||||
|
|
||||||
Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
|
|
||||||
- fix array overlay in deflate.c which sometimes caused bad compressed data
|
|
||||||
- fix inflate bug with empty stored block
|
|
||||||
- fix MSDOS medium model which was broken in 0.99
|
|
||||||
- fix deflateParams() which could generated bad compressed data.
|
|
||||||
- Bytef is define'd instead of typedef'ed (work around Borland bug)
|
|
||||||
- added an INDEX file
|
|
||||||
- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
|
|
||||||
Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
|
|
||||||
- speed up adler32 for modern machines without auto-increment
|
|
||||||
- added -ansi for IRIX in configure
|
|
||||||
- static_init_done in trees.c is an int
|
|
||||||
- define unlink as delete for VMS
|
|
||||||
- fix configure for QNX
|
|
||||||
- add configure branch for SCO and HPUX
|
|
||||||
- avoid many warnings (unused variables, dead assignments, etc...)
|
|
||||||
- no fdopen for BeOS
|
|
||||||
- fix the Watcom fix for 32 bit mode (define FAR as empty)
|
|
||||||
- removed redefinition of Byte for MKWERKS
|
|
||||||
- work around an MWKERKS bug (incorrect merge of all .h files)
|
|
||||||
|
|
||||||
Changes in 0.99 (27 Jan 96)
|
|
||||||
- allow preset dictionary shared between compressor and decompressor
|
|
||||||
- allow compression level 0 (no compression)
|
|
||||||
- add deflateParams in zlib.h: allow dynamic change of compression level
|
|
||||||
and compression strategy.
|
|
||||||
- test large buffers and deflateParams in example.c
|
|
||||||
- add optional "configure" to build zlib as a shared library
|
|
||||||
- suppress Makefile.qnx, use configure instead
|
|
||||||
- fixed deflate for 64-bit systems (detected on Cray)
|
|
||||||
- fixed inflate_blocks for 64-bit systems (detected on Alpha)
|
|
||||||
- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
|
|
||||||
- always return Z_BUF_ERROR when deflate() has nothing to do
|
|
||||||
- deflateInit and inflateInit are now macros to allow version checking
|
|
||||||
- prefix all global functions and types with z_ with -DZ_PREFIX
|
|
||||||
- make falloc completely reentrant (inftrees.c)
|
|
||||||
- fixed very unlikely race condition in ct_static_init
|
|
||||||
- free in reverse order of allocation to help memory manager
|
|
||||||
- use zlib-1.0/* instead of zlib/* inside the tar.gz
|
|
||||||
- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
|
|
||||||
-Wconversion -Wstrict-prototypes -Wmissing-prototypes"
|
|
||||||
- allow gzread on concatenated .gz files
|
|
||||||
- deflateEnd now returns Z_DATA_ERROR if it was premature
|
|
||||||
- deflate is finally (?) fully deterministic (no matches beyond end of input)
|
|
||||||
- Document Z_SYNC_FLUSH
|
|
||||||
- add uninstall in Makefile
|
|
||||||
- Check for __cpluplus in zlib.h
|
|
||||||
- Better test in ct_align for partial flush
|
|
||||||
- avoid harmless warnings for Borland C++
|
|
||||||
- initialize hash_head in deflate.c
|
|
||||||
- avoid warning on fdopen (gzio.c) for HP cc -Aa
|
|
||||||
- include stdlib.h for STDC compilers
|
|
||||||
- include errno.h for Cray
|
|
||||||
- ignore error if ranlib doesn't exist
|
|
||||||
- call ranlib twice for NeXTSTEP
|
|
||||||
- use exec_prefix instead of prefix for libz.a
|
|
||||||
- renamed ct_* as _tr_* to avoid conflict with applications
|
|
||||||
- clear z->msg in inflateInit2 before any error return
|
|
||||||
- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
|
|
||||||
- fixed typo in zconf.h (_GNUC__ => __GNUC__)
|
|
||||||
- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
|
|
||||||
- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
|
|
||||||
- in fcalloc, normalize pointer if size > 65520 bytes
|
|
||||||
- don't use special fcalloc for 32 bit Borland C++
|
|
||||||
- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
|
|
||||||
- use Z_BINARY instead of BINARY
|
|
||||||
- document that gzclose after gzdopen will close the file
|
|
||||||
- allow "a" as mode in gzopen.
|
|
||||||
- fix error checking in gzread
|
|
||||||
- allow skipping .gz extra-field on pipes
|
|
||||||
- added reference to Perl interface in README
|
|
||||||
- put the crc table in FAR data (I dislike more and more the medium model :)
|
|
||||||
- added get_crc_table
|
|
||||||
- added a dimension to all arrays (Borland C can't count).
|
|
||||||
- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
|
|
||||||
- guard against multiple inclusion of *.h (for precompiled header on Mac)
|
|
||||||
- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
|
|
||||||
- don't use unsized arrays to avoid silly warnings by Visual C++:
|
|
||||||
warning C4746: 'inflate_mask' : unsized array treated as '__far'
|
|
||||||
(what's wrong with far data in far model?).
|
|
||||||
- define enum out of inflate_blocks_state to allow compilation with C++
|
|
||||||
|
|
||||||
Changes in 0.95 (16 Aug 95)
|
|
||||||
- fix MSDOS small and medium model (now easier to adapt to any compiler)
|
|
||||||
- inlined send_bits
|
|
||||||
- fix the final (:-) bug for deflate with flush (output was correct but
|
|
||||||
not completely flushed in rare occasions).
|
|
||||||
- default window size is same for compression and decompression
|
|
||||||
(it's now sufficient to set MAX_WBITS in zconf.h).
|
|
||||||
- voidp -> voidpf and voidnp -> voidp (for consistency with other
|
|
||||||
typedefs and because voidnp was not near in large model).
|
|
||||||
|
|
||||||
Changes in 0.94 (13 Aug 95)
|
|
||||||
- support MSDOS medium model
|
|
||||||
- fix deflate with flush (could sometimes generate bad output)
|
|
||||||
- fix deflateReset (zlib header was incorrectly suppressed)
|
|
||||||
- added support for VMS
|
|
||||||
- allow a compression level in gzopen()
|
|
||||||
- gzflush now calls fflush
|
|
||||||
- For deflate with flush, flush even if no more input is provided.
|
|
||||||
- rename libgz.a as libz.a
|
|
||||||
- avoid complex expression in infcodes.c triggering Turbo C bug
|
|
||||||
- work around a problem with gcc on Alpha (in INSERT_STRING)
|
|
||||||
- don't use inline functions (problem with some gcc versions)
|
|
||||||
- allow renaming of Byte, uInt, etc... with #define.
|
|
||||||
- avoid warning about (unused) pointer before start of array in deflate.c
|
|
||||||
- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
|
|
||||||
- avoid reserved word 'new' in trees.c
|
|
||||||
|
|
||||||
Changes in 0.93 (25 June 95)
|
|
||||||
- temporarily disable inline functions
|
|
||||||
- make deflate deterministic
|
|
||||||
- give enough lookahead for PARTIAL_FLUSH
|
|
||||||
- Set binary mode for stdin/stdout in minigzip.c for OS/2
|
|
||||||
- don't even use signed char in inflate (not portable enough)
|
|
||||||
- fix inflate memory leak for segmented architectures
|
|
||||||
|
|
||||||
Changes in 0.92 (3 May 95)
|
|
||||||
- don't assume that char is signed (problem on SGI)
|
|
||||||
- Clear bit buffer when starting a stored block
|
|
||||||
- no memcpy on Pyramid
|
|
||||||
- suppressed inftest.c
|
|
||||||
- optimized fill_window, put longest_match inline for gcc
|
|
||||||
- optimized inflate on stored blocks.
|
|
||||||
- untabify all sources to simplify patches
|
|
||||||
|
|
||||||
Changes in 0.91 (2 May 95)
|
|
||||||
- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
|
|
||||||
- Document the memory requirements in zconf.h
|
|
||||||
- added "make install"
|
|
||||||
- fix sync search logic in inflateSync
|
|
||||||
- deflate(Z_FULL_FLUSH) now works even if output buffer too short
|
|
||||||
- after inflateSync, don't scare people with just "lo world"
|
|
||||||
- added support for DJGPP
|
|
||||||
|
|
||||||
Changes in 0.9 (1 May 95)
|
|
||||||
- don't assume that zalloc clears the allocated memory (the TurboC bug
|
|
||||||
was Mark's bug after all :)
|
|
||||||
- let again gzread copy uncompressed data unchanged (was working in 0.71)
|
|
||||||
- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
|
|
||||||
- added a test of inflateSync in example.c
|
|
||||||
- moved MAX_WBITS to zconf.h because users might want to change that.
|
|
||||||
- document explicitly that zalloc(64K) on MSDOS must return a normalized
|
|
||||||
pointer (zero offset)
|
|
||||||
- added Makefiles for Microsoft C, Turbo C, Borland C++
|
|
||||||
- faster crc32()
|
|
||||||
|
|
||||||
Changes in 0.8 (29 April 95)
|
|
||||||
- added fast inflate (inffast.c)
|
|
||||||
- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
|
|
||||||
is incompatible with previous versions of zlib which returned Z_OK.
|
|
||||||
- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
|
|
||||||
(actually that was not a compiler bug, see 0.81 above)
|
|
||||||
- gzread no longer reads one extra byte in certain cases
|
|
||||||
- In gzio destroy(), don't reference a freed structure
|
|
||||||
- avoid many warnings for MSDOS
|
|
||||||
- avoid the ERROR symbol which is used by MS Windows
|
|
||||||
|
|
||||||
Changes in 0.71 (14 April 95)
|
|
||||||
- Fixed more MSDOS compilation problems :( There is still a bug with
|
|
||||||
TurboC large model.
|
|
||||||
|
|
||||||
Changes in 0.7 (14 April 95)
|
|
||||||
- Added full inflate support.
|
|
||||||
- Simplified the crc32() interface. The pre- and post-conditioning
|
|
||||||
(one's complement) is now done inside crc32(). WARNING: this is
|
|
||||||
incompatible with previous versions; see zlib.h for the new usage.
|
|
||||||
|
|
||||||
Changes in 0.61 (12 April 95)
|
|
||||||
- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
|
|
||||||
|
|
||||||
Changes in 0.6 (11 April 95)
|
|
||||||
- added minigzip.c
|
|
||||||
- added gzdopen to reopen a file descriptor as gzFile
|
|
||||||
- added transparent reading of non-gziped files in gzread.
|
|
||||||
- fixed bug in gzread (don't read crc as data)
|
|
||||||
- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
|
|
||||||
- don't allocate big arrays in the stack (for MSDOS)
|
|
||||||
- fix some MSDOS compilation problems
|
|
||||||
|
|
||||||
Changes in 0.5:
|
|
||||||
- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
|
|
||||||
not yet Z_FULL_FLUSH.
|
|
||||||
- support decompression but only in a single step (forced Z_FINISH)
|
|
||||||
- added opaque object for zalloc and zfree.
|
|
||||||
- added deflateReset and inflateReset
|
|
||||||
- added a variable zlib_version for consistency checking.
|
|
||||||
- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
|
|
||||||
Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
|
|
||||||
|
|
||||||
Changes in 0.4:
|
|
||||||
- avoid "zip" everywhere, use zlib instead of ziplib.
|
|
||||||
- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
|
|
||||||
if compression method == 8.
|
|
||||||
- added adler32 and crc32
|
|
||||||
- renamed deflateOptions as deflateInit2, call one or the other but not both
|
|
||||||
- added the method parameter for deflateInit2.
|
|
||||||
- added inflateInit2
|
|
||||||
- simplied considerably deflateInit and inflateInit by not supporting
|
|
||||||
user-provided history buffer. This is supported only in deflateInit2
|
|
||||||
and inflateInit2.
|
|
||||||
|
|
||||||
Changes in 0.3:
|
|
||||||
- prefix all macro names with Z_
|
|
||||||
- use Z_FINISH instead of deflateEnd to finish compression.
|
|
||||||
- added Z_HUFFMAN_ONLY
|
|
||||||
- added gzerror()
|
|
||||||
72
lib/zlib/FAQ
72
lib/zlib/FAQ
@ -1,72 +0,0 @@
|
|||||||
|
|
||||||
Frequently Asked Questions about zlib
|
|
||||||
|
|
||||||
|
|
||||||
If your question is not there, please check the zlib home page
|
|
||||||
http://www.cdrom.com/pub/infozip/zlib/ which may have more recent information.
|
|
||||||
|
|
||||||
|
|
||||||
1) I need a Windows DLL
|
|
||||||
2) I need a Visual Basic interface to zlib
|
|
||||||
3) compress() returns Z_BUF_ERROR
|
|
||||||
4) deflate or inflate returns Z_BUF_ERROR
|
|
||||||
5) Where is the zlib documentation (man pages, etc...)?
|
|
||||||
6) Why don't you use GNU autoconf, libtool, etc...?
|
|
||||||
7) There is a bug in zlib.
|
|
||||||
8) I get "undefined reference to gzputc"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
1) I need a Windows DLL
|
|
||||||
|
|
||||||
The zlib sources can be compiled without change to produce a DLL.
|
|
||||||
If you want a precompiled DLL, see http://www.winimage.com/zLibDll
|
|
||||||
|
|
||||||
|
|
||||||
2) I need a Visual Basic interface to zlib
|
|
||||||
|
|
||||||
See http://www.tcfb.com/dowseware/cmp-z-it.zip
|
|
||||||
http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm
|
|
||||||
and contrib/visual-basic.txt
|
|
||||||
|
|
||||||
3) compress() returns Z_BUF_ERROR
|
|
||||||
|
|
||||||
Make sure that before the call of compress, the length of the
|
|
||||||
compressed buffer is equal to the total size of the compressed buffer
|
|
||||||
and not zero. For Visual Basic, check that this parameter is passed
|
|
||||||
by reference ("as any"), not by value ("as long").
|
|
||||||
|
|
||||||
|
|
||||||
4) deflate or inflate returns Z_BUF_ERROR
|
|
||||||
|
|
||||||
Make sure that before the call avail_in and avail_out are not zero.
|
|
||||||
|
|
||||||
|
|
||||||
5) Where is the zlib documentation (man pages, etc...)?
|
|
||||||
|
|
||||||
It's in zlib.h for the moment. Volunteers to transform this
|
|
||||||
to man pages, please contact jloup@gzip.org. Examples of zlib usage
|
|
||||||
are in the files example.c and minigzip.c.
|
|
||||||
|
|
||||||
|
|
||||||
6) Why don't you use GNU autoconf, libtool, etc...?
|
|
||||||
|
|
||||||
Because we would like to keep zlib as a very small and simple package.
|
|
||||||
zlib is rather portable and doesn't need much configuration.
|
|
||||||
|
|
||||||
|
|
||||||
7) There is a bug in zlib.
|
|
||||||
|
|
||||||
Most of the time, such problems are due to an incorrect usage
|
|
||||||
of zlib. Please try to reproduce the problem with a small
|
|
||||||
program and send us the corresponding source at zlib@quest.jpl.nasa.gov
|
|
||||||
Do not send multi-megabyte data files without prior agreement.
|
|
||||||
|
|
||||||
|
|
||||||
8) I get "undefined reference to gzputc"
|
|
||||||
|
|
||||||
If "make test" produces something like
|
|
||||||
example.o(.text+0x174):
|
|
||||||
check that you don't have old files libz.* in /usr/lib, /usr/local/lib
|
|
||||||
or /usr/X11R6/lib. Remove old versions then do "make install".
|
|
||||||
|
|
||||||
@ -1,86 +0,0 @@
|
|||||||
ChangeLog history of changes
|
|
||||||
INDEX this file
|
|
||||||
FAQ Frequently Asked Questions about zlib
|
|
||||||
Make_vms.com script for Vax/VMS
|
|
||||||
Makefile makefile for Unix (generated by configure)
|
|
||||||
Makefile.in makefile for Unix (template for configure)
|
|
||||||
Makefile.riscos makefile for RISCOS
|
|
||||||
README guess what
|
|
||||||
algorithm.txt description of the (de)compression algorithm
|
|
||||||
configure configure script for Unix
|
|
||||||
descrip.mms makefile for Vax/VMS
|
|
||||||
zlib.3 mini man page for zlib (volunteers to write full
|
|
||||||
man pages from zlib.h welcome. write to jloup@gzip.org)
|
|
||||||
|
|
||||||
amiga/Makefile.sas makefile for Amiga SAS/C
|
|
||||||
amiga/Makefile.pup makefile for Amiga powerUP SAS/C PPC
|
|
||||||
|
|
||||||
msdos/Makefile.w32 makefile for Microsoft Visual C++ 32-bit
|
|
||||||
msdos/Makefile.b32 makefile for Borland C++ 32-bit
|
|
||||||
msdos/Makefile.bor makefile for Borland C/C++ 16-bit
|
|
||||||
msdos/Makefile.dj2 makefile for DJGPP 2.x
|
|
||||||
msdos/Makefile.emx makefile for EMX 0.9c (32-bit DOS/OS2)
|
|
||||||
msdos/Makefile.msc makefile for Microsoft C 16-bit
|
|
||||||
msdos/Makefile.tc makefile for Turbo C
|
|
||||||
msdos/Makefile.wat makefile for Watcom C
|
|
||||||
msdos/zlib.def definition file for Windows DLL
|
|
||||||
msdos/zlib.rc definition file for Windows DLL
|
|
||||||
|
|
||||||
nt/Makefile.nt makefile for Windows NT
|
|
||||||
nt/zlib.dnt definition file for Windows NT DLL
|
|
||||||
nt/Makefile.emx makefile for EMX 0.9c/RSXNT 1.41 (Win32 Intel)
|
|
||||||
nt/Makefile.gcc makefile for Windows NT using GCC (mingw32)
|
|
||||||
|
|
||||||
|
|
||||||
zlib public header files (must be kept):
|
|
||||||
zconf.h
|
|
||||||
zlib.h
|
|
||||||
|
|
||||||
private source files used to build the zlib library:
|
|
||||||
adler32.c
|
|
||||||
compress.c
|
|
||||||
crc32.c
|
|
||||||
deflate.c
|
|
||||||
deflate.h
|
|
||||||
gzio.c
|
|
||||||
infblock.c
|
|
||||||
infblock.h
|
|
||||||
infcodes.c
|
|
||||||
infcodes.h
|
|
||||||
inffast.c
|
|
||||||
inffast.h
|
|
||||||
inflate.c
|
|
||||||
inftrees.c
|
|
||||||
inftrees.h
|
|
||||||
infutil.c
|
|
||||||
infutil.h
|
|
||||||
maketree.c
|
|
||||||
trees.c
|
|
||||||
uncompr.c
|
|
||||||
zutil.c
|
|
||||||
zutil.h
|
|
||||||
|
|
||||||
source files for sample programs:
|
|
||||||
example.c
|
|
||||||
minigzip.c
|
|
||||||
|
|
||||||
unsupported contribution by third parties
|
|
||||||
|
|
||||||
contrib/asm386/ by Gilles Vollant <info@winimage.com>
|
|
||||||
386 asm code replacing longest_match().
|
|
||||||
|
|
||||||
contrib/minizip/ by Gilles Vollant <info@winimage.com>
|
|
||||||
Mini zip and unzip based on zlib
|
|
||||||
See http://www.winimage.com/zLibDll/unzip.html
|
|
||||||
|
|
||||||
contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
|
|
||||||
A C++ I/O streams interface to the zlib gz* functions
|
|
||||||
|
|
||||||
contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
|
|
||||||
Another C++ I/O streams interface
|
|
||||||
|
|
||||||
contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
|
|
||||||
A very simple tar.gz extractor using zlib
|
|
||||||
|
|
||||||
contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
|
|
||||||
How to use compress(), uncompress() and the gz* functions from VB.
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
$! make libz under VMS
|
|
||||||
$! written by Martin P.J. Zinser <m.zinser@gsi.de>
|
|
||||||
$!
|
|
||||||
$! Look for the compiler used
|
|
||||||
$!
|
|
||||||
$ ccopt = ""
|
|
||||||
$ if f$getsyi("HW_MODEL").ge.1024
|
|
||||||
$ then
|
|
||||||
$ ccopt = "/prefix=all"+ccopt
|
|
||||||
$ comp = "__decc__=1"
|
|
||||||
$ if f$trnlnm("SYS").eqs."" then define sys sys$library:
|
|
||||||
$ else
|
|
||||||
$ if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""
|
|
||||||
$ then
|
|
||||||
$ comp = "__vaxc__=1"
|
|
||||||
$ if f$trnlnm("SYS").eqs."" then define sys sys$library:
|
|
||||||
$ else
|
|
||||||
$ if f$trnlnm("SYS").eqs."" then define sys decc$library_include:
|
|
||||||
$ ccopt = "/decc/prefix=all"+ccopt
|
|
||||||
$ comp = "__decc__=1"
|
|
||||||
$ endif
|
|
||||||
$ endif
|
|
||||||
$!
|
|
||||||
$! Build the thing plain or with mms
|
|
||||||
$!
|
|
||||||
$ write sys$output "Compiling Zlib sources ..."
|
|
||||||
$ if f$search("SYS$SYSTEM:MMS.EXE").eqs.""
|
|
||||||
$ then
|
|
||||||
$ dele example.obj;*,minigzip.obj;*
|
|
||||||
$ CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
|
|
||||||
adler32.c zlib.h zconf.h
|
|
||||||
$ CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
|
|
||||||
compress.c zlib.h zconf.h
|
|
||||||
$ CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
|
|
||||||
crc32.c zlib.h zconf.h
|
|
||||||
$ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
|
|
||||||
deflate.c deflate.h zutil.h zlib.h zconf.h
|
|
||||||
$ CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
|
|
||||||
gzio.c zutil.h zlib.h zconf.h
|
|
||||||
$ CALL MAKE infblock.OBJ "CC ''CCOPT' infblock" -
|
|
||||||
infblock.c zutil.h zlib.h zconf.h infblock.h
|
|
||||||
$ CALL MAKE infcodes.OBJ "CC ''CCOPT' infcodes" -
|
|
||||||
infcodes.c zutil.h zlib.h zconf.h inftrees.h
|
|
||||||
$ CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
|
|
||||||
inffast.c zutil.h zlib.h zconf.h inffast.h
|
|
||||||
$ CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
|
|
||||||
inflate.c zutil.h zlib.h zconf.h infblock.h
|
|
||||||
$ CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
|
|
||||||
inftrees.c zutil.h zlib.h zconf.h inftrees.h
|
|
||||||
$ CALL MAKE infutil.OBJ "CC ''CCOPT' infutil" -
|
|
||||||
infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
|
|
||||||
$ CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
|
|
||||||
trees.c deflate.h zutil.h zlib.h zconf.h
|
|
||||||
$ CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
|
|
||||||
uncompr.c zlib.h zconf.h
|
|
||||||
$ CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
|
|
||||||
zutil.c zutil.h zlib.h zconf.h
|
|
||||||
$ write sys$output "Building Zlib ..."
|
|
||||||
$ CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
|
|
||||||
$ write sys$output "Building example..."
|
|
||||||
$ CALL MAKE example.OBJ "CC ''CCOPT' example" -
|
|
||||||
example.c zlib.h zconf.h
|
|
||||||
$ call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
|
|
||||||
$ write sys$output "Building minigzip..."
|
|
||||||
$ CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
|
|
||||||
minigzip.c zlib.h zconf.h
|
|
||||||
$ call make minigzip.exe -
|
|
||||||
"LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -
|
|
||||||
minigzip.obj libz.olb
|
|
||||||
$ else
|
|
||||||
$ mms/macro=('comp')
|
|
||||||
$ endif
|
|
||||||
$ write sys$output "Zlib build completed"
|
|
||||||
$ exit
|
|
||||||
$!
|
|
||||||
$!
|
|
||||||
$MAKE: SUBROUTINE !SUBROUTINE TO CHECK DEPENDENCIES
|
|
||||||
$ V = 'F$Verify(0)
|
|
||||||
$! P1 = What we are trying to make
|
|
||||||
$! P2 = Command to make it
|
|
||||||
$! P3 - P8 What it depends on
|
|
||||||
$
|
|
||||||
$ If F$Search(P1) .Eqs. "" Then Goto Makeit
|
|
||||||
$ Time = F$CvTime(F$File(P1,"RDT"))
|
|
||||||
$arg=3
|
|
||||||
$Loop:
|
|
||||||
$ Argument = P'arg
|
|
||||||
$ If Argument .Eqs. "" Then Goto Exit
|
|
||||||
$ El=0
|
|
||||||
$Loop2:
|
|
||||||
$ File = F$Element(El," ",Argument)
|
|
||||||
$ If File .Eqs. " " Then Goto Endl
|
|
||||||
$ AFile = ""
|
|
||||||
$Loop3:
|
|
||||||
$ OFile = AFile
|
|
||||||
$ AFile = F$Search(File)
|
|
||||||
$ If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
|
|
||||||
$ If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
|
|
||||||
$ Goto Loop3
|
|
||||||
$NextEL:
|
|
||||||
$ El = El + 1
|
|
||||||
$ Goto Loop2
|
|
||||||
$EndL:
|
|
||||||
$ arg=arg+1
|
|
||||||
$ If arg .Le. 8 Then Goto Loop
|
|
||||||
$ Goto Exit
|
|
||||||
$
|
|
||||||
$Makeit:
|
|
||||||
$ VV=F$VERIFY(0)
|
|
||||||
$ write sys$output P2
|
|
||||||
$ 'P2
|
|
||||||
$ VV='F$Verify(VV)
|
|
||||||
$Exit:
|
|
||||||
$ If V Then Set Verify
|
|
||||||
$ENDSUBROUTINE
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
EXTRA_DIST = ChangeLog INDEX Make_vms.com Makefile.riscos README \
|
|
||||||
algorithm.txt descrip.mms example.c maketree.c minigzip.c zlib.3
|
|
||||||
|
|
||||||
lib_LIBRARIES = libz.a
|
|
||||||
|
|
||||||
libz_a_SOURCES = \
|
|
||||||
adler32.c \
|
|
||||||
compress.c \
|
|
||||||
crc32.c \
|
|
||||||
deflate.c \
|
|
||||||
deflate.h \
|
|
||||||
gzio.c \
|
|
||||||
infblock.c \
|
|
||||||
infblock.h \
|
|
||||||
infcodes.c \
|
|
||||||
infcodes.h \
|
|
||||||
inffast.c \
|
|
||||||
inffast.h \
|
|
||||||
inffixed.h \
|
|
||||||
inflate.c \
|
|
||||||
inftrees.c \
|
|
||||||
inftrees.h \
|
|
||||||
infutil.c \
|
|
||||||
infutil.h \
|
|
||||||
trees.c \
|
|
||||||
trees.h \
|
|
||||||
uncompr.c \
|
|
||||||
zconf.h \
|
|
||||||
zlib.h \
|
|
||||||
zutil.c \
|
|
||||||
zutil.h
|
|
||||||
@ -1,151 +0,0 @@
|
|||||||
# 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 -fah
|
|
||||||
C++flags = -c -depend !Depend -IC: -throwback
|
|
||||||
Linkflags = -aif -c++ -o $@
|
|
||||||
ObjAsmflags = -throwback -NoCache -depend !Depend
|
|
||||||
CMHGflags =
|
|
||||||
LibFileflags = -c -l -o $@
|
|
||||||
Squeezeflags = -o $@
|
|
||||||
|
|
||||||
# change the line below to where _you_ want the library installed.
|
|
||||||
libdest = lib:zlib
|
|
||||||
|
|
||||||
# Final targets:
|
|
||||||
@.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.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.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:
|
|
||||||
|
|
||||||
# Dynamic dependencies:
|
|
||||||
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
|
|
||||||
148
lib/zlib/README
148
lib/zlib/README
@ -1,148 +0,0 @@
|
|||||||
zlib 1.1.3 is a general purpose data compression library. All the code
|
|
||||||
is thread safe. The data format used by the zlib library
|
|
||||||
is described by RFCs (Request for Comments) 1950 to 1952 in the files
|
|
||||||
ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate
|
|
||||||
format) and rfc1952.txt (gzip format). These documents are also available in
|
|
||||||
other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
|
|
||||||
|
|
||||||
All functions of the compression library are documented in the file zlib.h
|
|
||||||
(volunteer to write man pages welcome, contact jloup@gzip.org). A usage
|
|
||||||
example of the library is given in the file example.c which also tests that
|
|
||||||
the library is working correctly. Another example is given in the file
|
|
||||||
minigzip.c. The compression library itself is composed of all source files
|
|
||||||
except example.c and minigzip.c.
|
|
||||||
|
|
||||||
To compile all files and run the test program, follow the instructions
|
|
||||||
given at the top of Makefile. In short "make test; make install"
|
|
||||||
should work for most machines. For Unix: "configure; make test; make install"
|
|
||||||
For MSDOS, use one of the special makefiles such as Makefile.msc.
|
|
||||||
For VMS, use Make_vms.com or descrip.mms.
|
|
||||||
|
|
||||||
Questions about zlib should be sent to <zlib@quest.jpl.nasa.gov>, or to
|
|
||||||
Gilles Vollant <info@winimage.com> for the Windows DLL version.
|
|
||||||
The zlib home page is http://www.cdrom.com/pub/infozip/zlib/
|
|
||||||
The official zlib ftp site is ftp://ftp.cdrom.com/pub/infozip/zlib/
|
|
||||||
Before reporting a problem, please check those sites to verify that
|
|
||||||
you have the latest version of zlib; otherwise get the latest version and
|
|
||||||
check whether the problem still exists or not.
|
|
||||||
|
|
||||||
Mark Nelson <markn@tiny.com> wrote an article about zlib for the Jan. 1997
|
|
||||||
issue of Dr. Dobb's Journal; a copy of the article is available in
|
|
||||||
http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm
|
|
||||||
|
|
||||||
The changes made in version 1.1.3 are documented in the file ChangeLog.
|
|
||||||
The main changes since 1.1.2 are:
|
|
||||||
|
|
||||||
- fix "an inflate input buffer bug that shows up on rare but persistent
|
|
||||||
occasions" (Mark)
|
|
||||||
- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
|
|
||||||
- fix gzseek(..., SEEK_SET) in write mode
|
|
||||||
- fix crc check after a gzeek (Frank Faubert)
|
|
||||||
- fix miniunzip when the last entry in a zip file is itself a zip file
|
|
||||||
(J Lillge)
|
|
||||||
- add contrib/asm586 and contrib/asm686 (Brian Raiter)
|
|
||||||
See http://www.muppetlabs.com/~breadbox/software/assembly.html
|
|
||||||
- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
|
|
||||||
- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
|
|
||||||
- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
|
|
||||||
- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
|
|
||||||
- added a FAQ file
|
|
||||||
|
|
||||||
plus many changes for portability.
|
|
||||||
|
|
||||||
Unsupported third party contributions are provided in directory "contrib".
|
|
||||||
|
|
||||||
A Java implementation of zlib is available in the Java Development Kit 1.1
|
|
||||||
http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
|
|
||||||
See the zlib home page http://www.cdrom.com/pub/infozip/zlib/ for details.
|
|
||||||
|
|
||||||
A Perl interface to zlib written by Paul Marquess <pmarquess@bfsec.bt.co.uk>
|
|
||||||
is in the CPAN (Comprehensive Perl Archive Network) sites, such as:
|
|
||||||
ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
|
|
||||||
|
|
||||||
A Python interface to zlib written by A.M. Kuchling <amk@magnet.com>
|
|
||||||
is available in Python 1.5 and later versions, see
|
|
||||||
http://www.python.org/doc/lib/module-zlib.html
|
|
||||||
|
|
||||||
A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com>
|
|
||||||
is availlable at http://www.westend.com/~kupries/doc/trf/man/man.html
|
|
||||||
|
|
||||||
An experimental package to read and write files in .zip format,
|
|
||||||
written on top of zlib by Gilles Vollant <info@winimage.com>, is
|
|
||||||
available at http://www.winimage.com/zLibDll/unzip.html
|
|
||||||
and also in the contrib/minizip directory of zlib.
|
|
||||||
|
|
||||||
|
|
||||||
Notes for some targets:
|
|
||||||
|
|
||||||
- To build a Windows DLL version, include in a DLL project zlib.def, zlib.rc
|
|
||||||
and all .c files except example.c and minigzip.c; compile with -DZLIB_DLL
|
|
||||||
The zlib DLL support was initially done by Alessandro Iacopetti and is
|
|
||||||
now maintained by Gilles Vollant <info@winimage.com>. Check the zlib DLL
|
|
||||||
home page at http://www.winimage.com/zLibDll
|
|
||||||
|
|
||||||
From Visual Basic, you can call the DLL functions which do not take
|
|
||||||
a structure as argument: compress, uncompress and all gz* functions.
|
|
||||||
See contrib/visual-basic.txt for more information, or get
|
|
||||||
http://www.tcfb.com/dowseware/cmp-z-it.zip
|
|
||||||
|
|
||||||
- For 64-bit Irix, deflate.c must be compiled without any optimization.
|
|
||||||
With -O, one libpng test fails. The test works in 32 bit mode (with
|
|
||||||
the -n32 compiler flag). The compiler bug has been reported to SGI.
|
|
||||||
|
|
||||||
- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1
|
|
||||||
it works when compiled with cc.
|
|
||||||
|
|
||||||
- on Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1
|
|
||||||
is necessary to get gzprintf working correctly. This is done by configure.
|
|
||||||
|
|
||||||
- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works
|
|
||||||
with other compilers. Use "make test" to check your compiler.
|
|
||||||
|
|
||||||
- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
|
|
||||||
|
|
||||||
- For Turbo C the small model is supported only with reduced performance to
|
|
||||||
avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
|
|
||||||
|
|
||||||
- For PalmOs, see http://www.cs.uit.no/~perm/PASTA/pilot/software.html
|
|
||||||
Per Harald Myrvang <perm@stud.cs.uit.no>
|
|
||||||
|
|
||||||
|
|
||||||
Acknowledgments:
|
|
||||||
|
|
||||||
The deflate format used by zlib was defined by Phil Katz. The deflate
|
|
||||||
and zlib specifications were written by L. Peter Deutsch. Thanks to all the
|
|
||||||
people who reported problems and suggested various improvements in zlib;
|
|
||||||
they are too numerous to cite here.
|
|
||||||
|
|
||||||
Copyright notice:
|
|
||||||
|
|
||||||
(C) 1995-1998 Jean-loup Gailly and Mark Adler
|
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
|
||||||
warranty. In no event will the authors be held liable for any damages
|
|
||||||
arising from the use of this software.
|
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
|
||||||
including commercial applications, and to alter it and redistribute it
|
|
||||||
freely, subject to the following restrictions:
|
|
||||||
|
|
||||||
1. The origin of this software must not be misrepresented; you must not
|
|
||||||
claim that you wrote the original software. If you use this software
|
|
||||||
in a product, an acknowledgment in the product documentation would be
|
|
||||||
appreciated but is not required.
|
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
misrepresented as being the original software.
|
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
|
||||||
|
|
||||||
Jean-loup Gailly Mark Adler
|
|
||||||
jloup@gzip.org 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
|
|
||||||
for free but without warranty of any kind. The library has been
|
|
||||||
entirely written by Jean-loup Gailly and Mark Adler; it does not
|
|
||||||
include third-party code.
|
|
||||||
|
|
||||||
If you redistribute modified sources, we would appreciate that you include
|
|
||||||
in the file ChangeLog history information documenting your changes.
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
/* adler32.c -- compute the Adler-32 checksum of a data stream
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* @(#) $Id$ */
|
|
||||||
|
|
||||||
#include "zlib.h"
|
|
||||||
|
|
||||||
#define BASE 65521L /* largest prime smaller than 65536 */
|
|
||||||
#define NMAX 5552
|
|
||||||
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
|
|
||||||
|
|
||||||
#define DO1(buf,i) {s1 += buf[i]; s2 += s1;}
|
|
||||||
#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1);
|
|
||||||
#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2);
|
|
||||||
#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4);
|
|
||||||
#define DO16(buf) DO8(buf,0); DO8(buf,8);
|
|
||||||
|
|
||||||
/* ========================================================================= */
|
|
||||||
uLong ZEXPORT adler32(adler, buf, len)
|
|
||||||
uLong adler;
|
|
||||||
const Bytef *buf;
|
|
||||||
uInt len;
|
|
||||||
{
|
|
||||||
unsigned long s1 = adler & 0xffff;
|
|
||||||
unsigned long s2 = (adler >> 16) & 0xffff;
|
|
||||||
int k;
|
|
||||||
|
|
||||||
if (buf == Z_NULL) return 1L;
|
|
||||||
|
|
||||||
while (len > 0) {
|
|
||||||
k = len < NMAX ? len : NMAX;
|
|
||||||
len -= k;
|
|
||||||
while (k >= 16) {
|
|
||||||
DO16(buf);
|
|
||||||
buf += 16;
|
|
||||||
k -= 16;
|
|
||||||
}
|
|
||||||
if (k != 0) do {
|
|
||||||
s1 += *buf++;
|
|
||||||
s2 += s1;
|
|
||||||
} while (--k);
|
|
||||||
s1 %= BASE;
|
|
||||||
s2 %= BASE;
|
|
||||||
}
|
|
||||||
return (s2 << 16) | s1;
|
|
||||||
}
|
|
||||||
@ -1,213 +0,0 @@
|
|||||||
1. Compression algorithm (deflate)
|
|
||||||
|
|
||||||
The deflation algorithm used by gzip (also zip and zlib) is a variation of
|
|
||||||
LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
|
|
||||||
the input data. The second occurrence of a string is replaced by a
|
|
||||||
pointer to the previous string, in the form of a pair (distance,
|
|
||||||
length). Distances are limited to 32K bytes, and lengths are limited
|
|
||||||
to 258 bytes. When a string does not occur anywhere in the previous
|
|
||||||
32K bytes, it is emitted as a sequence of literal bytes. (In this
|
|
||||||
description, `string' must be taken as an arbitrary sequence of bytes,
|
|
||||||
and is not restricted to printable characters.)
|
|
||||||
|
|
||||||
Literals or match lengths are compressed with one Huffman tree, and
|
|
||||||
match distances are compressed with another tree. The trees are stored
|
|
||||||
in a compact form at the start of each block. The blocks can have any
|
|
||||||
size (except that the compressed data for one block must fit in
|
|
||||||
available memory). A block is terminated when deflate() determines that
|
|
||||||
it would be useful to start another block with fresh trees. (This is
|
|
||||||
somewhat similar to the behavior of LZW-based _compress_.)
|
|
||||||
|
|
||||||
Duplicated strings are found using a hash table. All input strings of
|
|
||||||
length 3 are inserted in the hash table. A hash index is computed for
|
|
||||||
the next 3 bytes. If the hash chain for this index is not empty, all
|
|
||||||
strings in the chain are compared with the current input string, and
|
|
||||||
the longest match is selected.
|
|
||||||
|
|
||||||
The hash chains are searched starting with the most recent strings, to
|
|
||||||
favor small distances and thus take advantage of the Huffman encoding.
|
|
||||||
The hash chains are singly linked. There are no deletions from the
|
|
||||||
hash chains, the algorithm simply discards matches that are too old.
|
|
||||||
|
|
||||||
To avoid a worst-case situation, very long hash chains are arbitrarily
|
|
||||||
truncated at a certain length, determined by a runtime option (level
|
|
||||||
parameter of deflateInit). So deflate() does not always find the longest
|
|
||||||
possible match but generally finds a match which is long enough.
|
|
||||||
|
|
||||||
deflate() also defers the selection of matches with a lazy evaluation
|
|
||||||
mechanism. After a match of length N has been found, deflate() searches for
|
|
||||||
a longer match at the next input byte. If a longer match is found, the
|
|
||||||
previous match is truncated to a length of one (thus producing a single
|
|
||||||
literal byte) and the process of lazy evaluation begins again. Otherwise,
|
|
||||||
the original match is kept, and the next match search is attempted only N
|
|
||||||
steps later.
|
|
||||||
|
|
||||||
The lazy match evaluation is also subject to a runtime parameter. If
|
|
||||||
the current match is long enough, deflate() reduces the search for a longer
|
|
||||||
match, thus speeding up the whole process. If compression ratio is more
|
|
||||||
important than speed, deflate() attempts a complete second search even if
|
|
||||||
the first match is already long enough.
|
|
||||||
|
|
||||||
The lazy match evaluation is not performed for the fastest compression
|
|
||||||
modes (level parameter 1 to 3). For these fast modes, new strings
|
|
||||||
are inserted in the hash table only when no match was found, or
|
|
||||||
when the match is not too long. This degrades the compression ratio
|
|
||||||
but saves time since there are both fewer insertions and fewer searches.
|
|
||||||
|
|
||||||
|
|
||||||
2. Decompression algorithm (inflate)
|
|
||||||
|
|
||||||
2.1 Introduction
|
|
||||||
|
|
||||||
The real question is, given a Huffman tree, how to decode fast. The most
|
|
||||||
important realization is that shorter codes are much more common than
|
|
||||||
longer codes, so pay attention to decoding the short codes fast, and let
|
|
||||||
the long codes take longer to decode.
|
|
||||||
|
|
||||||
inflate() sets up a first level table that covers some number of bits of
|
|
||||||
input less than the length of longest code. It gets that many bits from the
|
|
||||||
stream, and looks it up in the table. The table will tell if the next
|
|
||||||
code is that many bits or less and how many, and if it is, it will tell
|
|
||||||
the value, else it will point to the next level table for which inflate()
|
|
||||||
grabs more bits and tries to decode a longer code.
|
|
||||||
|
|
||||||
How many bits to make the first lookup is a tradeoff between the time it
|
|
||||||
takes to decode and the time it takes to build the table. If building the
|
|
||||||
table took no time (and if you had infinite memory), then there would only
|
|
||||||
be a first level table to cover all the way to the longest code. However,
|
|
||||||
building the table ends up taking a lot longer for more bits since short
|
|
||||||
codes are replicated many times in such a table. What inflate() does is
|
|
||||||
simply to make the number of bits in the first table a variable, and set it
|
|
||||||
for the maximum speed.
|
|
||||||
|
|
||||||
inflate() sends new trees relatively often, so it is possibly set for a
|
|
||||||
smaller first level table than an application that has only one tree for
|
|
||||||
all the data. For inflate, which has 286 possible codes for the
|
|
||||||
literal/length tree, the size of the first table is nine bits. Also the
|
|
||||||
distance trees have 30 possible values, and the size of the first table is
|
|
||||||
six bits. Note that for each of those cases, the table ended up one bit
|
|
||||||
longer than the ``average'' code length, i.e. the code length of an
|
|
||||||
approximately flat code which would be a little more than eight bits for
|
|
||||||
286 symbols and a little less than five bits for 30 symbols. It would be
|
|
||||||
interesting to see if optimizing the first level table for other
|
|
||||||
applications gave values within a bit or two of the flat code size.
|
|
||||||
|
|
||||||
|
|
||||||
2.2 More details on the inflate table lookup
|
|
||||||
|
|
||||||
Ok, you want to know what this cleverly obfuscated inflate tree actually
|
|
||||||
looks like. You are correct that it's not a Huffman tree. It is simply a
|
|
||||||
lookup table for the first, let's say, nine bits of a Huffman symbol. The
|
|
||||||
symbol could be as short as one bit or as long as 15 bits. If a particular
|
|
||||||
symbol is shorter than nine bits, then that symbol's translation is duplicated
|
|
||||||
in all those entries that start with that symbol's bits. For example, if the
|
|
||||||
symbol is four bits, then it's duplicated 32 times in a nine-bit table. If a
|
|
||||||
symbol is nine bits long, it appears in the table once.
|
|
||||||
|
|
||||||
If the symbol is longer than nine bits, then that entry in the table points
|
|
||||||
to another similar table for the remaining bits. Again, there are duplicated
|
|
||||||
entries as needed. The idea is that most of the time the symbol will be short
|
|
||||||
and there will only be one table look up. (That's whole idea behind data
|
|
||||||
compression in the first place.) For the less frequent long symbols, there
|
|
||||||
will be two lookups. If you had a compression method with really long
|
|
||||||
symbols, you could have as many levels of lookups as is efficient. For
|
|
||||||
inflate, two is enough.
|
|
||||||
|
|
||||||
So a table entry either points to another table (in which case nine bits in
|
|
||||||
the above example are gobbled), or it contains the translation for the symbol
|
|
||||||
and the number of bits to gobble. Then you start again with the next
|
|
||||||
ungobbled bit.
|
|
||||||
|
|
||||||
You may wonder: why not just have one lookup table for how ever many bits the
|
|
||||||
longest symbol is? The reason is that if you do that, you end up spending
|
|
||||||
more time filling in duplicate symbol entries than you do actually decoding.
|
|
||||||
At least for deflate's output that generates new trees every several 10's of
|
|
||||||
kbytes. You can imagine that filling in a 2^15 entry table for a 15-bit code
|
|
||||||
would take too long if you're only decoding several thousand symbols. At the
|
|
||||||
other extreme, you could make a new table for every bit in the code. In fact,
|
|
||||||
that's essentially a Huffman tree. But then you spend two much time
|
|
||||||
traversing the tree while decoding, even for short symbols.
|
|
||||||
|
|
||||||
So the number of bits for the first lookup table is a trade of the time to
|
|
||||||
fill out the table vs. the time spent looking at the second level and above of
|
|
||||||
the table.
|
|
||||||
|
|
||||||
Here is an example, scaled down:
|
|
||||||
|
|
||||||
The code being decoded, with 10 symbols, from 1 to 6 bits long:
|
|
||||||
|
|
||||||
A: 0
|
|
||||||
B: 10
|
|
||||||
C: 1100
|
|
||||||
D: 11010
|
|
||||||
E: 11011
|
|
||||||
F: 11100
|
|
||||||
G: 11101
|
|
||||||
H: 11110
|
|
||||||
I: 111110
|
|
||||||
J: 111111
|
|
||||||
|
|
||||||
Let's make the first table three bits long (eight entries):
|
|
||||||
|
|
||||||
000: A,1
|
|
||||||
001: A,1
|
|
||||||
010: A,1
|
|
||||||
011: A,1
|
|
||||||
100: B,2
|
|
||||||
101: B,2
|
|
||||||
110: -> table X (gobble 3 bits)
|
|
||||||
111: -> table Y (gobble 3 bits)
|
|
||||||
|
|
||||||
Each entry is what the bits decode to and how many bits that is, i.e. how
|
|
||||||
many bits to gobble. Or the entry points to another table, with the number of
|
|
||||||
bits to gobble implicit in the size of the table.
|
|
||||||
|
|
||||||
Table X is two bits long since the longest code starting with 110 is five bits
|
|
||||||
long:
|
|
||||||
|
|
||||||
00: C,1
|
|
||||||
01: C,1
|
|
||||||
10: D,2
|
|
||||||
11: E,2
|
|
||||||
|
|
||||||
Table Y is three bits long since the longest code starting with 111 is six
|
|
||||||
bits long:
|
|
||||||
|
|
||||||
000: F,2
|
|
||||||
001: F,2
|
|
||||||
010: G,2
|
|
||||||
011: G,2
|
|
||||||
100: H,2
|
|
||||||
101: H,2
|
|
||||||
110: I,3
|
|
||||||
111: J,3
|
|
||||||
|
|
||||||
So what we have here are three tables with a total of 20 entries that had to
|
|
||||||
be constructed. That's compared to 64 entries for a single table. Or
|
|
||||||
compared to 16 entries for a Huffman tree (six two entry tables and one four
|
|
||||||
entry table). Assuming that the code ideally represents the probability of
|
|
||||||
the symbols, it takes on the average 1.25 lookups per symbol. That's compared
|
|
||||||
to one lookup for the single table, or 1.66 lookups per symbol for the
|
|
||||||
Huffman tree.
|
|
||||||
|
|
||||||
There, I think that gives you a picture of what's going on. For inflate, the
|
|
||||||
meaning of a particular symbol is often more than just a letter. It can be a
|
|
||||||
byte (a "literal"), or it can be either a length or a distance which
|
|
||||||
indicates a base value and a number of bits to fetch after the code that is
|
|
||||||
added to the base value. Or it might be the special end-of-block code. The
|
|
||||||
data structures created in inftrees.c try to encode all that information
|
|
||||||
compactly in the tables.
|
|
||||||
|
|
||||||
|
|
||||||
Jean-loup Gailly Mark Adler
|
|
||||||
jloup@gzip.org madler@alumni.caltech.edu
|
|
||||||
|
|
||||||
|
|
||||||
References:
|
|
||||||
|
|
||||||
[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
|
|
||||||
Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
|
|
||||||
pp. 337-343.
|
|
||||||
|
|
||||||
``DEFLATE Compressed Data Format Specification'' available in
|
|
||||||
ftp://ds.internic.net/rfc/rfc1951.txt
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
# Amiga powerUP (TM) Makefile
|
|
||||||
# makefile for libpng and SAS C V6.58/7.00 PPC compiler
|
|
||||||
# Copyright (C) 1998 by Andreas R. Kleinert
|
|
||||||
|
|
||||||
CC = scppc
|
|
||||||
CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL \
|
|
||||||
OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8
|
|
||||||
LIBNAME = libzip.a
|
|
||||||
AR = ppc-amigaos-ar
|
|
||||||
AR_FLAGS = cr
|
|
||||||
RANLIB = ppc-amigaos-ranlib
|
|
||||||
LDFLAGS = -r -o
|
|
||||||
LDLIBS = LIB:scppc.a
|
|
||||||
LN = ppc-amigaos-ld
|
|
||||||
RM = delete quiet
|
|
||||||
|
|
||||||
OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
|
|
||||||
zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
|
|
||||||
|
|
||||||
TEST_OBJS = example.o minigzip.o
|
|
||||||
|
|
||||||
all: example minigzip
|
|
||||||
|
|
||||||
test: all
|
|
||||||
example
|
|
||||||
echo hello world | minigzip | minigzip -d
|
|
||||||
|
|
||||||
$(LIBNAME): $(OBJS)
|
|
||||||
$(AR) $(AR_FLAGS) $@ $(OBJS)
|
|
||||||
$(RANLIB) $@
|
|
||||||
|
|
||||||
example: example.o $(LIBNAME)
|
|
||||||
$(LN) $(LDFLAGS) example LIB:c_ppc.o example.o $(LIBNAME) $(LDLIBS) LIB:end.o
|
|
||||||
|
|
||||||
minigzip: minigzip.o $(LIBNAME)
|
|
||||||
$(LN) $(LDFLAGS) minigzip LIB:c_ppc.o minigzip.o $(LIBNAME) $(LDLIBS) LIB:end.o
|
|
||||||
|
|
||||||
clean:
|
|
||||||
$(RM) *.o example minigzip $(LIBNAME) foo.gz
|
|
||||||
|
|
||||||
zip:
|
|
||||||
zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
|
|
||||||
descrip.mms *.[ch]
|
|
||||||
|
|
||||||
tgz:
|
|
||||||
cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
|
|
||||||
zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
|
|
||||||
|
|
||||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
|
||||||
|
|
||||||
adler32.o: zutil.h zlib.h zconf.h
|
|
||||||
compress.o: zlib.h zconf.h
|
|
||||||
crc32.o: zutil.h zlib.h zconf.h
|
|
||||||
deflate.o: deflate.h zutil.h zlib.h zconf.h
|
|
||||||
example.o: zlib.h zconf.h
|
|
||||||
gzio.o: zutil.h zlib.h zconf.h
|
|
||||||
infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
|
|
||||||
infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
|
|
||||||
inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
|
|
||||||
inflate.o: zutil.h zlib.h zconf.h infblock.h
|
|
||||||
inftrees.o: zutil.h zlib.h zconf.h inftrees.h
|
|
||||||
infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
|
|
||||||
minigzip.o: zlib.h zconf.h
|
|
||||||
trees.o: deflate.h zutil.h zlib.h zconf.h
|
|
||||||
uncompr.o: zlib.h zconf.h
|
|
||||||
zutil.o: zutil.h zlib.h zconf.h
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
# SMakefile for zlib
|
|
||||||
# Modified from the standard UNIX Makefile Copyright Jean-loup Gailly
|
|
||||||
# Osma Ahvenlampi <Osma.Ahvenlampi@hut.fi>
|
|
||||||
# Amiga, SAS/C 6.56 & Smake
|
|
||||||
|
|
||||||
CC=sc
|
|
||||||
CFLAGS=OPT
|
|
||||||
#CFLAGS=OPT CPU=68030
|
|
||||||
#CFLAGS=DEBUG=LINE
|
|
||||||
LDFLAGS=LIB z.lib
|
|
||||||
|
|
||||||
SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
|
|
||||||
NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX
|
|
||||||
|
|
||||||
OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
|
|
||||||
zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
|
|
||||||
|
|
||||||
TEST_OBJS = example.o minigzip.o
|
|
||||||
|
|
||||||
all: SCOPTIONS example minigzip
|
|
||||||
|
|
||||||
test: all
|
|
||||||
`cd`/example
|
|
||||||
echo hello world | minigzip | minigzip -d
|
|
||||||
|
|
||||||
install: z.lib
|
|
||||||
copy zlib.h zconf.h INCLUDE: clone
|
|
||||||
copy z.lib LIB: clone
|
|
||||||
|
|
||||||
z.lib: $(OBJS)
|
|
||||||
oml z.lib r $(OBJS)
|
|
||||||
|
|
||||||
example: example.o z.lib
|
|
||||||
$(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS)
|
|
||||||
|
|
||||||
minigzip: minigzip.o z.lib
|
|
||||||
$(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
-delete force quiet *.o example minigzip z.lib foo.gz *.lnk SCOPTIONS
|
|
||||||
|
|
||||||
SCOPTIONS: Smakefile
|
|
||||||
copy to $@ <from <
|
|
||||||
$(SCOPTIONS)
|
|
||||||
<
|
|
||||||
|
|
||||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
|
||||||
|
|
||||||
adler32.o: zutil.h zlib.h zconf.h
|
|
||||||
compress.o: zlib.h zconf.h
|
|
||||||
crc32.o: zutil.h zlib.h zconf.h
|
|
||||||
deflate.o: deflate.h zutil.h zlib.h zconf.h
|
|
||||||
example.o: zlib.h zconf.h
|
|
||||||
gzio.o: zutil.h zlib.h zconf.h
|
|
||||||
infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
|
|
||||||
infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
|
|
||||||
inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
|
|
||||||
inflate.o: zutil.h zlib.h zconf.h infblock.h
|
|
||||||
inftrees.o: zutil.h zlib.h zconf.h inftrees.h
|
|
||||||
infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
|
|
||||||
minigzip.o: zlib.h zconf.h
|
|
||||||
trees.o: deflate.h zutil.h zlib.h zconf.h
|
|
||||||
uncompr.o: zlib.h zconf.h
|
|
||||||
zutil.o: zutil.h zlib.h zconf.h
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
/* compress.c -- compress a memory buffer
|
|
||||||
* Copyright (C) 1995-1998 Jean-loup Gailly.
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* @(#) $Id$ */
|
|
||||||
|
|
||||||
#include "zlib.h"
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Compresses the source buffer into the destination buffer. The level
|
|
||||||
parameter has the same meaning as in deflateInit. 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
|
|
||||||
12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
|
|
||||||
|
|
||||||
compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
|
|
||||||
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
|
|
||||||
Z_STREAM_ERROR if the level parameter is invalid.
|
|
||||||
*/
|
|
||||||
int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
|
|
||||||
Bytef *dest;
|
|
||||||
uLongf *destLen;
|
|
||||||
const Bytef *source;
|
|
||||||
uLong sourceLen;
|
|
||||||
int level;
|
|
||||||
{
|
|
||||||
z_stream stream;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
stream.next_in = (Bytef*)source;
|
|
||||||
stream.avail_in = (uInt)sourceLen;
|
|
||||||
#ifdef MAXSEG_64K
|
|
||||||
/* Check for source > 64K on 16-bit machine: */
|
|
||||||
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
|
|
||||||
#endif
|
|
||||||
stream.next_out = dest;
|
|
||||||
stream.avail_out = (uInt)*destLen;
|
|
||||||
if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
|
|
||||||
|
|
||||||
stream.zalloc = (alloc_func)0;
|
|
||||||
stream.zfree = (free_func)0;
|
|
||||||
stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
err = deflateInit(&stream, level);
|
|
||||||
if (err != Z_OK) return err;
|
|
||||||
|
|
||||||
err = deflate(&stream, Z_FINISH);
|
|
||||||
if (err != Z_STREAM_END) {
|
|
||||||
deflateEnd(&stream);
|
|
||||||
return err == Z_OK ? Z_BUF_ERROR : err;
|
|
||||||
}
|
|
||||||
*destLen = stream.total_out;
|
|
||||||
|
|
||||||
err = deflateEnd(&stream);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
*/
|
|
||||||
int ZEXPORT compress (dest, destLen, source, sourceLen)
|
|
||||||
Bytef *dest;
|
|
||||||
uLongf *destLen;
|
|
||||||
const Bytef *source;
|
|
||||||
uLong sourceLen;
|
|
||||||
{
|
|
||||||
return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
|
|
||||||
}
|
|
||||||
214
lib/zlib/configure
vendored
214
lib/zlib/configure
vendored
@ -1,214 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# configure script for zlib. This script is needed only if
|
|
||||||
# you wish to build a shared library and your system supports them,
|
|
||||||
# of if you need special compiler, flags or install directory.
|
|
||||||
# Otherwise, you can just use directly "make test; make install"
|
|
||||||
#
|
|
||||||
# To create a shared library, use "configure --shared"; by default a static
|
|
||||||
# library is created. If the primitive shared library support provided here
|
|
||||||
# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz
|
|
||||||
#
|
|
||||||
# To impose specific compiler or flags or install directory, use for example:
|
|
||||||
# prefix=$HOME CC=cc CFLAGS="-O4" ./configure
|
|
||||||
# or for csh/tcsh users:
|
|
||||||
# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
|
|
||||||
# LDSHARED is the command to be used to create a shared library
|
|
||||||
|
|
||||||
# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
|
|
||||||
# If you have problems, try without defining CC and CFLAGS before reporting
|
|
||||||
# an error.
|
|
||||||
|
|
||||||
LIBS=libz.a
|
|
||||||
SHAREDLIB=libz.so
|
|
||||||
VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
|
|
||||||
AR=${AR-"ar rc"}
|
|
||||||
RANLIB=${RANLIB-"ranlib"}
|
|
||||||
prefix=${prefix-/usr/local}
|
|
||||||
exec_prefix=${exec_prefix-'${prefix}'}
|
|
||||||
libdir=${libdir-'${exec_prefix}/lib'}
|
|
||||||
includedir=${includedir-'${prefix}/include'}
|
|
||||||
shared_ext='.so'
|
|
||||||
shared=0
|
|
||||||
gcc=0
|
|
||||||
old_cc="$CC"
|
|
||||||
old_cflags="$CFLAGS"
|
|
||||||
|
|
||||||
while test $# -ge 1
|
|
||||||
do
|
|
||||||
case "$1" in
|
|
||||||
-p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
|
|
||||||
-e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
|
|
||||||
-l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
|
|
||||||
-i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;
|
|
||||||
-p* | --p*) prefix="$2"; shift; shift;;
|
|
||||||
-e* | --e*) exec_prefix="$2"; shift; shift;;
|
|
||||||
-l* | --l*) libdir="$2"; shift; shift;;
|
|
||||||
-i* | --i*) includedir="$2"; shift; shift;;
|
|
||||||
-sh* | --sh*) shared=1; shift;;
|
|
||||||
--src*) shift;;
|
|
||||||
--c*) shift;;
|
|
||||||
*)
|
|
||||||
echo 'usage:'
|
|
||||||
echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]'
|
|
||||||
echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
|
|
||||||
exit 0;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
test=ztest$$
|
|
||||||
cat > $test.c <<EOF
|
|
||||||
extern int getchar();
|
|
||||||
int hello() {return getchar();}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test -z "$CC" && echo Checking for gcc...
|
|
||||||
cc=${CC-gcc}
|
|
||||||
cflags=${CFLAGS-"-O3"}
|
|
||||||
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
|
|
||||||
case "$cc" in
|
|
||||||
*gcc*) gcc=1;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
|
|
||||||
CC="$cc"
|
|
||||||
SFLAGS=${CFLAGS-"-fPIC -O3"}
|
|
||||||
CFLAGS="$cflags"
|
|
||||||
case `(uname -s || echo unknown) 2>/dev/null` in
|
|
||||||
Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;
|
|
||||||
*) LDSHARED=${LDSHARED-"gcc -shared"};;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
# find system name and corresponding cc options
|
|
||||||
CC=${CC-cc}
|
|
||||||
case `(uname -sr || echo unknown) 2>/dev/null` in
|
|
||||||
HP-UX*) SFLAGS=${CFLAGS-"-O +z"}
|
|
||||||
CFLAGS=${CFLAGS-"-O"}
|
|
||||||
# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
|
|
||||||
LDSHARED=${LDSHARED-"ld -b"}
|
|
||||||
shared_ext='.sl'
|
|
||||||
SHAREDLIB='libz.sl';;
|
|
||||||
IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
|
|
||||||
CFLAGS=${CFLAGS-"-ansi -O2"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -shared"};;
|
|
||||||
OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
|
|
||||||
CFLAGS=${CFLAGS-"-O -std1"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,$SHAREDLIB -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};;
|
|
||||||
OSF1*) SFLAGS=${CFLAGS-"-O -std1"}
|
|
||||||
CFLAGS=${CFLAGS-"-O -std1"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -shared"};;
|
|
||||||
QNX*) SFLAGS=${CFLAGS-"-4 -O"}
|
|
||||||
CFLAGS=${CFLAGS-"-4 -O"}
|
|
||||||
LDSHARED=${LDSHARED-"cc"}
|
|
||||||
RANLIB=${RANLIB-"true"}
|
|
||||||
AR="cc -A";;
|
|
||||||
SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
|
|
||||||
CFLAGS=${CFLAGS-"-O3"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
|
|
||||||
SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
|
|
||||||
CFLAGS=${CFLAGS-"-fast -xcg89"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -G"};;
|
|
||||||
SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
|
|
||||||
CFLAGS=${CFLAGS-"-O2"}
|
|
||||||
LDSHARED=${LDSHARED-"ld"};;
|
|
||||||
UNIX_System_V\ 4.2.0)
|
|
||||||
SFLAGS=${CFLAGS-"-KPIC -O"}
|
|
||||||
CFLAGS=${CFLAGS-"-O"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -G"};;
|
|
||||||
UNIX_SV\ 4.2MP)
|
|
||||||
SFLAGS=${CFLAGS-"-Kconform_pic -O"}
|
|
||||||
CFLAGS=${CFLAGS-"-O"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -G"};;
|
|
||||||
# send working options for other systems to support@gzip.org
|
|
||||||
*) SFLAGS=${CFLAGS-"-O"}
|
|
||||||
CFLAGS=${CFLAGS-"-O"}
|
|
||||||
LDSHARED=${LDSHARED-"cc -shared"};;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $shared -eq 1; then
|
|
||||||
echo Checking for shared library support...
|
|
||||||
# we must test in two steps (cc then ld), required at least on SunOS 4.x
|
|
||||||
if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
|
|
||||||
test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
|
|
||||||
CFLAGS="$SFLAGS"
|
|
||||||
LIBS="$SHAREDLIB.$VER"
|
|
||||||
echo Building shared library $SHAREDLIB.$VER with $CC.
|
|
||||||
elif test -z "$old_cc" -a -z "$old_cflags"; then
|
|
||||||
echo No shared library suppport.
|
|
||||||
shared=0;
|
|
||||||
else
|
|
||||||
echo 'No shared library suppport; try without defining CC and CFLAGS'
|
|
||||||
shared=0;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test $shared -eq 0; then
|
|
||||||
LDSHARED="$CC"
|
|
||||||
echo Building static library $LIBS version $VER with $CC.
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat > $test.c <<EOF
|
|
||||||
#include <unistd.h>
|
|
||||||
int main() { return 0; }
|
|
||||||
EOF
|
|
||||||
if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
|
|
||||||
CFLAGS="$CFLAGS -DHAVE_UNISTD_H"
|
|
||||||
echo "Checking for unistd.h... Yes."
|
|
||||||
else
|
|
||||||
echo "Checking for unistd.h... No."
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat > $test.c <<EOF
|
|
||||||
#include <errno.h>
|
|
||||||
int main() { return 0; }
|
|
||||||
EOF
|
|
||||||
if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
|
|
||||||
echo "Checking for errno.h... Yes."
|
|
||||||
else
|
|
||||||
echo "Checking for errno.h... No."
|
|
||||||
CFLAGS="$CFLAGS -DNO_ERRNO_H"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat > $test.c <<EOF
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/mman.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
caddr_t hello() {
|
|
||||||
return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
|
|
||||||
CFLAGS="$CFLAGS -DUSE_MMAP"
|
|
||||||
echo Checking for mmap support... Yes.
|
|
||||||
else
|
|
||||||
echo Checking for mmap support... No.
|
|
||||||
fi
|
|
||||||
|
|
||||||
CPP=${CPP-"$CC -E"}
|
|
||||||
case $CFLAGS in
|
|
||||||
*ASMV*)
|
|
||||||
if test "`nm $test.o | grep _hello`" = ""; then
|
|
||||||
CPP="$CPP -DNO_UNDERLINE"
|
|
||||||
echo Checking for underline in external names... No.
|
|
||||||
else
|
|
||||||
echo Checking for underline in external names... Yes.
|
|
||||||
fi;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
rm -f $test.[co] $test$shared_ext
|
|
||||||
|
|
||||||
# udpate Makefile
|
|
||||||
sed < Makefile.in "
|
|
||||||
/^CC *=/s%=.*%=$CC%
|
|
||||||
/^CFLAGS *=/s%=.*%=$CFLAGS%
|
|
||||||
/^CPP *=/s%=.*%=$CPP%
|
|
||||||
/^LDSHARED *=/s%=.*%=$LDSHARED%
|
|
||||||
/^LIBS *=/s%=.*%=$LIBS%
|
|
||||||
/^SHAREDLIB *=/s%=.*%=$SHAREDLIB%
|
|
||||||
/^AR *=/s%=.*%=$AR%
|
|
||||||
/^RANLIB *=/s%=.*%=$RANLIB%
|
|
||||||
/^VER *=/s%=.*%=$VER%
|
|
||||||
/^prefix *=/s%=.*%=$prefix%
|
|
||||||
/^exec_prefix *=/s%=.*%=$exec_prefix%
|
|
||||||
/^libdir *=/s%=.*%=$libdir%
|
|
||||||
/^includedir *=/s%=.*%=$includedir%
|
|
||||||
" > Makefile
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
All files under this contrib directory are UNSUPPORTED. There were
|
|
||||||
provided by users of zlib and were not tested by the authors of zlib.
|
|
||||||
Use at your own risk. Please contact the authors of the contributions
|
|
||||||
for help about these, not the zlib authors. Thanks.
|
|
||||||
|
|
||||||
|
|
||||||
asm386/ by Gilles Vollant <info@winimage.com>
|
|
||||||
386 asm code replacing longest_match(), for Visual C++ 4.2 and ML 6.11c
|
|
||||||
|
|
||||||
asm586/ and asm686/ by Brian Raiter <breadbox@muppetlabs.com>
|
|
||||||
asm code for Pentium and Pentium Pro
|
|
||||||
See http://www.muppetlabs.com/~breadbox/software/assembly.html
|
|
||||||
|
|
||||||
delphi/ by Bob Dellaca <bobdl@xtra.co.nz>
|
|
||||||
Support for Delphi
|
|
||||||
|
|
||||||
delphi2/ by Davide Moretti <dave@rimini.com>
|
|
||||||
Another support for C++Builder and Delphi
|
|
||||||
|
|
||||||
minizip/ by Gilles Vollant <info@winimage.com>
|
|
||||||
Mini zip and unzip based on zlib
|
|
||||||
See http://www.winimage.com/zLibDll/unzip.html
|
|
||||||
|
|
||||||
iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
|
|
||||||
A C++ I/O streams interface to the zlib gz* functions
|
|
||||||
|
|
||||||
iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
|
|
||||||
Another C++ I/O streams interface
|
|
||||||
|
|
||||||
untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
|
|
||||||
A very simple tar.gz file extractor using zlib
|
|
||||||
|
|
||||||
visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
|
|
||||||
How to use compress(), uncompress() and the gz* functions from VB.
|
|
||||||
@ -1,559 +0,0 @@
|
|||||||
;
|
|
||||||
; gvmat32.asm -- Asm portion of the optimized longest_match for 32 bits x86
|
|
||||||
; Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
|
|
||||||
; File written by Gilles Vollant, by modifiying the longest_match
|
|
||||||
; from Jean-loup Gailly in deflate.c
|
|
||||||
; It need wmask == 0x7fff
|
|
||||||
; (assembly code is faster with a fixed wmask)
|
|
||||||
;
|
|
||||||
; For Visual C++ 4.2 and ML 6.11c (version in directory \MASM611C of Win95 DDK)
|
|
||||||
; I compile with : "ml /coff /Zi /c gvmat32.asm"
|
|
||||||
;
|
|
||||||
|
|
||||||
;uInt longest_match_7fff(s, cur_match)
|
|
||||||
; deflate_state *s;
|
|
||||||
; IPos cur_match; /* current match */
|
|
||||||
|
|
||||||
NbStack equ 76
|
|
||||||
cur_match equ dword ptr[esp+NbStack-0]
|
|
||||||
str_s equ dword ptr[esp+NbStack-4]
|
|
||||||
; 5 dword on top (ret,ebp,esi,edi,ebx)
|
|
||||||
adrret equ dword ptr[esp+NbStack-8]
|
|
||||||
pushebp equ dword ptr[esp+NbStack-12]
|
|
||||||
pushedi equ dword ptr[esp+NbStack-16]
|
|
||||||
pushesi equ dword ptr[esp+NbStack-20]
|
|
||||||
pushebx equ dword ptr[esp+NbStack-24]
|
|
||||||
|
|
||||||
chain_length equ dword ptr [esp+NbStack-28]
|
|
||||||
limit equ dword ptr [esp+NbStack-32]
|
|
||||||
best_len equ dword ptr [esp+NbStack-36]
|
|
||||||
window equ dword ptr [esp+NbStack-40]
|
|
||||||
prev equ dword ptr [esp+NbStack-44]
|
|
||||||
scan_start equ word ptr [esp+NbStack-48]
|
|
||||||
wmask equ dword ptr [esp+NbStack-52]
|
|
||||||
match_start_ptr equ dword ptr [esp+NbStack-56]
|
|
||||||
nice_match equ dword ptr [esp+NbStack-60]
|
|
||||||
scan equ dword ptr [esp+NbStack-64]
|
|
||||||
|
|
||||||
windowlen equ dword ptr [esp+NbStack-68]
|
|
||||||
match_start equ dword ptr [esp+NbStack-72]
|
|
||||||
strend equ dword ptr [esp+NbStack-76]
|
|
||||||
NbStackAdd equ (NbStack-24)
|
|
||||||
|
|
||||||
.386p
|
|
||||||
|
|
||||||
name gvmatch
|
|
||||||
.MODEL FLAT
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; all the +4 offsets are due to the addition of pending_buf_size (in zlib
|
|
||||||
; in the deflate_state structure since the asm code was first written
|
|
||||||
; (if you compile with zlib 1.0.4 or older, remove the +4).
|
|
||||||
; Note : these value are good with a 8 bytes boundary pack structure
|
|
||||||
dep_chain_length equ 70h+4
|
|
||||||
dep_window equ 2ch+4
|
|
||||||
dep_strstart equ 60h+4
|
|
||||||
dep_prev_length equ 6ch+4
|
|
||||||
dep_nice_match equ 84h+4
|
|
||||||
dep_w_size equ 20h+4
|
|
||||||
dep_prev equ 34h+4
|
|
||||||
dep_w_mask equ 28h+4
|
|
||||||
dep_good_match equ 80h+4
|
|
||||||
dep_match_start equ 64h+4
|
|
||||||
dep_lookahead equ 68h+4
|
|
||||||
|
|
||||||
|
|
||||||
_TEXT segment
|
|
||||||
|
|
||||||
IFDEF NOUNDERLINE
|
|
||||||
public longest_match_7fff
|
|
||||||
; public match_init
|
|
||||||
ELSE
|
|
||||||
public _longest_match_7fff
|
|
||||||
; public _match_init
|
|
||||||
ENDIF
|
|
||||||
|
|
||||||
MAX_MATCH equ 258
|
|
||||||
MIN_MATCH equ 3
|
|
||||||
MIN_LOOKAHEAD equ (MAX_MATCH+MIN_MATCH+1)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
IFDEF NOUNDERLINE
|
|
||||||
;match_init proc near
|
|
||||||
; ret
|
|
||||||
;match_init endp
|
|
||||||
ELSE
|
|
||||||
;_match_init proc near
|
|
||||||
; ret
|
|
||||||
;_match_init endp
|
|
||||||
ENDIF
|
|
||||||
|
|
||||||
|
|
||||||
IFDEF NOUNDERLINE
|
|
||||||
longest_match_7fff proc near
|
|
||||||
ELSE
|
|
||||||
_longest_match_7fff proc near
|
|
||||||
ENDIF
|
|
||||||
|
|
||||||
mov edx,[esp+4]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
push ebp
|
|
||||||
push edi
|
|
||||||
push esi
|
|
||||||
push ebx
|
|
||||||
|
|
||||||
sub esp,NbStackAdd
|
|
||||||
|
|
||||||
; initialize or check the variables used in match.asm.
|
|
||||||
mov ebp,edx
|
|
||||||
|
|
||||||
; chain_length = s->max_chain_length
|
|
||||||
; if (prev_length>=good_match) chain_length >>= 2
|
|
||||||
mov edx,[ebp+dep_chain_length]
|
|
||||||
mov ebx,[ebp+dep_prev_length]
|
|
||||||
cmp [ebp+dep_good_match],ebx
|
|
||||||
ja noshr
|
|
||||||
shr edx,2
|
|
||||||
noshr:
|
|
||||||
; we increment chain_length because in the asm, the --chain_lenght is in the beginning of the loop
|
|
||||||
inc edx
|
|
||||||
mov edi,[ebp+dep_nice_match]
|
|
||||||
mov chain_length,edx
|
|
||||||
mov eax,[ebp+dep_lookahead]
|
|
||||||
cmp eax,edi
|
|
||||||
; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
|
|
||||||
jae nolookaheadnicematch
|
|
||||||
mov edi,eax
|
|
||||||
nolookaheadnicematch:
|
|
||||||
; best_len = s->prev_length
|
|
||||||
mov best_len,ebx
|
|
||||||
|
|
||||||
; window = s->window
|
|
||||||
mov esi,[ebp+dep_window]
|
|
||||||
mov ecx,[ebp+dep_strstart]
|
|
||||||
mov window,esi
|
|
||||||
|
|
||||||
mov nice_match,edi
|
|
||||||
; scan = window + strstart
|
|
||||||
add esi,ecx
|
|
||||||
mov scan,esi
|
|
||||||
; dx = *window
|
|
||||||
mov dx,word ptr [esi]
|
|
||||||
; bx = *(window+best_len-1)
|
|
||||||
mov bx,word ptr [esi+ebx-1]
|
|
||||||
add esi,MAX_MATCH-1
|
|
||||||
; scan_start = *scan
|
|
||||||
mov scan_start,dx
|
|
||||||
; strend = scan + MAX_MATCH-1
|
|
||||||
mov strend,esi
|
|
||||||
; bx = scan_end = *(window+best_len-1)
|
|
||||||
|
|
||||||
; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
|
|
||||||
; s->strstart - (IPos)MAX_DIST(s) : NIL;
|
|
||||||
|
|
||||||
mov esi,[ebp+dep_w_size]
|
|
||||||
sub esi,MIN_LOOKAHEAD
|
|
||||||
; here esi = MAX_DIST(s)
|
|
||||||
sub ecx,esi
|
|
||||||
ja nodist
|
|
||||||
xor ecx,ecx
|
|
||||||
nodist:
|
|
||||||
mov limit,ecx
|
|
||||||
|
|
||||||
; prev = s->prev
|
|
||||||
mov edx,[ebp+dep_prev]
|
|
||||||
mov prev,edx
|
|
||||||
|
|
||||||
;
|
|
||||||
mov edx,dword ptr [ebp+dep_match_start]
|
|
||||||
mov bp,scan_start
|
|
||||||
mov eax,cur_match
|
|
||||||
mov match_start,edx
|
|
||||||
|
|
||||||
mov edx,window
|
|
||||||
mov edi,edx
|
|
||||||
add edi,best_len
|
|
||||||
mov esi,prev
|
|
||||||
dec edi
|
|
||||||
; windowlen = window + best_len -1
|
|
||||||
mov windowlen,edi
|
|
||||||
|
|
||||||
jmp beginloop2
|
|
||||||
align 4
|
|
||||||
|
|
||||||
; here, in the loop
|
|
||||||
; eax = ax = cur_match
|
|
||||||
; ecx = limit
|
|
||||||
; bx = scan_end
|
|
||||||
; bp = scan_start
|
|
||||||
; edi = windowlen (window + best_len -1)
|
|
||||||
; esi = prev
|
|
||||||
|
|
||||||
|
|
||||||
;// here; chain_length <=16
|
|
||||||
normalbeg0add16:
|
|
||||||
add chain_length,16
|
|
||||||
jz exitloop
|
|
||||||
normalbeg0:
|
|
||||||
cmp word ptr[edi+eax],bx
|
|
||||||
je normalbeg2noroll
|
|
||||||
rcontlabnoroll:
|
|
||||||
; cur_match = prev[cur_match & wmask]
|
|
||||||
and eax,7fffh
|
|
||||||
mov ax,word ptr[esi+eax*2]
|
|
||||||
; if cur_match > limit, go to exitloop
|
|
||||||
cmp ecx,eax
|
|
||||||
jnb exitloop
|
|
||||||
; if --chain_length != 0, go to exitloop
|
|
||||||
dec chain_length
|
|
||||||
jnz normalbeg0
|
|
||||||
jmp exitloop
|
|
||||||
|
|
||||||
normalbeg2noroll:
|
|
||||||
; if (scan_start==*(cur_match+window)) goto normalbeg2
|
|
||||||
cmp bp,word ptr[edx+eax]
|
|
||||||
jne rcontlabnoroll
|
|
||||||
jmp normalbeg2
|
|
||||||
|
|
||||||
contloop3:
|
|
||||||
mov edi,windowlen
|
|
||||||
|
|
||||||
; cur_match = prev[cur_match & wmask]
|
|
||||||
and eax,7fffh
|
|
||||||
mov ax,word ptr[esi+eax*2]
|
|
||||||
; if cur_match > limit, go to exitloop
|
|
||||||
cmp ecx,eax
|
|
||||||
jnbexitloopshort1:
|
|
||||||
jnb exitloop
|
|
||||||
; if --chain_length != 0, go to exitloop
|
|
||||||
|
|
||||||
|
|
||||||
; begin the main loop
|
|
||||||
beginloop2:
|
|
||||||
sub chain_length,16+1
|
|
||||||
; if chain_length <=16, don't use the unrolled loop
|
|
||||||
jna normalbeg0add16
|
|
||||||
|
|
||||||
do16:
|
|
||||||
cmp word ptr[edi+eax],bx
|
|
||||||
je normalbeg2dc0
|
|
||||||
|
|
||||||
maccn MACRO lab
|
|
||||||
and eax,7fffh
|
|
||||||
mov ax,word ptr[esi+eax*2]
|
|
||||||
cmp ecx,eax
|
|
||||||
jnb exitloop
|
|
||||||
cmp word ptr[edi+eax],bx
|
|
||||||
je lab
|
|
||||||
ENDM
|
|
||||||
|
|
||||||
rcontloop0:
|
|
||||||
maccn normalbeg2dc1
|
|
||||||
|
|
||||||
rcontloop1:
|
|
||||||
maccn normalbeg2dc2
|
|
||||||
|
|
||||||
rcontloop2:
|
|
||||||
maccn normalbeg2dc3
|
|
||||||
|
|
||||||
rcontloop3:
|
|
||||||
maccn normalbeg2dc4
|
|
||||||
|
|
||||||
rcontloop4:
|
|
||||||
maccn normalbeg2dc5
|
|
||||||
|
|
||||||
rcontloop5:
|
|
||||||
maccn normalbeg2dc6
|
|
||||||
|
|
||||||
rcontloop6:
|
|
||||||
maccn normalbeg2dc7
|
|
||||||
|
|
||||||
rcontloop7:
|
|
||||||
maccn normalbeg2dc8
|
|
||||||
|
|
||||||
rcontloop8:
|
|
||||||
maccn normalbeg2dc9
|
|
||||||
|
|
||||||
rcontloop9:
|
|
||||||
maccn normalbeg2dc10
|
|
||||||
|
|
||||||
rcontloop10:
|
|
||||||
maccn short normalbeg2dc11
|
|
||||||
|
|
||||||
rcontloop11:
|
|
||||||
maccn short normalbeg2dc12
|
|
||||||
|
|
||||||
rcontloop12:
|
|
||||||
maccn short normalbeg2dc13
|
|
||||||
|
|
||||||
rcontloop13:
|
|
||||||
maccn short normalbeg2dc14
|
|
||||||
|
|
||||||
rcontloop14:
|
|
||||||
maccn short normalbeg2dc15
|
|
||||||
|
|
||||||
rcontloop15:
|
|
||||||
and eax,7fffh
|
|
||||||
mov ax,word ptr[esi+eax*2]
|
|
||||||
cmp ecx,eax
|
|
||||||
jnb exitloop
|
|
||||||
|
|
||||||
sub chain_length,16
|
|
||||||
ja do16
|
|
||||||
jmp normalbeg0add16
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
normbeg MACRO rcontlab,valsub
|
|
||||||
; if we are here, we know that *(match+best_len-1) == scan_end
|
|
||||||
cmp bp,word ptr[edx+eax]
|
|
||||||
; if (match != scan_start) goto rcontlab
|
|
||||||
jne rcontlab
|
|
||||||
; calculate the good chain_length, and we'll compare scan and match string
|
|
||||||
add chain_length,16-valsub
|
|
||||||
jmp iseq
|
|
||||||
ENDM
|
|
||||||
|
|
||||||
|
|
||||||
normalbeg2dc11:
|
|
||||||
normbeg rcontloop11,11
|
|
||||||
|
|
||||||
normalbeg2dc12:
|
|
||||||
normbeg short rcontloop12,12
|
|
||||||
|
|
||||||
normalbeg2dc13:
|
|
||||||
normbeg short rcontloop13,13
|
|
||||||
|
|
||||||
normalbeg2dc14:
|
|
||||||
normbeg short rcontloop14,14
|
|
||||||
|
|
||||||
normalbeg2dc15:
|
|
||||||
normbeg short rcontloop15,15
|
|
||||||
|
|
||||||
normalbeg2dc10:
|
|
||||||
normbeg rcontloop10,10
|
|
||||||
|
|
||||||
normalbeg2dc9:
|
|
||||||
normbeg rcontloop9,9
|
|
||||||
|
|
||||||
normalbeg2dc8:
|
|
||||||
normbeg rcontloop8,8
|
|
||||||
|
|
||||||
normalbeg2dc7:
|
|
||||||
normbeg rcontloop7,7
|
|
||||||
|
|
||||||
normalbeg2dc6:
|
|
||||||
normbeg rcontloop6,6
|
|
||||||
|
|
||||||
normalbeg2dc5:
|
|
||||||
normbeg rcontloop5,5
|
|
||||||
|
|
||||||
normalbeg2dc4:
|
|
||||||
normbeg rcontloop4,4
|
|
||||||
|
|
||||||
normalbeg2dc3:
|
|
||||||
normbeg rcontloop3,3
|
|
||||||
|
|
||||||
normalbeg2dc2:
|
|
||||||
normbeg rcontloop2,2
|
|
||||||
|
|
||||||
normalbeg2dc1:
|
|
||||||
normbeg rcontloop1,1
|
|
||||||
|
|
||||||
normalbeg2dc0:
|
|
||||||
normbeg rcontloop0,0
|
|
||||||
|
|
||||||
|
|
||||||
; we go in normalbeg2 because *(ushf*)(match+best_len-1) == scan_end
|
|
||||||
|
|
||||||
normalbeg2:
|
|
||||||
mov edi,window
|
|
||||||
|
|
||||||
cmp bp,word ptr[edi+eax]
|
|
||||||
jne contloop3 ; if *(ushf*)match != scan_start, continue
|
|
||||||
|
|
||||||
iseq:
|
|
||||||
; if we are here, we know that *(match+best_len-1) == scan_end
|
|
||||||
; and (match == scan_start)
|
|
||||||
|
|
||||||
mov edi,edx
|
|
||||||
mov esi,scan ; esi = scan
|
|
||||||
add edi,eax ; edi = window + cur_match = match
|
|
||||||
|
|
||||||
mov edx,[esi+3] ; compare manually dword at match+3
|
|
||||||
xor edx,[edi+3] ; and scan +3
|
|
||||||
|
|
||||||
jz begincompare ; if equal, go to long compare
|
|
||||||
|
|
||||||
; we will determine the unmatch byte and calculate len (in esi)
|
|
||||||
or dl,dl
|
|
||||||
je eq1rr
|
|
||||||
mov esi,3
|
|
||||||
jmp trfinval
|
|
||||||
eq1rr:
|
|
||||||
or dx,dx
|
|
||||||
je eq1
|
|
||||||
|
|
||||||
mov esi,4
|
|
||||||
jmp trfinval
|
|
||||||
eq1:
|
|
||||||
and edx,0ffffffh
|
|
||||||
jz eq11
|
|
||||||
mov esi,5
|
|
||||||
jmp trfinval
|
|
||||||
eq11:
|
|
||||||
mov esi,6
|
|
||||||
jmp trfinval
|
|
||||||
|
|
||||||
begincompare:
|
|
||||||
; here we now scan and match begin same
|
|
||||||
add edi,6
|
|
||||||
add esi,6
|
|
||||||
mov ecx,(MAX_MATCH-(2+4))/4 ; scan for at most MAX_MATCH bytes
|
|
||||||
repe cmpsd ; loop until mismatch
|
|
||||||
|
|
||||||
je trfin ; go to trfin if not unmatch
|
|
||||||
; we determine the unmatch byte
|
|
||||||
sub esi,4
|
|
||||||
mov edx,[edi-4]
|
|
||||||
xor edx,[esi]
|
|
||||||
|
|
||||||
or dl,dl
|
|
||||||
jnz trfin
|
|
||||||
inc esi
|
|
||||||
|
|
||||||
or dx,dx
|
|
||||||
jnz trfin
|
|
||||||
inc esi
|
|
||||||
|
|
||||||
and edx,0ffffffh
|
|
||||||
jnz trfin
|
|
||||||
inc esi
|
|
||||||
|
|
||||||
trfin:
|
|
||||||
sub esi,scan ; esi = len
|
|
||||||
trfinval:
|
|
||||||
; here we have finised compare, and esi contain len of equal string
|
|
||||||
cmp esi,best_len ; if len > best_len, go newbestlen
|
|
||||||
ja short newbestlen
|
|
||||||
; now we restore edx, ecx and esi, for the big loop
|
|
||||||
mov esi,prev
|
|
||||||
mov ecx,limit
|
|
||||||
mov edx,window
|
|
||||||
jmp contloop3
|
|
||||||
|
|
||||||
newbestlen:
|
|
||||||
mov best_len,esi ; len become best_len
|
|
||||||
|
|
||||||
mov match_start,eax ; save new position as match_start
|
|
||||||
cmp esi,nice_match ; if best_len >= nice_match, exit
|
|
||||||
jae exitloop
|
|
||||||
mov ecx,scan
|
|
||||||
mov edx,window ; restore edx=window
|
|
||||||
add ecx,esi
|
|
||||||
add esi,edx
|
|
||||||
|
|
||||||
dec esi
|
|
||||||
mov windowlen,esi ; windowlen = window + best_len-1
|
|
||||||
mov bx,[ecx-1] ; bx = *(scan+best_len-1) = scan_end
|
|
||||||
|
|
||||||
; now we restore ecx and esi, for the big loop :
|
|
||||||
mov esi,prev
|
|
||||||
mov ecx,limit
|
|
||||||
jmp contloop3
|
|
||||||
|
|
||||||
exitloop:
|
|
||||||
; exit : s->match_start=match_start
|
|
||||||
mov ebx,match_start
|
|
||||||
mov ebp,str_s
|
|
||||||
mov ecx,best_len
|
|
||||||
mov dword ptr [ebp+dep_match_start],ebx
|
|
||||||
mov eax,dword ptr [ebp+dep_lookahead]
|
|
||||||
cmp ecx,eax
|
|
||||||
ja minexlo
|
|
||||||
mov eax,ecx
|
|
||||||
minexlo:
|
|
||||||
; return min(best_len,s->lookahead)
|
|
||||||
|
|
||||||
; restore stack and register ebx,esi,edi,ebp
|
|
||||||
add esp,NbStackAdd
|
|
||||||
|
|
||||||
pop ebx
|
|
||||||
pop esi
|
|
||||||
pop edi
|
|
||||||
pop ebp
|
|
||||||
ret
|
|
||||||
InfoAuthor:
|
|
||||||
; please don't remove this string !
|
|
||||||
; Your are free use gvmat32 in any fre or commercial apps if you don't remove the string in the binary!
|
|
||||||
db 0dh,0ah,"GVMat32 optimised assembly code written 1996-98 by Gilles Vollant",0dh,0ah
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
IFDEF NOUNDERLINE
|
|
||||||
longest_match_7fff endp
|
|
||||||
ELSE
|
|
||||||
_longest_match_7fff endp
|
|
||||||
ENDIF
|
|
||||||
|
|
||||||
|
|
||||||
IFDEF NOUNDERLINE
|
|
||||||
cpudetect32 proc near
|
|
||||||
ELSE
|
|
||||||
_cpudetect32 proc near
|
|
||||||
ENDIF
|
|
||||||
|
|
||||||
|
|
||||||
pushfd ; push original EFLAGS
|
|
||||||
pop eax ; get original EFLAGS
|
|
||||||
mov ecx, eax ; save original EFLAGS
|
|
||||||
xor eax, 40000h ; flip AC bit in EFLAGS
|
|
||||||
push eax ; save new EFLAGS value on stack
|
|
||||||
popfd ; replace current EFLAGS value
|
|
||||||
pushfd ; get new EFLAGS
|
|
||||||
pop eax ; store new EFLAGS in EAX
|
|
||||||
xor eax, ecx ; can’t toggle AC bit, processor=80386
|
|
||||||
jz end_cpu_is_386 ; jump if 80386 processor
|
|
||||||
push ecx
|
|
||||||
popfd ; restore AC bit in EFLAGS first
|
|
||||||
|
|
||||||
pushfd
|
|
||||||
pushfd
|
|
||||||
pop ecx
|
|
||||||
|
|
||||||
mov eax, ecx ; get original EFLAGS
|
|
||||||
xor eax, 200000h ; flip ID bit in EFLAGS
|
|
||||||
push eax ; save new EFLAGS value on stack
|
|
||||||
popfd ; replace current EFLAGS value
|
|
||||||
pushfd ; get new EFLAGS
|
|
||||||
pop eax ; store new EFLAGS in EAX
|
|
||||||
popfd ; restore original EFLAGS
|
|
||||||
xor eax, ecx ; can’t toggle ID bit,
|
|
||||||
je is_old_486 ; processor=old
|
|
||||||
|
|
||||||
mov eax,1
|
|
||||||
db 0fh,0a2h ;CPUID
|
|
||||||
|
|
||||||
exitcpudetect:
|
|
||||||
ret
|
|
||||||
|
|
||||||
end_cpu_is_386:
|
|
||||||
mov eax,0300h
|
|
||||||
jmp exitcpudetect
|
|
||||||
|
|
||||||
is_old_486:
|
|
||||||
mov eax,0400h
|
|
||||||
jmp exitcpudetect
|
|
||||||
|
|
||||||
IFDEF NOUNDERLINE
|
|
||||||
cpudetect32 endp
|
|
||||||
ELSE
|
|
||||||
_cpudetect32 endp
|
|
||||||
ENDIF
|
|
||||||
|
|
||||||
_TEXT ends
|
|
||||||
end
|
|
||||||
@ -1,200 +0,0 @@
|
|||||||
/* gvmat32.c -- C portion of the optimized longest_match for 32 bits x86
|
|
||||||
* Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
|
|
||||||
* File written by Gilles Vollant, by modifiying the longest_match
|
|
||||||
* from Jean-loup Gailly in deflate.c
|
|
||||||
* it prepare all parameters and call the assembly longest_match_gvasm
|
|
||||||
* longest_match execute standard C code is wmask != 0x7fff
|
|
||||||
* (assembly code is faster with a fixed wmask)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "deflate.h"
|
|
||||||
|
|
||||||
#undef FAR
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#ifdef ASMV
|
|
||||||
#define NIL 0
|
|
||||||
|
|
||||||
#define UNALIGNED_OK
|
|
||||||
|
|
||||||
|
|
||||||
/* if your C compiler don't add underline before function name,
|
|
||||||
define ADD_UNDERLINE_ASMFUNC */
|
|
||||||
#ifdef ADD_UNDERLINE_ASMFUNC
|
|
||||||
#define longest_match_7fff _longest_match_7fff
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void match_init()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned long cpudetect32();
|
|
||||||
|
|
||||||
uInt longest_match_c(
|
|
||||||
deflate_state *s,
|
|
||||||
IPos cur_match); /* current match */
|
|
||||||
|
|
||||||
|
|
||||||
uInt longest_match_7fff(
|
|
||||||
deflate_state *s,
|
|
||||||
IPos cur_match); /* current match */
|
|
||||||
|
|
||||||
uInt longest_match(
|
|
||||||
deflate_state *s,
|
|
||||||
IPos cur_match) /* current match */
|
|
||||||
{
|
|
||||||
static uInt iIsPPro=2;
|
|
||||||
|
|
||||||
if ((s->w_mask == 0x7fff) && (iIsPPro==0))
|
|
||||||
return longest_match_7fff(s,cur_match);
|
|
||||||
|
|
||||||
if (iIsPPro==2)
|
|
||||||
iIsPPro = (((cpudetect32()/0x100)&0xf)>=6) ? 1 : 0;
|
|
||||||
|
|
||||||
return longest_match_c(s,cur_match);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
uInt longest_match_c(s, cur_match)
|
|
||||||
deflate_state *s;
|
|
||||||
IPos cur_match; /* current match */
|
|
||||||
{
|
|
||||||
unsigned chain_length = s->max_chain_length;/* max hash chain length */
|
|
||||||
register Bytef *scan = s->window + s->strstart; /* current string */
|
|
||||||
register Bytef *match; /* matched string */
|
|
||||||
register int len; /* length of current match */
|
|
||||||
int best_len = s->prev_length; /* best match length so far */
|
|
||||||
int nice_match = s->nice_match; /* stop if match long enough */
|
|
||||||
IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
Posf *prev = s->prev;
|
|
||||||
uInt wmask = s->w_mask;
|
|
||||||
|
|
||||||
#ifdef UNALIGNED_OK
|
|
||||||
/* Compare two bytes at a time. Note: this is not always beneficial.
|
|
||||||
* Try with and without -DUNALIGNED_OK to check.
|
|
||||||
*/
|
|
||||||
register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
|
|
||||||
register ush scan_start = *(ushf*)scan;
|
|
||||||
register ush scan_end = *(ushf*)(scan+best_len-1);
|
|
||||||
#else
|
|
||||||
register Bytef *strend = s->window + s->strstart + MAX_MATCH;
|
|
||||||
register Byte scan_end1 = scan[best_len-1];
|
|
||||||
register Byte scan_end = scan[best_len];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
|
|
||||||
* It is easy to get rid of this optimization if necessary.
|
|
||||||
*/
|
|
||||||
Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
|
|
||||||
|
|
||||||
/* Do not waste too much time if we already have a good match: */
|
|
||||||
if (s->prev_length >= s->good_match) {
|
|
||||||
chain_length >>= 2;
|
|
||||||
}
|
|
||||||
/* Do not look for matches beyond the end of the input. This is necessary
|
|
||||||
* to make deflate deterministic.
|
|
||||||
*/
|
|
||||||
if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
|
|
||||||
|
|
||||||
Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
|
|
||||||
|
|
||||||
do {
|
|
||||||
Assert(cur_match < s->strstart, "no future");
|
|
||||||
match = s->window + cur_match;
|
|
||||||
|
|
||||||
/* Skip to next match if the match length cannot increase
|
|
||||||
* or if the match length is less than 2:
|
|
||||||
*/
|
|
||||||
#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
|
|
||||||
/* This code assumes sizeof(unsigned short) == 2. Do not use
|
|
||||||
* UNALIGNED_OK if your compiler uses a different size.
|
|
||||||
*/
|
|
||||||
if (*(ushf*)(match+best_len-1) != scan_end ||
|
|
||||||
*(ushf*)match != scan_start) continue;
|
|
||||||
|
|
||||||
/* It is not necessary to compare scan[2] and match[2] since they are
|
|
||||||
* always equal when the other bytes match, given that the hash keys
|
|
||||||
* are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
|
|
||||||
* strstart+3, +5, ... up to strstart+257. We check for insufficient
|
|
||||||
* lookahead only every 4th comparison; the 128th check will be made
|
|
||||||
* at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
|
|
||||||
* necessary to put more guard bytes at the end of the window, or
|
|
||||||
* to check more often for insufficient lookahead.
|
|
||||||
*/
|
|
||||||
Assert(scan[2] == match[2], "scan[2]?");
|
|
||||||
scan++, match++;
|
|
||||||
do {
|
|
||||||
} while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
|
|
||||||
*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
|
|
||||||
*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
|
|
||||||
*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
|
|
||||||
scan < strend);
|
|
||||||
/* The funny "do {}" generates better code on most compilers */
|
|
||||||
|
|
||||||
/* Here, scan <= window+strstart+257 */
|
|
||||||
Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
|
|
||||||
if (*scan == *match) scan++;
|
|
||||||
|
|
||||||
len = (MAX_MATCH - 1) - (int)(strend-scan);
|
|
||||||
scan = strend - (MAX_MATCH-1);
|
|
||||||
|
|
||||||
#else /* UNALIGNED_OK */
|
|
||||||
|
|
||||||
if (match[best_len] != scan_end ||
|
|
||||||
match[best_len-1] != scan_end1 ||
|
|
||||||
*match != *scan ||
|
|
||||||
*++match != scan[1]) continue;
|
|
||||||
|
|
||||||
/* The check at best_len-1 can be removed because it will be made
|
|
||||||
* again later. (This heuristic is not always a win.)
|
|
||||||
* It is not necessary to compare scan[2] and match[2] since they
|
|
||||||
* are always equal when the other bytes match, given that
|
|
||||||
* the hash keys are equal and that HASH_BITS >= 8.
|
|
||||||
*/
|
|
||||||
scan += 2, match++;
|
|
||||||
Assert(*scan == *match, "match[2]?");
|
|
||||||
|
|
||||||
/* We check for insufficient lookahead only every 8th comparison;
|
|
||||||
* the 256th check will be made at strstart+258.
|
|
||||||
*/
|
|
||||||
do {
|
|
||||||
} while (*++scan == *++match && *++scan == *++match &&
|
|
||||||
*++scan == *++match && *++scan == *++match &&
|
|
||||||
*++scan == *++match && *++scan == *++match &&
|
|
||||||
*++scan == *++match && *++scan == *++match &&
|
|
||||||
scan < strend);
|
|
||||||
|
|
||||||
Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
|
|
||||||
|
|
||||||
len = MAX_MATCH - (int)(strend - scan);
|
|
||||||
scan = strend - MAX_MATCH;
|
|
||||||
|
|
||||||
#endif /* UNALIGNED_OK */
|
|
||||||
|
|
||||||
if (len > best_len) {
|
|
||||||
s->match_start = cur_match;
|
|
||||||
best_len = len;
|
|
||||||
if (len >= nice_match) break;
|
|
||||||
#ifdef UNALIGNED_OK
|
|
||||||
scan_end = *(ushf*)(scan+best_len-1);
|
|
||||||
#else
|
|
||||||
scan_end1 = scan[best_len-1];
|
|
||||||
scan_end = scan[best_len];
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
} while ((cur_match = prev[cur_match & wmask]) > limit
|
|
||||||
&& --chain_length != 0);
|
|
||||||
|
|
||||||
if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
|
|
||||||
return s->lookahead;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* ASMV */
|
|
||||||
@ -1 +0,0 @@
|
|||||||
c:\masm611\bin\ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
LIBRARY "zlib"
|
|
||||||
|
|
||||||
DESCRIPTION '"""zlib data compression library"""'
|
|
||||||
|
|
||||||
|
|
||||||
VERSION 1.11
|
|
||||||
|
|
||||||
|
|
||||||
HEAPSIZE 1048576,8192
|
|
||||||
|
|
||||||
EXPORTS
|
|
||||||
adler32 @1
|
|
||||||
compress @2
|
|
||||||
crc32 @3
|
|
||||||
deflate @4
|
|
||||||
deflateCopy @5
|
|
||||||
deflateEnd @6
|
|
||||||
deflateInit2_ @7
|
|
||||||
deflateInit_ @8
|
|
||||||
deflateParams @9
|
|
||||||
deflateReset @10
|
|
||||||
deflateSetDictionary @11
|
|
||||||
gzclose @12
|
|
||||||
gzdopen @13
|
|
||||||
gzerror @14
|
|
||||||
gzflush @15
|
|
||||||
gzopen @16
|
|
||||||
gzread @17
|
|
||||||
gzwrite @18
|
|
||||||
inflate @19
|
|
||||||
inflateEnd @20
|
|
||||||
inflateInit2_ @21
|
|
||||||
inflateInit_ @22
|
|
||||||
inflateReset @23
|
|
||||||
inflateSetDictionary @24
|
|
||||||
inflateSync @25
|
|
||||||
uncompress @26
|
|
||||||
zlibVersion @27
|
|
||||||
gzprintf @28
|
|
||||||
gzputc @29
|
|
||||||
gzgetc @30
|
|
||||||
gzseek @31
|
|
||||||
gzrewind @32
|
|
||||||
gztell @33
|
|
||||||
gzeof @34
|
|
||||||
gzsetparams @35
|
|
||||||
zError @36
|
|
||||||
inflateSyncPoint @37
|
|
||||||
get_crc_table @38
|
|
||||||
compress2 @39
|
|
||||||
gzputs @40
|
|
||||||
gzgets @41
|
|
||||||
|
|
||||||
unzOpen @61
|
|
||||||
unzClose @62
|
|
||||||
unzGetGlobalInfo @63
|
|
||||||
unzGetCurrentFileInfo @64
|
|
||||||
unzGoToFirstFile @65
|
|
||||||
unzGoToNextFile @66
|
|
||||||
unzOpenCurrentFile @67
|
|
||||||
unzReadCurrentFile @68
|
|
||||||
unztell @70
|
|
||||||
unzeof @71
|
|
||||||
unzCloseCurrentFile @72
|
|
||||||
unzGetGlobalComment @73
|
|
||||||
unzStringFileNameCompare @74
|
|
||||||
unzLocateFile @75
|
|
||||||
unzGetLocalExtrafield @76
|
|
||||||
|
|
||||||
zipOpen @80
|
|
||||||
zipOpenNewFileInZip @81
|
|
||||||
zipWriteInFileInZip @82
|
|
||||||
zipCloseFileInZip @83
|
|
||||||
zipClose @84
|
|
||||||
@ -1,651 +0,0 @@
|
|||||||
# Microsoft Developer Studio Project File - Name="zlibvc" - Package Owner=<4>
|
|
||||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
|
||||||
# ** DO NOT EDIT **
|
|
||||||
|
|
||||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
|
||||||
# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
|
|
||||||
|
|
||||||
CFG=zlibvc - Win32 Release
|
|
||||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
|
||||||
!MESSAGE use the Export Makefile command and run
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "zlibvc.mak".
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE You can specify a configuration when running NMAKE
|
|
||||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "zlibvc.mak" CFG="zlibvc - Win32 Release"
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE Possible choices for configuration are:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE "zlibvc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 ReleaseAxp" (based on\
|
|
||||||
"Win32 (ALPHA) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 ReleaseWithoutAsm" (based on\
|
|
||||||
"Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 ReleaseWithoutCrtdll" (based on\
|
|
||||||
"Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE
|
|
||||||
|
|
||||||
# Begin Project
|
|
||||||
# PROP Scc_ProjName ""
|
|
||||||
# PROP Scc_LocalPath ""
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir ".\Release"
|
|
||||||
# PROP BASE Intermediate_Dir ".\Release"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir ".\Release"
|
|
||||||
# PROP Intermediate_Dir ".\Release"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
|
|
||||||
# ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 1
|
|
||||||
# PROP BASE Output_Dir ".\Debug"
|
|
||||||
# PROP BASE Intermediate_Dir ".\Debug"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 1
|
|
||||||
# PROP Output_Dir ".\Debug"
|
|
||||||
# PROP Intermediate_Dir ".\Debug"
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
|
|
||||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "_DEBUG" /win32
|
|
||||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "_DEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "_DEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
|
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Debug\zlib.dll"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "zlibvc__"
|
|
||||||
# PROP BASE Intermediate_Dir "zlibvc__"
|
|
||||||
# PROP BASE Ignore_Export_Lib 0
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "zlibvc__"
|
|
||||||
# PROP Intermediate_Dir "zlibvc__"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 crtdll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /map /machine:ALPHA /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT BASE LINK32 /pdb:none
|
|
||||||
# ADD LINK32 crtdll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /map /machine:ALPHA /nodefaultlib /out:"zlibvc__\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "zlibvc_0"
|
|
||||||
# PROP BASE Intermediate_Dir "zlibvc_0"
|
|
||||||
# PROP BASE Ignore_Export_Lib 0
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "zlibvc_0"
|
|
||||||
# PROP Intermediate_Dir "zlibvc_0"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT BASE LINK32 /pdb:none
|
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_0\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "zlibvc_1"
|
|
||||||
# PROP BASE Intermediate_Dir "zlibvc_1"
|
|
||||||
# PROP BASE Ignore_Export_Lib 0
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "zlibvc_1"
|
|
||||||
# PROP Intermediate_Dir "zlibvc_1"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT BASE LINK32 /pdb:none
|
|
||||||
# ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_1\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# Begin Target
|
|
||||||
|
|
||||||
# Name "zlibvc - Win32 Release"
|
|
||||||
# Name "zlibvc - Win32 Debug"
|
|
||||||
# Name "zlibvc - Win32 ReleaseAxp"
|
|
||||||
# Name "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
# Name "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
# Begin Group "Source Files"
|
|
||||||
|
|
||||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\adler32.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_ADLER=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\compress.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_COMPR=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\crc32.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_CRC32=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\deflate.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_DEFLA=\
|
|
||||||
".\deflate.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\gvmat32c.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\gzio.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_GZIO_=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infblock.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFBL=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infcodes.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFCO=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inffast.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inffast.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFFA=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inffast.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inflate.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFLA=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inftrees.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFTR=\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infutil.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFUT=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\trees.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_TREES=\
|
|
||||||
".\deflate.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\uncompr.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_UNCOM=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\unzip.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zip.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zlib.rc
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zlibvc.def
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zutil.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_ZUTIL=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# Begin Group "Header Files"
|
|
||||||
|
|
||||||
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\deflate.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infblock.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infcodes.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inffast.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inftrees.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infutil.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zconf.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zlib.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zutil.h
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# Begin Group "Resource Files"
|
|
||||||
|
|
||||||
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
|
|
||||||
# End Group
|
|
||||||
# End Target
|
|
||||||
# End Project
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
Microsoft Developer Studio Workspace File, Format Version 5.00
|
|
||||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "zlibstat"=.\zlibstat.dsp - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "zlibvc"=.\zlibvc.dsp - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Global:
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<3>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
This is a patched version of zlib modified to use
|
|
||||||
Pentium-optimized assembly code in the deflation algorithm. The files
|
|
||||||
changed/added by this patch are:
|
|
||||||
|
|
||||||
README.586
|
|
||||||
match.S
|
|
||||||
|
|
||||||
The effectiveness of these modifications is a bit marginal, as the the
|
|
||||||
program's bottleneck seems to be mostly L1-cache contention, for which
|
|
||||||
there is no real way to work around without rewriting the basic
|
|
||||||
algorithm. The speedup on average is around 5-10% (which is generally
|
|
||||||
less than the amount of variance between subsequent executions).
|
|
||||||
However, when used at level 9 compression, the cache contention can
|
|
||||||
drop enough for the assembly version to achieve 10-20% speedup (and
|
|
||||||
sometimes more, depending on the amount of overall redundancy in the
|
|
||||||
files). Even here, though, cache contention can still be the limiting
|
|
||||||
factor, depending on the nature of the program using the zlib library.
|
|
||||||
This may also mean that better improvements will be seen on a Pentium
|
|
||||||
with MMX, which suffers much less from L1-cache contention, but I have
|
|
||||||
not yet verified this.
|
|
||||||
|
|
||||||
Note that this code has been tailored for the Pentium in particular,
|
|
||||||
and will not perform well on the Pentium Pro (due to the use of a
|
|
||||||
partial register in the inner loop).
|
|
||||||
|
|
||||||
If you are using an assembler other than GNU as, you will have to
|
|
||||||
translate match.S to use your assembler's syntax. (Have fun.)
|
|
||||||
|
|
||||||
Brian Raiter
|
|
||||||
breadbox@muppetlabs.com
|
|
||||||
April, 1998
|
|
||||||
|
|
||||||
|
|
||||||
Added for zlib 1.1.3:
|
|
||||||
|
|
||||||
The patches come from
|
|
||||||
http://www.muppetlabs.com/~breadbox/software/assembly.html
|
|
||||||
|
|
||||||
To compile zlib with this asm file, copy match.S to the zlib directory
|
|
||||||
then do:
|
|
||||||
|
|
||||||
CFLAGS="-O3 -DASMV" ./configure
|
|
||||||
make OBJA=match.o
|
|
||||||
@ -1,354 +0,0 @@
|
|||||||
/* match.s -- Pentium-optimized version of longest_match()
|
|
||||||
* Written for zlib 1.1.2
|
|
||||||
* Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
|
|
||||||
*
|
|
||||||
* This is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef NO_UNDERLINE
|
|
||||||
#define match_init _match_init
|
|
||||||
#define longest_match _longest_match
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAX_MATCH (258)
|
|
||||||
#define MIN_MATCH (3)
|
|
||||||
#define MIN_LOOKAHEAD (MAX_MATCH + MIN_MATCH + 1)
|
|
||||||
#define MAX_MATCH_8 ((MAX_MATCH + 7) & ~7)
|
|
||||||
|
|
||||||
/* stack frame offsets */
|
|
||||||
|
|
||||||
#define wmask 0 /* local copy of s->wmask */
|
|
||||||
#define window 4 /* local copy of s->window */
|
|
||||||
#define windowbestlen 8 /* s->window + bestlen */
|
|
||||||
#define chainlenscanend 12 /* high word: current chain len */
|
|
||||||
/* low word: last bytes sought */
|
|
||||||
#define scanstart 16 /* first two bytes of string */
|
|
||||||
#define scanalign 20 /* dword-misalignment of string */
|
|
||||||
#define nicematch 24 /* a good enough match size */
|
|
||||||
#define bestlen 28 /* size of best match so far */
|
|
||||||
#define scan 32 /* ptr to string wanting match */
|
|
||||||
|
|
||||||
#define LocalVarsSize (36)
|
|
||||||
/* saved ebx 36 */
|
|
||||||
/* saved edi 40 */
|
|
||||||
/* saved esi 44 */
|
|
||||||
/* saved ebp 48 */
|
|
||||||
/* return address 52 */
|
|
||||||
#define deflatestate 56 /* the function arguments */
|
|
||||||
#define curmatch 60
|
|
||||||
|
|
||||||
/* Offsets for fields in the deflate_state structure. These numbers
|
|
||||||
* are calculated from the definition of deflate_state, with the
|
|
||||||
* assumption that the compiler will dword-align the fields. (Thus,
|
|
||||||
* changing the definition of deflate_state could easily cause this
|
|
||||||
* program to crash horribly, without so much as a warning at
|
|
||||||
* compile time. Sigh.)
|
|
||||||
*/
|
|
||||||
#define dsWSize 36
|
|
||||||
#define dsWMask 44
|
|
||||||
#define dsWindow 48
|
|
||||||
#define dsPrev 56
|
|
||||||
#define dsMatchLen 88
|
|
||||||
#define dsPrevMatch 92
|
|
||||||
#define dsStrStart 100
|
|
||||||
#define dsMatchStart 104
|
|
||||||
#define dsLookahead 108
|
|
||||||
#define dsPrevLen 112
|
|
||||||
#define dsMaxChainLen 116
|
|
||||||
#define dsGoodMatch 132
|
|
||||||
#define dsNiceMatch 136
|
|
||||||
|
|
||||||
|
|
||||||
.file "match.S"
|
|
||||||
|
|
||||||
.globl match_init, longest_match
|
|
||||||
|
|
||||||
.text
|
|
||||||
|
|
||||||
/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
|
|
||||||
|
|
||||||
longest_match:
|
|
||||||
|
|
||||||
/* Save registers that the compiler may be using, and adjust %esp to */
|
|
||||||
/* make room for our stack frame. */
|
|
||||||
|
|
||||||
pushl %ebp
|
|
||||||
pushl %edi
|
|
||||||
pushl %esi
|
|
||||||
pushl %ebx
|
|
||||||
subl $LocalVarsSize, %esp
|
|
||||||
|
|
||||||
/* Retrieve the function arguments. %ecx will hold cur_match */
|
|
||||||
/* throughout the entire function. %edx will hold the pointer to the */
|
|
||||||
/* deflate_state structure during the function's setup (before */
|
|
||||||
/* entering the main loop). */
|
|
||||||
|
|
||||||
movl deflatestate(%esp), %edx
|
|
||||||
movl curmatch(%esp), %ecx
|
|
||||||
|
|
||||||
/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; */
|
|
||||||
|
|
||||||
movl dsNiceMatch(%edx), %eax
|
|
||||||
movl dsLookahead(%edx), %ebx
|
|
||||||
cmpl %eax, %ebx
|
|
||||||
jl LookaheadLess
|
|
||||||
movl %eax, %ebx
|
|
||||||
LookaheadLess: movl %ebx, nicematch(%esp)
|
|
||||||
|
|
||||||
/* register Bytef *scan = s->window + s->strstart; */
|
|
||||||
|
|
||||||
movl dsWindow(%edx), %esi
|
|
||||||
movl %esi, window(%esp)
|
|
||||||
movl dsStrStart(%edx), %ebp
|
|
||||||
lea (%esi,%ebp), %edi
|
|
||||||
movl %edi, scan(%esp)
|
|
||||||
|
|
||||||
/* Determine how many bytes the scan ptr is off from being */
|
|
||||||
/* dword-aligned. */
|
|
||||||
|
|
||||||
movl %edi, %eax
|
|
||||||
negl %eax
|
|
||||||
andl $3, %eax
|
|
||||||
movl %eax, scanalign(%esp)
|
|
||||||
|
|
||||||
/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ? */
|
|
||||||
/* s->strstart - (IPos)MAX_DIST(s) : NIL; */
|
|
||||||
|
|
||||||
movl dsWSize(%edx), %eax
|
|
||||||
subl $MIN_LOOKAHEAD, %eax
|
|
||||||
subl %eax, %ebp
|
|
||||||
jg LimitPositive
|
|
||||||
xorl %ebp, %ebp
|
|
||||||
LimitPositive:
|
|
||||||
|
|
||||||
/* unsigned chain_length = s->max_chain_length; */
|
|
||||||
/* if (s->prev_length >= s->good_match) { */
|
|
||||||
/* chain_length >>= 2; */
|
|
||||||
/* } */
|
|
||||||
|
|
||||||
movl dsPrevLen(%edx), %eax
|
|
||||||
movl dsGoodMatch(%edx), %ebx
|
|
||||||
cmpl %ebx, %eax
|
|
||||||
movl dsMaxChainLen(%edx), %ebx
|
|
||||||
jl LastMatchGood
|
|
||||||
shrl $2, %ebx
|
|
||||||
LastMatchGood:
|
|
||||||
|
|
||||||
/* chainlen is decremented once beforehand so that the function can */
|
|
||||||
/* use the sign flag instead of the zero flag for the exit test. */
|
|
||||||
/* It is then shifted into the high word, to make room for the scanend */
|
|
||||||
/* scanend value, which it will always accompany. */
|
|
||||||
|
|
||||||
decl %ebx
|
|
||||||
shll $16, %ebx
|
|
||||||
|
|
||||||
/* int best_len = s->prev_length; */
|
|
||||||
|
|
||||||
movl dsPrevLen(%edx), %eax
|
|
||||||
movl %eax, bestlen(%esp)
|
|
||||||
|
|
||||||
/* Store the sum of s->window + best_len in %esi locally, and in %esi. */
|
|
||||||
|
|
||||||
addl %eax, %esi
|
|
||||||
movl %esi, windowbestlen(%esp)
|
|
||||||
|
|
||||||
/* register ush scan_start = *(ushf*)scan; */
|
|
||||||
/* register ush scan_end = *(ushf*)(scan+best_len-1); */
|
|
||||||
|
|
||||||
movw (%edi), %bx
|
|
||||||
movw %bx, scanstart(%esp)
|
|
||||||
movw -1(%edi,%eax), %bx
|
|
||||||
movl %ebx, chainlenscanend(%esp)
|
|
||||||
|
|
||||||
/* Posf *prev = s->prev; */
|
|
||||||
/* uInt wmask = s->w_mask; */
|
|
||||||
|
|
||||||
movl dsPrev(%edx), %edi
|
|
||||||
movl dsWMask(%edx), %edx
|
|
||||||
mov %edx, wmask(%esp)
|
|
||||||
|
|
||||||
/* Jump into the main loop. */
|
|
||||||
|
|
||||||
jmp LoopEntry
|
|
||||||
|
|
||||||
.balign 16
|
|
||||||
|
|
||||||
/* do {
|
|
||||||
* match = s->window + cur_match;
|
|
||||||
* if (*(ushf*)(match+best_len-1) != scan_end ||
|
|
||||||
* *(ushf*)match != scan_start) continue;
|
|
||||||
* [...]
|
|
||||||
* } while ((cur_match = prev[cur_match & wmask]) > limit
|
|
||||||
* && --chain_length != 0);
|
|
||||||
*
|
|
||||||
* Here is the inner loop of the function. The function will spend the
|
|
||||||
* majority of its time in this loop, and majority of that time will
|
|
||||||
* be spent in the first ten instructions.
|
|
||||||
*
|
|
||||||
* Within this loop:
|
|
||||||
* %ebx = chainlenscanend - i.e., ((chainlen << 16) | scanend)
|
|
||||||
* %ecx = curmatch
|
|
||||||
* %edx = curmatch & wmask
|
|
||||||
* %esi = windowbestlen - i.e., (window + bestlen)
|
|
||||||
* %edi = prev
|
|
||||||
* %ebp = limit
|
|
||||||
*
|
|
||||||
* Two optimization notes on the choice of instructions:
|
|
||||||
*
|
|
||||||
* The first instruction uses a 16-bit address, which costs an extra,
|
|
||||||
* unpairable cycle. This is cheaper than doing a 32-bit access and
|
|
||||||
* zeroing the high word, due to the 3-cycle misalignment penalty which
|
|
||||||
* would occur half the time. This also turns out to be cheaper than
|
|
||||||
* doing two separate 8-bit accesses, as the memory is so rarely in the
|
|
||||||
* L1 cache.
|
|
||||||
*
|
|
||||||
* The window buffer, however, apparently spends a lot of time in the
|
|
||||||
* cache, and so it is faster to retrieve the word at the end of the
|
|
||||||
* match string with two 8-bit loads. The instructions that test the
|
|
||||||
* word at the beginning of the match string, however, are executed
|
|
||||||
* much less frequently, and there it was cheaper to use 16-bit
|
|
||||||
* instructions, which avoided the necessity of saving off and
|
|
||||||
* subsequently reloading one of the other registers.
|
|
||||||
*/
|
|
||||||
LookupLoop:
|
|
||||||
/* 1 U & V */
|
|
||||||
movw (%edi,%edx,2), %cx /* 2 U pipe */
|
|
||||||
movl wmask(%esp), %edx /* 2 V pipe */
|
|
||||||
cmpl %ebp, %ecx /* 3 U pipe */
|
|
||||||
jbe LeaveNow /* 3 V pipe */
|
|
||||||
subl $0x00010000, %ebx /* 4 U pipe */
|
|
||||||
js LeaveNow /* 4 V pipe */
|
|
||||||
LoopEntry: movb -1(%esi,%ecx), %al /* 5 U pipe */
|
|
||||||
andl %ecx, %edx /* 5 V pipe */
|
|
||||||
cmpb %bl, %al /* 6 U pipe */
|
|
||||||
jnz LookupLoop /* 6 V pipe */
|
|
||||||
movb (%esi,%ecx), %ah
|
|
||||||
cmpb %bh, %ah
|
|
||||||
jnz LookupLoop
|
|
||||||
movl window(%esp), %eax
|
|
||||||
movw (%eax,%ecx), %ax
|
|
||||||
cmpw scanstart(%esp), %ax
|
|
||||||
jnz LookupLoop
|
|
||||||
|
|
||||||
/* Store the current value of chainlen. */
|
|
||||||
|
|
||||||
movl %ebx, chainlenscanend(%esp)
|
|
||||||
|
|
||||||
/* Point %edi to the string under scrutiny, and %esi to the string we */
|
|
||||||
/* are hoping to match it up with. In actuality, %esi and %edi are */
|
|
||||||
/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is */
|
|
||||||
/* initialized to -(MAX_MATCH_8 - scanalign). */
|
|
||||||
|
|
||||||
movl window(%esp), %esi
|
|
||||||
movl scan(%esp), %edi
|
|
||||||
addl %ecx, %esi
|
|
||||||
movl scanalign(%esp), %eax
|
|
||||||
movl $(-MAX_MATCH_8), %edx
|
|
||||||
lea MAX_MATCH_8(%edi,%eax), %edi
|
|
||||||
lea MAX_MATCH_8(%esi,%eax), %esi
|
|
||||||
|
|
||||||
/* Test the strings for equality, 8 bytes at a time. At the end,
|
|
||||||
* adjust %edx so that it is offset to the exact byte that mismatched.
|
|
||||||
*
|
|
||||||
* We already know at this point that the first three bytes of the
|
|
||||||
* strings match each other, and they can be safely passed over before
|
|
||||||
* starting the compare loop. So what this code does is skip over 0-3
|
|
||||||
* bytes, as much as necessary in order to dword-align the %edi
|
|
||||||
* pointer. (%esi will still be misaligned three times out of four.)
|
|
||||||
*
|
|
||||||
* It should be confessed that this loop usually does not represent
|
|
||||||
* much of the total running time. Replacing it with a more
|
|
||||||
* straightforward "rep cmpsb" would not drastically degrade
|
|
||||||
* performance.
|
|
||||||
*/
|
|
||||||
LoopCmps:
|
|
||||||
movl (%esi,%edx), %eax
|
|
||||||
movl (%edi,%edx), %ebx
|
|
||||||
xorl %ebx, %eax
|
|
||||||
jnz LeaveLoopCmps
|
|
||||||
movl 4(%esi,%edx), %eax
|
|
||||||
movl 4(%edi,%edx), %ebx
|
|
||||||
xorl %ebx, %eax
|
|
||||||
jnz LeaveLoopCmps4
|
|
||||||
addl $8, %edx
|
|
||||||
jnz LoopCmps
|
|
||||||
jmp LenMaximum
|
|
||||||
LeaveLoopCmps4: addl $4, %edx
|
|
||||||
LeaveLoopCmps: testl $0x0000FFFF, %eax
|
|
||||||
jnz LenLower
|
|
||||||
addl $2, %edx
|
|
||||||
shrl $16, %eax
|
|
||||||
LenLower: subb $1, %al
|
|
||||||
adcl $0, %edx
|
|
||||||
|
|
||||||
/* Calculate the length of the match. If it is longer than MAX_MATCH, */
|
|
||||||
/* then automatically accept it as the best possible match and leave. */
|
|
||||||
|
|
||||||
lea (%edi,%edx), %eax
|
|
||||||
movl scan(%esp), %edi
|
|
||||||
subl %edi, %eax
|
|
||||||
cmpl $MAX_MATCH, %eax
|
|
||||||
jge LenMaximum
|
|
||||||
|
|
||||||
/* If the length of the match is not longer than the best match we */
|
|
||||||
/* have so far, then forget it and return to the lookup loop. */
|
|
||||||
|
|
||||||
movl deflatestate(%esp), %edx
|
|
||||||
movl bestlen(%esp), %ebx
|
|
||||||
cmpl %ebx, %eax
|
|
||||||
jg LongerMatch
|
|
||||||
movl chainlenscanend(%esp), %ebx
|
|
||||||
movl windowbestlen(%esp), %esi
|
|
||||||
movl dsPrev(%edx), %edi
|
|
||||||
movl wmask(%esp), %edx
|
|
||||||
andl %ecx, %edx
|
|
||||||
jmp LookupLoop
|
|
||||||
|
|
||||||
/* s->match_start = cur_match; */
|
|
||||||
/* best_len = len; */
|
|
||||||
/* if (len >= nice_match) break; */
|
|
||||||
/* scan_end = *(ushf*)(scan+best_len-1); */
|
|
||||||
|
|
||||||
LongerMatch: movl nicematch(%esp), %ebx
|
|
||||||
movl %eax, bestlen(%esp)
|
|
||||||
movl %ecx, dsMatchStart(%edx)
|
|
||||||
cmpl %ebx, %eax
|
|
||||||
jge LeaveNow
|
|
||||||
movl window(%esp), %esi
|
|
||||||
addl %eax, %esi
|
|
||||||
movl %esi, windowbestlen(%esp)
|
|
||||||
movl chainlenscanend(%esp), %ebx
|
|
||||||
movw -1(%edi,%eax), %bx
|
|
||||||
movl dsPrev(%edx), %edi
|
|
||||||
movl %ebx, chainlenscanend(%esp)
|
|
||||||
movl wmask(%esp), %edx
|
|
||||||
andl %ecx, %edx
|
|
||||||
jmp LookupLoop
|
|
||||||
|
|
||||||
/* Accept the current string, with the maximum possible length. */
|
|
||||||
|
|
||||||
LenMaximum: movl deflatestate(%esp), %edx
|
|
||||||
movl $MAX_MATCH, bestlen(%esp)
|
|
||||||
movl %ecx, dsMatchStart(%edx)
|
|
||||||
|
|
||||||
/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len; */
|
|
||||||
/* return s->lookahead; */
|
|
||||||
|
|
||||||
LeaveNow:
|
|
||||||
movl deflatestate(%esp), %edx
|
|
||||||
movl bestlen(%esp), %ebx
|
|
||||||
movl dsLookahead(%edx), %eax
|
|
||||||
cmpl %eax, %ebx
|
|
||||||
jg LookaheadRet
|
|
||||||
movl %ebx, %eax
|
|
||||||
LookaheadRet:
|
|
||||||
|
|
||||||
/* Restore the stack and return from whence we came. */
|
|
||||||
|
|
||||||
addl $LocalVarsSize, %esp
|
|
||||||
popl %ebx
|
|
||||||
popl %esi
|
|
||||||
popl %edi
|
|
||||||
popl %ebp
|
|
||||||
match_init: ret
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
This is a patched version of zlib, modified to use
|
|
||||||
Pentium-Pro-optimized assembly code in the deflation algorithm. The
|
|
||||||
files changed/added by this patch are:
|
|
||||||
|
|
||||||
README.686
|
|
||||||
match.S
|
|
||||||
|
|
||||||
The speedup that this patch provides varies, depending on whether the
|
|
||||||
compiler used to build the original version of zlib falls afoul of the
|
|
||||||
PPro's speed traps. My own tests show a speedup of around 10-20% at
|
|
||||||
the default compression level, and 20-30% using -9, against a version
|
|
||||||
compiled using gcc 2.7.2.3. Your mileage may vary.
|
|
||||||
|
|
||||||
Note that this code has been tailored for the PPro/PII in particular,
|
|
||||||
and will not perform particuarly well on a Pentium.
|
|
||||||
|
|
||||||
If you are using an assembler other than GNU as, you will have to
|
|
||||||
translate match.S to use your assembler's syntax. (Have fun.)
|
|
||||||
|
|
||||||
Brian Raiter
|
|
||||||
breadbox@muppetlabs.com
|
|
||||||
April, 1998
|
|
||||||
|
|
||||||
|
|
||||||
Added for zlib 1.1.3:
|
|
||||||
|
|
||||||
The patches come from
|
|
||||||
http://www.muppetlabs.com/~breadbox/software/assembly.html
|
|
||||||
|
|
||||||
To compile zlib with this asm file, copy match.S to the zlib directory
|
|
||||||
then do:
|
|
||||||
|
|
||||||
CFLAGS="-O3 -DASMV" ./configure
|
|
||||||
make OBJA=match.o
|
|
||||||
@ -1,327 +0,0 @@
|
|||||||
/* match.s -- Pentium-Pro-optimized version of longest_match()
|
|
||||||
* Written for zlib 1.1.2
|
|
||||||
* Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
|
|
||||||
*
|
|
||||||
* This is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef NO_UNDERLINE
|
|
||||||
#define match_init _match_init
|
|
||||||
#define longest_match _longest_match
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAX_MATCH (258)
|
|
||||||
#define MIN_MATCH (3)
|
|
||||||
#define MIN_LOOKAHEAD (MAX_MATCH + MIN_MATCH + 1)
|
|
||||||
#define MAX_MATCH_8 ((MAX_MATCH + 7) & ~7)
|
|
||||||
|
|
||||||
/* stack frame offsets */
|
|
||||||
|
|
||||||
#define chainlenwmask 0 /* high word: current chain len */
|
|
||||||
/* low word: s->wmask */
|
|
||||||
#define window 4 /* local copy of s->window */
|
|
||||||
#define windowbestlen 8 /* s->window + bestlen */
|
|
||||||
#define scanstart 16 /* first two bytes of string */
|
|
||||||
#define scanend 12 /* last two bytes of string */
|
|
||||||
#define scanalign 20 /* dword-misalignment of string */
|
|
||||||
#define nicematch 24 /* a good enough match size */
|
|
||||||
#define bestlen 28 /* size of best match so far */
|
|
||||||
#define scan 32 /* ptr to string wanting match */
|
|
||||||
|
|
||||||
#define LocalVarsSize (36)
|
|
||||||
/* saved ebx 36 */
|
|
||||||
/* saved edi 40 */
|
|
||||||
/* saved esi 44 */
|
|
||||||
/* saved ebp 48 */
|
|
||||||
/* return address 52 */
|
|
||||||
#define deflatestate 56 /* the function arguments */
|
|
||||||
#define curmatch 60
|
|
||||||
|
|
||||||
/* Offsets for fields in the deflate_state structure. These numbers
|
|
||||||
* are calculated from the definition of deflate_state, with the
|
|
||||||
* assumption that the compiler will dword-align the fields. (Thus,
|
|
||||||
* changing the definition of deflate_state could easily cause this
|
|
||||||
* program to crash horribly, without so much as a warning at
|
|
||||||
* compile time. Sigh.)
|
|
||||||
*/
|
|
||||||
#define dsWSize 36
|
|
||||||
#define dsWMask 44
|
|
||||||
#define dsWindow 48
|
|
||||||
#define dsPrev 56
|
|
||||||
#define dsMatchLen 88
|
|
||||||
#define dsPrevMatch 92
|
|
||||||
#define dsStrStart 100
|
|
||||||
#define dsMatchStart 104
|
|
||||||
#define dsLookahead 108
|
|
||||||
#define dsPrevLen 112
|
|
||||||
#define dsMaxChainLen 116
|
|
||||||
#define dsGoodMatch 132
|
|
||||||
#define dsNiceMatch 136
|
|
||||||
|
|
||||||
|
|
||||||
.file "match.S"
|
|
||||||
|
|
||||||
.globl match_init, longest_match
|
|
||||||
|
|
||||||
.text
|
|
||||||
|
|
||||||
/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
|
|
||||||
|
|
||||||
longest_match:
|
|
||||||
|
|
||||||
/* Save registers that the compiler may be using, and adjust %esp to */
|
|
||||||
/* make room for our stack frame. */
|
|
||||||
|
|
||||||
pushl %ebp
|
|
||||||
pushl %edi
|
|
||||||
pushl %esi
|
|
||||||
pushl %ebx
|
|
||||||
subl $LocalVarsSize, %esp
|
|
||||||
|
|
||||||
/* Retrieve the function arguments. %ecx will hold cur_match */
|
|
||||||
/* throughout the entire function. %edx will hold the pointer to the */
|
|
||||||
/* deflate_state structure during the function's setup (before */
|
|
||||||
/* entering the main loop). */
|
|
||||||
|
|
||||||
movl deflatestate(%esp), %edx
|
|
||||||
movl curmatch(%esp), %ecx
|
|
||||||
|
|
||||||
/* uInt wmask = s->w_mask; */
|
|
||||||
/* unsigned chain_length = s->max_chain_length; */
|
|
||||||
/* if (s->prev_length >= s->good_match) { */
|
|
||||||
/* chain_length >>= 2; */
|
|
||||||
/* } */
|
|
||||||
|
|
||||||
movl dsPrevLen(%edx), %eax
|
|
||||||
movl dsGoodMatch(%edx), %ebx
|
|
||||||
cmpl %ebx, %eax
|
|
||||||
movl dsWMask(%edx), %eax
|
|
||||||
movl dsMaxChainLen(%edx), %ebx
|
|
||||||
jl LastMatchGood
|
|
||||||
shrl $2, %ebx
|
|
||||||
LastMatchGood:
|
|
||||||
|
|
||||||
/* chainlen is decremented once beforehand so that the function can */
|
|
||||||
/* use the sign flag instead of the zero flag for the exit test. */
|
|
||||||
/* It is then shifted into the high word, to make room for the wmask */
|
|
||||||
/* value, which it will always accompany. */
|
|
||||||
|
|
||||||
decl %ebx
|
|
||||||
shll $16, %ebx
|
|
||||||
orl %eax, %ebx
|
|
||||||
movl %ebx, chainlenwmask(%esp)
|
|
||||||
|
|
||||||
/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; */
|
|
||||||
|
|
||||||
movl dsNiceMatch(%edx), %eax
|
|
||||||
movl dsLookahead(%edx), %ebx
|
|
||||||
cmpl %eax, %ebx
|
|
||||||
jl LookaheadLess
|
|
||||||
movl %eax, %ebx
|
|
||||||
LookaheadLess: movl %ebx, nicematch(%esp)
|
|
||||||
|
|
||||||
/* register Bytef *scan = s->window + s->strstart; */
|
|
||||||
|
|
||||||
movl dsWindow(%edx), %esi
|
|
||||||
movl %esi, window(%esp)
|
|
||||||
movl dsStrStart(%edx), %ebp
|
|
||||||
lea (%esi,%ebp), %edi
|
|
||||||
movl %edi, scan(%esp)
|
|
||||||
|
|
||||||
/* Determine how many bytes the scan ptr is off from being */
|
|
||||||
/* dword-aligned. */
|
|
||||||
|
|
||||||
movl %edi, %eax
|
|
||||||
negl %eax
|
|
||||||
andl $3, %eax
|
|
||||||
movl %eax, scanalign(%esp)
|
|
||||||
|
|
||||||
/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ? */
|
|
||||||
/* s->strstart - (IPos)MAX_DIST(s) : NIL; */
|
|
||||||
|
|
||||||
movl dsWSize(%edx), %eax
|
|
||||||
subl $MIN_LOOKAHEAD, %eax
|
|
||||||
subl %eax, %ebp
|
|
||||||
jg LimitPositive
|
|
||||||
xorl %ebp, %ebp
|
|
||||||
LimitPositive:
|
|
||||||
|
|
||||||
/* int best_len = s->prev_length; */
|
|
||||||
|
|
||||||
movl dsPrevLen(%edx), %eax
|
|
||||||
movl %eax, bestlen(%esp)
|
|
||||||
|
|
||||||
/* Store the sum of s->window + best_len in %esi locally, and in %esi. */
|
|
||||||
|
|
||||||
addl %eax, %esi
|
|
||||||
movl %esi, windowbestlen(%esp)
|
|
||||||
|
|
||||||
/* register ush scan_start = *(ushf*)scan; */
|
|
||||||
/* register ush scan_end = *(ushf*)(scan+best_len-1); */
|
|
||||||
/* Posf *prev = s->prev; */
|
|
||||||
|
|
||||||
movzwl (%edi), %ebx
|
|
||||||
movl %ebx, scanstart(%esp)
|
|
||||||
movzwl -1(%edi,%eax), %ebx
|
|
||||||
movl %ebx, scanend(%esp)
|
|
||||||
movl dsPrev(%edx), %edi
|
|
||||||
|
|
||||||
/* Jump into the main loop. */
|
|
||||||
|
|
||||||
movl chainlenwmask(%esp), %edx
|
|
||||||
jmp LoopEntry
|
|
||||||
|
|
||||||
.balign 16
|
|
||||||
|
|
||||||
/* do {
|
|
||||||
* match = s->window + cur_match;
|
|
||||||
* if (*(ushf*)(match+best_len-1) != scan_end ||
|
|
||||||
* *(ushf*)match != scan_start) continue;
|
|
||||||
* [...]
|
|
||||||
* } while ((cur_match = prev[cur_match & wmask]) > limit
|
|
||||||
* && --chain_length != 0);
|
|
||||||
*
|
|
||||||
* Here is the inner loop of the function. The function will spend the
|
|
||||||
* majority of its time in this loop, and majority of that time will
|
|
||||||
* be spent in the first ten instructions.
|
|
||||||
*
|
|
||||||
* Within this loop:
|
|
||||||
* %ebx = scanend
|
|
||||||
* %ecx = curmatch
|
|
||||||
* %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
|
|
||||||
* %esi = windowbestlen - i.e., (window + bestlen)
|
|
||||||
* %edi = prev
|
|
||||||
* %ebp = limit
|
|
||||||
*/
|
|
||||||
LookupLoop:
|
|
||||||
andl %edx, %ecx
|
|
||||||
movzwl (%edi,%ecx,2), %ecx
|
|
||||||
cmpl %ebp, %ecx
|
|
||||||
jbe LeaveNow
|
|
||||||
subl $0x00010000, %edx
|
|
||||||
js LeaveNow
|
|
||||||
LoopEntry: movzwl -1(%esi,%ecx), %eax
|
|
||||||
cmpl %ebx, %eax
|
|
||||||
jnz LookupLoop
|
|
||||||
movl window(%esp), %eax
|
|
||||||
movzwl (%eax,%ecx), %eax
|
|
||||||
cmpl scanstart(%esp), %eax
|
|
||||||
jnz LookupLoop
|
|
||||||
|
|
||||||
/* Store the current value of chainlen. */
|
|
||||||
|
|
||||||
movl %edx, chainlenwmask(%esp)
|
|
||||||
|
|
||||||
/* Point %edi to the string under scrutiny, and %esi to the string we */
|
|
||||||
/* are hoping to match it up with. In actuality, %esi and %edi are */
|
|
||||||
/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is */
|
|
||||||
/* initialized to -(MAX_MATCH_8 - scanalign). */
|
|
||||||
|
|
||||||
movl window(%esp), %esi
|
|
||||||
movl scan(%esp), %edi
|
|
||||||
addl %ecx, %esi
|
|
||||||
movl scanalign(%esp), %eax
|
|
||||||
movl $(-MAX_MATCH_8), %edx
|
|
||||||
lea MAX_MATCH_8(%edi,%eax), %edi
|
|
||||||
lea MAX_MATCH_8(%esi,%eax), %esi
|
|
||||||
|
|
||||||
/* Test the strings for equality, 8 bytes at a time. At the end,
|
|
||||||
* adjust %edx so that it is offset to the exact byte that mismatched.
|
|
||||||
*
|
|
||||||
* We already know at this point that the first three bytes of the
|
|
||||||
* strings match each other, and they can be safely passed over before
|
|
||||||
* starting the compare loop. So what this code does is skip over 0-3
|
|
||||||
* bytes, as much as necessary in order to dword-align the %edi
|
|
||||||
* pointer. (%esi will still be misaligned three times out of four.)
|
|
||||||
*
|
|
||||||
* It should be confessed that this loop usually does not represent
|
|
||||||
* much of the total running time. Replacing it with a more
|
|
||||||
* straightforward "rep cmpsb" would not drastically degrade
|
|
||||||
* performance.
|
|
||||||
*/
|
|
||||||
LoopCmps:
|
|
||||||
movl (%esi,%edx), %eax
|
|
||||||
xorl (%edi,%edx), %eax
|
|
||||||
jnz LeaveLoopCmps
|
|
||||||
movl 4(%esi,%edx), %eax
|
|
||||||
xorl 4(%edi,%edx), %eax
|
|
||||||
jnz LeaveLoopCmps4
|
|
||||||
addl $8, %edx
|
|
||||||
jnz LoopCmps
|
|
||||||
jmp LenMaximum
|
|
||||||
LeaveLoopCmps4: addl $4, %edx
|
|
||||||
LeaveLoopCmps: testl $0x0000FFFF, %eax
|
|
||||||
jnz LenLower
|
|
||||||
addl $2, %edx
|
|
||||||
shrl $16, %eax
|
|
||||||
LenLower: subb $1, %al
|
|
||||||
adcl $0, %edx
|
|
||||||
|
|
||||||
/* Calculate the length of the match. If it is longer than MAX_MATCH, */
|
|
||||||
/* then automatically accept it as the best possible match and leave. */
|
|
||||||
|
|
||||||
lea (%edi,%edx), %eax
|
|
||||||
movl scan(%esp), %edi
|
|
||||||
subl %edi, %eax
|
|
||||||
cmpl $MAX_MATCH, %eax
|
|
||||||
jge LenMaximum
|
|
||||||
|
|
||||||
/* If the length of the match is not longer than the best match we */
|
|
||||||
/* have so far, then forget it and return to the lookup loop. */
|
|
||||||
|
|
||||||
movl deflatestate(%esp), %edx
|
|
||||||
movl bestlen(%esp), %ebx
|
|
||||||
cmpl %ebx, %eax
|
|
||||||
jg LongerMatch
|
|
||||||
movl windowbestlen(%esp), %esi
|
|
||||||
movl dsPrev(%edx), %edi
|
|
||||||
movl scanend(%esp), %ebx
|
|
||||||
movl chainlenwmask(%esp), %edx
|
|
||||||
jmp LookupLoop
|
|
||||||
|
|
||||||
/* s->match_start = cur_match; */
|
|
||||||
/* best_len = len; */
|
|
||||||
/* if (len >= nice_match) break; */
|
|
||||||
/* scan_end = *(ushf*)(scan+best_len-1); */
|
|
||||||
|
|
||||||
LongerMatch: movl nicematch(%esp), %ebx
|
|
||||||
movl %eax, bestlen(%esp)
|
|
||||||
movl %ecx, dsMatchStart(%edx)
|
|
||||||
cmpl %ebx, %eax
|
|
||||||
jge LeaveNow
|
|
||||||
movl window(%esp), %esi
|
|
||||||
addl %eax, %esi
|
|
||||||
movl %esi, windowbestlen(%esp)
|
|
||||||
movzwl -1(%edi,%eax), %ebx
|
|
||||||
movl dsPrev(%edx), %edi
|
|
||||||
movl %ebx, scanend(%esp)
|
|
||||||
movl chainlenwmask(%esp), %edx
|
|
||||||
jmp LookupLoop
|
|
||||||
|
|
||||||
/* Accept the current string, with the maximum possible length. */
|
|
||||||
|
|
||||||
LenMaximum: movl deflatestate(%esp), %edx
|
|
||||||
movl $MAX_MATCH, bestlen(%esp)
|
|
||||||
movl %ecx, dsMatchStart(%edx)
|
|
||||||
|
|
||||||
/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len; */
|
|
||||||
/* return s->lookahead; */
|
|
||||||
|
|
||||||
LeaveNow:
|
|
||||||
movl deflatestate(%esp), %edx
|
|
||||||
movl bestlen(%esp), %ebx
|
|
||||||
movl dsLookahead(%edx), %eax
|
|
||||||
cmpl %eax, %ebx
|
|
||||||
jg LookaheadRet
|
|
||||||
movl %ebx, %eax
|
|
||||||
LookaheadRet:
|
|
||||||
|
|
||||||
/* Restore the stack and return from whence we came. */
|
|
||||||
|
|
||||||
addl $LocalVarsSize, %esp
|
|
||||||
popl %ebx
|
|
||||||
popl %esi
|
|
||||||
popl %edi
|
|
||||||
popl %ebp
|
|
||||||
match_init: ret
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
# Makefile for zlib32bd.lib
|
|
||||||
# ------------- Borland C++ 4.5 -------------
|
|
||||||
|
|
||||||
# The (32-bit) zlib32bd.lib made with this makefile is intended for use
|
|
||||||
# in making the (32-bit) DLL, png32bd.dll. It uses the "stdcall" calling
|
|
||||||
# convention.
|
|
||||||
|
|
||||||
CFLAGS= -ps -O2 -C -K -N- -k- -d -3 -r- -w-par -w-aus -WDE
|
|
||||||
CC=f:\bc45\bin\bcc32
|
|
||||||
LIBFLAGS= /C
|
|
||||||
LIB=f:\bc45\bin\tlib
|
|
||||||
ZLIB=zlib32bd.lib
|
|
||||||
|
|
||||||
.autodepend
|
|
||||||
.c.obj:
|
|
||||||
$(CC) -c $(CFLAGS) $<
|
|
||||||
|
|
||||||
OBJ1=adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infblock.obj
|
|
||||||
OBJ2=infcodes.obj inflate.obj inftrees.obj infutil.obj inffast.obj
|
|
||||||
OBJ3=trees.obj uncompr.obj zutil.obj
|
|
||||||
pOBJ1=+adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infblock.obj
|
|
||||||
pOBJ2=+infcodes.obj+inflate.obj+inftrees.obj+infutil.obj+inffast.obj
|
|
||||||
pOBJ3=+trees.obj+uncompr.obj+zutil.obj
|
|
||||||
|
|
||||||
all: $(ZLIB)
|
|
||||||
|
|
||||||
$(ZLIB): $(OBJ1) $(OBJ2) $(OBJ3)
|
|
||||||
@if exist $@ del $@
|
|
||||||
$(LIB) @&&|
|
|
||||||
$@ $(LIBFLAGS) &
|
|
||||||
$(pOBJ1) &
|
|
||||||
$(pOBJ2) &
|
|
||||||
$(pOBJ3)
|
|
||||||
|
|
|
||||||
|
|
||||||
# End of makefile for zlib32bd.lib
|
|
||||||
@ -1,169 +0,0 @@
|
|||||||
unit zlibdef;
|
|
||||||
|
|
||||||
interface
|
|
||||||
|
|
||||||
uses
|
|
||||||
Windows;
|
|
||||||
|
|
||||||
const
|
|
||||||
ZLIB_VERSION = '1.1.3';
|
|
||||||
|
|
||||||
type
|
|
||||||
voidpf = Pointer;
|
|
||||||
int = Integer;
|
|
||||||
uInt = Cardinal;
|
|
||||||
pBytef = PChar;
|
|
||||||
uLong = Cardinal;
|
|
||||||
|
|
||||||
alloc_func = function(opaque: voidpf; items, size: uInt): voidpf;
|
|
||||||
stdcall;
|
|
||||||
free_func = procedure(opaque, address: voidpf);
|
|
||||||
stdcall;
|
|
||||||
|
|
||||||
internal_state = Pointer;
|
|
||||||
|
|
||||||
z_streamp = ^z_stream;
|
|
||||||
z_stream = packed record
|
|
||||||
next_in: pBytef; // next input byte
|
|
||||||
avail_in: uInt; // number of bytes available at next_in
|
|
||||||
total_in: uLong; // total nb of input bytes read so far
|
|
||||||
|
|
||||||
next_out: pBytef; // next output byte should be put there
|
|
||||||
avail_out: uInt; // remaining free space at next_out
|
|
||||||
total_out: uLong; // total nb of bytes output so far
|
|
||||||
|
|
||||||
msg: PChar; // last error message, NULL if no error
|
|
||||||
state: internal_state; // not visible by applications
|
|
||||||
|
|
||||||
zalloc: alloc_func; // used to allocate the internal state
|
|
||||||
zfree: free_func; // used to free the internal state
|
|
||||||
opaque: voidpf; // private data object passed to zalloc and zfree
|
|
||||||
|
|
||||||
data_type: int; // best guess about the data type: ascii or binary
|
|
||||||
adler: uLong; // adler32 value of the uncompressed data
|
|
||||||
reserved: uLong; // reserved for future use
|
|
||||||
end;
|
|
||||||
|
|
||||||
const
|
|
||||||
Z_NO_FLUSH = 0;
|
|
||||||
Z_SYNC_FLUSH = 2;
|
|
||||||
Z_FULL_FLUSH = 3;
|
|
||||||
Z_FINISH = 4;
|
|
||||||
|
|
||||||
Z_OK = 0;
|
|
||||||
Z_STREAM_END = 1;
|
|
||||||
|
|
||||||
Z_NO_COMPRESSION = 0;
|
|
||||||
Z_BEST_SPEED = 1;
|
|
||||||
Z_BEST_COMPRESSION = 9;
|
|
||||||
Z_DEFAULT_COMPRESSION = -1;
|
|
||||||
|
|
||||||
Z_FILTERED = 1;
|
|
||||||
Z_HUFFMAN_ONLY = 2;
|
|
||||||
Z_DEFAULT_STRATEGY = 0;
|
|
||||||
|
|
||||||
Z_BINARY = 0;
|
|
||||||
Z_ASCII = 1;
|
|
||||||
Z_UNKNOWN = 2;
|
|
||||||
|
|
||||||
Z_DEFLATED = 8;
|
|
||||||
|
|
||||||
MAX_MEM_LEVEL = 9;
|
|
||||||
|
|
||||||
function adler32(adler: uLong; const buf: pBytef; len: uInt): uLong;
|
|
||||||
stdcall;
|
|
||||||
function crc32(crc: uLong; const buf: pBytef; len: uInt): uLong;
|
|
||||||
stdcall;
|
|
||||||
function deflate(strm: z_streamp; flush: int): int;
|
|
||||||
stdcall;
|
|
||||||
function deflateCopy(dest, source: z_streamp): int;
|
|
||||||
stdcall;
|
|
||||||
function deflateEnd(strm: z_streamp): int;
|
|
||||||
stdcall;
|
|
||||||
function deflateInit2_(strm: z_streamp; level, method,
|
|
||||||
windowBits, memLevel, strategy: int;
|
|
||||||
const version: PChar; stream_size: int): int;
|
|
||||||
stdcall;
|
|
||||||
function deflateInit_(strm: z_streamp; level: int;
|
|
||||||
const version: PChar; stream_size: int): int;
|
|
||||||
stdcall;
|
|
||||||
function deflateParams(strm: z_streamp; level, strategy: int): int;
|
|
||||||
stdcall;
|
|
||||||
function deflateReset(strm: z_streamp): int;
|
|
||||||
stdcall;
|
|
||||||
function deflateSetDictionary(strm: z_streamp;
|
|
||||||
const dictionary: pBytef;
|
|
||||||
dictLength: uInt): int;
|
|
||||||
stdcall;
|
|
||||||
function inflate(strm: z_streamp; flush: int): int;
|
|
||||||
stdcall;
|
|
||||||
function inflateEnd(strm: z_streamp): int;
|
|
||||||
stdcall;
|
|
||||||
function inflateInit2_(strm: z_streamp; windowBits: int;
|
|
||||||
const version: PChar; stream_size: int): int;
|
|
||||||
stdcall;
|
|
||||||
function inflateInit_(strm: z_streamp; const version: PChar;
|
|
||||||
stream_size: int): int;
|
|
||||||
stdcall;
|
|
||||||
function inflateReset(strm: z_streamp): int;
|
|
||||||
stdcall;
|
|
||||||
function inflateSetDictionary(strm: z_streamp;
|
|
||||||
const dictionary: pBytef;
|
|
||||||
dictLength: uInt): int;
|
|
||||||
stdcall;
|
|
||||||
function inflateSync(strm: z_streamp): int;
|
|
||||||
stdcall;
|
|
||||||
|
|
||||||
function deflateInit(strm: z_streamp; level: int): int;
|
|
||||||
function deflateInit2(strm: z_streamp; level, method, windowBits,
|
|
||||||
memLevel, strategy: int): int;
|
|
||||||
function inflateInit(strm: z_streamp): int;
|
|
||||||
function inflateInit2(strm: z_streamp; windowBits: int): int;
|
|
||||||
|
|
||||||
implementation
|
|
||||||
|
|
||||||
function deflateInit(strm: z_streamp; level: int): int;
|
|
||||||
begin
|
|
||||||
Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream));
|
|
||||||
end;
|
|
||||||
|
|
||||||
function deflateInit2(strm: z_streamp; level, method, windowBits,
|
|
||||||
memLevel, strategy: int): int;
|
|
||||||
begin
|
|
||||||
Result := deflateInit2_(strm, level, method, windowBits, memLevel,
|
|
||||||
strategy, ZLIB_VERSION, sizeof(z_stream));
|
|
||||||
end;
|
|
||||||
|
|
||||||
function inflateInit(strm: z_streamp): int;
|
|
||||||
begin
|
|
||||||
Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream));
|
|
||||||
end;
|
|
||||||
|
|
||||||
function inflateInit2(strm: z_streamp; windowBits: int): int;
|
|
||||||
begin
|
|
||||||
Result := inflateInit2_(strm, windowBits, ZLIB_VERSION,
|
|
||||||
sizeof(z_stream));
|
|
||||||
end;
|
|
||||||
|
|
||||||
const
|
|
||||||
zlibDLL = 'png32bd.dll';
|
|
||||||
|
|
||||||
function adler32; external zlibDLL;
|
|
||||||
function crc32; external zlibDLL;
|
|
||||||
function deflate; external zlibDLL;
|
|
||||||
function deflateCopy; external zlibDLL;
|
|
||||||
function deflateEnd; external zlibDLL;
|
|
||||||
function deflateInit2_; external zlibDLL;
|
|
||||||
function deflateInit_; external zlibDLL;
|
|
||||||
function deflateParams; external zlibDLL;
|
|
||||||
function deflateReset; external zlibDLL;
|
|
||||||
function deflateSetDictionary; external zlibDLL;
|
|
||||||
function inflate; external zlibDLL;
|
|
||||||
function inflateEnd; external zlibDLL;
|
|
||||||
function inflateInit2_; external zlibDLL;
|
|
||||||
function inflateInit_; external zlibDLL;
|
|
||||||
function inflateReset; external zlibDLL;
|
|
||||||
function inflateSetDictionary; external zlibDLL;
|
|
||||||
function inflateSync; external zlibDLL;
|
|
||||||
|
|
||||||
end.
|
|
||||||
@ -1,224 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if !$d(BCB)
|
|
||||||
BCB = $(MAKEDIR)\..
|
|
||||||
!endif
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# IDE SECTION
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# The following section of the project makefile is managed by the BCB IDE.
|
|
||||||
# It is recommended to use the IDE to change any of the values in this
|
|
||||||
# section.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
VERSION = BCB.03
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
PROJECT = d_zlib.lib
|
|
||||||
OBJFILES = d_zlib.obj adler32.obj deflate.obj infblock.obj infcodes.obj inffast.obj \
|
|
||||||
inflate.obj inftrees.obj infutil.obj trees.obj
|
|
||||||
RESFILES =
|
|
||||||
RESDEPEN = $(RESFILES)
|
|
||||||
LIBFILES =
|
|
||||||
LIBRARIES = VCL35.lib
|
|
||||||
SPARELIBS = VCL35.lib
|
|
||||||
DEFFILE =
|
|
||||||
PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi ibsmp35.bpi bcbsmp35.bpi \
|
|
||||||
dclocx35.bpi QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi DSS35.bpi \
|
|
||||||
NMFAST35.bpi INETDB35.bpi INET35.bpi VCLMID35.bpi
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
PATHCPP = .;
|
|
||||||
PATHASM = .;
|
|
||||||
PATHPAS = .;
|
|
||||||
PATHRC = .;
|
|
||||||
DEBUGLIBPATH = $(BCB)\lib\debug
|
|
||||||
RELEASELIBPATH = $(BCB)\lib\release
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
CFLAG1 = -O2 -Ve -d -k- -vi
|
|
||||||
CFLAG2 = -I$(BCB)\include;$(BCB)\include\vcl -H=$(BCB)\lib\vcl35.csm
|
|
||||||
CFLAG3 = -ff -pr -5
|
|
||||||
PFLAGS = -U;$(DEBUGLIBPATH) -I$(BCB)\include;$(BCB)\include\vcl -H -W -$I- -v -JPHN -M
|
|
||||||
RFLAGS = -i$(BCB)\include;$(BCB)\include\vcl
|
|
||||||
AFLAGS = /i$(BCB)\include /i$(BCB)\include\vcl /mx /w2 /zn
|
|
||||||
LFLAGS =
|
|
||||||
IFLAGS = -g -Gn
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
ALLOBJ = c0w32.obj $(OBJFILES)
|
|
||||||
ALLRES = $(RESFILES)
|
|
||||||
ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!!ifdef IDEOPTIONS
|
|
||||||
|
|
||||||
[Version Info]
|
|
||||||
IncludeVerInfo=0
|
|
||||||
AutoIncBuild=0
|
|
||||||
MajorVer=1
|
|
||||||
MinorVer=0
|
|
||||||
Release=0
|
|
||||||
Build=0
|
|
||||||
Debug=0
|
|
||||||
PreRelease=0
|
|
||||||
Special=0
|
|
||||||
Private=0
|
|
||||||
DLL=0
|
|
||||||
Locale=1040
|
|
||||||
CodePage=1252
|
|
||||||
|
|
||||||
[Version Info Keys]
|
|
||||||
CompanyName=
|
|
||||||
FileDescription=
|
|
||||||
FileVersion=1.0.0.0
|
|
||||||
InternalName=
|
|
||||||
LegalCopyright=
|
|
||||||
LegalTrademarks=
|
|
||||||
OriginalFilename=
|
|
||||||
ProductName=
|
|
||||||
ProductVersion=1.0.0.0
|
|
||||||
Comments=
|
|
||||||
|
|
||||||
[HistoryLists\hlIncludePath]
|
|
||||||
Count=2
|
|
||||||
Item0=$(BCB)\include
|
|
||||||
Item1=$(BCB)\include;$(BCB)\include\vcl
|
|
||||||
|
|
||||||
[HistoryLists\hlLibraryPath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\lib\obj;$(BCB)\lib
|
|
||||||
|
|
||||||
[HistoryLists\hlDebugSourcePath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\source\vcl
|
|
||||||
|
|
||||||
[Debugging]
|
|
||||||
DebugSourceDirs=
|
|
||||||
|
|
||||||
[Parameters]
|
|
||||||
RunParams=
|
|
||||||
HostApplication=
|
|
||||||
|
|
||||||
!endif
|
|
||||||
|
|
||||||
---------------------------------------------------------------------------
|
|
||||||
# MAKE SECTION
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# This section of the project file is not used by the BCB IDE. It is for
|
|
||||||
# the benefit of building from the command-line using the MAKE utility.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
.autodepend
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if !$d(BCC32)
|
|
||||||
BCC32 = bcc32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(DCC32)
|
|
||||||
DCC32 = dcc32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(TASM32)
|
|
||||||
TASM32 = tasm32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(LINKER)
|
|
||||||
LINKER = TLib
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(BRCC32)
|
|
||||||
BRCC32 = brcc32
|
|
||||||
!endif
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if $d(PATHCPP)
|
|
||||||
.PATH.CPP = $(PATHCPP)
|
|
||||||
.PATH.C = $(PATHCPP)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHPAS)
|
|
||||||
.PATH.PAS = $(PATHPAS)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHASM)
|
|
||||||
.PATH.ASM = $(PATHASM)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHRC)
|
|
||||||
.PATH.RC = $(PATHRC)
|
|
||||||
!endif
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!ifdef IDEOPTIONS
|
|
||||||
|
|
||||||
[Version Info]
|
|
||||||
IncludeVerInfo=0
|
|
||||||
AutoIncBuild=0
|
|
||||||
MajorVer=1
|
|
||||||
MinorVer=0
|
|
||||||
Release=0
|
|
||||||
Build=0
|
|
||||||
Debug=0
|
|
||||||
PreRelease=0
|
|
||||||
Special=0
|
|
||||||
Private=0
|
|
||||||
DLL=0
|
|
||||||
Locale=1040
|
|
||||||
CodePage=1252
|
|
||||||
|
|
||||||
[Version Info Keys]
|
|
||||||
CompanyName=
|
|
||||||
FileDescription=
|
|
||||||
FileVersion=1.0.0.0
|
|
||||||
InternalName=
|
|
||||||
LegalCopyright=
|
|
||||||
LegalTrademarks=
|
|
||||||
OriginalFilename=
|
|
||||||
ProductName=
|
|
||||||
ProductVersion=1.0.0.0
|
|
||||||
Comments=
|
|
||||||
|
|
||||||
[HistoryLists\hlIncludePath]
|
|
||||||
Count=2
|
|
||||||
Item0=$(BCB)\include;$(BCB)\include\vcl
|
|
||||||
Item1=$(BCB)\include
|
|
||||||
|
|
||||||
[HistoryLists\hlLibraryPath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\lib\obj;$(BCB)\lib
|
|
||||||
|
|
||||||
[HistoryLists\hlDebugSourcePath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\source\vcl
|
|
||||||
|
|
||||||
[Debugging]
|
|
||||||
DebugSourceDirs=
|
|
||||||
|
|
||||||
[Parameters]
|
|
||||||
RunParams=
|
|
||||||
HostApplication=
|
|
||||||
|
|
||||||
!endif
|
|
||||||
|
|
||||||
$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
|
|
||||||
$(BCB)\BIN\$(LINKER) @&&!
|
|
||||||
$(LFLAGS) $(IFLAGS) +
|
|
||||||
$(ALLOBJ), +
|
|
||||||
$(PROJECT),, +
|
|
||||||
$(ALLLIB), +
|
|
||||||
$(DEFFILE), +
|
|
||||||
$(ALLRES)
|
|
||||||
!
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
.pas.hpp:
|
|
||||||
$(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
|
|
||||||
|
|
||||||
.pas.obj:
|
|
||||||
$(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
|
|
||||||
|
|
||||||
.cpp.obj:
|
|
||||||
$(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
|
|
||||||
|
|
||||||
.c.obj:
|
|
||||||
$(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
|
|
||||||
|
|
||||||
.asm.obj:
|
|
||||||
$(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
|
|
||||||
|
|
||||||
.rc.res:
|
|
||||||
$(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
#include <condefs.h>
|
|
||||||
#pragma hdrstop
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
USEUNIT("adler32.c");
|
|
||||||
USEUNIT("deflate.c");
|
|
||||||
USEUNIT("infblock.c");
|
|
||||||
USEUNIT("infcodes.c");
|
|
||||||
USEUNIT("inffast.c");
|
|
||||||
USEUNIT("inflate.c");
|
|
||||||
USEUNIT("inftrees.c");
|
|
||||||
USEUNIT("infutil.c");
|
|
||||||
USEUNIT("trees.c");
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
#define Library
|
|
||||||
|
|
||||||
// To add a file to the library use the Project menu 'Add to Project'.
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
These are files used to compile zlib under Borland C++ Builder 3.
|
|
||||||
|
|
||||||
zlib.bpg is the main project group that can be loaded in the BCB IDE and
|
|
||||||
loads all other *.bpr projects
|
|
||||||
|
|
||||||
zlib.bpr is a project used to create a static zlib.lib library with C calling
|
|
||||||
convention for functions.
|
|
||||||
|
|
||||||
zlib32.bpr creates a zlib32.dll dynamic link library with Windows standard
|
|
||||||
calling convention.
|
|
||||||
|
|
||||||
d_zlib.bpr creates a set of .obj files with register calling convention.
|
|
||||||
These files are used by zlib.pas to create a Delphi unit containing zlib.
|
|
||||||
The d_zlib.lib file generated isn't useful and can be deleted.
|
|
||||||
|
|
||||||
zlib.cpp, zlib32.cpp and d_zlib.cpp are used by the above projects.
|
|
||||||
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
#------------------------------------------------------------------------------
|
|
||||||
VERSION = BWS.01
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
!ifndef ROOT
|
|
||||||
ROOT = $(MAKEDIR)\..
|
|
||||||
!endif
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
|
|
||||||
DCC = $(ROOT)\bin\dcc32.exe $**
|
|
||||||
BRCC = $(ROOT)\bin\brcc32.exe $**
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
PROJECTS = zlib zlib32 d_zlib
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
default: $(PROJECTS)
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
zlib: zlib.bpr
|
|
||||||
$(MAKE)
|
|
||||||
|
|
||||||
zlib32: zlib32.bpr
|
|
||||||
$(MAKE)
|
|
||||||
|
|
||||||
d_zlib: d_zlib.bpr
|
|
||||||
$(MAKE)
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,225 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if !$d(BCB)
|
|
||||||
BCB = $(MAKEDIR)\..
|
|
||||||
!endif
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# IDE SECTION
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# The following section of the project makefile is managed by the BCB IDE.
|
|
||||||
# It is recommended to use the IDE to change any of the values in this
|
|
||||||
# section.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
VERSION = BCB.03
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
PROJECT = zlib.lib
|
|
||||||
OBJFILES = zlib.obj adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infblock.obj \
|
|
||||||
infcodes.obj inffast.obj inflate.obj inftrees.obj infutil.obj trees.obj \
|
|
||||||
uncompr.obj zutil.obj
|
|
||||||
RESFILES =
|
|
||||||
RESDEPEN = $(RESFILES)
|
|
||||||
LIBFILES =
|
|
||||||
LIBRARIES = VCL35.lib
|
|
||||||
SPARELIBS = VCL35.lib
|
|
||||||
DEFFILE =
|
|
||||||
PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi ibsmp35.bpi bcbsmp35.bpi \
|
|
||||||
dclocx35.bpi QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi DSS35.bpi \
|
|
||||||
NMFAST35.bpi INETDB35.bpi INET35.bpi VCLMID35.bpi
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
PATHCPP = .;
|
|
||||||
PATHASM = .;
|
|
||||||
PATHPAS = .;
|
|
||||||
PATHRC = .;
|
|
||||||
DEBUGLIBPATH = $(BCB)\lib\debug
|
|
||||||
RELEASELIBPATH = $(BCB)\lib\release
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
CFLAG1 = -O2 -Ve -d -k- -vi
|
|
||||||
CFLAG2 = -I$(BCB)\include;$(BCB)\include\vcl -H=$(BCB)\lib\vcl35.csm
|
|
||||||
CFLAG3 = -ff -5
|
|
||||||
PFLAGS = -U;$(DEBUGLIBPATH) -I$(BCB)\include;$(BCB)\include\vcl -H -W -$I- -v -JPHN -M
|
|
||||||
RFLAGS = -i$(BCB)\include;$(BCB)\include\vcl
|
|
||||||
AFLAGS = /i$(BCB)\include /i$(BCB)\include\vcl /mx /w2 /zn
|
|
||||||
LFLAGS =
|
|
||||||
IFLAGS = -g -Gn
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
ALLOBJ = c0w32.obj $(OBJFILES)
|
|
||||||
ALLRES = $(RESFILES)
|
|
||||||
ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!!ifdef IDEOPTIONS
|
|
||||||
|
|
||||||
[Version Info]
|
|
||||||
IncludeVerInfo=0
|
|
||||||
AutoIncBuild=0
|
|
||||||
MajorVer=1
|
|
||||||
MinorVer=0
|
|
||||||
Release=0
|
|
||||||
Build=0
|
|
||||||
Debug=0
|
|
||||||
PreRelease=0
|
|
||||||
Special=0
|
|
||||||
Private=0
|
|
||||||
DLL=0
|
|
||||||
Locale=1040
|
|
||||||
CodePage=1252
|
|
||||||
|
|
||||||
[Version Info Keys]
|
|
||||||
CompanyName=
|
|
||||||
FileDescription=
|
|
||||||
FileVersion=1.0.0.0
|
|
||||||
InternalName=
|
|
||||||
LegalCopyright=
|
|
||||||
LegalTrademarks=
|
|
||||||
OriginalFilename=
|
|
||||||
ProductName=
|
|
||||||
ProductVersion=1.0.0.0
|
|
||||||
Comments=
|
|
||||||
|
|
||||||
[HistoryLists\hlIncludePath]
|
|
||||||
Count=2
|
|
||||||
Item0=$(BCB)\include
|
|
||||||
Item1=$(BCB)\include;$(BCB)\include\vcl
|
|
||||||
|
|
||||||
[HistoryLists\hlLibraryPath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\lib\obj;$(BCB)\lib
|
|
||||||
|
|
||||||
[HistoryLists\hlDebugSourcePath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\source\vcl
|
|
||||||
|
|
||||||
[Debugging]
|
|
||||||
DebugSourceDirs=
|
|
||||||
|
|
||||||
[Parameters]
|
|
||||||
RunParams=
|
|
||||||
HostApplication=
|
|
||||||
|
|
||||||
!endif
|
|
||||||
|
|
||||||
---------------------------------------------------------------------------
|
|
||||||
# MAKE SECTION
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# This section of the project file is not used by the BCB IDE. It is for
|
|
||||||
# the benefit of building from the command-line using the MAKE utility.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
.autodepend
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if !$d(BCC32)
|
|
||||||
BCC32 = bcc32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(DCC32)
|
|
||||||
DCC32 = dcc32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(TASM32)
|
|
||||||
TASM32 = tasm32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(LINKER)
|
|
||||||
LINKER = TLib
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(BRCC32)
|
|
||||||
BRCC32 = brcc32
|
|
||||||
!endif
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if $d(PATHCPP)
|
|
||||||
.PATH.CPP = $(PATHCPP)
|
|
||||||
.PATH.C = $(PATHCPP)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHPAS)
|
|
||||||
.PATH.PAS = $(PATHPAS)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHASM)
|
|
||||||
.PATH.ASM = $(PATHASM)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHRC)
|
|
||||||
.PATH.RC = $(PATHRC)
|
|
||||||
!endif
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!ifdef IDEOPTIONS
|
|
||||||
|
|
||||||
[Version Info]
|
|
||||||
IncludeVerInfo=0
|
|
||||||
AutoIncBuild=0
|
|
||||||
MajorVer=1
|
|
||||||
MinorVer=0
|
|
||||||
Release=0
|
|
||||||
Build=0
|
|
||||||
Debug=0
|
|
||||||
PreRelease=0
|
|
||||||
Special=0
|
|
||||||
Private=0
|
|
||||||
DLL=0
|
|
||||||
Locale=1040
|
|
||||||
CodePage=1252
|
|
||||||
|
|
||||||
[Version Info Keys]
|
|
||||||
CompanyName=
|
|
||||||
FileDescription=
|
|
||||||
FileVersion=1.0.0.0
|
|
||||||
InternalName=
|
|
||||||
LegalCopyright=
|
|
||||||
LegalTrademarks=
|
|
||||||
OriginalFilename=
|
|
||||||
ProductName=
|
|
||||||
ProductVersion=1.0.0.0
|
|
||||||
Comments=
|
|
||||||
|
|
||||||
[HistoryLists\hlIncludePath]
|
|
||||||
Count=2
|
|
||||||
Item0=$(BCB)\include;$(BCB)\include\vcl
|
|
||||||
Item1=$(BCB)\include
|
|
||||||
|
|
||||||
[HistoryLists\hlLibraryPath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\lib\obj;$(BCB)\lib
|
|
||||||
|
|
||||||
[HistoryLists\hlDebugSourcePath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\source\vcl
|
|
||||||
|
|
||||||
[Debugging]
|
|
||||||
DebugSourceDirs=
|
|
||||||
|
|
||||||
[Parameters]
|
|
||||||
RunParams=
|
|
||||||
HostApplication=
|
|
||||||
|
|
||||||
!endif
|
|
||||||
|
|
||||||
$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
|
|
||||||
$(BCB)\BIN\$(LINKER) @&&!
|
|
||||||
$(LFLAGS) $(IFLAGS) +
|
|
||||||
$(ALLOBJ), +
|
|
||||||
$(PROJECT),, +
|
|
||||||
$(ALLLIB), +
|
|
||||||
$(DEFFILE), +
|
|
||||||
$(ALLRES)
|
|
||||||
!
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
.pas.hpp:
|
|
||||||
$(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
|
|
||||||
|
|
||||||
.pas.obj:
|
|
||||||
$(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
|
|
||||||
|
|
||||||
.cpp.obj:
|
|
||||||
$(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
|
|
||||||
|
|
||||||
.c.obj:
|
|
||||||
$(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
|
|
||||||
|
|
||||||
.asm.obj:
|
|
||||||
$(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
|
|
||||||
|
|
||||||
.rc.res:
|
|
||||||
$(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
#include <condefs.h>
|
|
||||||
#pragma hdrstop
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
USEUNIT("adler32.c");
|
|
||||||
USEUNIT("compress.c");
|
|
||||||
USEUNIT("crc32.c");
|
|
||||||
USEUNIT("deflate.c");
|
|
||||||
USEUNIT("gzio.c");
|
|
||||||
USEUNIT("infblock.c");
|
|
||||||
USEUNIT("infcodes.c");
|
|
||||||
USEUNIT("inffast.c");
|
|
||||||
USEUNIT("inflate.c");
|
|
||||||
USEUNIT("inftrees.c");
|
|
||||||
USEUNIT("infutil.c");
|
|
||||||
USEUNIT("trees.c");
|
|
||||||
USEUNIT("uncompr.c");
|
|
||||||
USEUNIT("zutil.c");
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
#define Library
|
|
||||||
|
|
||||||
// To add a file to the library use the Project menu 'Add to Project'.
|
|
||||||
|
|
||||||
@ -1,534 +0,0 @@
|
|||||||
{*******************************************************}
|
|
||||||
{ }
|
|
||||||
{ Delphi Supplemental Components }
|
|
||||||
{ ZLIB Data Compression Interface Unit }
|
|
||||||
{ }
|
|
||||||
{ Copyright (c) 1997 Borland International }
|
|
||||||
{ }
|
|
||||||
{*******************************************************}
|
|
||||||
|
|
||||||
{ Modified for zlib 1.1.3 by Davide Moretti <dave@rimini.com }
|
|
||||||
|
|
||||||
unit zlib;
|
|
||||||
|
|
||||||
interface
|
|
||||||
|
|
||||||
uses Sysutils, Classes;
|
|
||||||
|
|
||||||
type
|
|
||||||
TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer;
|
|
||||||
TFree = procedure (AppData, Block: Pointer);
|
|
||||||
|
|
||||||
// Internal structure. Ignore.
|
|
||||||
TZStreamRec = packed record
|
|
||||||
next_in: PChar; // next input byte
|
|
||||||
avail_in: Integer; // number of bytes available at next_in
|
|
||||||
total_in: Integer; // total nb of input bytes read so far
|
|
||||||
|
|
||||||
next_out: PChar; // next output byte should be put here
|
|
||||||
avail_out: Integer; // remaining free space at next_out
|
|
||||||
total_out: Integer; // total nb of bytes output so far
|
|
||||||
|
|
||||||
msg: PChar; // last error message, NULL if no error
|
|
||||||
internal: Pointer; // not visible by applications
|
|
||||||
|
|
||||||
zalloc: TAlloc; // used to allocate the internal state
|
|
||||||
zfree: TFree; // used to free the internal state
|
|
||||||
AppData: Pointer; // private data object passed to zalloc and zfree
|
|
||||||
|
|
||||||
data_type: Integer; // best guess about the data type: ascii or binary
|
|
||||||
adler: Integer; // adler32 value of the uncompressed data
|
|
||||||
reserved: Integer; // reserved for future use
|
|
||||||
end;
|
|
||||||
|
|
||||||
// Abstract ancestor class
|
|
||||||
TCustomZlibStream = class(TStream)
|
|
||||||
private
|
|
||||||
FStrm: TStream;
|
|
||||||
FStrmPos: Integer;
|
|
||||||
FOnProgress: TNotifyEvent;
|
|
||||||
FZRec: TZStreamRec;
|
|
||||||
FBuffer: array [Word] of Char;
|
|
||||||
protected
|
|
||||||
procedure Progress(Sender: TObject); dynamic;
|
|
||||||
property OnProgress: TNotifyEvent read FOnProgress write FOnProgress;
|
|
||||||
constructor Create(Strm: TStream);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TCompressionStream compresses data on the fly as data is written to it, and
|
|
||||||
stores the compressed data to another stream.
|
|
||||||
|
|
||||||
TCompressionStream is write-only and strictly sequential. Reading from the
|
|
||||||
stream will raise an exception. Using Seek to move the stream pointer
|
|
||||||
will raise an exception.
|
|
||||||
|
|
||||||
Output data is cached internally, written to the output stream only when
|
|
||||||
the internal output buffer is full. All pending output data is flushed
|
|
||||||
when the stream is destroyed.
|
|
||||||
|
|
||||||
The Position property returns the number of uncompressed bytes of
|
|
||||||
data that have been written to the stream so far.
|
|
||||||
|
|
||||||
CompressionRate returns the on-the-fly percentage by which the original
|
|
||||||
data has been compressed: (1 - (CompressedBytes / UncompressedBytes)) * 100
|
|
||||||
If raw data size = 100 and compressed data size = 25, the CompressionRate
|
|
||||||
is 75%
|
|
||||||
|
|
||||||
The OnProgress event is called each time the output buffer is filled and
|
|
||||||
written to the output stream. This is useful for updating a progress
|
|
||||||
indicator when you are writing a large chunk of data to the compression
|
|
||||||
stream in a single call.}
|
|
||||||
|
|
||||||
|
|
||||||
TCompressionLevel = (clNone, clFastest, clDefault, clMax);
|
|
||||||
|
|
||||||
TCompressionStream = class(TCustomZlibStream)
|
|
||||||
private
|
|
||||||
function GetCompressionRate: Single;
|
|
||||||
public
|
|
||||||
constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream);
|
|
||||||
destructor Destroy; override;
|
|
||||||
function Read(var Buffer; Count: Longint): Longint; override;
|
|
||||||
function Write(const Buffer; Count: Longint): Longint; override;
|
|
||||||
function Seek(Offset: Longint; Origin: Word): Longint; override;
|
|
||||||
property CompressionRate: Single read GetCompressionRate;
|
|
||||||
property OnProgress;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ TDecompressionStream decompresses data on the fly as data is read from it.
|
|
||||||
|
|
||||||
Compressed data comes from a separate source stream. TDecompressionStream
|
|
||||||
is read-only and unidirectional; you can seek forward in the stream, but not
|
|
||||||
backwards. The special case of setting the stream position to zero is
|
|
||||||
allowed. Seeking forward decompresses data until the requested position in
|
|
||||||
the uncompressed data has been reached. Seeking backwards, seeking relative
|
|
||||||
to the end of the stream, requesting the size of the stream, and writing to
|
|
||||||
the stream will raise an exception.
|
|
||||||
|
|
||||||
The Position property returns the number of bytes of uncompressed data that
|
|
||||||
have been read from the stream so far.
|
|
||||||
|
|
||||||
The OnProgress event is called each time the internal input buffer of
|
|
||||||
compressed data is exhausted and the next block is read from the input stream.
|
|
||||||
This is useful for updating a progress indicator when you are reading a
|
|
||||||
large chunk of data from the decompression stream in a single call.}
|
|
||||||
|
|
||||||
TDecompressionStream = class(TCustomZlibStream)
|
|
||||||
public
|
|
||||||
constructor Create(Source: TStream);
|
|
||||||
destructor Destroy; override;
|
|
||||||
function Read(var Buffer; Count: Longint): Longint; override;
|
|
||||||
function Write(const Buffer; Count: Longint): Longint; override;
|
|
||||||
function Seek(Offset: Longint; Origin: Word): Longint; override;
|
|
||||||
property OnProgress;
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ CompressBuf compresses data, buffer to buffer, in one call.
|
|
||||||
In: InBuf = ptr to compressed data
|
|
||||||
InBytes = number of bytes in InBuf
|
|
||||||
Out: OutBuf = ptr to newly allocated buffer containing decompressed data
|
|
||||||
OutBytes = number of bytes in OutBuf }
|
|
||||||
procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
|
|
||||||
out OutBuf: Pointer; out OutBytes: Integer);
|
|
||||||
|
|
||||||
|
|
||||||
{ DecompressBuf decompresses data, buffer to buffer, in one call.
|
|
||||||
In: InBuf = ptr to compressed data
|
|
||||||
InBytes = number of bytes in InBuf
|
|
||||||
OutEstimate = zero, or est. size of the decompressed data
|
|
||||||
Out: OutBuf = ptr to newly allocated buffer containing decompressed data
|
|
||||||
OutBytes = number of bytes in OutBuf }
|
|
||||||
procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
|
|
||||||
OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
|
|
||||||
|
|
||||||
const
|
|
||||||
zlib_version = '1.1.3';
|
|
||||||
|
|
||||||
type
|
|
||||||
EZlibError = class(Exception);
|
|
||||||
ECompressionError = class(EZlibError);
|
|
||||||
EDecompressionError = class(EZlibError);
|
|
||||||
|
|
||||||
function adler32(adler: Integer; buf: PChar; len: Integer): Integer;
|
|
||||||
|
|
||||||
implementation
|
|
||||||
|
|
||||||
const
|
|
||||||
Z_NO_FLUSH = 0;
|
|
||||||
Z_PARTIAL_FLUSH = 1;
|
|
||||||
Z_SYNC_FLUSH = 2;
|
|
||||||
Z_FULL_FLUSH = 3;
|
|
||||||
Z_FINISH = 4;
|
|
||||||
|
|
||||||
Z_OK = 0;
|
|
||||||
Z_STREAM_END = 1;
|
|
||||||
Z_NEED_DICT = 2;
|
|
||||||
Z_ERRNO = (-1);
|
|
||||||
Z_STREAM_ERROR = (-2);
|
|
||||||
Z_DATA_ERROR = (-3);
|
|
||||||
Z_MEM_ERROR = (-4);
|
|
||||||
Z_BUF_ERROR = (-5);
|
|
||||||
Z_VERSION_ERROR = (-6);
|
|
||||||
|
|
||||||
Z_NO_COMPRESSION = 0;
|
|
||||||
Z_BEST_SPEED = 1;
|
|
||||||
Z_BEST_COMPRESSION = 9;
|
|
||||||
Z_DEFAULT_COMPRESSION = (-1);
|
|
||||||
|
|
||||||
Z_FILTERED = 1;
|
|
||||||
Z_HUFFMAN_ONLY = 2;
|
|
||||||
Z_DEFAULT_STRATEGY = 0;
|
|
||||||
|
|
||||||
Z_BINARY = 0;
|
|
||||||
Z_ASCII = 1;
|
|
||||||
Z_UNKNOWN = 2;
|
|
||||||
|
|
||||||
Z_DEFLATED = 8;
|
|
||||||
|
|
||||||
_z_errmsg: array[0..9] of PChar = (
|
|
||||||
'need dictionary', // Z_NEED_DICT (2)
|
|
||||||
'stream end', // Z_STREAM_END (1)
|
|
||||||
'', // Z_OK (0)
|
|
||||||
'file error', // Z_ERRNO (-1)
|
|
||||||
'stream error', // Z_STREAM_ERROR (-2)
|
|
||||||
'data error', // Z_DATA_ERROR (-3)
|
|
||||||
'insufficient memory', // Z_MEM_ERROR (-4)
|
|
||||||
'buffer error', // Z_BUF_ERROR (-5)
|
|
||||||
'incompatible version', // Z_VERSION_ERROR (-6)
|
|
||||||
''
|
|
||||||
);
|
|
||||||
|
|
||||||
{$L deflate.obj}
|
|
||||||
{$L inflate.obj}
|
|
||||||
{$L inftrees.obj}
|
|
||||||
{$L trees.obj}
|
|
||||||
{$L adler32.obj}
|
|
||||||
{$L infblock.obj}
|
|
||||||
{$L infcodes.obj}
|
|
||||||
{$L infutil.obj}
|
|
||||||
{$L inffast.obj}
|
|
||||||
|
|
||||||
procedure _tr_init; external;
|
|
||||||
procedure _tr_tally; external;
|
|
||||||
procedure _tr_flush_block; external;
|
|
||||||
procedure _tr_align; external;
|
|
||||||
procedure _tr_stored_block; external;
|
|
||||||
function adler32; external;
|
|
||||||
procedure inflate_blocks_new; external;
|
|
||||||
procedure inflate_blocks; external;
|
|
||||||
procedure inflate_blocks_reset; external;
|
|
||||||
procedure inflate_blocks_free; external;
|
|
||||||
procedure inflate_set_dictionary; external;
|
|
||||||
procedure inflate_trees_bits; external;
|
|
||||||
procedure inflate_trees_dynamic; external;
|
|
||||||
procedure inflate_trees_fixed; external;
|
|
||||||
procedure inflate_codes_new; external;
|
|
||||||
procedure inflate_codes; external;
|
|
||||||
procedure inflate_codes_free; external;
|
|
||||||
procedure _inflate_mask; external;
|
|
||||||
procedure inflate_flush; external;
|
|
||||||
procedure inflate_fast; external;
|
|
||||||
|
|
||||||
procedure _memset(P: Pointer; B: Byte; count: Integer);cdecl;
|
|
||||||
begin
|
|
||||||
FillChar(P^, count, B);
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure _memcpy(dest, source: Pointer; count: Integer);cdecl;
|
|
||||||
begin
|
|
||||||
Move(source^, dest^, count);
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// deflate compresses data
|
|
||||||
function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar;
|
|
||||||
recsize: Integer): Integer; external;
|
|
||||||
function deflate(var strm: TZStreamRec; flush: Integer): Integer; external;
|
|
||||||
function deflateEnd(var strm: TZStreamRec): Integer; external;
|
|
||||||
|
|
||||||
// inflate decompresses data
|
|
||||||
function inflateInit_(var strm: TZStreamRec; version: PChar;
|
|
||||||
recsize: Integer): Integer; external;
|
|
||||||
function inflate(var strm: TZStreamRec; flush: Integer): Integer; external;
|
|
||||||
function inflateEnd(var strm: TZStreamRec): Integer; external;
|
|
||||||
function inflateReset(var strm: TZStreamRec): Integer; external;
|
|
||||||
|
|
||||||
|
|
||||||
function zcalloc(AppData: Pointer; Items, Size: Integer): Pointer;
|
|
||||||
begin
|
|
||||||
GetMem(Result, Items*Size);
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure zcfree(AppData, Block: Pointer);
|
|
||||||
begin
|
|
||||||
FreeMem(Block);
|
|
||||||
end;
|
|
||||||
|
|
||||||
function zlibCheck(code: Integer): Integer;
|
|
||||||
begin
|
|
||||||
Result := code;
|
|
||||||
if code < 0 then
|
|
||||||
raise EZlibError.Create('error'); //!!
|
|
||||||
end;
|
|
||||||
|
|
||||||
function CCheck(code: Integer): Integer;
|
|
||||||
begin
|
|
||||||
Result := code;
|
|
||||||
if code < 0 then
|
|
||||||
raise ECompressionError.Create('error'); //!!
|
|
||||||
end;
|
|
||||||
|
|
||||||
function DCheck(code: Integer): Integer;
|
|
||||||
begin
|
|
||||||
Result := code;
|
|
||||||
if code < 0 then
|
|
||||||
raise EDecompressionError.Create('error'); //!!
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
|
|
||||||
out OutBuf: Pointer; out OutBytes: Integer);
|
|
||||||
var
|
|
||||||
strm: TZStreamRec;
|
|
||||||
P: Pointer;
|
|
||||||
begin
|
|
||||||
FillChar(strm, sizeof(strm), 0);
|
|
||||||
OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255;
|
|
||||||
GetMem(OutBuf, OutBytes);
|
|
||||||
try
|
|
||||||
strm.next_in := InBuf;
|
|
||||||
strm.avail_in := InBytes;
|
|
||||||
strm.next_out := OutBuf;
|
|
||||||
strm.avail_out := OutBytes;
|
|
||||||
CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm)));
|
|
||||||
try
|
|
||||||
while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do
|
|
||||||
begin
|
|
||||||
P := OutBuf;
|
|
||||||
Inc(OutBytes, 256);
|
|
||||||
ReallocMem(OutBuf, OutBytes);
|
|
||||||
strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
|
|
||||||
strm.avail_out := 256;
|
|
||||||
end;
|
|
||||||
finally
|
|
||||||
CCheck(deflateEnd(strm));
|
|
||||||
end;
|
|
||||||
ReallocMem(OutBuf, strm.total_out);
|
|
||||||
OutBytes := strm.total_out;
|
|
||||||
except
|
|
||||||
FreeMem(OutBuf);
|
|
||||||
raise
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
|
|
||||||
OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
|
|
||||||
var
|
|
||||||
strm: TZStreamRec;
|
|
||||||
P: Pointer;
|
|
||||||
BufInc: Integer;
|
|
||||||
begin
|
|
||||||
FillChar(strm, sizeof(strm), 0);
|
|
||||||
BufInc := (InBytes + 255) and not 255;
|
|
||||||
if OutEstimate = 0 then
|
|
||||||
OutBytes := BufInc
|
|
||||||
else
|
|
||||||
OutBytes := OutEstimate;
|
|
||||||
GetMem(OutBuf, OutBytes);
|
|
||||||
try
|
|
||||||
strm.next_in := InBuf;
|
|
||||||
strm.avail_in := InBytes;
|
|
||||||
strm.next_out := OutBuf;
|
|
||||||
strm.avail_out := OutBytes;
|
|
||||||
DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
|
|
||||||
try
|
|
||||||
while DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END do
|
|
||||||
begin
|
|
||||||
P := OutBuf;
|
|
||||||
Inc(OutBytes, BufInc);
|
|
||||||
ReallocMem(OutBuf, OutBytes);
|
|
||||||
strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
|
|
||||||
strm.avail_out := BufInc;
|
|
||||||
end;
|
|
||||||
finally
|
|
||||||
DCheck(inflateEnd(strm));
|
|
||||||
end;
|
|
||||||
ReallocMem(OutBuf, strm.total_out);
|
|
||||||
OutBytes := strm.total_out;
|
|
||||||
except
|
|
||||||
FreeMem(OutBuf);
|
|
||||||
raise
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
// TCustomZlibStream
|
|
||||||
|
|
||||||
constructor TCustomZLibStream.Create(Strm: TStream);
|
|
||||||
begin
|
|
||||||
inherited Create;
|
|
||||||
FStrm := Strm;
|
|
||||||
FStrmPos := Strm.Position;
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TCustomZLibStream.Progress(Sender: TObject);
|
|
||||||
begin
|
|
||||||
if Assigned(FOnProgress) then FOnProgress(Sender);
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
// TCompressionStream
|
|
||||||
|
|
||||||
constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel;
|
|
||||||
Dest: TStream);
|
|
||||||
const
|
|
||||||
Levels: array [TCompressionLevel] of ShortInt =
|
|
||||||
(Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION);
|
|
||||||
begin
|
|
||||||
inherited Create(Dest);
|
|
||||||
FZRec.next_out := FBuffer;
|
|
||||||
FZRec.avail_out := sizeof(FBuffer);
|
|
||||||
CCheck(deflateInit_(FZRec, Levels[CompressionLevel], zlib_version, sizeof(FZRec)));
|
|
||||||
end;
|
|
||||||
|
|
||||||
destructor TCompressionStream.Destroy;
|
|
||||||
begin
|
|
||||||
FZRec.next_in := nil;
|
|
||||||
FZRec.avail_in := 0;
|
|
||||||
try
|
|
||||||
if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
|
|
||||||
while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END)
|
|
||||||
and (FZRec.avail_out = 0) do
|
|
||||||
begin
|
|
||||||
FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
|
|
||||||
FZRec.next_out := FBuffer;
|
|
||||||
FZRec.avail_out := sizeof(FBuffer);
|
|
||||||
end;
|
|
||||||
if FZRec.avail_out < sizeof(FBuffer) then
|
|
||||||
FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out);
|
|
||||||
finally
|
|
||||||
deflateEnd(FZRec);
|
|
||||||
end;
|
|
||||||
inherited Destroy;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TCompressionStream.Read(var Buffer; Count: Longint): Longint;
|
|
||||||
begin
|
|
||||||
raise ECompressionError.Create('Invalid stream operation');
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TCompressionStream.Write(const Buffer; Count: Longint): Longint;
|
|
||||||
begin
|
|
||||||
FZRec.next_in := @Buffer;
|
|
||||||
FZRec.avail_in := Count;
|
|
||||||
if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
|
|
||||||
while (FZRec.avail_in > 0) do
|
|
||||||
begin
|
|
||||||
CCheck(deflate(FZRec, 0));
|
|
||||||
if FZRec.avail_out = 0 then
|
|
||||||
begin
|
|
||||||
FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
|
|
||||||
FZRec.next_out := FBuffer;
|
|
||||||
FZRec.avail_out := sizeof(FBuffer);
|
|
||||||
FStrmPos := FStrm.Position;
|
|
||||||
Progress(Self);
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
Result := Count;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
|
|
||||||
begin
|
|
||||||
if (Offset = 0) and (Origin = soFromCurrent) then
|
|
||||||
Result := FZRec.total_in
|
|
||||||
else
|
|
||||||
raise ECompressionError.Create('Invalid stream operation');
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TCompressionStream.GetCompressionRate: Single;
|
|
||||||
begin
|
|
||||||
if FZRec.total_in = 0 then
|
|
||||||
Result := 0
|
|
||||||
else
|
|
||||||
Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0;
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
// TDecompressionStream
|
|
||||||
|
|
||||||
constructor TDecompressionStream.Create(Source: TStream);
|
|
||||||
begin
|
|
||||||
inherited Create(Source);
|
|
||||||
FZRec.next_in := FBuffer;
|
|
||||||
FZRec.avail_in := 0;
|
|
||||||
DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec)));
|
|
||||||
end;
|
|
||||||
|
|
||||||
destructor TDecompressionStream.Destroy;
|
|
||||||
begin
|
|
||||||
inflateEnd(FZRec);
|
|
||||||
inherited Destroy;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TDecompressionStream.Read(var Buffer; Count: Longint): Longint;
|
|
||||||
begin
|
|
||||||
FZRec.next_out := @Buffer;
|
|
||||||
FZRec.avail_out := Count;
|
|
||||||
if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
|
|
||||||
while (FZRec.avail_out > 0) do
|
|
||||||
begin
|
|
||||||
if FZRec.avail_in = 0 then
|
|
||||||
begin
|
|
||||||
FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer));
|
|
||||||
if FZRec.avail_in = 0 then
|
|
||||||
begin
|
|
||||||
Result := Count - FZRec.avail_out;
|
|
||||||
Exit;
|
|
||||||
end;
|
|
||||||
FZRec.next_in := FBuffer;
|
|
||||||
FStrmPos := FStrm.Position;
|
|
||||||
Progress(Self);
|
|
||||||
end;
|
|
||||||
DCheck(inflate(FZRec, 0));
|
|
||||||
end;
|
|
||||||
Result := Count;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TDecompressionStream.Write(const Buffer; Count: Longint): Longint;
|
|
||||||
begin
|
|
||||||
raise EDecompressionError.Create('Invalid stream operation');
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
|
|
||||||
var
|
|
||||||
I: Integer;
|
|
||||||
Buf: array [0..4095] of Char;
|
|
||||||
begin
|
|
||||||
if (Offset = 0) and (Origin = soFromBeginning) then
|
|
||||||
begin
|
|
||||||
DCheck(inflateReset(FZRec));
|
|
||||||
FZRec.next_in := FBuffer;
|
|
||||||
FZRec.avail_in := 0;
|
|
||||||
FStrm.Position := 0;
|
|
||||||
FStrmPos := 0;
|
|
||||||
end
|
|
||||||
else if ( (Offset >= 0) and (Origin = soFromCurrent)) or
|
|
||||||
( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then
|
|
||||||
begin
|
|
||||||
if Origin = soFromBeginning then Dec(Offset, FZRec.total_out);
|
|
||||||
if Offset > 0 then
|
|
||||||
begin
|
|
||||||
for I := 1 to Offset div sizeof(Buf) do
|
|
||||||
ReadBuffer(Buf, sizeof(Buf));
|
|
||||||
ReadBuffer(Buf, Offset mod sizeof(Buf));
|
|
||||||
end;
|
|
||||||
end
|
|
||||||
else
|
|
||||||
raise EDecompressionError.Create('Invalid stream operation');
|
|
||||||
Result := FZRec.total_out;
|
|
||||||
end;
|
|
||||||
|
|
||||||
end.
|
|
||||||
@ -1,174 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if !$d(BCB)
|
|
||||||
BCB = $(MAKEDIR)\..
|
|
||||||
!endif
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# IDE SECTION
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# The following section of the project makefile is managed by the BCB IDE.
|
|
||||||
# It is recommended to use the IDE to change any of the values in this
|
|
||||||
# section.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
VERSION = BCB.03
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
PROJECT = zlib32.dll
|
|
||||||
OBJFILES = zlib32.obj adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infblock.obj \
|
|
||||||
infcodes.obj inffast.obj inflate.obj inftrees.obj infutil.obj trees.obj \
|
|
||||||
uncompr.obj zutil.obj
|
|
||||||
RESFILES =
|
|
||||||
RESDEPEN = $(RESFILES)
|
|
||||||
LIBFILES =
|
|
||||||
LIBRARIES =
|
|
||||||
SPARELIBS =
|
|
||||||
DEFFILE =
|
|
||||||
PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi ibsmp35.bpi bcbsmp35.bpi \
|
|
||||||
dclocx35.bpi QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi DSS35.bpi \
|
|
||||||
NMFAST35.bpi INETDB35.bpi INET35.bpi VCLMID35.bpi
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
PATHCPP = .;
|
|
||||||
PATHASM = .;
|
|
||||||
PATHPAS = .;
|
|
||||||
PATHRC = .;
|
|
||||||
DEBUGLIBPATH = $(BCB)\lib\debug
|
|
||||||
RELEASELIBPATH = $(BCB)\lib\release
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
CFLAG1 = -WD -O2 -Ve -d -k- -vi -c -tWD
|
|
||||||
CFLAG2 = -D_NO_VCL;ZLIB_DLL -I$(BCB)\include
|
|
||||||
CFLAG3 = -ff -5
|
|
||||||
PFLAGS = -D_NO_VCL;ZLIB_DLL -U$(BCB)\lib;$(RELEASELIBPATH) -I$(BCB)\include -$I- -v \
|
|
||||||
-JPHN -M
|
|
||||||
RFLAGS = -D_NO_VCL;ZLIB_DLL -i$(BCB)\include
|
|
||||||
AFLAGS = /i$(BCB)\include /d_NO_VCL /dZLIB_DLL /mx /w2 /zn
|
|
||||||
LFLAGS = -L$(BCB)\lib;$(RELEASELIBPATH) -aa -Tpd -x -Gi
|
|
||||||
IFLAGS = -Gn -g
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
ALLOBJ = c0d32.obj $(OBJFILES)
|
|
||||||
ALLRES = $(RESFILES)
|
|
||||||
ALLLIB = $(LIBFILES) import32.lib cw32mt.lib
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!ifdef IDEOPTIONS
|
|
||||||
|
|
||||||
[Version Info]
|
|
||||||
IncludeVerInfo=0
|
|
||||||
AutoIncBuild=0
|
|
||||||
MajorVer=1
|
|
||||||
MinorVer=0
|
|
||||||
Release=0
|
|
||||||
Build=0
|
|
||||||
Debug=0
|
|
||||||
PreRelease=0
|
|
||||||
Special=0
|
|
||||||
Private=0
|
|
||||||
DLL=1
|
|
||||||
Locale=1040
|
|
||||||
CodePage=1252
|
|
||||||
|
|
||||||
[Version Info Keys]
|
|
||||||
CompanyName=
|
|
||||||
FileDescription=DLL (GUI)
|
|
||||||
FileVersion=1.0.0.0
|
|
||||||
InternalName=
|
|
||||||
LegalCopyright=
|
|
||||||
LegalTrademarks=
|
|
||||||
OriginalFilename=
|
|
||||||
ProductName=
|
|
||||||
ProductVersion=1.0.0.0
|
|
||||||
Comments=
|
|
||||||
|
|
||||||
[HistoryLists\hlIncludePath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\include
|
|
||||||
|
|
||||||
[HistoryLists\hlLibraryPath]
|
|
||||||
Count=1
|
|
||||||
Item0=$(BCB)\lib
|
|
||||||
|
|
||||||
[HistoryLists\hlConditionals]
|
|
||||||
Count=1
|
|
||||||
Item0=_NO_VCL;ZLIB_DLL
|
|
||||||
|
|
||||||
[Debugging]
|
|
||||||
DebugSourceDirs=
|
|
||||||
|
|
||||||
[Parameters]
|
|
||||||
RunParams=
|
|
||||||
HostApplication=
|
|
||||||
|
|
||||||
!endif
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# MAKE SECTION
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# This section of the project file is not used by the BCB IDE. It is for
|
|
||||||
# the benefit of building from the command-line using the MAKE utility.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
.autodepend
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if !$d(BCC32)
|
|
||||||
BCC32 = bcc32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(DCC32)
|
|
||||||
DCC32 = dcc32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(TASM32)
|
|
||||||
TASM32 = tasm32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(LINKER)
|
|
||||||
LINKER = ilink32
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if !$d(BRCC32)
|
|
||||||
BRCC32 = brcc32
|
|
||||||
!endif
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
!if $d(PATHCPP)
|
|
||||||
.PATH.CPP = $(PATHCPP)
|
|
||||||
.PATH.C = $(PATHCPP)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHPAS)
|
|
||||||
.PATH.PAS = $(PATHPAS)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHASM)
|
|
||||||
.PATH.ASM = $(PATHASM)
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!if $d(PATHRC)
|
|
||||||
.PATH.RC = $(PATHRC)
|
|
||||||
!endif
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
|
|
||||||
$(BCB)\BIN\$(LINKER) @&&!
|
|
||||||
$(LFLAGS) $(IFLAGS) +
|
|
||||||
$(ALLOBJ), +
|
|
||||||
$(PROJECT),, +
|
|
||||||
$(ALLLIB), +
|
|
||||||
$(DEFFILE), +
|
|
||||||
$(ALLRES)
|
|
||||||
!
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
.pas.hpp:
|
|
||||||
$(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
|
|
||||||
|
|
||||||
.pas.obj:
|
|
||||||
$(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
|
|
||||||
|
|
||||||
.cpp.obj:
|
|
||||||
$(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
|
|
||||||
|
|
||||||
.c.obj:
|
|
||||||
$(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
|
|
||||||
|
|
||||||
.asm.obj:
|
|
||||||
$(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
|
|
||||||
|
|
||||||
.rc.res:
|
|
||||||
$(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
|
|
||||||
#include <windows.h>
|
|
||||||
#pragma hdrstop
|
|
||||||
#include <condefs.h>
|
|
||||||
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
// Important note about DLL memory management in a VCL DLL:
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// If your DLL uses VCL and exports any functions that pass VCL String objects
|
|
||||||
// (or structs/classes containing nested Strings) as parameter or function
|
|
||||||
// results, you will need to build both your DLL project and any EXE projects
|
|
||||||
// that use your DLL with the dynamic RTL (the RTL DLL). This will change your
|
|
||||||
// DLL and its calling EXE's to use BORLNDMM.DLL as their memory manager. In
|
|
||||||
// these cases, the file BORLNDMM.DLL should be deployed along with your DLL
|
|
||||||
// and the RTL DLL (CP3240MT.DLL). To avoid the requiring BORLNDMM.DLL in
|
|
||||||
// these situations, pass string information using "char *" or ShortString
|
|
||||||
// parameters and then link with the static RTL.
|
|
||||||
//
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
USEUNIT("adler32.c");
|
|
||||||
USEUNIT("compress.c");
|
|
||||||
USEUNIT("crc32.c");
|
|
||||||
USEUNIT("deflate.c");
|
|
||||||
USEUNIT("gzio.c");
|
|
||||||
USEUNIT("infblock.c");
|
|
||||||
USEUNIT("infcodes.c");
|
|
||||||
USEUNIT("inffast.c");
|
|
||||||
USEUNIT("inflate.c");
|
|
||||||
USEUNIT("inftrees.c");
|
|
||||||
USEUNIT("infutil.c");
|
|
||||||
USEUNIT("trees.c");
|
|
||||||
USEUNIT("uncompr.c");
|
|
||||||
USEUNIT("zutil.c");
|
|
||||||
//---------------------------------------------------------------------------
|
|
||||||
#pragma argsused
|
|
||||||
int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
|
|
||||||
#include "zfstream.h"
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
|
|
||||||
// Construct a stream object with this filebuffer. Anything sent
|
|
||||||
// to this stream will go to standard out.
|
|
||||||
gzofstream os( 1, ios::out );
|
|
||||||
|
|
||||||
// This text is getting compressed and sent to stdout.
|
|
||||||
// To prove this, run 'test | zcat'.
|
|
||||||
os << "Hello, Mommy" << endl;
|
|
||||||
|
|
||||||
os << setcompressionlevel( Z_NO_COMPRESSION );
|
|
||||||
os << "hello, hello, hi, ho!" << endl;
|
|
||||||
|
|
||||||
setcompressionlevel( os, Z_DEFAULT_COMPRESSION )
|
|
||||||
<< "I'm compressing again" << endl;
|
|
||||||
|
|
||||||
os.close();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,329 +0,0 @@
|
|||||||
|
|
||||||
#include <memory.h>
|
|
||||||
#include "zfstream.h"
|
|
||||||
|
|
||||||
gzfilebuf::gzfilebuf() :
|
|
||||||
file(NULL),
|
|
||||||
mode(0),
|
|
||||||
own_file_descriptor(0)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
gzfilebuf::~gzfilebuf() {
|
|
||||||
|
|
||||||
sync();
|
|
||||||
if ( own_file_descriptor )
|
|
||||||
close();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
gzfilebuf *gzfilebuf::open( const char *name,
|
|
||||||
int io_mode ) {
|
|
||||||
|
|
||||||
if ( is_open() )
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
char char_mode[10];
|
|
||||||
char *p;
|
|
||||||
memset(char_mode,'\0',10);
|
|
||||||
p = char_mode;
|
|
||||||
|
|
||||||
if ( io_mode & ios::in ) {
|
|
||||||
mode = ios::in;
|
|
||||||
*p++ = 'r';
|
|
||||||
} else if ( io_mode & ios::app ) {
|
|
||||||
mode = ios::app;
|
|
||||||
*p++ = 'a';
|
|
||||||
} else {
|
|
||||||
mode = ios::out;
|
|
||||||
*p++ = 'w';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( io_mode & ios::binary ) {
|
|
||||||
mode |= ios::binary;
|
|
||||||
*p++ = 'b';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hard code the compression level
|
|
||||||
if ( io_mode & (ios::out|ios::app )) {
|
|
||||||
*p++ = '9';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( (file = gzopen(name, char_mode)) == NULL )
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
own_file_descriptor = 1;
|
|
||||||
|
|
||||||
return this;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
gzfilebuf *gzfilebuf::attach( int file_descriptor,
|
|
||||||
int io_mode ) {
|
|
||||||
|
|
||||||
if ( is_open() )
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
char char_mode[10];
|
|
||||||
char *p;
|
|
||||||
memset(char_mode,'\0',10);
|
|
||||||
p = char_mode;
|
|
||||||
|
|
||||||
if ( io_mode & ios::in ) {
|
|
||||||
mode = ios::in;
|
|
||||||
*p++ = 'r';
|
|
||||||
} else if ( io_mode & ios::app ) {
|
|
||||||
mode = ios::app;
|
|
||||||
*p++ = 'a';
|
|
||||||
} else {
|
|
||||||
mode = ios::out;
|
|
||||||
*p++ = 'w';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( io_mode & ios::binary ) {
|
|
||||||
mode |= ios::binary;
|
|
||||||
*p++ = 'b';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hard code the compression level
|
|
||||||
if ( io_mode & (ios::out|ios::app )) {
|
|
||||||
*p++ = '9';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( (file = gzdopen(file_descriptor, char_mode)) == NULL )
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
own_file_descriptor = 0;
|
|
||||||
|
|
||||||
return this;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
gzfilebuf *gzfilebuf::close() {
|
|
||||||
|
|
||||||
if ( is_open() ) {
|
|
||||||
|
|
||||||
sync();
|
|
||||||
gzclose( file );
|
|
||||||
file = NULL;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int gzfilebuf::setcompressionlevel( short comp_level ) {
|
|
||||||
|
|
||||||
return gzsetparams(file, comp_level, -2);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int gzfilebuf::setcompressionstrategy( short comp_strategy ) {
|
|
||||||
|
|
||||||
return gzsetparams(file, -2, comp_strategy);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
streampos gzfilebuf::seekoff( streamoff off, ios::seek_dir dir, int which ) {
|
|
||||||
|
|
||||||
return streampos(EOF);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int gzfilebuf::underflow() {
|
|
||||||
|
|
||||||
// If the file hasn't been opened for reading, error.
|
|
||||||
if ( !is_open() || !(mode & ios::in) )
|
|
||||||
return EOF;
|
|
||||||
|
|
||||||
// if a buffer doesn't exists, allocate one.
|
|
||||||
if ( !base() ) {
|
|
||||||
|
|
||||||
if ( (allocate()) == EOF )
|
|
||||||
return EOF;
|
|
||||||
setp(0,0);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if ( in_avail() )
|
|
||||||
return (unsigned char) *gptr();
|
|
||||||
|
|
||||||
if ( out_waiting() ) {
|
|
||||||
if ( flushbuf() == EOF )
|
|
||||||
return EOF;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Attempt to fill the buffer.
|
|
||||||
|
|
||||||
int result = fillbuf();
|
|
||||||
if ( result == EOF ) {
|
|
||||||
// disable get area
|
|
||||||
setg(0,0,0);
|
|
||||||
return EOF;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (unsigned char) *gptr();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int gzfilebuf::overflow( int c ) {
|
|
||||||
|
|
||||||
if ( !is_open() || !(mode & ios::out) )
|
|
||||||
return EOF;
|
|
||||||
|
|
||||||
if ( !base() ) {
|
|
||||||
if ( allocate() == EOF )
|
|
||||||
return EOF;
|
|
||||||
setg(0,0,0);
|
|
||||||
} else {
|
|
||||||
if (in_avail()) {
|
|
||||||
return EOF;
|
|
||||||
}
|
|
||||||
if (out_waiting()) {
|
|
||||||
if (flushbuf() == EOF)
|
|
||||||
return EOF;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int bl = blen();
|
|
||||||
setp( base(), base() + bl);
|
|
||||||
|
|
||||||
if ( c != EOF ) {
|
|
||||||
|
|
||||||
*pptr() = c;
|
|
||||||
pbump(1);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int gzfilebuf::sync() {
|
|
||||||
|
|
||||||
if ( !is_open() )
|
|
||||||
return EOF;
|
|
||||||
|
|
||||||
if ( out_waiting() )
|
|
||||||
return flushbuf();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int gzfilebuf::flushbuf() {
|
|
||||||
|
|
||||||
int n;
|
|
||||||
char *q;
|
|
||||||
|
|
||||||
q = pbase();
|
|
||||||
n = pptr() - q;
|
|
||||||
|
|
||||||
if ( gzwrite( file, q, n) < n )
|
|
||||||
return EOF;
|
|
||||||
|
|
||||||
setp(0,0);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int gzfilebuf::fillbuf() {
|
|
||||||
|
|
||||||
int required;
|
|
||||||
char *p;
|
|
||||||
|
|
||||||
p = base();
|
|
||||||
|
|
||||||
required = blen();
|
|
||||||
|
|
||||||
int t = gzread( file, p, required );
|
|
||||||
|
|
||||||
if ( t <= 0) return EOF;
|
|
||||||
|
|
||||||
setg( base(), base(), base()+t);
|
|
||||||
|
|
||||||
return t;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
gzfilestream_common::gzfilestream_common() :
|
|
||||||
ios( gzfilestream_common::rdbuf() )
|
|
||||||
{ }
|
|
||||||
|
|
||||||
gzfilestream_common::~gzfilestream_common()
|
|
||||||
{ }
|
|
||||||
|
|
||||||
void gzfilestream_common::attach( int fd, int io_mode ) {
|
|
||||||
|
|
||||||
if ( !buffer.attach( fd, io_mode) )
|
|
||||||
clear( ios::failbit | ios::badbit );
|
|
||||||
else
|
|
||||||
clear();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void gzfilestream_common::open( const char *name, int io_mode ) {
|
|
||||||
|
|
||||||
if ( !buffer.open( name, io_mode ) )
|
|
||||||
clear( ios::failbit | ios::badbit );
|
|
||||||
else
|
|
||||||
clear();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void gzfilestream_common::close() {
|
|
||||||
|
|
||||||
if ( !buffer.close() )
|
|
||||||
clear( ios::failbit | ios::badbit );
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
gzfilebuf *gzfilestream_common::rdbuf() {
|
|
||||||
|
|
||||||
return &buffer;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
gzifstream::gzifstream() :
|
|
||||||
ios( gzfilestream_common::rdbuf() )
|
|
||||||
{
|
|
||||||
clear( ios::badbit );
|
|
||||||
}
|
|
||||||
|
|
||||||
gzifstream::gzifstream( const char *name, int io_mode ) :
|
|
||||||
ios( gzfilestream_common::rdbuf() )
|
|
||||||
{
|
|
||||||
gzfilestream_common::open( name, io_mode );
|
|
||||||
}
|
|
||||||
|
|
||||||
gzifstream::gzifstream( int fd, int io_mode ) :
|
|
||||||
ios( gzfilestream_common::rdbuf() )
|
|
||||||
{
|
|
||||||
gzfilestream_common::attach( fd, io_mode );
|
|
||||||
}
|
|
||||||
|
|
||||||
gzifstream::~gzifstream() { }
|
|
||||||
|
|
||||||
gzofstream::gzofstream() :
|
|
||||||
ios( gzfilestream_common::rdbuf() )
|
|
||||||
{
|
|
||||||
clear( ios::badbit );
|
|
||||||
}
|
|
||||||
|
|
||||||
gzofstream::gzofstream( const char *name, int io_mode ) :
|
|
||||||
ios( gzfilestream_common::rdbuf() )
|
|
||||||
{
|
|
||||||
gzfilestream_common::open( name, io_mode );
|
|
||||||
}
|
|
||||||
|
|
||||||
gzofstream::gzofstream( int fd, int io_mode ) :
|
|
||||||
ios( gzfilestream_common::rdbuf() )
|
|
||||||
{
|
|
||||||
gzfilestream_common::attach( fd, io_mode );
|
|
||||||
}
|
|
||||||
|
|
||||||
gzofstream::~gzofstream() { }
|
|
||||||
@ -1,142 +0,0 @@
|
|||||||
|
|
||||||
#ifndef _zfstream_h
|
|
||||||
#define _zfstream_h
|
|
||||||
|
|
||||||
#include <fstream.h>
|
|
||||||
#include "zlib.h"
|
|
||||||
|
|
||||||
class gzfilebuf : public streambuf {
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
gzfilebuf( );
|
|
||||||
virtual ~gzfilebuf();
|
|
||||||
|
|
||||||
gzfilebuf *open( const char *name, int io_mode );
|
|
||||||
gzfilebuf *attach( int file_descriptor, int io_mode );
|
|
||||||
gzfilebuf *close();
|
|
||||||
|
|
||||||
int setcompressionlevel( short comp_level );
|
|
||||||
int setcompressionstrategy( short comp_strategy );
|
|
||||||
|
|
||||||
inline int is_open() const { return (file !=NULL); }
|
|
||||||
|
|
||||||
virtual streampos seekoff( streamoff, ios::seek_dir, int );
|
|
||||||
|
|
||||||
virtual int sync();
|
|
||||||
|
|
||||||
protected:
|
|
||||||
|
|
||||||
virtual int underflow();
|
|
||||||
virtual int overflow( int = EOF );
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
gzFile file;
|
|
||||||
short mode;
|
|
||||||
short own_file_descriptor;
|
|
||||||
|
|
||||||
int flushbuf();
|
|
||||||
int fillbuf();
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
class gzfilestream_common : virtual public ios {
|
|
||||||
|
|
||||||
friend class gzifstream;
|
|
||||||
friend class gzofstream;
|
|
||||||
friend gzofstream &setcompressionlevel( gzofstream &, int );
|
|
||||||
friend gzofstream &setcompressionstrategy( gzofstream &, int );
|
|
||||||
|
|
||||||
public:
|
|
||||||
virtual ~gzfilestream_common();
|
|
||||||
|
|
||||||
void attach( int fd, int io_mode );
|
|
||||||
void open( const char *name, int io_mode );
|
|
||||||
void close();
|
|
||||||
|
|
||||||
protected:
|
|
||||||
gzfilestream_common();
|
|
||||||
|
|
||||||
private:
|
|
||||||
gzfilebuf *rdbuf();
|
|
||||||
|
|
||||||
gzfilebuf buffer;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
class gzifstream : public gzfilestream_common, public istream {
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
gzifstream();
|
|
||||||
gzifstream( const char *name, int io_mode = ios::in );
|
|
||||||
gzifstream( int fd, int io_mode = ios::in );
|
|
||||||
|
|
||||||
virtual ~gzifstream();
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
class gzofstream : public gzfilestream_common, public ostream {
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
gzofstream();
|
|
||||||
gzofstream( const char *name, int io_mode = ios::out );
|
|
||||||
gzofstream( int fd, int io_mode = ios::out );
|
|
||||||
|
|
||||||
virtual ~gzofstream();
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
template<class T> class gzomanip {
|
|
||||||
friend gzofstream &operator<<(gzofstream &, const gzomanip<T> &);
|
|
||||||
public:
|
|
||||||
gzomanip(gzofstream &(*f)(gzofstream &, T), T v) : func(f), val(v) { }
|
|
||||||
private:
|
|
||||||
gzofstream &(*func)(gzofstream &, T);
|
|
||||||
T val;
|
|
||||||
};
|
|
||||||
|
|
||||||
template<class T> gzofstream &operator<<(gzofstream &s,
|
|
||||||
const gzomanip<T> &m) {
|
|
||||||
return (*m.func)(s, m.val);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
inline gzofstream &setcompressionlevel( gzofstream &s, int l ) {
|
|
||||||
(s.rdbuf())->setcompressionlevel(l);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline gzofstream &setcompressionstrategy( gzofstream &s, int l ) {
|
|
||||||
(s.rdbuf())->setcompressionstrategy(l);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline gzomanip<int> setcompressionlevel(int l)
|
|
||||||
{
|
|
||||||
return gzomanip<int>(&setcompressionlevel,l);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline gzomanip<int> setcompressionstrategy(int l)
|
|
||||||
{
|
|
||||||
return gzomanip<int>(&setcompressionstrategy,l);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,307 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (c) 1997
|
|
||||||
* Christian Michelsen Research AS
|
|
||||||
* Advanced Computing
|
|
||||||
* Fantoftvegen 38, 5036 BERGEN, Norway
|
|
||||||
* http://www.cmr.no
|
|
||||||
*
|
|
||||||
* Permission to use, copy, modify, distribute and sell this software
|
|
||||||
* and its documentation for any purpose is hereby granted without fee,
|
|
||||||
* provided that the above copyright notice appear in all copies and
|
|
||||||
* that both that copyright notice and this permission notice appear
|
|
||||||
* in supporting documentation. Christian Michelsen Research AS makes no
|
|
||||||
* representations about the suitability of this software for any
|
|
||||||
* purpose. It is provided "as is" without express or implied warranty.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ZSTREAM__H
|
|
||||||
#define ZSTREAM__H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* zstream.h - C++ interface to the 'zlib' general purpose compression library
|
|
||||||
* $Id$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <strstream.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "zlib.h"
|
|
||||||
|
|
||||||
#if defined(_WIN32)
|
|
||||||
# include <fcntl.h>
|
|
||||||
# include <io.h>
|
|
||||||
# define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
|
|
||||||
#else
|
|
||||||
# define SET_BINARY_MODE(file)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class zstringlen {
|
|
||||||
public:
|
|
||||||
zstringlen(class izstream&);
|
|
||||||
zstringlen(class ozstream&, const char*);
|
|
||||||
size_t value() const { return val.word; }
|
|
||||||
private:
|
|
||||||
struct Val { unsigned char byte; size_t word; } val;
|
|
||||||
};
|
|
||||||
|
|
||||||
// ----------------------------- izstream -----------------------------
|
|
||||||
|
|
||||||
class izstream
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
izstream() : m_fp(0) {}
|
|
||||||
izstream(FILE* fp) : m_fp(0) { open(fp); }
|
|
||||||
izstream(const char* name) : m_fp(0) { open(name); }
|
|
||||||
~izstream() { close(); }
|
|
||||||
|
|
||||||
/* Opens a gzip (.gz) file for reading.
|
|
||||||
* open() can be used to read a file which is not in gzip format;
|
|
||||||
* in this case read() will directly read from the file without
|
|
||||||
* decompression. errno can be checked to distinguish two error
|
|
||||||
* cases (if errno is zero, the zlib error is Z_MEM_ERROR).
|
|
||||||
*/
|
|
||||||
void open(const char* name) {
|
|
||||||
if (m_fp) close();
|
|
||||||
m_fp = ::gzopen(name, "rb");
|
|
||||||
}
|
|
||||||
|
|
||||||
void open(FILE* fp) {
|
|
||||||
SET_BINARY_MODE(fp);
|
|
||||||
if (m_fp) close();
|
|
||||||
m_fp = ::gzdopen(fileno(fp), "rb");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Flushes all pending input if necessary, closes the compressed file
|
|
||||||
* and deallocates all the (de)compression state. The return value is
|
|
||||||
* the zlib error number (see function error() below).
|
|
||||||
*/
|
|
||||||
int close() {
|
|
||||||
int r = ::gzclose(m_fp);
|
|
||||||
m_fp = 0; return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Binary read the given number of bytes from the compressed file.
|
|
||||||
*/
|
|
||||||
int read(void* buf, size_t len) {
|
|
||||||
return ::gzread(m_fp, buf, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Returns the error message for the last error which occurred on the
|
|
||||||
* given compressed file. errnum is set to zlib error number. If an
|
|
||||||
* error occurred in the file system and not in the compression library,
|
|
||||||
* errnum is set to Z_ERRNO and the application may consult errno
|
|
||||||
* to get the exact error code.
|
|
||||||
*/
|
|
||||||
const char* error(int* errnum) {
|
|
||||||
return ::gzerror(m_fp, errnum);
|
|
||||||
}
|
|
||||||
|
|
||||||
gzFile fp() { return m_fp; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
gzFile m_fp;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Binary read the given (array of) object(s) from the compressed file.
|
|
||||||
* If the input file was not in gzip format, read() copies the objects number
|
|
||||||
* of bytes into the buffer.
|
|
||||||
* returns the number of uncompressed bytes actually read
|
|
||||||
* (0 for end of file, -1 for error).
|
|
||||||
*/
|
|
||||||
template <class T, class Items>
|
|
||||||
inline int read(izstream& zs, T* x, Items items) {
|
|
||||||
return ::gzread(zs.fp(), x, items*sizeof(T));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Binary input with the '>' operator.
|
|
||||||
*/
|
|
||||||
template <class T>
|
|
||||||
inline izstream& operator>(izstream& zs, T& x) {
|
|
||||||
::gzread(zs.fp(), &x, sizeof(T));
|
|
||||||
return zs;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
inline zstringlen::zstringlen(izstream& zs) {
|
|
||||||
zs > val.byte;
|
|
||||||
if (val.byte == 255) zs > val.word;
|
|
||||||
else val.word = val.byte;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Read length of string + the string with the '>' operator.
|
|
||||||
*/
|
|
||||||
inline izstream& operator>(izstream& zs, char* x) {
|
|
||||||
zstringlen len(zs);
|
|
||||||
::gzread(zs.fp(), x, len.value());
|
|
||||||
x[len.value()] = '\0';
|
|
||||||
return zs;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline char* read_string(izstream& zs) {
|
|
||||||
zstringlen len(zs);
|
|
||||||
char* x = new char[len.value()+1];
|
|
||||||
::gzread(zs.fp(), x, len.value());
|
|
||||||
x[len.value()] = '\0';
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------- ozstream -----------------------------
|
|
||||||
|
|
||||||
class ozstream
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
ozstream() : m_fp(0), m_os(0) {
|
|
||||||
}
|
|
||||||
ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION)
|
|
||||||
: m_fp(0), m_os(0) {
|
|
||||||
open(fp, level);
|
|
||||||
}
|
|
||||||
ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION)
|
|
||||||
: m_fp(0), m_os(0) {
|
|
||||||
open(name, level);
|
|
||||||
}
|
|
||||||
~ozstream() {
|
|
||||||
close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Opens a gzip (.gz) file for writing.
|
|
||||||
* The compression level parameter should be in 0..9
|
|
||||||
* errno can be checked to distinguish two error cases
|
|
||||||
* (if errno is zero, the zlib error is Z_MEM_ERROR).
|
|
||||||
*/
|
|
||||||
void open(const char* name, int level = Z_DEFAULT_COMPRESSION) {
|
|
||||||
char mode[4] = "wb\0";
|
|
||||||
if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
|
|
||||||
if (m_fp) close();
|
|
||||||
m_fp = ::gzopen(name, mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* open from a FILE pointer.
|
|
||||||
*/
|
|
||||||
void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) {
|
|
||||||
SET_BINARY_MODE(fp);
|
|
||||||
char mode[4] = "wb\0";
|
|
||||||
if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
|
|
||||||
if (m_fp) close();
|
|
||||||
m_fp = ::gzdopen(fileno(fp), mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Flushes all pending output if necessary, closes the compressed file
|
|
||||||
* and deallocates all the (de)compression state. The return value is
|
|
||||||
* the zlib error number (see function error() below).
|
|
||||||
*/
|
|
||||||
int close() {
|
|
||||||
if (m_os) {
|
|
||||||
::gzwrite(m_fp, m_os->str(), m_os->pcount());
|
|
||||||
delete[] m_os->str(); delete m_os; m_os = 0;
|
|
||||||
}
|
|
||||||
int r = ::gzclose(m_fp); m_fp = 0; return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Binary write the given number of bytes into the compressed file.
|
|
||||||
*/
|
|
||||||
int write(const void* buf, size_t len) {
|
|
||||||
return ::gzwrite(m_fp, (voidp) buf, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 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). flush() returns Z_OK if
|
|
||||||
* the flush_ parameter is Z_FINISH and all output could be flushed.
|
|
||||||
* flush() should be called only when strictly necessary because it can
|
|
||||||
* degrade compression.
|
|
||||||
*/
|
|
||||||
int flush(int _flush) {
|
|
||||||
os_flush();
|
|
||||||
return ::gzflush(m_fp, _flush);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Returns the error message for the last error which occurred on the
|
|
||||||
* given compressed file. errnum is set to zlib error number. If an
|
|
||||||
* error occurred in the file system and not in the compression library,
|
|
||||||
* errnum is set to Z_ERRNO and the application may consult errno
|
|
||||||
* to get the exact error code.
|
|
||||||
*/
|
|
||||||
const char* error(int* errnum) {
|
|
||||||
return ::gzerror(m_fp, errnum);
|
|
||||||
}
|
|
||||||
|
|
||||||
gzFile fp() { return m_fp; }
|
|
||||||
|
|
||||||
ostream& os() {
|
|
||||||
if (m_os == 0) m_os = new ostrstream;
|
|
||||||
return *m_os;
|
|
||||||
}
|
|
||||||
|
|
||||||
void os_flush() {
|
|
||||||
if (m_os && m_os->pcount()>0) {
|
|
||||||
ostrstream* oss = new ostrstream;
|
|
||||||
oss->fill(m_os->fill());
|
|
||||||
oss->flags(m_os->flags());
|
|
||||||
oss->precision(m_os->precision());
|
|
||||||
oss->width(m_os->width());
|
|
||||||
::gzwrite(m_fp, m_os->str(), m_os->pcount());
|
|
||||||
delete[] m_os->str(); delete m_os; m_os = oss;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
gzFile m_fp;
|
|
||||||
ostrstream* m_os;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Binary write the given (array of) object(s) into the compressed file.
|
|
||||||
* returns the number of uncompressed bytes actually written
|
|
||||||
* (0 in case of error).
|
|
||||||
*/
|
|
||||||
template <class T, class Items>
|
|
||||||
inline int write(ozstream& zs, const T* x, Items items) {
|
|
||||||
return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Binary output with the '<' operator.
|
|
||||||
*/
|
|
||||||
template <class T>
|
|
||||||
inline ozstream& operator<(ozstream& zs, const T& x) {
|
|
||||||
::gzwrite(zs.fp(), (voidp) &x, sizeof(T));
|
|
||||||
return zs;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline zstringlen::zstringlen(ozstream& zs, const char* x) {
|
|
||||||
val.byte = 255; val.word = ::strlen(x);
|
|
||||||
if (val.word < 255) zs < (val.byte = val.word);
|
|
||||||
else zs < val;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Write length of string + the string with the '<' operator.
|
|
||||||
*/
|
|
||||||
inline ozstream& operator<(ozstream& zs, const char* x) {
|
|
||||||
zstringlen len(zs, x);
|
|
||||||
::gzwrite(zs.fp(), (voidp) x, len.value());
|
|
||||||
return zs;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
inline ozstream& operator<(ozstream& zs, char* const& x) {
|
|
||||||
return zs < (const char*) x;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Ascii write with the << operator;
|
|
||||||
*/
|
|
||||||
template <class T>
|
|
||||||
inline ostream& operator<<(ozstream& zs, const T& x) {
|
|
||||||
zs.os_flush();
|
|
||||||
return zs.os() << x;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
#include "zstream.h"
|
|
||||||
#include <math.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <iomanip.h>
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
char h[256] = "Hello";
|
|
||||||
char* g = "Goodbye";
|
|
||||||
ozstream out("temp.gz");
|
|
||||||
out < "This works well" < h < g;
|
|
||||||
out.close();
|
|
||||||
|
|
||||||
izstream in("temp.gz"); // read it back
|
|
||||||
char *x = read_string(in), *y = new char[256], z[256];
|
|
||||||
in > y > z;
|
|
||||||
in.close();
|
|
||||||
cout << x << endl << y << endl << z << endl;
|
|
||||||
|
|
||||||
out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results
|
|
||||||
out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl;
|
|
||||||
out << z << endl << y << endl << x << endl;
|
|
||||||
out << 1.1234567890123456789 << endl;
|
|
||||||
|
|
||||||
delete[] x; delete[] y;
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
Change in 0.15: (19 Mar 98)
|
|
||||||
- fix memory leak in minizip.c
|
|
||||||
|
|
||||||
Change in 0.14: (10 Mar 98)
|
|
||||||
- fix bugs in minizip.c sample for zipping big file
|
|
||||||
- fix problem in month in date handling
|
|
||||||
- fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for
|
|
||||||
comment handling
|
|
||||||
|
|
||||||
Change in 0.13: (6 Mar 98)
|
|
||||||
- fix bugs in zip.c
|
|
||||||
- add real minizip sample
|
|
||||||
|
|
||||||
Change in 0.12: (4 Mar 98)
|
|
||||||
- add zip.c and zip.h for creates .zip file
|
|
||||||
- fix change_file_date in miniunz.c for Unix (Jean-loup Gailly)
|
|
||||||
- fix miniunz.c for file without specific record for directory
|
|
||||||
|
|
||||||
Change in 0.11: (3 Mar 98)
|
|
||||||
- fix bug in unzGetCurrentFileInfo for get extra field and comment
|
|
||||||
- enhance miniunz sample, remove the bad unztst.c sample
|
|
||||||
|
|
||||||
Change in 0.10: (2 Mar 98)
|
|
||||||
- fix bug in unzReadCurrentFile
|
|
||||||
- rename unzip* to unz* function and structure
|
|
||||||
- remove Windows-like hungary notation variable name
|
|
||||||
- modify some structure in unzip.h
|
|
||||||
- add somes comment in source
|
|
||||||
- remove unzipGetcCurrentFile function
|
|
||||||
- replace ZUNZEXPORT by ZEXPORT
|
|
||||||
- add unzGetLocalExtrafield for get the local extrafield info
|
|
||||||
- add a new sample, miniunz.c
|
|
||||||
|
|
||||||
Change in 0.4: (25 Feb 98)
|
|
||||||
- suppress the type unzipFileInZip.
|
|
||||||
Only on file in the zipfile can be open at the same time
|
|
||||||
- fix somes typo in code
|
|
||||||
- added tm_unz structure in unzip_file_info (date/time in readable format)
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
CC=cc
|
|
||||||
CFLAGS=-O -I../..
|
|
||||||
|
|
||||||
UNZ_OBJS = miniunz.o unzip.o ../../libz.a
|
|
||||||
ZIP_OBJS = minizip.o zip.o ../../libz.a
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(CC) -c $(CFLAGS) $*.c
|
|
||||||
|
|
||||||
all: miniunz minizip
|
|
||||||
|
|
||||||
miniunz: $(UNZ_OBJS)
|
|
||||||
$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
|
|
||||||
|
|
||||||
minizip: $(ZIP_OBJS)
|
|
||||||
$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
|
|
||||||
|
|
||||||
test: miniunz minizip
|
|
||||||
./minizip test readme.txt
|
|
||||||
./miniunz -l test.zip
|
|
||||||
mv readme.txt readme.old
|
|
||||||
./miniunz test.zip
|
|
||||||
|
|
||||||
clean:
|
|
||||||
/bin/rm -f *.o *~ minizip miniunz
|
|
||||||
@ -1,508 +0,0 @@
|
|||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
|
|
||||||
#ifdef unix
|
|
||||||
# include <unistd.h>
|
|
||||||
# include <utime.h>
|
|
||||||
#else
|
|
||||||
# include <direct.h>
|
|
||||||
# include <io.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "unzip.h"
|
|
||||||
|
|
||||||
#define CASESENSITIVITY (0)
|
|
||||||
#define WRITEBUFFERSIZE (8192)
|
|
||||||
|
|
||||||
/*
|
|
||||||
mini unzip, demo of unzip package
|
|
||||||
|
|
||||||
usage :
|
|
||||||
Usage : miniunz [-exvlo] file.zip [file_to_extract]
|
|
||||||
|
|
||||||
list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
|
|
||||||
if it exists
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/* change_file_date : change the date/time of a file
|
|
||||||
filename : the filename of the file where date/time must be modified
|
|
||||||
dosdate : the new date at the MSDos format (4 bytes)
|
|
||||||
tmu_date : the SAME new date at the tm_unz format */
|
|
||||||
void change_file_date(filename,dosdate,tmu_date)
|
|
||||||
const char *filename;
|
|
||||||
uLong dosdate;
|
|
||||||
tm_unz tmu_date;
|
|
||||||
{
|
|
||||||
#ifdef WIN32
|
|
||||||
HANDLE hFile;
|
|
||||||
FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
|
|
||||||
|
|
||||||
hFile = CreateFile(filename,GENERIC_READ | GENERIC_WRITE,
|
|
||||||
0,NULL,OPEN_EXISTING,0,NULL);
|
|
||||||
GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
|
|
||||||
DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
|
|
||||||
LocalFileTimeToFileTime(&ftLocal,&ftm);
|
|
||||||
SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
|
|
||||||
CloseHandle(hFile);
|
|
||||||
#else
|
|
||||||
#ifdef unix
|
|
||||||
struct utimbuf ut;
|
|
||||||
struct tm newdate;
|
|
||||||
newdate.tm_sec = tmu_date.tm_sec;
|
|
||||||
newdate.tm_min=tmu_date.tm_min;
|
|
||||||
newdate.tm_hour=tmu_date.tm_hour;
|
|
||||||
newdate.tm_mday=tmu_date.tm_mday;
|
|
||||||
newdate.tm_mon=tmu_date.tm_mon;
|
|
||||||
if (tmu_date.tm_year > 1900)
|
|
||||||
newdate.tm_year=tmu_date.tm_year - 1900;
|
|
||||||
else
|
|
||||||
newdate.tm_year=tmu_date.tm_year ;
|
|
||||||
newdate.tm_isdst=-1;
|
|
||||||
|
|
||||||
ut.actime=ut.modtime=mktime(&newdate);
|
|
||||||
utime(filename,&ut);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* mymkdir and change_file_date are not 100 % portable
|
|
||||||
As I don't know well Unix, I wait feedback for the unix portion */
|
|
||||||
|
|
||||||
int mymkdir(dirname)
|
|
||||||
const char* dirname;
|
|
||||||
{
|
|
||||||
int ret=0;
|
|
||||||
#ifdef WIN32
|
|
||||||
ret = mkdir(dirname);
|
|
||||||
#else
|
|
||||||
#ifdef unix
|
|
||||||
ret = mkdir (dirname,0775);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int makedir (newdir)
|
|
||||||
char *newdir;
|
|
||||||
{
|
|
||||||
char *buffer ;
|
|
||||||
char *p;
|
|
||||||
int len = strlen(newdir);
|
|
||||||
|
|
||||||
if (len <= 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
buffer = (char*)malloc(len+1);
|
|
||||||
strcpy(buffer,newdir);
|
|
||||||
|
|
||||||
if (buffer[len-1] == '/') {
|
|
||||||
buffer[len-1] = '\0';
|
|
||||||
}
|
|
||||||
if (mymkdir(buffer) == 0)
|
|
||||||
{
|
|
||||||
free(buffer);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
p = buffer+1;
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
char hold;
|
|
||||||
|
|
||||||
while(*p && *p != '\\' && *p != '/')
|
|
||||||
p++;
|
|
||||||
hold = *p;
|
|
||||||
*p = 0;
|
|
||||||
if ((mymkdir(buffer) == -1) && (errno == ENOENT))
|
|
||||||
{
|
|
||||||
printf("couldn't create directory %s\n",buffer);
|
|
||||||
free(buffer);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (hold == 0)
|
|
||||||
break;
|
|
||||||
*p++ = hold;
|
|
||||||
}
|
|
||||||
free(buffer);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void do_banner()
|
|
||||||
{
|
|
||||||
printf("MiniUnz 0.15, demo of zLib + Unz package written by Gilles Vollant\n");
|
|
||||||
printf("more info at http://wwww.winimage/zLibDll/unzip.htm\n\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
void do_help()
|
|
||||||
{
|
|
||||||
printf("Usage : miniunz [-exvlo] file.zip [file_to_extract]\n\n") ;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int do_list(uf)
|
|
||||||
unzFile uf;
|
|
||||||
{
|
|
||||||
uLong i;
|
|
||||||
unz_global_info gi;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
err = unzGetGlobalInfo (uf,&gi);
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
printf("error %d with zipfile in unzGetGlobalInfo \n",err);
|
|
||||||
printf(" Length Method Size Ratio Date Time CRC-32 Name\n");
|
|
||||||
printf(" ------ ------ ---- ----- ---- ---- ------ ----\n");
|
|
||||||
for (i=0;i<gi.number_entry;i++)
|
|
||||||
{
|
|
||||||
char filename_inzip[256];
|
|
||||||
unz_file_info file_info;
|
|
||||||
uLong ratio=0;
|
|
||||||
const char *string_method;
|
|
||||||
err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
{
|
|
||||||
printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (file_info.uncompressed_size>0)
|
|
||||||
ratio = (file_info.compressed_size*100)/file_info.uncompressed_size;
|
|
||||||
|
|
||||||
if (file_info.compression_method==0)
|
|
||||||
string_method="Stored";
|
|
||||||
else
|
|
||||||
if (file_info.compression_method==Z_DEFLATED)
|
|
||||||
{
|
|
||||||
uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
|
|
||||||
if (iLevel==0)
|
|
||||||
string_method="Defl:N";
|
|
||||||
else if (iLevel==1)
|
|
||||||
string_method="Defl:X";
|
|
||||||
else if ((iLevel==2) || (iLevel==3))
|
|
||||||
string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
|
|
||||||
}
|
|
||||||
else
|
|
||||||
string_method="Unkn. ";
|
|
||||||
|
|
||||||
printf("%7lu %6s %7lu %3lu%% %2.2lu-%2.2lu-%2.2lu %2.2lu:%2.2lu %8.8lx %s\n",
|
|
||||||
file_info.uncompressed_size,string_method,file_info.compressed_size,
|
|
||||||
ratio,
|
|
||||||
(uLong)file_info.tmu_date.tm_mon + 1,
|
|
||||||
(uLong)file_info.tmu_date.tm_mday,
|
|
||||||
(uLong)file_info.tmu_date.tm_year % 100,
|
|
||||||
(uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
|
|
||||||
(uLong)file_info.crc,filename_inzip);
|
|
||||||
if ((i+1)<gi.number_entry)
|
|
||||||
{
|
|
||||||
err = unzGoToNextFile(uf);
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
{
|
|
||||||
printf("error %d with zipfile in unzGoToNextFile\n",err);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite)
|
|
||||||
unzFile uf;
|
|
||||||
const int* popt_extract_without_path;
|
|
||||||
int* popt_overwrite;
|
|
||||||
{
|
|
||||||
char filename_inzip[256];
|
|
||||||
char* filename_withoutpath;
|
|
||||||
char* p;
|
|
||||||
int err=UNZ_OK;
|
|
||||||
FILE *fout=NULL;
|
|
||||||
void* buf;
|
|
||||||
uInt size_buf;
|
|
||||||
|
|
||||||
unz_file_info file_info;
|
|
||||||
uLong ratio=0;
|
|
||||||
err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
|
|
||||||
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
{
|
|
||||||
printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_buf = WRITEBUFFERSIZE;
|
|
||||||
buf = (void*)malloc(size_buf);
|
|
||||||
if (buf==NULL)
|
|
||||||
{
|
|
||||||
printf("Error allocating memory\n");
|
|
||||||
return UNZ_INTERNALERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
p = filename_withoutpath = filename_inzip;
|
|
||||||
while ((*p) != '\0')
|
|
||||||
{
|
|
||||||
if (((*p)=='/') || ((*p)=='\\'))
|
|
||||||
filename_withoutpath = p+1;
|
|
||||||
p++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((*filename_withoutpath)=='\0')
|
|
||||||
{
|
|
||||||
if ((*popt_extract_without_path)==0)
|
|
||||||
{
|
|
||||||
printf("creating directory: %s\n",filename_inzip);
|
|
||||||
mymkdir(filename_inzip);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const char* write_filename;
|
|
||||||
int skip=0;
|
|
||||||
|
|
||||||
if ((*popt_extract_without_path)==0)
|
|
||||||
write_filename = filename_inzip;
|
|
||||||
else
|
|
||||||
write_filename = filename_withoutpath;
|
|
||||||
|
|
||||||
err = unzOpenCurrentFile(uf);
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
{
|
|
||||||
printf("error %d with zipfile in unzOpenCurrentFile\n",err);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (((*popt_overwrite)==0) && (err==UNZ_OK))
|
|
||||||
{
|
|
||||||
char rep;
|
|
||||||
FILE* ftestexist;
|
|
||||||
ftestexist = fopen(write_filename,"rb");
|
|
||||||
if (ftestexist!=NULL)
|
|
||||||
{
|
|
||||||
fclose(ftestexist);
|
|
||||||
do
|
|
||||||
{
|
|
||||||
char answer[128];
|
|
||||||
printf("The file %s exist. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
|
|
||||||
scanf("%1s",answer);
|
|
||||||
rep = answer[0] ;
|
|
||||||
if ((rep>='a') && (rep<='z'))
|
|
||||||
rep -= 0x20;
|
|
||||||
}
|
|
||||||
while ((rep!='Y') && (rep!='N') && (rep!='A'));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rep == 'N')
|
|
||||||
skip = 1;
|
|
||||||
|
|
||||||
if (rep == 'A')
|
|
||||||
*popt_overwrite=1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((skip==0) && (err==UNZ_OK))
|
|
||||||
{
|
|
||||||
fout=fopen(write_filename,"wb");
|
|
||||||
|
|
||||||
/* some zipfile don't contain directory alone before file */
|
|
||||||
if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
|
|
||||||
(filename_withoutpath!=(char*)filename_inzip))
|
|
||||||
{
|
|
||||||
char c=*(filename_withoutpath-1);
|
|
||||||
*(filename_withoutpath-1)='\0';
|
|
||||||
makedir(write_filename);
|
|
||||||
*(filename_withoutpath-1)=c;
|
|
||||||
fout=fopen(write_filename,"wb");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fout==NULL)
|
|
||||||
{
|
|
||||||
printf("error opening %s\n",write_filename);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fout!=NULL)
|
|
||||||
{
|
|
||||||
printf(" extracting: %s\n",write_filename);
|
|
||||||
|
|
||||||
do
|
|
||||||
{
|
|
||||||
err = unzReadCurrentFile(uf,buf,size_buf);
|
|
||||||
if (err<0)
|
|
||||||
{
|
|
||||||
printf("error %d with zipfile in unzReadCurrentFile\n",err);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (err>0)
|
|
||||||
if (fwrite(buf,err,1,fout)!=1)
|
|
||||||
{
|
|
||||||
printf("error in writing extracted file\n");
|
|
||||||
err=UNZ_ERRNO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
while (err>0);
|
|
||||||
fclose(fout);
|
|
||||||
if (err==0)
|
|
||||||
change_file_date(write_filename,file_info.dosDate,
|
|
||||||
file_info.tmu_date);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (err==UNZ_OK)
|
|
||||||
{
|
|
||||||
err = unzCloseCurrentFile (uf);
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
{
|
|
||||||
printf("error %d with zipfile in unzCloseCurrentFile\n",err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
unzCloseCurrentFile(uf); /* don't lose the error */
|
|
||||||
}
|
|
||||||
|
|
||||||
free(buf);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int do_extract(uf,opt_extract_without_path,opt_overwrite)
|
|
||||||
unzFile uf;
|
|
||||||
int opt_extract_without_path;
|
|
||||||
int opt_overwrite;
|
|
||||||
{
|
|
||||||
uLong i;
|
|
||||||
unz_global_info gi;
|
|
||||||
int err;
|
|
||||||
FILE* fout=NULL;
|
|
||||||
|
|
||||||
err = unzGetGlobalInfo (uf,&gi);
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
printf("error %d with zipfile in unzGetGlobalInfo \n",err);
|
|
||||||
|
|
||||||
for (i=0;i<gi.number_entry;i++)
|
|
||||||
{
|
|
||||||
if (do_extract_currentfile(uf,&opt_extract_without_path,
|
|
||||||
&opt_overwrite) != UNZ_OK)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if ((i+1)<gi.number_entry)
|
|
||||||
{
|
|
||||||
err = unzGoToNextFile(uf);
|
|
||||||
if (err!=UNZ_OK)
|
|
||||||
{
|
|
||||||
printf("error %d with zipfile in unzGoToNextFile\n",err);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite)
|
|
||||||
unzFile uf;
|
|
||||||
const char* filename;
|
|
||||||
int opt_extract_without_path;
|
|
||||||
int opt_overwrite;
|
|
||||||
{
|
|
||||||
int err = UNZ_OK;
|
|
||||||
if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
|
|
||||||
{
|
|
||||||
printf("file %s not found in the zipfile\n",filename);
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (do_extract_currentfile(uf,&opt_extract_without_path,
|
|
||||||
&opt_overwrite) == UNZ_OK)
|
|
||||||
return 0;
|
|
||||||
else
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int main(argc,argv)
|
|
||||||
int argc;
|
|
||||||
char *argv[];
|
|
||||||
{
|
|
||||||
const char *zipfilename=NULL;
|
|
||||||
const char *filename_to_extract=NULL;
|
|
||||||
int i;
|
|
||||||
int opt_do_list=0;
|
|
||||||
int opt_do_extract=1;
|
|
||||||
int opt_do_extract_withoutpath=0;
|
|
||||||
int opt_overwrite=0;
|
|
||||||
char filename_try[512];
|
|
||||||
unzFile uf=NULL;
|
|
||||||
|
|
||||||
do_banner();
|
|
||||||
if (argc==1)
|
|
||||||
{
|
|
||||||
do_help();
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for (i=1;i<argc;i++)
|
|
||||||
{
|
|
||||||
if ((*argv[i])=='-')
|
|
||||||
{
|
|
||||||
const char *p=argv[i]+1;
|
|
||||||
|
|
||||||
while ((*p)!='\0')
|
|
||||||
{
|
|
||||||
char c=*(p++);;
|
|
||||||
if ((c=='l') || (c=='L'))
|
|
||||||
opt_do_list = 1;
|
|
||||||
if ((c=='v') || (c=='V'))
|
|
||||||
opt_do_list = 1;
|
|
||||||
if ((c=='x') || (c=='X'))
|
|
||||||
opt_do_extract = 1;
|
|
||||||
if ((c=='e') || (c=='E'))
|
|
||||||
opt_do_extract = opt_do_extract_withoutpath = 1;
|
|
||||||
if ((c=='o') || (c=='O'))
|
|
||||||
opt_overwrite=1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (zipfilename == NULL)
|
|
||||||
zipfilename = argv[i];
|
|
||||||
else if (filename_to_extract==NULL)
|
|
||||||
filename_to_extract = argv[i] ;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (zipfilename!=NULL)
|
|
||||||
{
|
|
||||||
strcpy(filename_try,zipfilename);
|
|
||||||
uf = unzOpen(zipfilename);
|
|
||||||
if (uf==NULL)
|
|
||||||
{
|
|
||||||
strcat(filename_try,".zip");
|
|
||||||
uf = unzOpen(filename_try);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (uf==NULL)
|
|
||||||
{
|
|
||||||
printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
printf("%s opened\n",filename_try);
|
|
||||||
|
|
||||||
if (opt_do_list==1)
|
|
||||||
return do_list(uf);
|
|
||||||
else if (opt_do_extract==1)
|
|
||||||
{
|
|
||||||
if (filename_to_extract == NULL)
|
|
||||||
return do_extract(uf,opt_do_extract_withoutpath,opt_overwrite);
|
|
||||||
else
|
|
||||||
return do_extract_onefile(uf,filename_to_extract,
|
|
||||||
opt_do_extract_withoutpath,opt_overwrite);
|
|
||||||
}
|
|
||||||
unzCloseCurrentFile(uf);
|
|
||||||
|
|
||||||
return 0; /* to avoid warning */
|
|
||||||
}
|
|
||||||
@ -1,302 +0,0 @@
|
|||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
|
|
||||||
#ifdef unix
|
|
||||||
# include <unistd.h>
|
|
||||||
# include <utime.h>
|
|
||||||
# include <sys/types.h>
|
|
||||||
# include <sys/stat.h>
|
|
||||||
#else
|
|
||||||
# include <direct.h>
|
|
||||||
# include <io.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "zip.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define WRITEBUFFERSIZE (16384)
|
|
||||||
#define MAXFILENAME (256)
|
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
uLong filetime(f, tmzip, dt)
|
|
||||||
char *f; /* name of file to get info on */
|
|
||||||
tm_zip *tmzip; /* return value: access, modific. and creation times */
|
|
||||||
uLong *dt; /* dostime */
|
|
||||||
{
|
|
||||||
int ret = 0;
|
|
||||||
{
|
|
||||||
FILETIME ftLocal;
|
|
||||||
HANDLE hFind;
|
|
||||||
WIN32_FIND_DATA ff32;
|
|
||||||
|
|
||||||
hFind = FindFirstFile(f,&ff32);
|
|
||||||
if (hFind != INVALID_HANDLE_VALUE)
|
|
||||||
{
|
|
||||||
FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
|
|
||||||
FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
|
|
||||||
FindClose(hFind);
|
|
||||||
ret = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
#ifdef unix
|
|
||||||
uLong filetime(f, tmzip, dt)
|
|
||||||
char *f; /* name of file to get info on */
|
|
||||||
tm_zip *tmzip; /* return value: access, modific. and creation times */
|
|
||||||
uLong *dt; /* dostime */
|
|
||||||
{
|
|
||||||
int ret=0;
|
|
||||||
struct stat s; /* results of stat() */
|
|
||||||
struct tm* filedate;
|
|
||||||
time_t tm_t=0;
|
|
||||||
|
|
||||||
if (strcmp(f,"-")!=0)
|
|
||||||
{
|
|
||||||
char name[MAXFILENAME];
|
|
||||||
int len = strlen(f);
|
|
||||||
strcpy(name, f);
|
|
||||||
if (name[len - 1] == '/')
|
|
||||||
name[len - 1] = '\0';
|
|
||||||
/* not all systems allow stat'ing a file with / appended */
|
|
||||||
if (stat(name,&s)==0)
|
|
||||||
{
|
|
||||||
tm_t = s.st_mtime;
|
|
||||||
ret = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filedate = localtime(&tm_t);
|
|
||||||
|
|
||||||
tmzip->tm_sec = filedate->tm_sec;
|
|
||||||
tmzip->tm_min = filedate->tm_min;
|
|
||||||
tmzip->tm_hour = filedate->tm_hour;
|
|
||||||
tmzip->tm_mday = filedate->tm_mday;
|
|
||||||
tmzip->tm_mon = filedate->tm_mon ;
|
|
||||||
tmzip->tm_year = filedate->tm_year;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
uLong filetime(f, tmzip, dt)
|
|
||||||
char *f; /* name of file to get info on */
|
|
||||||
tm_zip *tmzip; /* return value: access, modific. and creation times */
|
|
||||||
uLong *dt; /* dostime */
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int check_exist_file(filename)
|
|
||||||
const char* filename;
|
|
||||||
{
|
|
||||||
FILE* ftestexist;
|
|
||||||
int ret = 1;
|
|
||||||
ftestexist = fopen(filename,"rb");
|
|
||||||
if (ftestexist==NULL)
|
|
||||||
ret = 0;
|
|
||||||
else
|
|
||||||
fclose(ftestexist);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void do_banner()
|
|
||||||
{
|
|
||||||
printf("MiniZip 0.15, demo of zLib + Zip package written by Gilles Vollant\n");
|
|
||||||
printf("more info at http://wwww.winimage/zLibDll/unzip.htm\n\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
void do_help()
|
|
||||||
{
|
|
||||||
printf("Usage : minizip [-o] file.zip [files_to_add]\n\n") ;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(argc,argv)
|
|
||||||
int argc;
|
|
||||||
char *argv[];
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
int opt_overwrite=0;
|
|
||||||
int opt_compress_level=Z_DEFAULT_COMPRESSION;
|
|
||||||
int zipfilenamearg = 0;
|
|
||||||
char filename_try[MAXFILENAME];
|
|
||||||
int zipok;
|
|
||||||
int err=0;
|
|
||||||
int size_buf=0;
|
|
||||||
void* buf=NULL,
|
|
||||||
|
|
||||||
|
|
||||||
do_banner();
|
|
||||||
if (argc==1)
|
|
||||||
{
|
|
||||||
do_help();
|
|
||||||
exit(0);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for (i=1;i<argc;i++)
|
|
||||||
{
|
|
||||||
if ((*argv[i])=='-')
|
|
||||||
{
|
|
||||||
const char *p=argv[i]+1;
|
|
||||||
|
|
||||||
while ((*p)!='\0')
|
|
||||||
{
|
|
||||||
char c=*(p++);;
|
|
||||||
if ((c=='o') || (c=='O'))
|
|
||||||
opt_overwrite = 1;
|
|
||||||
if ((c>='0') && (c<='9'))
|
|
||||||
opt_compress_level = c-'0';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
if (zipfilenamearg == 0)
|
|
||||||
zipfilenamearg = i ;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
size_buf = WRITEBUFFERSIZE;
|
|
||||||
buf = (void*)malloc(size_buf);
|
|
||||||
if (buf==NULL)
|
|
||||||
{
|
|
||||||
printf("Error allocating memory\n");
|
|
||||||
return ZIP_INTERNALERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (zipfilenamearg==0)
|
|
||||||
zipok=0;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int i,len;
|
|
||||||
int dot_found=0;
|
|
||||||
|
|
||||||
zipok = 1 ;
|
|
||||||
strcpy(filename_try,argv[zipfilenamearg]);
|
|
||||||
len=strlen(filename_try);
|
|
||||||
for (i=0;i<len;i++)
|
|
||||||
if (filename_try[i]=='.')
|
|
||||||
dot_found=1;
|
|
||||||
|
|
||||||
if (dot_found==0)
|
|
||||||
strcat(filename_try,".zip");
|
|
||||||
|
|
||||||
if (opt_overwrite==0)
|
|
||||||
if (check_exist_file(filename_try)!=0)
|
|
||||||
{
|
|
||||||
char rep;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
char answer[128];
|
|
||||||
printf("The file %s exist. Overwrite ? [y]es, [n]o : ",filename_try);
|
|
||||||
scanf("%1s",answer);
|
|
||||||
rep = answer[0] ;
|
|
||||||
if ((rep>='a') && (rep<='z'))
|
|
||||||
rep -= 0x20;
|
|
||||||
}
|
|
||||||
while ((rep!='Y') && (rep!='N'));
|
|
||||||
if (rep=='N')
|
|
||||||
zipok = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (zipok==1)
|
|
||||||
{
|
|
||||||
zipFile zf;
|
|
||||||
int errclose;
|
|
||||||
zf = zipOpen(filename_try,0);
|
|
||||||
if (zf == NULL)
|
|
||||||
{
|
|
||||||
printf("error opening %s\n",filename_try);
|
|
||||||
err= ZIP_ERRNO;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
printf("creating %s\n",filename_try);
|
|
||||||
|
|
||||||
for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
|
|
||||||
{
|
|
||||||
if (((*(argv[i]))!='-') && ((*(argv[i]))!='/'))
|
|
||||||
{
|
|
||||||
FILE * fin;
|
|
||||||
int size_read;
|
|
||||||
const char* filenameinzip = argv[i];
|
|
||||||
zip_fileinfo zi;
|
|
||||||
|
|
||||||
zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
|
|
||||||
zi.tmz_date.tm_mday = zi.tmz_date.tm_min = zi.tmz_date.tm_year = 0;
|
|
||||||
zi.dosDate = 0;
|
|
||||||
zi.internal_fa = 0;
|
|
||||||
zi.external_fa = 0;
|
|
||||||
filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
|
|
||||||
|
|
||||||
|
|
||||||
err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
|
|
||||||
NULL,0,NULL,0,NULL /* comment*/,
|
|
||||||
(opt_compress_level != 0) ? Z_DEFLATED : 0,
|
|
||||||
opt_compress_level);
|
|
||||||
|
|
||||||
if (err != ZIP_OK)
|
|
||||||
printf("error in opening %s in zipfile\n",filenameinzip);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fin = fopen(filenameinzip,"rb");
|
|
||||||
if (fin==NULL)
|
|
||||||
{
|
|
||||||
err=ZIP_ERRNO;
|
|
||||||
printf("error in opening %s for reading\n",filenameinzip);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (err == ZIP_OK)
|
|
||||||
do
|
|
||||||
{
|
|
||||||
err = ZIP_OK;
|
|
||||||
size_read = fread(buf,1,size_buf,fin);
|
|
||||||
if (size_read < size_buf)
|
|
||||||
if (feof(fin)==0)
|
|
||||||
{
|
|
||||||
printf("error in reading %s\n",filenameinzip);
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (size_read>0)
|
|
||||||
{
|
|
||||||
err = zipWriteInFileInZip (zf,buf,size_read);
|
|
||||||
if (err<0)
|
|
||||||
{
|
|
||||||
printf("error in writing %s in the zipfile\n",
|
|
||||||
filenameinzip);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
} while ((err == ZIP_OK) && (size_read>0));
|
|
||||||
|
|
||||||
fclose(fin);
|
|
||||||
if (err<0)
|
|
||||||
err=ZIP_ERRNO;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
err = zipCloseFileInZip(zf);
|
|
||||||
if (err!=ZIP_OK)
|
|
||||||
printf("error in closing %s in the zipfile\n",
|
|
||||||
filenameinzip);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
errclose = zipClose(zf,NULL);
|
|
||||||
if (errclose != ZIP_OK)
|
|
||||||
printf("error in closing %s\n",filename_try);
|
|
||||||
}
|
|
||||||
|
|
||||||
free(buf);
|
|
||||||
exit(0);
|
|
||||||
return 0; /* to avoid warning */
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
|
|
||||||
UnZip 0.15 additionnal library
|
|
||||||
|
|
||||||
|
|
||||||
This unzip package allow extract file from .ZIP file, compatible with
|
|
||||||
PKZip 2.04g, WinZip, InfoZip tools and compatible.
|
|
||||||
|
|
||||||
Multi volume ZipFile (span) are not supported, and old compression used by old
|
|
||||||
PKZip 1.x are not supported.
|
|
||||||
|
|
||||||
See probdesc.zip from PKWare for specification of .ZIP format.
|
|
||||||
|
|
||||||
What is Unzip
|
|
||||||
The Zlib library support the deflate compression and the creation of gzip (.gz)
|
|
||||||
file. Zlib is free and small.
|
|
||||||
The .Zip format, which can contain several compressed files (.gz can containt
|
|
||||||
only one file) is a very popular format. This is why I've written a package for reading file compressed in Zipfile.
|
|
||||||
|
|
||||||
Using Unzip package
|
|
||||||
|
|
||||||
You need source of Zlib (get zlib111.zip and read zlib.h).
|
|
||||||
Get unzlb015.zip and read unzip.h (whith documentation of unzip functions)
|
|
||||||
|
|
||||||
The Unzip package is only two file : unzip.h and unzip.c. But it use the Zlib
|
|
||||||
files.
|
|
||||||
unztst.c is a simple sample program, which list file in a zipfile and display
|
|
||||||
README.TXT or FILE_ID.DIZ (if these files are found).
|
|
||||||
miniunz.c is a mini unzip program.
|
|
||||||
|
|
||||||
I'm also currenlyt writing a zipping portion (zip.h, zip.c and test with minizip.c)
|
|
||||||
|
|
||||||
Please email me for feedback.
|
|
||||||
I hope my source is compatible with Unix system, but I need your help for be sure
|
|
||||||
|
|
||||||
Latest revision : Mar 04th, 1998
|
|
||||||
|
|
||||||
Check http://www.winimage.com/zLibDll/unzip.html for up to date info.
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,15 +0,0 @@
|
|||||||
unzOpen @61
|
|
||||||
unzClose @62
|
|
||||||
unzGetGlobalInfo @63
|
|
||||||
unzGetCurrentFileInfo @64
|
|
||||||
unzGoToFirstFile @65
|
|
||||||
unzGoToNextFile @66
|
|
||||||
unzOpenCurrentFile @67
|
|
||||||
unzReadCurrentFile @68
|
|
||||||
unztell @70
|
|
||||||
unzeof @71
|
|
||||||
unzCloseCurrentFile @72
|
|
||||||
unzGetGlobalComment @73
|
|
||||||
unzStringFileNameCompare @74
|
|
||||||
unzLocateFile @75
|
|
||||||
unzGetLocalExtrafield @76
|
|
||||||
@ -1,275 +0,0 @@
|
|||||||
/* unzip.h -- IO for uncompress .zip files using zlib
|
|
||||||
Version 0.15 beta, Mar 19th, 1998,
|
|
||||||
|
|
||||||
Copyright (C) 1998 Gilles Vollant
|
|
||||||
|
|
||||||
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
|
|
||||||
WinZip, InfoZip tools and compatible.
|
|
||||||
Encryption and multi volume ZipFile (span) are not supported.
|
|
||||||
Old compressions used by old PKZip 1.x are not supported
|
|
||||||
|
|
||||||
THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
|
|
||||||
CAN CHANGE IN FUTURE VERSION !!
|
|
||||||
I WAIT FEEDBACK at mail info@winimage.com
|
|
||||||
Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
|
|
||||||
|
|
||||||
Condition of use and distribution are the same than zlib :
|
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
|
||||||
warranty. In no event will the authors be held liable for any damages
|
|
||||||
arising from the use of this software.
|
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
|
||||||
including commercial applications, and to alter it and redistribute it
|
|
||||||
freely, subject to the following restrictions:
|
|
||||||
|
|
||||||
1. The origin of this software must not be misrepresented; you must not
|
|
||||||
claim that you wrote the original software. If you use this software
|
|
||||||
in a product, an acknowledgment in the product documentation would be
|
|
||||||
appreciated but is not required.
|
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
misrepresented as being the original software.
|
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
/* for more info about .ZIP format, see
|
|
||||||
ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
|
|
||||||
PkWare has also a specification at :
|
|
||||||
ftp://ftp.pkware.com/probdesc.zip */
|
|
||||||
|
|
||||||
#ifndef _unz_H
|
|
||||||
#define _unz_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _ZLIB_H
|
|
||||||
#include "zlib.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
|
|
||||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
|
||||||
from (void*) without cast */
|
|
||||||
typedef struct TagunzFile__ { int unused; } unzFile__;
|
|
||||||
typedef unzFile__ *unzFile;
|
|
||||||
#else
|
|
||||||
typedef voidp unzFile;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#define UNZ_OK (0)
|
|
||||||
#define UNZ_END_OF_LIST_OF_FILE (-100)
|
|
||||||
#define UNZ_ERRNO (Z_ERRNO)
|
|
||||||
#define UNZ_EOF (0)
|
|
||||||
#define UNZ_PARAMERROR (-102)
|
|
||||||
#define UNZ_BADZIPFILE (-103)
|
|
||||||
#define UNZ_INTERNALERROR (-104)
|
|
||||||
#define UNZ_CRCERROR (-105)
|
|
||||||
|
|
||||||
/* tm_unz contain date/time info */
|
|
||||||
typedef struct tm_unz_s
|
|
||||||
{
|
|
||||||
uInt tm_sec; /* seconds after the minute - [0,59] */
|
|
||||||
uInt tm_min; /* minutes after the hour - [0,59] */
|
|
||||||
uInt tm_hour; /* hours since midnight - [0,23] */
|
|
||||||
uInt tm_mday; /* day of the month - [1,31] */
|
|
||||||
uInt tm_mon; /* months since January - [0,11] */
|
|
||||||
uInt tm_year; /* years - [1980..2044] */
|
|
||||||
} tm_unz;
|
|
||||||
|
|
||||||
/* unz_global_info structure contain global data about the ZIPfile
|
|
||||||
These data comes from the end of central dir */
|
|
||||||
typedef struct unz_global_info_s
|
|
||||||
{
|
|
||||||
uLong number_entry; /* total number of entries in
|
|
||||||
the central dir on this disk */
|
|
||||||
uLong size_comment; /* size of the global comment of the zipfile */
|
|
||||||
} unz_global_info;
|
|
||||||
|
|
||||||
|
|
||||||
/* unz_file_info contain information about a file in the zipfile */
|
|
||||||
typedef struct unz_file_info_s
|
|
||||||
{
|
|
||||||
uLong version; /* version made by 2 bytes */
|
|
||||||
uLong version_needed; /* version needed to extract 2 bytes */
|
|
||||||
uLong flag; /* general purpose bit flag 2 bytes */
|
|
||||||
uLong compression_method; /* compression method 2 bytes */
|
|
||||||
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
|
|
||||||
uLong crc; /* crc-32 4 bytes */
|
|
||||||
uLong compressed_size; /* compressed size 4 bytes */
|
|
||||||
uLong uncompressed_size; /* uncompressed size 4 bytes */
|
|
||||||
uLong size_filename; /* filename length 2 bytes */
|
|
||||||
uLong size_file_extra; /* extra field length 2 bytes */
|
|
||||||
uLong size_file_comment; /* file comment length 2 bytes */
|
|
||||||
|
|
||||||
uLong disk_num_start; /* disk number start 2 bytes */
|
|
||||||
uLong internal_fa; /* internal file attributes 2 bytes */
|
|
||||||
uLong external_fa; /* external file attributes 4 bytes */
|
|
||||||
|
|
||||||
tm_unz tmu_date;
|
|
||||||
} unz_file_info;
|
|
||||||
|
|
||||||
extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
|
|
||||||
const char* fileName2,
|
|
||||||
int iCaseSensitivity));
|
|
||||||
/*
|
|
||||||
Compare two filename (fileName1,fileName2).
|
|
||||||
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
|
|
||||||
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
|
|
||||||
or strcasecmp)
|
|
||||||
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
|
|
||||||
(like 1 on Unix, 2 on Windows)
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
extern unzFile ZEXPORT unzOpen OF((const char *path));
|
|
||||||
/*
|
|
||||||
Open a Zip file. path contain the full pathname (by example,
|
|
||||||
on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
|
|
||||||
"zlib/zlib111.zip".
|
|
||||||
If the zipfile cannot be opened (file don't exist or in not valid), the
|
|
||||||
return value is NULL.
|
|
||||||
Else, the return value is a unzFile Handle, usable with other function
|
|
||||||
of this unzip package.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzClose OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Close a ZipFile opened with unzipOpen.
|
|
||||||
If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
|
|
||||||
these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
|
|
||||||
return UNZ_OK if there is no problem. */
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
|
|
||||||
unz_global_info *pglobal_info));
|
|
||||||
/*
|
|
||||||
Write info about the ZipFile in the *pglobal_info structure.
|
|
||||||
No preparation of the structure is needed
|
|
||||||
return UNZ_OK if there is no problem. */
|
|
||||||
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
|
|
||||||
char *szComment,
|
|
||||||
uLong uSizeBuf));
|
|
||||||
/*
|
|
||||||
Get the global comment string of the ZipFile, in the szComment buffer.
|
|
||||||
uSizeBuf is the size of the szComment buffer.
|
|
||||||
return the number of byte copied or an error code <0
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************/
|
|
||||||
/* Unzip package allow you browse the directory of the zipfile */
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Set the current file of the zipfile to the first file.
|
|
||||||
return UNZ_OK if there is no problem
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGoToNextFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Set the current file of the zipfile to the next file.
|
|
||||||
return UNZ_OK if there is no problem
|
|
||||||
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzLocateFile OF((unzFile file,
|
|
||||||
const char *szFileName,
|
|
||||||
int iCaseSensitivity));
|
|
||||||
/*
|
|
||||||
Try locate the file szFileName in the zipfile.
|
|
||||||
For the iCaseSensitivity signification, see unzStringFileNameCompare
|
|
||||||
|
|
||||||
return value :
|
|
||||||
UNZ_OK if the file is found. It becomes the current file.
|
|
||||||
UNZ_END_OF_LIST_OF_FILE if the file is not found
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
|
|
||||||
unz_file_info *pfile_info,
|
|
||||||
char *szFileName,
|
|
||||||
uLong fileNameBufferSize,
|
|
||||||
void *extraField,
|
|
||||||
uLong extraFieldBufferSize,
|
|
||||||
char *szComment,
|
|
||||||
uLong commentBufferSize));
|
|
||||||
/*
|
|
||||||
Get Info about the current file
|
|
||||||
if pfile_info!=NULL, the *pfile_info structure will contain somes info about
|
|
||||||
the current file
|
|
||||||
if szFileName!=NULL, the filemane string will be copied in szFileName
|
|
||||||
(fileNameBufferSize is the size of the buffer)
|
|
||||||
if extraField!=NULL, the extra field information will be copied in extraField
|
|
||||||
(extraFieldBufferSize is the size of the buffer).
|
|
||||||
This is the Central-header version of the extra field
|
|
||||||
if szComment!=NULL, the comment string of the file will be copied in szComment
|
|
||||||
(commentBufferSize is the size of the buffer)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/***************************************************************************/
|
|
||||||
/* for reading the content of the current zipfile, you can open it, read data
|
|
||||||
from it, and close it (you can close it before reading all the file)
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Open for reading data the current file in the zipfile.
|
|
||||||
If there is no error, the return value is UNZ_OK.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Close the file in zip opened with unzOpenCurrentFile
|
|
||||||
Return UNZ_CRCERROR if all the file was read but the CRC is not good
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
|
|
||||||
voidp buf,
|
|
||||||
unsigned len));
|
|
||||||
/*
|
|
||||||
Read bytes from the current file (opened by unzOpenCurrentFile)
|
|
||||||
buf contain buffer where data must be copied
|
|
||||||
len the size of buf.
|
|
||||||
|
|
||||||
return the number of byte copied if somes bytes are copied
|
|
||||||
return 0 if the end of file was reached
|
|
||||||
return <0 with error code if there is an error
|
|
||||||
(UNZ_ERRNO for IO error, or zLib error for uncompress error)
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern z_off_t ZEXPORT unztell OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Give the current position in uncompressed data
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzeof OF((unzFile file));
|
|
||||||
/*
|
|
||||||
return 1 if the end of file was reached, 0 elsewhere
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
|
|
||||||
voidp buf,
|
|
||||||
unsigned len));
|
|
||||||
/*
|
|
||||||
Read extra field from the current file (opened by unzOpenCurrentFile)
|
|
||||||
This is the local-header version of the extra field (sometimes, there is
|
|
||||||
more info in the local-header version than in the central-header)
|
|
||||||
|
|
||||||
if buf==NULL, it return the size of the local extra field
|
|
||||||
|
|
||||||
if buf!=NULL, len is the size of the buffer, the extra header is copied in
|
|
||||||
buf.
|
|
||||||
the return value is the number of bytes copied in buf, or (if <0)
|
|
||||||
the error code
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _unz_H */
|
|
||||||
@ -1,718 +0,0 @@
|
|||||||
/* zip.c -- IO on .zip files using zlib
|
|
||||||
Version 0.15 beta, Mar 19th, 1998,
|
|
||||||
|
|
||||||
Read zip.h for more info
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include "zlib.h"
|
|
||||||
#include "zip.h"
|
|
||||||
|
|
||||||
#ifdef STDC
|
|
||||||
# include <stddef.h>
|
|
||||||
# include <string.h>
|
|
||||||
# include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
#ifdef NO_ERRNO_H
|
|
||||||
extern int errno;
|
|
||||||
#else
|
|
||||||
# include <errno.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef local
|
|
||||||
# define local static
|
|
||||||
#endif
|
|
||||||
/* compile with -Dlocal if your debugger can't find static symbols */
|
|
||||||
|
|
||||||
#ifndef VERSIONMADEBY
|
|
||||||
# define VERSIONMADEBY (0x0) /* platform depedent */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef Z_BUFSIZE
|
|
||||||
#define Z_BUFSIZE (16384)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef Z_MAXFILENAMEINZIP
|
|
||||||
#define Z_MAXFILENAMEINZIP (256)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ALLOC
|
|
||||||
# define ALLOC(size) (malloc(size))
|
|
||||||
#endif
|
|
||||||
#ifndef TRYFREE
|
|
||||||
# define TRYFREE(p) {if (p) free(p);}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
#define SIZECENTRALDIRITEM (0x2e)
|
|
||||||
#define SIZEZIPLOCALHEADER (0x1e)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
|
|
||||||
|
|
||||||
#ifndef SEEK_CUR
|
|
||||||
#define SEEK_CUR 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SEEK_END
|
|
||||||
#define SEEK_END 2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SEEK_SET
|
|
||||||
#define SEEK_SET 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char zip_copyright[] =
|
|
||||||
" zip 0.15 Copyright 1998 Gilles Vollant ";
|
|
||||||
|
|
||||||
|
|
||||||
#define SIZEDATA_INDATABLOCK (4096-(4*4))
|
|
||||||
|
|
||||||
#define LOCALHEADERMAGIC (0x04034b50)
|
|
||||||
#define CENTRALHEADERMAGIC (0x02014b50)
|
|
||||||
#define ENDHEADERMAGIC (0x06054b50)
|
|
||||||
|
|
||||||
#define FLAG_LOCALHEADER_OFFSET (0x06)
|
|
||||||
#define CRC_LOCALHEADER_OFFSET (0x0e)
|
|
||||||
|
|
||||||
#define SIZECENTRALHEADER (0x2e) /* 46 */
|
|
||||||
|
|
||||||
typedef struct linkedlist_datablock_internal_s
|
|
||||||
{
|
|
||||||
struct linkedlist_datablock_internal_s* next_datablock;
|
|
||||||
uLong avail_in_this_block;
|
|
||||||
uLong filled_in_this_block;
|
|
||||||
uLong unused; /* for future use and alignement */
|
|
||||||
unsigned char data[SIZEDATA_INDATABLOCK];
|
|
||||||
} linkedlist_datablock_internal;
|
|
||||||
|
|
||||||
typedef struct linkedlist_data_s
|
|
||||||
{
|
|
||||||
linkedlist_datablock_internal* first_block;
|
|
||||||
linkedlist_datablock_internal* last_block;
|
|
||||||
} linkedlist_data;
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
z_stream stream; /* zLib stream structure for inflate */
|
|
||||||
int stream_initialised; /* 1 is stream is initialised */
|
|
||||||
uInt pos_in_buffered_data; /* last written byte in buffered_data */
|
|
||||||
|
|
||||||
uLong pos_local_header; /* offset of the local header of the file
|
|
||||||
currenty writing */
|
|
||||||
char* central_header; /* central header data for the current file */
|
|
||||||
uLong size_centralheader; /* size of the central header for cur file */
|
|
||||||
uLong flag; /* flag of the file currently writing */
|
|
||||||
|
|
||||||
int method; /* compression method of file currenty wr.*/
|
|
||||||
Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
|
|
||||||
uLong dosDate;
|
|
||||||
uLong crc32;
|
|
||||||
} curfile_info;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
FILE * filezip;
|
|
||||||
linkedlist_data central_dir;/* datablock with central dir in construction*/
|
|
||||||
int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/
|
|
||||||
curfile_info ci; /* info on the file curretly writing */
|
|
||||||
|
|
||||||
uLong begin_pos; /* position of the beginning of the zipfile */
|
|
||||||
uLong number_entry;
|
|
||||||
} zip_internal;
|
|
||||||
|
|
||||||
local linkedlist_datablock_internal* allocate_new_datablock()
|
|
||||||
{
|
|
||||||
linkedlist_datablock_internal* ldi;
|
|
||||||
ldi = (linkedlist_datablock_internal*)
|
|
||||||
ALLOC(sizeof(linkedlist_datablock_internal));
|
|
||||||
if (ldi!=NULL)
|
|
||||||
{
|
|
||||||
ldi->next_datablock = NULL ;
|
|
||||||
ldi->filled_in_this_block = 0 ;
|
|
||||||
ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
|
|
||||||
}
|
|
||||||
return ldi;
|
|
||||||
}
|
|
||||||
|
|
||||||
local void free_datablock(ldi)
|
|
||||||
linkedlist_datablock_internal* ldi;
|
|
||||||
{
|
|
||||||
while (ldi!=NULL)
|
|
||||||
{
|
|
||||||
linkedlist_datablock_internal* ldinext = ldi->next_datablock;
|
|
||||||
TRYFREE(ldi);
|
|
||||||
ldi = ldinext;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
local void init_linkedlist(ll)
|
|
||||||
linkedlist_data* ll;
|
|
||||||
{
|
|
||||||
ll->first_block = ll->last_block = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
local void free_linkedlist(ll)
|
|
||||||
linkedlist_data* ll;
|
|
||||||
{
|
|
||||||
free_datablock(ll->first_block);
|
|
||||||
ll->first_block = ll->last_block = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
local int add_data_in_datablock(ll,buf,len)
|
|
||||||
linkedlist_data* ll;
|
|
||||||
const void* buf;
|
|
||||||
uLong len;
|
|
||||||
{
|
|
||||||
linkedlist_datablock_internal* ldi;
|
|
||||||
const unsigned char* from_copy;
|
|
||||||
|
|
||||||
if (ll==NULL)
|
|
||||||
return ZIP_INTERNALERROR;
|
|
||||||
|
|
||||||
if (ll->last_block == NULL)
|
|
||||||
{
|
|
||||||
ll->first_block = ll->last_block = allocate_new_datablock();
|
|
||||||
if (ll->first_block == NULL)
|
|
||||||
return ZIP_INTERNALERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
ldi = ll->last_block;
|
|
||||||
from_copy = (unsigned char*)buf;
|
|
||||||
|
|
||||||
while (len>0)
|
|
||||||
{
|
|
||||||
uInt copy_this;
|
|
||||||
uInt i;
|
|
||||||
unsigned char* to_copy;
|
|
||||||
|
|
||||||
if (ldi->avail_in_this_block==0)
|
|
||||||
{
|
|
||||||
ldi->next_datablock = allocate_new_datablock();
|
|
||||||
if (ldi->next_datablock == NULL)
|
|
||||||
return ZIP_INTERNALERROR;
|
|
||||||
ldi = ldi->next_datablock ;
|
|
||||||
ll->last_block = ldi;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ldi->avail_in_this_block < len)
|
|
||||||
copy_this = (uInt)ldi->avail_in_this_block;
|
|
||||||
else
|
|
||||||
copy_this = (uInt)len;
|
|
||||||
|
|
||||||
to_copy = &(ldi->data[ldi->filled_in_this_block]);
|
|
||||||
|
|
||||||
for (i=0;i<copy_this;i++)
|
|
||||||
*(to_copy+i)=*(from_copy+i);
|
|
||||||
|
|
||||||
ldi->filled_in_this_block += copy_this;
|
|
||||||
ldi->avail_in_this_block -= copy_this;
|
|
||||||
from_copy += copy_this ;
|
|
||||||
len -= copy_this;
|
|
||||||
}
|
|
||||||
return ZIP_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
local int write_datablock(fout,ll)
|
|
||||||
FILE * fout;
|
|
||||||
linkedlist_data* ll;
|
|
||||||
{
|
|
||||||
linkedlist_datablock_internal* ldi;
|
|
||||||
ldi = ll->first_block;
|
|
||||||
while (ldi!=NULL)
|
|
||||||
{
|
|
||||||
if (ldi->filled_in_this_block > 0)
|
|
||||||
if (fwrite(ldi->data,(uInt)ldi->filled_in_this_block,1,fout)!=1)
|
|
||||||
return ZIP_ERRNO;
|
|
||||||
ldi = ldi->next_datablock;
|
|
||||||
}
|
|
||||||
return ZIP_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
/****************************************************************************/
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Outputs a long in LSB order to the given file
|
|
||||||
nbByte == 1, 2 or 4 (byte, short or long)
|
|
||||||
*/
|
|
||||||
|
|
||||||
local int ziplocal_putValue OF((FILE *file, uLong x, int nbByte));
|
|
||||||
local int ziplocal_putValue (file, x, nbByte)
|
|
||||||
FILE *file;
|
|
||||||
uLong x;
|
|
||||||
int nbByte;
|
|
||||||
{
|
|
||||||
unsigned char buf[4];
|
|
||||||
int n;
|
|
||||||
for (n = 0; n < nbByte; n++) {
|
|
||||||
buf[n] = (unsigned char)(x & 0xff);
|
|
||||||
x >>= 8;
|
|
||||||
}
|
|
||||||
if (fwrite(buf,nbByte,1,file)!=1)
|
|
||||||
return ZIP_ERRNO;
|
|
||||||
else
|
|
||||||
return ZIP_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
|
|
||||||
local void ziplocal_putValue_inmemory (dest, x, nbByte)
|
|
||||||
void* dest;
|
|
||||||
uLong x;
|
|
||||||
int nbByte;
|
|
||||||
{
|
|
||||||
unsigned char* buf=(unsigned char*)dest;
|
|
||||||
int n;
|
|
||||||
for (n = 0; n < nbByte; n++) {
|
|
||||||
buf[n] = (unsigned char)(x & 0xff);
|
|
||||||
x >>= 8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/****************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
|
|
||||||
tm_zip* ptm;
|
|
||||||
uLong dosDate;
|
|
||||||
{
|
|
||||||
uLong year = (uLong)ptm->tm_year;
|
|
||||||
if (year>1980)
|
|
||||||
year-=1980;
|
|
||||||
else if (year>80)
|
|
||||||
year-=80;
|
|
||||||
return
|
|
||||||
(uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
|
|
||||||
((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************/
|
|
||||||
|
|
||||||
extern zipFile ZEXPORT zipOpen (pathname, append)
|
|
||||||
const char *pathname;
|
|
||||||
int append;
|
|
||||||
{
|
|
||||||
zip_internal ziinit;
|
|
||||||
zip_internal* zi;
|
|
||||||
|
|
||||||
ziinit.filezip = fopen(pathname,(append == 0) ? "wb" : "ab");
|
|
||||||
if (ziinit.filezip == NULL)
|
|
||||||
return NULL;
|
|
||||||
ziinit.begin_pos = ftell(ziinit.filezip);
|
|
||||||
ziinit.in_opened_file_inzip = 0;
|
|
||||||
ziinit.ci.stream_initialised = 0;
|
|
||||||
ziinit.number_entry = 0;
|
|
||||||
init_linkedlist(&(ziinit.central_dir));
|
|
||||||
|
|
||||||
|
|
||||||
zi = (zip_internal*)ALLOC(sizeof(zip_internal));
|
|
||||||
if (zi==NULL)
|
|
||||||
{
|
|
||||||
fclose(ziinit.filezip);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
*zi = ziinit;
|
|
||||||
return (zipFile)zi;
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
|
|
||||||
extrafield_local, size_extrafield_local,
|
|
||||||
extrafield_global, size_extrafield_global,
|
|
||||||
comment, method, level)
|
|
||||||
zipFile file;
|
|
||||||
const char* filename;
|
|
||||||
const zip_fileinfo* zipfi;
|
|
||||||
const void* extrafield_local;
|
|
||||||
uInt size_extrafield_local;
|
|
||||||
const void* extrafield_global;
|
|
||||||
uInt size_extrafield_global;
|
|
||||||
const char* comment;
|
|
||||||
int method;
|
|
||||||
int level;
|
|
||||||
{
|
|
||||||
zip_internal* zi;
|
|
||||||
uInt size_filename;
|
|
||||||
uInt size_comment;
|
|
||||||
uInt i;
|
|
||||||
int err = ZIP_OK;
|
|
||||||
|
|
||||||
if (file == NULL)
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
if ((method!=0) && (method!=Z_DEFLATED))
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
|
|
||||||
zi = (zip_internal*)file;
|
|
||||||
|
|
||||||
if (zi->in_opened_file_inzip == 1)
|
|
||||||
{
|
|
||||||
err = zipCloseFileInZip (file);
|
|
||||||
if (err != ZIP_OK)
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (filename==NULL)
|
|
||||||
filename="-";
|
|
||||||
|
|
||||||
if (comment==NULL)
|
|
||||||
size_comment = 0;
|
|
||||||
else
|
|
||||||
size_comment = strlen(comment);
|
|
||||||
|
|
||||||
size_filename = strlen(filename);
|
|
||||||
|
|
||||||
if (zipfi == NULL)
|
|
||||||
zi->ci.dosDate = 0;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (zipfi->dosDate != 0)
|
|
||||||
zi->ci.dosDate = zipfi->dosDate;
|
|
||||||
else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);
|
|
||||||
}
|
|
||||||
|
|
||||||
zi->ci.flag = 0;
|
|
||||||
if ((level==8) || (level==9))
|
|
||||||
zi->ci.flag |= 2;
|
|
||||||
if ((level==2))
|
|
||||||
zi->ci.flag |= 4;
|
|
||||||
if ((level==1))
|
|
||||||
zi->ci.flag |= 6;
|
|
||||||
|
|
||||||
zi->ci.crc32 = 0;
|
|
||||||
zi->ci.method = method;
|
|
||||||
zi->ci.stream_initialised = 0;
|
|
||||||
zi->ci.pos_in_buffered_data = 0;
|
|
||||||
zi->ci.pos_local_header = ftell(zi->filezip);
|
|
||||||
zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +
|
|
||||||
size_extrafield_global + size_comment;
|
|
||||||
zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);
|
|
||||||
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
|
|
||||||
/* version info */
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
|
|
||||||
|
|
||||||
if (zipfi==NULL)
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
|
|
||||||
else
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
|
|
||||||
|
|
||||||
if (zipfi==NULL)
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
|
|
||||||
else
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
|
|
||||||
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header,4);
|
|
||||||
|
|
||||||
for (i=0;i<size_filename;i++)
|
|
||||||
*(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
|
|
||||||
|
|
||||||
for (i=0;i<size_extrafield_global;i++)
|
|
||||||
*(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
|
|
||||||
*(((const char*)extrafield_global)+i);
|
|
||||||
|
|
||||||
for (i=0;i<size_comment;i++)
|
|
||||||
*(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
|
|
||||||
size_extrafield_global+i) = *(filename+i);
|
|
||||||
if (zi->ci.central_header == NULL)
|
|
||||||
return ZIP_INTERNALERROR;
|
|
||||||
|
|
||||||
/* write the local header */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)LOCALHEADERMAGIC,4);
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)20,2);/* version needed to extract */
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.flag,2);
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.method,2);
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.dosDate,4);
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)0,4); /* crc 32, unknown */
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)0,4); /* compressed size, unknown */
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)0,4); /* uncompressed size, unknown */
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)size_filename,2);
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)size_extrafield_local,2);
|
|
||||||
|
|
||||||
if ((err==ZIP_OK) && (size_filename>0))
|
|
||||||
if (fwrite(filename,(uInt)size_filename,1,zi->filezip)!=1)
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
|
|
||||||
if ((err==ZIP_OK) && (size_extrafield_local>0))
|
|
||||||
if (fwrite(extrafield_local,(uInt)size_extrafield_local,1,zi->filezip)
|
|
||||||
!=1)
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
|
|
||||||
zi->ci.stream.avail_in = (uInt)0;
|
|
||||||
zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
|
|
||||||
zi->ci.stream.next_out = zi->ci.buffered_data;
|
|
||||||
zi->ci.stream.total_in = 0;
|
|
||||||
zi->ci.stream.total_out = 0;
|
|
||||||
|
|
||||||
if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED))
|
|
||||||
{
|
|
||||||
zi->ci.stream.zalloc = (alloc_func)0;
|
|
||||||
zi->ci.stream.zfree = (free_func)0;
|
|
||||||
zi->ci.stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
err = deflateInit2(&zi->ci.stream, level,
|
|
||||||
Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
|
|
||||||
|
|
||||||
if (err==Z_OK)
|
|
||||||
zi->ci.stream_initialised = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (err==Z_OK)
|
|
||||||
zi->in_opened_file_inzip = 1;
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
|
|
||||||
zipFile file;
|
|
||||||
const voidp buf;
|
|
||||||
unsigned len;
|
|
||||||
{
|
|
||||||
zip_internal* zi;
|
|
||||||
int err=ZIP_OK;
|
|
||||||
|
|
||||||
if (file == NULL)
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
zi = (zip_internal*)file;
|
|
||||||
|
|
||||||
if (zi->in_opened_file_inzip == 0)
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
|
|
||||||
zi->ci.stream.next_in = buf;
|
|
||||||
zi->ci.stream.avail_in = len;
|
|
||||||
zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
|
|
||||||
|
|
||||||
while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
|
|
||||||
{
|
|
||||||
if (zi->ci.stream.avail_out == 0)
|
|
||||||
{
|
|
||||||
if (fwrite(zi->ci.buffered_data,(uInt)zi->ci.pos_in_buffered_data,1,zi->filezip)
|
|
||||||
!=1)
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
zi->ci.pos_in_buffered_data = 0;
|
|
||||||
zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
|
|
||||||
zi->ci.stream.next_out = zi->ci.buffered_data;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (zi->ci.method == Z_DEFLATED)
|
|
||||||
{
|
|
||||||
uLong uTotalOutBefore = zi->ci.stream.total_out;
|
|
||||||
err=deflate(&zi->ci.stream, Z_NO_FLUSH);
|
|
||||||
zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
uInt copy_this,i;
|
|
||||||
if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
|
|
||||||
copy_this = zi->ci.stream.avail_in;
|
|
||||||
else
|
|
||||||
copy_this = zi->ci.stream.avail_out;
|
|
||||||
for (i=0;i<copy_this;i++)
|
|
||||||
*(((char*)zi->ci.stream.next_out)+i) =
|
|
||||||
*(((const char*)zi->ci.stream.next_in)+i);
|
|
||||||
{
|
|
||||||
zi->ci.stream.avail_in -= copy_this;
|
|
||||||
zi->ci.stream.avail_out-= copy_this;
|
|
||||||
zi->ci.stream.next_in+= copy_this;
|
|
||||||
zi->ci.stream.next_out+= copy_this;
|
|
||||||
zi->ci.stream.total_in+= copy_this;
|
|
||||||
zi->ci.stream.total_out+= copy_this;
|
|
||||||
zi->ci.pos_in_buffered_data += copy_this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int ZEXPORT zipCloseFileInZip (file)
|
|
||||||
zipFile file;
|
|
||||||
{
|
|
||||||
zip_internal* zi;
|
|
||||||
int err=ZIP_OK;
|
|
||||||
|
|
||||||
if (file == NULL)
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
zi = (zip_internal*)file;
|
|
||||||
|
|
||||||
if (zi->in_opened_file_inzip == 0)
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
zi->ci.stream.avail_in = 0;
|
|
||||||
|
|
||||||
if (zi->ci.method == Z_DEFLATED)
|
|
||||||
while (err==ZIP_OK)
|
|
||||||
{
|
|
||||||
uLong uTotalOutBefore;
|
|
||||||
if (zi->ci.stream.avail_out == 0)
|
|
||||||
{
|
|
||||||
if (fwrite(zi->ci.buffered_data,(uInt)zi->ci.pos_in_buffered_data,1,zi->filezip)
|
|
||||||
!=1)
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
zi->ci.pos_in_buffered_data = 0;
|
|
||||||
zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
|
|
||||||
zi->ci.stream.next_out = zi->ci.buffered_data;
|
|
||||||
}
|
|
||||||
uTotalOutBefore = zi->ci.stream.total_out;
|
|
||||||
err=deflate(&zi->ci.stream, Z_FINISH);
|
|
||||||
zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (err==Z_STREAM_END)
|
|
||||||
err=ZIP_OK; /* this is normal */
|
|
||||||
|
|
||||||
if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
|
|
||||||
if (fwrite(zi->ci.buffered_data,(uInt)zi->ci.pos_in_buffered_data,1,zi->filezip)
|
|
||||||
!=1)
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
|
|
||||||
if ((zi->ci.method == Z_DEFLATED) && (err==ZIP_OK))
|
|
||||||
{
|
|
||||||
err=deflateEnd(&zi->ci.stream);
|
|
||||||
zi->ci.stream_initialised = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)zi->ci.crc32,4); /*crc*/
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+20,
|
|
||||||
(uLong)zi->ci.stream.total_out,4); /*compr size*/
|
|
||||||
ziplocal_putValue_inmemory(zi->ci.central_header+24,
|
|
||||||
(uLong)zi->ci.stream.total_in,4); /*uncompr size*/
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,
|
|
||||||
(uLong)zi->ci.size_centralheader);
|
|
||||||
free(zi->ci.central_header);
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
{
|
|
||||||
long cur_pos_inzip = ftell(zi->filezip);
|
|
||||||
if (fseek(zi->filezip,
|
|
||||||
zi->ci.pos_local_header + 14,SEEK_SET)!=0)
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.crc32,4); /* crc 32, unknown */
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* compressed size, unknown */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.stream.total_out,4);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* uncompressed size, unknown */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.stream.total_in,4);
|
|
||||||
|
|
||||||
if (fseek(zi->filezip,
|
|
||||||
cur_pos_inzip,SEEK_SET)!=0)
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
}
|
|
||||||
|
|
||||||
zi->number_entry ++;
|
|
||||||
zi->in_opened_file_inzip = 0;
|
|
||||||
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int ZEXPORT zipClose (file, global_comment)
|
|
||||||
zipFile file;
|
|
||||||
const char* global_comment;
|
|
||||||
{
|
|
||||||
zip_internal* zi;
|
|
||||||
int err = 0;
|
|
||||||
uLong size_centraldir = 0;
|
|
||||||
uLong centraldir_pos_inzip ;
|
|
||||||
uInt size_global_comment;
|
|
||||||
if (file == NULL)
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
zi = (zip_internal*)file;
|
|
||||||
|
|
||||||
if (zi->in_opened_file_inzip == 1)
|
|
||||||
{
|
|
||||||
err = zipCloseFileInZip (file);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (global_comment==NULL)
|
|
||||||
size_global_comment = 0;
|
|
||||||
else
|
|
||||||
size_global_comment = strlen(global_comment);
|
|
||||||
|
|
||||||
|
|
||||||
centraldir_pos_inzip = ftell(zi->filezip);
|
|
||||||
if (err==ZIP_OK)
|
|
||||||
{
|
|
||||||
linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;
|
|
||||||
while (ldi!=NULL)
|
|
||||||
{
|
|
||||||
if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
|
|
||||||
if (fwrite(ldi->data,(uInt)ldi->filled_in_this_block,
|
|
||||||
1,zi->filezip) !=1 )
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
|
|
||||||
size_centraldir += ldi->filled_in_this_block;
|
|
||||||
ldi = ldi->next_datablock;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free_datablock(zi->central_dir.first_block);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* Magic End */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)ENDHEADERMAGIC,4);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* number of this disk */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)0,2);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* number of the disk with the start of the central directory */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)0,2);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->number_entry,2);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* total number of entries in the central dir */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)zi->number_entry,2);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* size of the central directory */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)size_centraldir,4);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* offset of start of central directory with respect to the
|
|
||||||
starting disk number */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)centraldir_pos_inzip ,4);
|
|
||||||
|
|
||||||
if (err==ZIP_OK) /* zipfile comment length */
|
|
||||||
err = ziplocal_putValue(zi->filezip,(uLong)size_global_comment,2);
|
|
||||||
|
|
||||||
if ((err==ZIP_OK) && (size_global_comment>0))
|
|
||||||
if (fwrite(global_comment,(uInt)size_global_comment,1,zi->filezip) !=1 )
|
|
||||||
err = ZIP_ERRNO;
|
|
||||||
fclose(zi->filezip);
|
|
||||||
TRYFREE(zi);
|
|
||||||
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
zipOpen @80
|
|
||||||
zipOpenNewFileInZip @81
|
|
||||||
zipWriteInFileInZip @82
|
|
||||||
zipCloseFileInZip @83
|
|
||||||
zipClose @84
|
|
||||||
@ -1,150 +0,0 @@
|
|||||||
/* zip.h -- IO for compress .zip files using zlib
|
|
||||||
Version 0.15 alpha, Mar 19th, 1998,
|
|
||||||
|
|
||||||
Copyright (C) 1998 Gilles Vollant
|
|
||||||
|
|
||||||
This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
|
|
||||||
WinZip, InfoZip tools and compatible.
|
|
||||||
Encryption and multi volume ZipFile (span) are not supported.
|
|
||||||
Old compressions used by old PKZip 1.x are not supported
|
|
||||||
|
|
||||||
For uncompress .zip file, look at unzip.h
|
|
||||||
|
|
||||||
THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
|
|
||||||
CAN CHANGE IN FUTURE VERSION !!
|
|
||||||
I WAIT FEEDBACK at mail info@winimage.com
|
|
||||||
Visit also http://www.winimage.com/zLibDll/zip.htm for evolution
|
|
||||||
|
|
||||||
Condition of use and distribution are the same than zlib :
|
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
|
||||||
warranty. In no event will the authors be held liable for any damages
|
|
||||||
arising from the use of this software.
|
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
|
||||||
including commercial applications, and to alter it and redistribute it
|
|
||||||
freely, subject to the following restrictions:
|
|
||||||
|
|
||||||
1. The origin of this software must not be misrepresented; you must not
|
|
||||||
claim that you wrote the original software. If you use this software
|
|
||||||
in a product, an acknowledgment in the product documentation would be
|
|
||||||
appreciated but is not required.
|
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
misrepresented as being the original software.
|
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* for more info about .ZIP format, see
|
|
||||||
ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
|
|
||||||
PkWare has also a specification at :
|
|
||||||
ftp://ftp.pkware.com/probdesc.zip
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _zip_H
|
|
||||||
#define _zip_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _ZLIB_H
|
|
||||||
#include "zlib.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
|
|
||||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
|
||||||
from (void*) without cast */
|
|
||||||
typedef struct TagzipFile__ { int unused; } zipFile__;
|
|
||||||
typedef zipFile__ *zipFile;
|
|
||||||
#else
|
|
||||||
typedef voidp zipFile;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ZIP_OK (0)
|
|
||||||
#define ZIP_ERRNO (Z_ERRNO)
|
|
||||||
#define ZIP_PARAMERROR (-102)
|
|
||||||
#define ZIP_INTERNALERROR (-104)
|
|
||||||
|
|
||||||
/* tm_zip contain date/time info */
|
|
||||||
typedef struct tm_zip_s
|
|
||||||
{
|
|
||||||
uInt tm_sec; /* seconds after the minute - [0,59] */
|
|
||||||
uInt tm_min; /* minutes after the hour - [0,59] */
|
|
||||||
uInt tm_hour; /* hours since midnight - [0,23] */
|
|
||||||
uInt tm_mday; /* day of the month - [1,31] */
|
|
||||||
uInt tm_mon; /* months since January - [0,11] */
|
|
||||||
uInt tm_year; /* years - [1980..2044] */
|
|
||||||
} tm_zip;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
tm_zip tmz_date; /* date in understandable format */
|
|
||||||
uLong dosDate; /* if dos_date == 0, tmu_date is used */
|
|
||||||
/* uLong flag; */ /* general purpose bit flag 2 bytes */
|
|
||||||
|
|
||||||
uLong internal_fa; /* internal file attributes 2 bytes */
|
|
||||||
uLong external_fa; /* external file attributes 4 bytes */
|
|
||||||
} zip_fileinfo;
|
|
||||||
|
|
||||||
extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
|
|
||||||
/*
|
|
||||||
Create a zipfile.
|
|
||||||
pathname contain on Windows NT a filename like "c:\\zlib\\zlib111.zip" or on
|
|
||||||
an Unix computer "zlib/zlib111.zip".
|
|
||||||
if the file pathname exist and append=1, the zip will be created at the end
|
|
||||||
of the file. (useful if the file contain a self extractor code)
|
|
||||||
If the zipfile cannot be opened, the return value is NULL.
|
|
||||||
Else, the return value is a zipFile Handle, usable with other function
|
|
||||||
of this zip package.
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
|
|
||||||
const char* filename,
|
|
||||||
const zip_fileinfo* zipfi,
|
|
||||||
const void* extrafield_local,
|
|
||||||
uInt size_extrafield_local,
|
|
||||||
const void* extrafield_global,
|
|
||||||
uInt size_extrafield_global,
|
|
||||||
const char* comment,
|
|
||||||
int method,
|
|
||||||
int level));
|
|
||||||
/*
|
|
||||||
Open a file in the ZIP for writing.
|
|
||||||
filename : the filename in zip (if NULL, '-' without quote will be used
|
|
||||||
*zipfi contain supplemental information
|
|
||||||
if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
|
|
||||||
contains the extrafield data the the local header
|
|
||||||
if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
|
|
||||||
contains the extrafield data the the local header
|
|
||||||
if comment != NULL, comment contain the comment string
|
|
||||||
method contain the compression method (0 for store, Z_DEFLATED for deflate)
|
|
||||||
level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
|
|
||||||
const voidp buf,
|
|
||||||
unsigned len));
|
|
||||||
/*
|
|
||||||
Write data in the zipfile
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
|
|
||||||
/*
|
|
||||||
Close the current file in the zipfile
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT zipClose OF((zipFile file,
|
|
||||||
const char* global_comment));
|
|
||||||
/*
|
|
||||||
Close the zipfile
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _zip_H */
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
LIBRARY "zlib"
|
|
||||||
|
|
||||||
DESCRIPTION '"""zlib data compression library"""'
|
|
||||||
|
|
||||||
|
|
||||||
VERSION 1.11
|
|
||||||
|
|
||||||
|
|
||||||
HEAPSIZE 1048576,8192
|
|
||||||
|
|
||||||
EXPORTS
|
|
||||||
adler32 @1
|
|
||||||
compress @2
|
|
||||||
crc32 @3
|
|
||||||
deflate @4
|
|
||||||
deflateCopy @5
|
|
||||||
deflateEnd @6
|
|
||||||
deflateInit2_ @7
|
|
||||||
deflateInit_ @8
|
|
||||||
deflateParams @9
|
|
||||||
deflateReset @10
|
|
||||||
deflateSetDictionary @11
|
|
||||||
gzclose @12
|
|
||||||
gzdopen @13
|
|
||||||
gzerror @14
|
|
||||||
gzflush @15
|
|
||||||
gzopen @16
|
|
||||||
gzread @17
|
|
||||||
gzwrite @18
|
|
||||||
inflate @19
|
|
||||||
inflateEnd @20
|
|
||||||
inflateInit2_ @21
|
|
||||||
inflateInit_ @22
|
|
||||||
inflateReset @23
|
|
||||||
inflateSetDictionary @24
|
|
||||||
inflateSync @25
|
|
||||||
uncompress @26
|
|
||||||
zlibVersion @27
|
|
||||||
gzprintf @28
|
|
||||||
gzputc @29
|
|
||||||
gzgetc @30
|
|
||||||
gzseek @31
|
|
||||||
gzrewind @32
|
|
||||||
gztell @33
|
|
||||||
gzeof @34
|
|
||||||
gzsetparams @35
|
|
||||||
zError @36
|
|
||||||
inflateSyncPoint @37
|
|
||||||
get_crc_table @38
|
|
||||||
compress2 @39
|
|
||||||
gzputs @40
|
|
||||||
gzgets @41
|
|
||||||
|
|
||||||
unzOpen @61
|
|
||||||
unzClose @62
|
|
||||||
unzGetGlobalInfo @63
|
|
||||||
unzGetCurrentFileInfo @64
|
|
||||||
unzGoToFirstFile @65
|
|
||||||
unzGoToNextFile @66
|
|
||||||
unzOpenCurrentFile @67
|
|
||||||
unzReadCurrentFile @68
|
|
||||||
unztell @70
|
|
||||||
unzeof @71
|
|
||||||
unzCloseCurrentFile @72
|
|
||||||
unzGetGlobalComment @73
|
|
||||||
unzStringFileNameCompare @74
|
|
||||||
unzLocateFile @75
|
|
||||||
unzGetLocalExtrafield @76
|
|
||||||
|
|
||||||
zipOpen @80
|
|
||||||
zipOpenNewFileInZip @81
|
|
||||||
zipWriteInFileInZip @82
|
|
||||||
zipCloseFileInZip @83
|
|
||||||
zipClose @84
|
|
||||||
@ -1,651 +0,0 @@
|
|||||||
# Microsoft Developer Studio Project File - Name="zlibvc" - Package Owner=<4>
|
|
||||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
|
||||||
# ** DO NOT EDIT **
|
|
||||||
|
|
||||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
|
||||||
# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
|
|
||||||
|
|
||||||
CFG=zlibvc - Win32 Release
|
|
||||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
|
||||||
!MESSAGE use the Export Makefile command and run
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "zlibvc.mak".
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE You can specify a configuration when running NMAKE
|
|
||||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "zlibvc.mak" CFG="zlibvc - Win32 Release"
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE Possible choices for configuration are:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE "zlibvc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 ReleaseAxp" (based on\
|
|
||||||
"Win32 (ALPHA) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 ReleaseWithoutAsm" (based on\
|
|
||||||
"Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE "zlibvc - Win32 ReleaseWithoutCrtdll" (based on\
|
|
||||||
"Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE
|
|
||||||
|
|
||||||
# Begin Project
|
|
||||||
# PROP Scc_ProjName ""
|
|
||||||
# PROP Scc_LocalPath ""
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir ".\Release"
|
|
||||||
# PROP BASE Intermediate_Dir ".\Release"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir ".\Release"
|
|
||||||
# PROP Intermediate_Dir ".\Release"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
|
|
||||||
# ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 1
|
|
||||||
# PROP BASE Output_Dir ".\Debug"
|
|
||||||
# PROP BASE Intermediate_Dir ".\Debug"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 1
|
|
||||||
# PROP Output_Dir ".\Debug"
|
|
||||||
# PROP Intermediate_Dir ".\Debug"
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
|
|
||||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "_DEBUG" /win32
|
|
||||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "_DEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "_DEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
|
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Debug\zlib.dll"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "zlibvc__"
|
|
||||||
# PROP BASE Intermediate_Dir "zlibvc__"
|
|
||||||
# PROP BASE Ignore_Export_Lib 0
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "zlibvc__"
|
|
||||||
# PROP Intermediate_Dir "zlibvc__"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 crtdll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /map /machine:ALPHA /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT BASE LINK32 /pdb:none
|
|
||||||
# ADD LINK32 crtdll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /map /machine:ALPHA /nodefaultlib /out:"zlibvc__\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "zlibvc_0"
|
|
||||||
# PROP BASE Intermediate_Dir "zlibvc_0"
|
|
||||||
# PROP BASE Ignore_Export_Lib 0
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "zlibvc_0"
|
|
||||||
# PROP Intermediate_Dir "zlibvc_0"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT BASE LINK32 /pdb:none
|
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_0\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "zlibvc_1"
|
|
||||||
# PROP BASE Intermediate_Dir "zlibvc_1"
|
|
||||||
# PROP BASE Ignore_Export_Lib 0
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "zlibvc_1"
|
|
||||||
# PROP Intermediate_Dir "zlibvc_1"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
CPP=cl.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_WIN32" /D "BUILD_ZLIBDLL" /D "ZLIB_DLL" /D "DYNAMIC_CRC_TABLE" /D "ASMV" /FAcs /FR /FD /c
|
|
||||||
# SUBTRACT CPP /YX
|
|
||||||
MTL=midl.exe
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x40c /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\Release\zlib.dll"
|
|
||||||
# SUBTRACT BASE LINK32 /pdb:none
|
|
||||||
# ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_1\zlib.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# Begin Target
|
|
||||||
|
|
||||||
# Name "zlibvc - Win32 Release"
|
|
||||||
# Name "zlibvc - Win32 Debug"
|
|
||||||
# Name "zlibvc - Win32 ReleaseAxp"
|
|
||||||
# Name "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
# Name "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
# Begin Group "Source Files"
|
|
||||||
|
|
||||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\adler32.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_ADLER=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\compress.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_COMPR=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\crc32.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_CRC32=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\deflate.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_DEFLA=\
|
|
||||||
".\deflate.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\gvmat32c.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\gzio.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_GZIO_=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infblock.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFBL=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infcodes.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFCO=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inffast.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inffast.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFFA=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inffast.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inflate.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFLA=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inftrees.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFTR=\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infutil.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_INFUT=\
|
|
||||||
".\infblock.h"\
|
|
||||||
".\infcodes.h"\
|
|
||||||
".\inftrees.h"\
|
|
||||||
".\infutil.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\trees.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_TREES=\
|
|
||||||
".\deflate.h"\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\uncompr.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_UNCOM=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\unzip.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zip.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zlib.rc
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zlibvc.def
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zutil.c
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "zlibvc - Win32 Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseAxp"
|
|
||||||
|
|
||||||
DEP_CPP_ZUTIL=\
|
|
||||||
".\zconf.h"\
|
|
||||||
".\zlib.h"\
|
|
||||||
".\zutil.h"\
|
|
||||||
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# Begin Group "Header Files"
|
|
||||||
|
|
||||||
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\deflate.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infblock.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infcodes.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inffast.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\inftrees.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\infutil.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zconf.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zlib.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\zutil.h
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# Begin Group "Resource Files"
|
|
||||||
|
|
||||||
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
|
|
||||||
# End Group
|
|
||||||
# End Target
|
|
||||||
# End Project
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
Microsoft Developer Studio Workspace File, Format Version 5.00
|
|
||||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "zlibstat"=.\zlibstat.dsp - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "zlibvc"=.\zlibvc.dsp - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Global:
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<3>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
CC=cc
|
|
||||||
CFLAGS=-g
|
|
||||||
|
|
||||||
untgz: untgz.o ../../libz.a
|
|
||||||
$(CC) $(CFLAGS) -o untgz untgz.o -L../.. -lz
|
|
||||||
|
|
||||||
untgz.o: untgz.c ../../zlib.h
|
|
||||||
$(CC) $(CFLAGS) -c -I../.. untgz.c
|
|
||||||
|
|
||||||
../../libz.a:
|
|
||||||
cd ../..; make
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f untgz untgz.o *~
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
# Makefile for zlib. Modified for mingw32
|
|
||||||
# For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
|
|
||||||
# To compile,
|
|
||||||
#
|
|
||||||
# make -fmakefile.w32
|
|
||||||
#
|
|
||||||
|
|
||||||
CC=gcc
|
|
||||||
|
|
||||||
# Generate dependencies (see end of the file)
|
|
||||||
|
|
||||||
CPPFLAGS=-MMD
|
|
||||||
|
|
||||||
#CFLAGS=-MMD -O
|
|
||||||
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
|
|
||||||
#CFLAGS=-MMD -g -DDEBUG
|
|
||||||
CFLAGS=-O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
|
|
||||||
-Wstrict-prototypes -Wmissing-prototypes
|
|
||||||
|
|
||||||
# If cp.exe is not found, replace with copy /Y .
|
|
||||||
CP=cp -f
|
|
||||||
|
|
||||||
# The default value of RM is "rm -f."
|
|
||||||
# If "rm.exe" is not found, uncomment:
|
|
||||||
# RM=del
|
|
||||||
|
|
||||||
LD=gcc
|
|
||||||
LDLIBS=-L. -lz
|
|
||||||
LDFLAGS=-s
|
|
||||||
|
|
||||||
|
|
||||||
INCL=zlib.h zconf.h
|
|
||||||
LIBS=libz.a
|
|
||||||
|
|
||||||
AR=ar rcs
|
|
||||||
|
|
||||||
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 = minigzip.o untgz.o
|
|
||||||
|
|
||||||
all: minigzip.exe untgz.exe
|
|
||||||
|
|
||||||
rebuild: clean all
|
|
||||||
|
|
||||||
libz.a: $(OBJS)
|
|
||||||
$(AR) $@ $(OBJS)
|
|
||||||
|
|
||||||
%.exe : %.o $(LIBS)
|
|
||||||
$(LD) $(LDFLAGS) -o $@ $< $(LDLIBS)
|
|
||||||
|
|
||||||
.PHONY : clean
|
|
||||||
|
|
||||||
clean:
|
|
||||||
$(RM) *.d *.o *.exe libz.a foo.gz
|
|
||||||
|
|
||||||
DEPS := $(wildcard *.d)
|
|
||||||
ifneq ($(DEPS),)
|
|
||||||
include $(DEPS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
@ -1,522 +0,0 @@
|
|||||||
/*
|
|
||||||
* untgz.c -- Display contents and/or extract file from
|
|
||||||
* a gzip'd TAR file
|
|
||||||
* written by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
|
|
||||||
* adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#ifdef unix
|
|
||||||
# include <unistd.h>
|
|
||||||
#else
|
|
||||||
# include <direct.h>
|
|
||||||
# include <io.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "zlib.h"
|
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
# ifndef F_OK
|
|
||||||
# define F_OK (0)
|
|
||||||
# endif
|
|
||||||
# ifdef _MSC_VER
|
|
||||||
# define mkdir(dirname,mode) _mkdir(dirname)
|
|
||||||
# define strdup(str) _strdup(str)
|
|
||||||
# define unlink(fn) _unlink(fn)
|
|
||||||
# define access(path,mode) _access(path,mode)
|
|
||||||
# else
|
|
||||||
# define mkdir(dirname,mode) _mkdir(dirname)
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# include <utime.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Values used in typeflag field. */
|
|
||||||
|
|
||||||
#define REGTYPE '0' /* regular file */
|
|
||||||
#define AREGTYPE '\0' /* regular file */
|
|
||||||
#define LNKTYPE '1' /* link */
|
|
||||||
#define SYMTYPE '2' /* reserved */
|
|
||||||
#define CHRTYPE '3' /* character special */
|
|
||||||
#define BLKTYPE '4' /* block special */
|
|
||||||
#define DIRTYPE '5' /* directory */
|
|
||||||
#define FIFOTYPE '6' /* FIFO special */
|
|
||||||
#define CONTTYPE '7' /* reserved */
|
|
||||||
|
|
||||||
#define BLOCKSIZE 512
|
|
||||||
|
|
||||||
struct tar_header
|
|
||||||
{ /* byte offset */
|
|
||||||
char name[100]; /* 0 */
|
|
||||||
char mode[8]; /* 100 */
|
|
||||||
char uid[8]; /* 108 */
|
|
||||||
char gid[8]; /* 116 */
|
|
||||||
char size[12]; /* 124 */
|
|
||||||
char mtime[12]; /* 136 */
|
|
||||||
char chksum[8]; /* 148 */
|
|
||||||
char typeflag; /* 156 */
|
|
||||||
char linkname[100]; /* 157 */
|
|
||||||
char magic[6]; /* 257 */
|
|
||||||
char version[2]; /* 263 */
|
|
||||||
char uname[32]; /* 265 */
|
|
||||||
char gname[32]; /* 297 */
|
|
||||||
char devmajor[8]; /* 329 */
|
|
||||||
char devminor[8]; /* 337 */
|
|
||||||
char prefix[155]; /* 345 */
|
|
||||||
/* 500 */
|
|
||||||
};
|
|
||||||
|
|
||||||
union tar_buffer {
|
|
||||||
char buffer[BLOCKSIZE];
|
|
||||||
struct tar_header header;
|
|
||||||
};
|
|
||||||
|
|
||||||
enum { TGZ_EXTRACT = 0, TGZ_LIST };
|
|
||||||
|
|
||||||
static char *TGZfname OF((const char *));
|
|
||||||
void TGZnotfound OF((const char *));
|
|
||||||
|
|
||||||
int getoct OF((char *, int));
|
|
||||||
char *strtime OF((time_t *));
|
|
||||||
int ExprMatch OF((char *,char *));
|
|
||||||
|
|
||||||
int makedir OF((char *));
|
|
||||||
int matchname OF((int,int,char **,char *));
|
|
||||||
|
|
||||||
void error OF((const char *));
|
|
||||||
int tar OF((gzFile, int, int, int, char **));
|
|
||||||
|
|
||||||
void help OF((int));
|
|
||||||
int main OF((int, char **));
|
|
||||||
|
|
||||||
char *prog;
|
|
||||||
|
|
||||||
/* This will give a benign warning */
|
|
||||||
|
|
||||||
static char *TGZprefix[] = { "\0", ".tgz", ".tar.gz", ".tar", NULL };
|
|
||||||
|
|
||||||
/* Return the real name of the TGZ archive */
|
|
||||||
/* or NULL if it does not exist. */
|
|
||||||
|
|
||||||
static char *TGZfname OF((const char *fname))
|
|
||||||
{
|
|
||||||
static char buffer[1024];
|
|
||||||
int origlen,i;
|
|
||||||
|
|
||||||
strcpy(buffer,fname);
|
|
||||||
origlen = strlen(buffer);
|
|
||||||
|
|
||||||
for (i=0; TGZprefix[i]; i++)
|
|
||||||
{
|
|
||||||
strcpy(buffer+origlen,TGZprefix[i]);
|
|
||||||
if (access(buffer,F_OK) == 0)
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* error message for the filename */
|
|
||||||
|
|
||||||
void TGZnotfound OF((const char *fname))
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
fprintf(stderr,"%s : couldn't find ",prog);
|
|
||||||
for (i=0;TGZprefix[i];i++)
|
|
||||||
fprintf(stderr,(TGZprefix[i+1]) ? "%s%s, " : "or %s%s\n",
|
|
||||||
fname,
|
|
||||||
TGZprefix[i]);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* help functions */
|
|
||||||
|
|
||||||
int getoct(char *p,int width)
|
|
||||||
{
|
|
||||||
int result = 0;
|
|
||||||
char c;
|
|
||||||
|
|
||||||
while (width --)
|
|
||||||
{
|
|
||||||
c = *p++;
|
|
||||||
if (c == ' ')
|
|
||||||
continue;
|
|
||||||
if (c == 0)
|
|
||||||
break;
|
|
||||||
result = result * 8 + (c - '0');
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
char *strtime (time_t *t)
|
|
||||||
{
|
|
||||||
struct tm *local;
|
|
||||||
static char result[32];
|
|
||||||
|
|
||||||
local = localtime(t);
|
|
||||||
sprintf(result,"%2d/%02d/%4d %02d:%02d:%02d",
|
|
||||||
local->tm_mday, local->tm_mon+1, local->tm_year+1900,
|
|
||||||
local->tm_hour, local->tm_min, local->tm_sec);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* regular expression matching */
|
|
||||||
|
|
||||||
#define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
|
|
||||||
|
|
||||||
int ExprMatch(char *string,char *expr)
|
|
||||||
{
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
if (ISSPECIAL(*expr))
|
|
||||||
{
|
|
||||||
if (*expr == '/')
|
|
||||||
{
|
|
||||||
if (*string != '\\' && *string != '/')
|
|
||||||
return 0;
|
|
||||||
string ++; expr++;
|
|
||||||
}
|
|
||||||
else if (*expr == '*')
|
|
||||||
{
|
|
||||||
if (*expr ++ == 0)
|
|
||||||
return 1;
|
|
||||||
while (*++string != *expr)
|
|
||||||
if (*string == 0)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (*string != *expr)
|
|
||||||
return 0;
|
|
||||||
if (*expr++ == 0)
|
|
||||||
return 1;
|
|
||||||
string++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* recursive make directory */
|
|
||||||
/* abort if you get an ENOENT errno somewhere in the middle */
|
|
||||||
/* e.g. ignore error "mkdir on existing directory" */
|
|
||||||
/* */
|
|
||||||
/* return 1 if OK */
|
|
||||||
/* 0 on error */
|
|
||||||
|
|
||||||
int makedir (char *newdir)
|
|
||||||
{
|
|
||||||
char *buffer = strdup(newdir);
|
|
||||||
char *p;
|
|
||||||
int len = strlen(buffer);
|
|
||||||
|
|
||||||
if (len <= 0) {
|
|
||||||
free(buffer);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (buffer[len-1] == '/') {
|
|
||||||
buffer[len-1] = '\0';
|
|
||||||
}
|
|
||||||
if (mkdir(buffer, 0775) == 0)
|
|
||||||
{
|
|
||||||
free(buffer);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
p = buffer+1;
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
char hold;
|
|
||||||
|
|
||||||
while(*p && *p != '\\' && *p != '/')
|
|
||||||
p++;
|
|
||||||
hold = *p;
|
|
||||||
*p = 0;
|
|
||||||
if ((mkdir(buffer, 0775) == -1) && (errno == ENOENT))
|
|
||||||
{
|
|
||||||
fprintf(stderr,"%s: couldn't create directory %s\n",prog,buffer);
|
|
||||||
free(buffer);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (hold == 0)
|
|
||||||
break;
|
|
||||||
*p++ = hold;
|
|
||||||
}
|
|
||||||
free(buffer);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int matchname (int arg,int argc,char **argv,char *fname)
|
|
||||||
{
|
|
||||||
if (arg == argc) /* no arguments given (untgz tgzarchive) */
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
while (arg < argc)
|
|
||||||
if (ExprMatch(fname,argv[arg++]))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
return 0; /* ignore this for the moment being */
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Tar file list or extract */
|
|
||||||
|
|
||||||
int tar (gzFile in,int action,int arg,int argc,char **argv)
|
|
||||||
{
|
|
||||||
union tar_buffer buffer;
|
|
||||||
int len;
|
|
||||||
int err;
|
|
||||||
int getheader = 1;
|
|
||||||
int remaining = 0;
|
|
||||||
FILE *outfile = NULL;
|
|
||||||
char fname[BLOCKSIZE];
|
|
||||||
time_t tartime;
|
|
||||||
|
|
||||||
if (action == TGZ_LIST)
|
|
||||||
printf(" day time size file\n"
|
|
||||||
" ---------- -------- --------- -------------------------------------\n");
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
len = gzread(in, &buffer, BLOCKSIZE);
|
|
||||||
if (len < 0)
|
|
||||||
error (gzerror(in, &err));
|
|
||||||
/*
|
|
||||||
* Always expect complete blocks to process
|
|
||||||
* the tar information.
|
|
||||||
*/
|
|
||||||
if (len != BLOCKSIZE)
|
|
||||||
error("gzread: incomplete block read");
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If we have to get a tar header
|
|
||||||
*/
|
|
||||||
if (getheader == 1)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* if we met the end of the tar
|
|
||||||
* or the end-of-tar block,
|
|
||||||
* we are done
|
|
||||||
*/
|
|
||||||
if ((len == 0) || (buffer.header.name[0]== 0)) break;
|
|
||||||
|
|
||||||
tartime = (time_t)getoct(buffer.header.mtime,12);
|
|
||||||
strcpy(fname,buffer.header.name);
|
|
||||||
|
|
||||||
switch (buffer.header.typeflag)
|
|
||||||
{
|
|
||||||
case DIRTYPE:
|
|
||||||
if (action == TGZ_LIST)
|
|
||||||
printf(" %s <dir> %s\n",strtime(&tartime),fname);
|
|
||||||
if (action == TGZ_EXTRACT)
|
|
||||||
makedir(fname);
|
|
||||||
break;
|
|
||||||
case REGTYPE:
|
|
||||||
case AREGTYPE:
|
|
||||||
remaining = getoct(buffer.header.size,12);
|
|
||||||
if (action == TGZ_LIST)
|
|
||||||
printf(" %s %9d %s\n",strtime(&tartime),remaining,fname);
|
|
||||||
if (action == TGZ_EXTRACT)
|
|
||||||
{
|
|
||||||
if ((remaining) && (matchname(arg,argc,argv,fname)))
|
|
||||||
{
|
|
||||||
outfile = fopen(fname,"wb");
|
|
||||||
if (outfile == NULL) {
|
|
||||||
/* try creating directory */
|
|
||||||
char *p = strrchr(fname, '/');
|
|
||||||
if (p != NULL) {
|
|
||||||
*p = '\0';
|
|
||||||
makedir(fname);
|
|
||||||
*p = '/';
|
|
||||||
outfile = fopen(fname,"wb");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fprintf(stderr,
|
|
||||||
"%s %s\n",
|
|
||||||
(outfile) ? "Extracting" : "Couldn't create",
|
|
||||||
fname);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
outfile = NULL;
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* could have no contents
|
|
||||||
*/
|
|
||||||
getheader = (remaining) ? 0 : 1;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
if (action == TGZ_LIST)
|
|
||||||
printf(" %s <---> %s\n",strtime(&tartime),fname);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
|
|
||||||
|
|
||||||
if ((action == TGZ_EXTRACT) && (outfile != NULL))
|
|
||||||
{
|
|
||||||
if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes)
|
|
||||||
{
|
|
||||||
fprintf(stderr,"%s : error writing %s skipping...\n",prog,fname);
|
|
||||||
fclose(outfile);
|
|
||||||
unlink(fname);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
remaining -= bytes;
|
|
||||||
if (remaining == 0)
|
|
||||||
{
|
|
||||||
getheader = 1;
|
|
||||||
if ((action == TGZ_EXTRACT) && (outfile != NULL))
|
|
||||||
{
|
|
||||||
#ifdef WIN32
|
|
||||||
HANDLE hFile;
|
|
||||||
FILETIME ftm,ftLocal;
|
|
||||||
SYSTEMTIME st;
|
|
||||||
struct tm localt;
|
|
||||||
|
|
||||||
fclose(outfile);
|
|
||||||
|
|
||||||
localt = *localtime(&tartime);
|
|
||||||
|
|
||||||
hFile = CreateFile(fname, GENERIC_READ | GENERIC_WRITE,
|
|
||||||
0, NULL, OPEN_EXISTING, 0, NULL);
|
|
||||||
|
|
||||||
st.wYear = (WORD)localt.tm_year+1900;
|
|
||||||
st.wMonth = (WORD)localt.tm_mon;
|
|
||||||
st.wDayOfWeek = (WORD)localt.tm_wday;
|
|
||||||
st.wDay = (WORD)localt.tm_mday;
|
|
||||||
st.wHour = (WORD)localt.tm_hour;
|
|
||||||
st.wMinute = (WORD)localt.tm_min;
|
|
||||||
st.wSecond = (WORD)localt.tm_sec;
|
|
||||||
st.wMilliseconds = 0;
|
|
||||||
SystemTimeToFileTime(&st,&ftLocal);
|
|
||||||
LocalFileTimeToFileTime(&ftLocal,&ftm);
|
|
||||||
SetFileTime(hFile,&ftm,NULL,&ftm);
|
|
||||||
CloseHandle(hFile);
|
|
||||||
|
|
||||||
outfile = NULL;
|
|
||||||
#else
|
|
||||||
struct utimbuf settime;
|
|
||||||
|
|
||||||
settime.actime = settime.modtime = tartime;
|
|
||||||
|
|
||||||
fclose(outfile);
|
|
||||||
outfile = NULL;
|
|
||||||
utime(fname,&settime);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (gzclose(in) != Z_OK)
|
|
||||||
error("failed gzclose");
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* =========================================================== */
|
|
||||||
|
|
||||||
void help(int exitval)
|
|
||||||
{
|
|
||||||
fprintf(stderr,
|
|
||||||
"untgz v 0.1\n"
|
|
||||||
" an sample application of zlib 1.0.4\n\n"
|
|
||||||
"Usage : untgz TGZfile to extract all files\n"
|
|
||||||
" untgz TGZfile fname ... to extract selected files\n"
|
|
||||||
" untgz -l TGZfile to list archive contents\n"
|
|
||||||
" untgz -h to display this help\n\n");
|
|
||||||
exit(exitval);
|
|
||||||
}
|
|
||||||
|
|
||||||
void error(const char *msg)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "%s: %s\n", prog, msg);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ====================================================================== */
|
|
||||||
|
|
||||||
int _CRT_glob = 0; /* disable globbing of the arguments */
|
|
||||||
|
|
||||||
int main(int argc,char **argv)
|
|
||||||
{
|
|
||||||
int action = TGZ_EXTRACT;
|
|
||||||
int arg = 1;
|
|
||||||
char *TGZfile;
|
|
||||||
gzFile *f;
|
|
||||||
|
|
||||||
|
|
||||||
prog = strrchr(argv[0],'\\');
|
|
||||||
if (prog == NULL)
|
|
||||||
{
|
|
||||||
prog = strrchr(argv[0],'/');
|
|
||||||
if (prog == NULL)
|
|
||||||
{
|
|
||||||
prog = strrchr(argv[0],':');
|
|
||||||
if (prog == NULL)
|
|
||||||
prog = argv[0];
|
|
||||||
else
|
|
||||||
prog++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
prog++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
prog++;
|
|
||||||
|
|
||||||
if (argc == 1)
|
|
||||||
help(0);
|
|
||||||
|
|
||||||
if (strcmp(argv[arg],"-l") == 0)
|
|
||||||
{
|
|
||||||
action = TGZ_LIST;
|
|
||||||
if (argc == ++arg)
|
|
||||||
help(0);
|
|
||||||
}
|
|
||||||
else if (strcmp(argv[arg],"-h") == 0)
|
|
||||||
{
|
|
||||||
help(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((TGZfile = TGZfname(argv[arg])) == NULL)
|
|
||||||
TGZnotfound(argv[arg]);
|
|
||||||
|
|
||||||
++arg;
|
|
||||||
if ((action == TGZ_LIST) && (arg != argc))
|
|
||||||
help(1);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Process the TGZ file
|
|
||||||
*/
|
|
||||||
switch(action)
|
|
||||||
{
|
|
||||||
case TGZ_LIST:
|
|
||||||
case TGZ_EXTRACT:
|
|
||||||
f = gzopen(TGZfile,"rb");
|
|
||||||
if (f == NULL)
|
|
||||||
{
|
|
||||||
fprintf(stderr,"%s: Couldn't gzopen %s\n",
|
|
||||||
prog,
|
|
||||||
TGZfile);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
exit(tar(f, action, arg, argc, argv));
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
error("Unknown option!");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
See below some functions declarations for Visual Basic.
|
|
||||||
|
|
||||||
Frequently Asked Question:
|
|
||||||
|
|
||||||
Q: Each time I use the compress function I get the -5 error (not enough
|
|
||||||
room in the output buffer).
|
|
||||||
|
|
||||||
A: Make sure that the length of the compressed buffer is passed by
|
|
||||||
reference ("as any"), not by value ("as long"). Also check that
|
|
||||||
before the call of compress this length is equal to the total size of
|
|
||||||
the compressed buffer and not zero.
|
|
||||||
|
|
||||||
|
|
||||||
From: "Jon Caruana" <jon-net@usa.net>
|
|
||||||
Subject: Re: How to port zlib declares to vb?
|
|
||||||
Date: Mon, 28 Oct 1996 18:33:03 -0600
|
|
||||||
|
|
||||||
Got the answer! (I haven't had time to check this but it's what I got, and
|
|
||||||
looks correct):
|
|
||||||
|
|
||||||
He has the following routines working:
|
|
||||||
compress
|
|
||||||
uncompress
|
|
||||||
gzopen
|
|
||||||
gzwrite
|
|
||||||
gzread
|
|
||||||
gzclose
|
|
||||||
|
|
||||||
Declares follow: (Quoted from Carlos Rios <c_rios@sonda.cl>, in Vb4 form)
|
|
||||||
|
|
||||||
#If Win16 Then 'Use Win16 calls.
|
|
||||||
Declare Function compress Lib "ZLIB.DLL" (ByVal compr As
|
|
||||||
String, comprLen As Any, ByVal buf As String, ByVal buflen
|
|
||||||
As Long) As Integer
|
|
||||||
Declare Function uncompress Lib "ZLIB.DLL" (ByVal uncompr
|
|
||||||
As String, uncomprLen As Any, ByVal compr As String, ByVal
|
|
||||||
lcompr As Long) As Integer
|
|
||||||
Declare Function gzopen Lib "ZLIB.DLL" (ByVal filePath As
|
|
||||||
String, ByVal mode As String) As Long
|
|
||||||
Declare Function gzread Lib "ZLIB.DLL" (ByVal file As
|
|
||||||
Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
|
|
||||||
As Integer
|
|
||||||
Declare Function gzwrite Lib "ZLIB.DLL" (ByVal file As
|
|
||||||
Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
|
|
||||||
As Integer
|
|
||||||
Declare Function gzclose Lib "ZLIB.DLL" (ByVal file As
|
|
||||||
Long) As Integer
|
|
||||||
#Else
|
|
||||||
Declare Function compress Lib "ZLIB32.DLL"
|
|
||||||
(ByVal compr As String, comprLen As Any, ByVal buf As
|
|
||||||
String, ByVal buflen As Long) As Integer
|
|
||||||
Declare Function uncompress Lib "ZLIB32.DLL"
|
|
||||||
(ByVal uncompr As String, uncomprLen As Any, ByVal compr As
|
|
||||||
String, ByVal lcompr As Long) As Long
|
|
||||||
Declare Function gzopen Lib "ZLIB32.DLL"
|
|
||||||
(ByVal file As String, ByVal mode As String) As Long
|
|
||||||
Declare Function gzread Lib "ZLIB32.DLL"
|
|
||||||
(ByVal file As Long, ByVal uncompr As String, ByVal
|
|
||||||
uncomprLen As Long) As Long
|
|
||||||
Declare Function gzwrite Lib "ZLIB32.DLL"
|
|
||||||
(ByVal file As Long, ByVal uncompr As String, ByVal
|
|
||||||
uncomprLen As Long) As Long
|
|
||||||
Declare Function gzclose Lib "ZLIB32.DLL"
|
|
||||||
(ByVal file As Long) As Long
|
|
||||||
#End If
|
|
||||||
|
|
||||||
-Jon Caruana
|
|
||||||
jon-net@usa.net
|
|
||||||
Microsoft Sitebuilder Network Level 1 Member - HTML Writer's Guild Member
|
|
||||||
162
lib/zlib/crc32.c
162
lib/zlib/crc32.c
@ -1,162 +0,0 @@
|
|||||||
/* crc32.c -- compute the CRC-32 of a data stream
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* @(#) $Id$ */
|
|
||||||
|
|
||||||
#include "zlib.h"
|
|
||||||
|
|
||||||
#define local static
|
|
||||||
|
|
||||||
#ifdef DYNAMIC_CRC_TABLE
|
|
||||||
|
|
||||||
local int crc_table_empty = 1;
|
|
||||||
local uLongf crc_table[256];
|
|
||||||
local void make_crc_table OF((void));
|
|
||||||
|
|
||||||
/*
|
|
||||||
Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
|
|
||||||
x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
|
|
||||||
|
|
||||||
Polynomials over GF(2) are represented in binary, one bit per coefficient,
|
|
||||||
with the lowest powers in the most significant bit. Then adding polynomials
|
|
||||||
is just exclusive-or, and multiplying a polynomial by x is a right shift by
|
|
||||||
one. If we call the above polynomial p, and represent a byte as the
|
|
||||||
polynomial q, also with the lowest power in the most significant bit (so the
|
|
||||||
byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
|
|
||||||
where a mod b means the remainder after dividing a by b.
|
|
||||||
|
|
||||||
This calculation is done using the shift-register method of multiplying and
|
|
||||||
taking the remainder. The register is initialized to zero, and for each
|
|
||||||
incoming bit, x^32 is added mod p to the register if the bit is a one (where
|
|
||||||
x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
|
|
||||||
x (which is shifting right by one and adding x^32 mod p if the bit shifted
|
|
||||||
out is a one). We start with the highest power (least significant bit) of
|
|
||||||
q and repeat for all eight bits of q.
|
|
||||||
|
|
||||||
The table is simply the CRC of all possible eight bit values. This is all
|
|
||||||
the information needed to generate CRC's on data a byte at a time for all
|
|
||||||
combinations of CRC register values and incoming bytes.
|
|
||||||
*/
|
|
||||||
local void make_crc_table()
|
|
||||||
{
|
|
||||||
uLong c;
|
|
||||||
int n, k;
|
|
||||||
uLong poly; /* polynomial exclusive-or pattern */
|
|
||||||
/* terms of polynomial defining this crc (except x^32): */
|
|
||||||
static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
|
|
||||||
|
|
||||||
/* make exclusive-or pattern from polynomial (0xedb88320L) */
|
|
||||||
poly = 0L;
|
|
||||||
for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
|
|
||||||
poly |= 1L << (31 - p[n]);
|
|
||||||
|
|
||||||
for (n = 0; n < 256; n++)
|
|
||||||
{
|
|
||||||
c = (uLong)n;
|
|
||||||
for (k = 0; k < 8; k++)
|
|
||||||
c = c & 1 ? poly ^ (c >> 1) : c >> 1;
|
|
||||||
crc_table[n] = c;
|
|
||||||
}
|
|
||||||
crc_table_empty = 0;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
/* ========================================================================
|
|
||||||
* Table of CRC-32's of all single-byte values (made by make_crc_table)
|
|
||||||
*/
|
|
||||||
local const uLongf crc_table[256] = {
|
|
||||||
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
|
|
||||||
0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
|
|
||||||
0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
|
|
||||||
0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
|
|
||||||
0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
|
|
||||||
0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
|
|
||||||
0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
|
|
||||||
0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
|
|
||||||
0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
|
|
||||||
0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
|
|
||||||
0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
|
|
||||||
0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
|
|
||||||
0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
|
|
||||||
0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
|
|
||||||
0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
|
|
||||||
0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
|
|
||||||
0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
|
|
||||||
0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
|
|
||||||
0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
|
|
||||||
0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
|
|
||||||
0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
|
|
||||||
0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
|
|
||||||
0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
|
|
||||||
0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
|
|
||||||
0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
|
|
||||||
0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
|
|
||||||
0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
|
|
||||||
0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
|
|
||||||
0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
|
|
||||||
0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
|
|
||||||
0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
|
|
||||||
0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
|
|
||||||
0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
|
|
||||||
0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
|
|
||||||
0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
|
|
||||||
0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
|
|
||||||
0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
|
|
||||||
0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
|
|
||||||
0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
|
|
||||||
0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
|
|
||||||
0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
|
|
||||||
0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
|
|
||||||
0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
|
|
||||||
0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
|
|
||||||
0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
|
|
||||||
0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
|
|
||||||
0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
|
|
||||||
0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
|
|
||||||
0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
|
|
||||||
0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
|
|
||||||
0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
|
|
||||||
0x2d02ef8dL
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* =========================================================================
|
|
||||||
* This function can be used by asm versions of crc32()
|
|
||||||
*/
|
|
||||||
const uLongf * ZEXPORT get_crc_table()
|
|
||||||
{
|
|
||||||
#ifdef DYNAMIC_CRC_TABLE
|
|
||||||
if (crc_table_empty) make_crc_table();
|
|
||||||
#endif
|
|
||||||
return (const uLongf *)crc_table;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ========================================================================= */
|
|
||||||
#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
|
|
||||||
#define DO2(buf) DO1(buf); DO1(buf);
|
|
||||||
#define DO4(buf) DO2(buf); DO2(buf);
|
|
||||||
#define DO8(buf) DO4(buf); DO4(buf);
|
|
||||||
|
|
||||||
/* ========================================================================= */
|
|
||||||
uLong ZEXPORT crc32(crc, buf, len)
|
|
||||||
uLong crc;
|
|
||||||
const Bytef *buf;
|
|
||||||
uInt len;
|
|
||||||
{
|
|
||||||
if (buf == Z_NULL) return 0L;
|
|
||||||
#ifdef DYNAMIC_CRC_TABLE
|
|
||||||
if (crc_table_empty)
|
|
||||||
make_crc_table();
|
|
||||||
#endif
|
|
||||||
crc = crc ^ 0xffffffffL;
|
|
||||||
while (len >= 8)
|
|
||||||
{
|
|
||||||
DO8(buf);
|
|
||||||
len -= 8;
|
|
||||||
}
|
|
||||||
if (len) do {
|
|
||||||
DO1(buf);
|
|
||||||
} while (--len);
|
|
||||||
return crc ^ 0xffffffffL;
|
|
||||||
}
|
|
||||||
1350
lib/zlib/deflate.c
1350
lib/zlib/deflate.c
File diff suppressed because it is too large
Load Diff
@ -1,318 +0,0 @@
|
|||||||
/* deflate.h -- internal compression state
|
|
||||||
* Copyright (C) 1995-1998 Jean-loup Gailly
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* WARNING: this file should *not* be used by applications. It is
|
|
||||||
part of the implementation of the compression library and is
|
|
||||||
subject to change. Applications should only use zlib.h.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* @(#) $Id$ */
|
|
||||||
|
|
||||||
#ifndef _DEFLATE_H
|
|
||||||
#define _DEFLATE_H
|
|
||||||
|
|
||||||
#include "zutil.h"
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Internal compression state.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define LENGTH_CODES 29
|
|
||||||
/* number of length codes, not counting the special END_BLOCK code */
|
|
||||||
|
|
||||||
#define LITERALS 256
|
|
||||||
/* number of literal bytes 0..255 */
|
|
||||||
|
|
||||||
#define L_CODES (LITERALS+1+LENGTH_CODES)
|
|
||||||
/* number of Literal or Length codes, including the END_BLOCK code */
|
|
||||||
|
|
||||||
#define D_CODES 30
|
|
||||||
/* number of distance codes */
|
|
||||||
|
|
||||||
#define BL_CODES 19
|
|
||||||
/* number of codes used to transfer the bit lengths */
|
|
||||||
|
|
||||||
#define HEAP_SIZE (2*L_CODES+1)
|
|
||||||
/* maximum heap size */
|
|
||||||
|
|
||||||
#define MAX_BITS 15
|
|
||||||
/* All codes must not exceed MAX_BITS bits */
|
|
||||||
|
|
||||||
#define INIT_STATE 42
|
|
||||||
#define BUSY_STATE 113
|
|
||||||
#define FINISH_STATE 666
|
|
||||||
/* Stream status */
|
|
||||||
|
|
||||||
|
|
||||||
/* Data structure describing a single value and its code string. */
|
|
||||||
typedef struct ct_data_s {
|
|
||||||
union {
|
|
||||||
ush freq; /* frequency count */
|
|
||||||
ush code; /* bit string */
|
|
||||||
} fc;
|
|
||||||
union {
|
|
||||||
ush dad; /* father node in Huffman tree */
|
|
||||||
ush len; /* length of bit string */
|
|
||||||
} dl;
|
|
||||||
} FAR ct_data;
|
|
||||||
|
|
||||||
#define Freq fc.freq
|
|
||||||
#define Code fc.code
|
|
||||||
#define Dad dl.dad
|
|
||||||
#define Len dl.len
|
|
||||||
|
|
||||||
typedef struct static_tree_desc_s static_tree_desc;
|
|
||||||
|
|
||||||
typedef struct tree_desc_s {
|
|
||||||
ct_data *dyn_tree; /* the dynamic tree */
|
|
||||||
int max_code; /* largest code with non zero frequency */
|
|
||||||
static_tree_desc *stat_desc; /* the corresponding static tree */
|
|
||||||
} FAR tree_desc;
|
|
||||||
|
|
||||||
typedef ush Pos;
|
|
||||||
typedef Pos FAR Posf;
|
|
||||||
typedef unsigned IPos;
|
|
||||||
|
|
||||||
/* A Pos is an index in the character window. We use short instead of int to
|
|
||||||
* save space in the various tables. IPos is used only for parameter passing.
|
|
||||||
*/
|
|
||||||
|
|
||||||
typedef struct internal_state {
|
|
||||||
z_streamp strm; /* pointer back to this zlib stream */
|
|
||||||
int status; /* as the name implies */
|
|
||||||
Bytef *pending_buf; /* output still pending */
|
|
||||||
ulg pending_buf_size; /* size of pending_buf */
|
|
||||||
Bytef *pending_out; /* next pending byte to output to the stream */
|
|
||||||
int pending; /* nb of bytes in the pending buffer */
|
|
||||||
int noheader; /* suppress zlib header and adler32 */
|
|
||||||
Byte data_type; /* UNKNOWN, BINARY or ASCII */
|
|
||||||
Byte method; /* STORED (for zip only) or DEFLATED */
|
|
||||||
int last_flush; /* value of flush param for previous deflate call */
|
|
||||||
|
|
||||||
/* used by deflate.c: */
|
|
||||||
|
|
||||||
uInt w_size; /* LZ77 window size (32K by default) */
|
|
||||||
uInt w_bits; /* log2(w_size) (8..16) */
|
|
||||||
uInt w_mask; /* w_size - 1 */
|
|
||||||
|
|
||||||
Bytef *window;
|
|
||||||
/* Sliding window. Input bytes are read into the second half of the window,
|
|
||||||
* and move to the first half later to keep a dictionary of at least wSize
|
|
||||||
* bytes. With this organization, matches are limited to a distance of
|
|
||||||
* wSize-MAX_MATCH bytes, but this ensures that IO is always
|
|
||||||
* performed with a length multiple of the block size. Also, it limits
|
|
||||||
* the window size to 64K, which is quite useful on MSDOS.
|
|
||||||
* To do: use the user input buffer as sliding window.
|
|
||||||
*/
|
|
||||||
|
|
||||||
ulg window_size;
|
|
||||||
/* Actual size of window: 2*wSize, except when the user input buffer
|
|
||||||
* is directly used as sliding window.
|
|
||||||
*/
|
|
||||||
|
|
||||||
Posf *prev;
|
|
||||||
/* Link to older string with same hash index. To limit the size of this
|
|
||||||
* array to 64K, this link is maintained only for the last 32K strings.
|
|
||||||
* An index in this array is thus a window index modulo 32K.
|
|
||||||
*/
|
|
||||||
|
|
||||||
Posf *head; /* Heads of the hash chains or NIL. */
|
|
||||||
|
|
||||||
uInt ins_h; /* hash index of string to be inserted */
|
|
||||||
uInt hash_size; /* number of elements in hash table */
|
|
||||||
uInt hash_bits; /* log2(hash_size) */
|
|
||||||
uInt hash_mask; /* hash_size-1 */
|
|
||||||
|
|
||||||
uInt hash_shift;
|
|
||||||
/* Number of bits by which ins_h must be shifted at each input
|
|
||||||
* step. It must be such that after MIN_MATCH steps, the oldest
|
|
||||||
* byte no longer takes part in the hash key, that is:
|
|
||||||
* hash_shift * MIN_MATCH >= hash_bits
|
|
||||||
*/
|
|
||||||
|
|
||||||
long block_start;
|
|
||||||
/* Window position at the beginning of the current output block. Gets
|
|
||||||
* negative when the window is moved backwards.
|
|
||||||
*/
|
|
||||||
|
|
||||||
uInt match_length; /* length of best match */
|
|
||||||
IPos prev_match; /* previous match */
|
|
||||||
int match_available; /* set if previous match exists */
|
|
||||||
uInt strstart; /* start of string to insert */
|
|
||||||
uInt match_start; /* start of matching string */
|
|
||||||
uInt lookahead; /* number of valid bytes ahead in window */
|
|
||||||
|
|
||||||
uInt prev_length;
|
|
||||||
/* Length of the best match at previous step. Matches not greater than this
|
|
||||||
* are discarded. This is used in the lazy match evaluation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
uInt max_chain_length;
|
|
||||||
/* To speed up deflation, hash chains are never searched beyond this
|
|
||||||
* length. A higher limit improves compression ratio but degrades the
|
|
||||||
* speed.
|
|
||||||
*/
|
|
||||||
|
|
||||||
uInt max_lazy_match;
|
|
||||||
/* Attempt to find a better match only when the current match is strictly
|
|
||||||
* smaller than this value. This mechanism is used only for compression
|
|
||||||
* levels >= 4.
|
|
||||||
*/
|
|
||||||
# define max_insert_length max_lazy_match
|
|
||||||
/* Insert new strings in the hash table only if the match length is not
|
|
||||||
* greater than this length. This saves time but degrades compression.
|
|
||||||
* max_insert_length is used only for compression levels <= 3.
|
|
||||||
*/
|
|
||||||
|
|
||||||
int level; /* compression level (1..9) */
|
|
||||||
int strategy; /* favor or force Huffman coding*/
|
|
||||||
|
|
||||||
uInt good_match;
|
|
||||||
/* Use a faster search when the previous match is longer than this */
|
|
||||||
|
|
||||||
int nice_match; /* Stop searching when current match exceeds this */
|
|
||||||
|
|
||||||
/* used by trees.c: */
|
|
||||||
/* Didn't use ct_data typedef below to supress compiler warning */
|
|
||||||
struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
|
|
||||||
struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
|
|
||||||
struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
|
|
||||||
|
|
||||||
struct tree_desc_s l_desc; /* desc. for literal tree */
|
|
||||||
struct tree_desc_s d_desc; /* desc. for distance tree */
|
|
||||||
struct tree_desc_s bl_desc; /* desc. for bit length tree */
|
|
||||||
|
|
||||||
ush bl_count[MAX_BITS+1];
|
|
||||||
/* number of codes at each bit length for an optimal tree */
|
|
||||||
|
|
||||||
int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */
|
|
||||||
int heap_len; /* number of elements in the heap */
|
|
||||||
int heap_max; /* element of largest frequency */
|
|
||||||
/* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
|
|
||||||
* The same heap array is used to build all trees.
|
|
||||||
*/
|
|
||||||
|
|
||||||
uch depth[2*L_CODES+1];
|
|
||||||
/* Depth of each subtree used as tie breaker for trees of equal frequency
|
|
||||||
*/
|
|
||||||
|
|
||||||
uchf *l_buf; /* buffer for literals or lengths */
|
|
||||||
|
|
||||||
uInt lit_bufsize;
|
|
||||||
/* Size of match buffer for literals/lengths. There are 4 reasons for
|
|
||||||
* limiting lit_bufsize to 64K:
|
|
||||||
* - frequencies can be kept in 16 bit counters
|
|
||||||
* - if compression is not successful for the first block, all input
|
|
||||||
* data is still in the window so we can still emit a stored block even
|
|
||||||
* when input comes from standard input. (This can also be done for
|
|
||||||
* all blocks if lit_bufsize is not greater than 32K.)
|
|
||||||
* - if compression is not successful for a file smaller than 64K, we can
|
|
||||||
* even emit a stored file instead of a stored block (saving 5 bytes).
|
|
||||||
* This is applicable only for zip (not gzip or zlib).
|
|
||||||
* - creating new Huffman trees less frequently may not provide fast
|
|
||||||
* adaptation to changes in the input data statistics. (Take for
|
|
||||||
* example a binary file with poorly compressible code followed by
|
|
||||||
* a highly compressible string table.) Smaller buffer sizes give
|
|
||||||
* fast adaptation but have of course the overhead of transmitting
|
|
||||||
* trees more frequently.
|
|
||||||
* - I can't count above 4
|
|
||||||
*/
|
|
||||||
|
|
||||||
uInt last_lit; /* running index in l_buf */
|
|
||||||
|
|
||||||
ushf *d_buf;
|
|
||||||
/* Buffer for distances. To simplify the code, d_buf and l_buf have
|
|
||||||
* the same number of elements. To use different lengths, an extra flag
|
|
||||||
* array would be necessary.
|
|
||||||
*/
|
|
||||||
|
|
||||||
ulg opt_len; /* bit length of current block with optimal trees */
|
|
||||||
ulg static_len; /* bit length of current block with static trees */
|
|
||||||
uInt matches; /* number of string matches in current block */
|
|
||||||
int last_eob_len; /* bit length of EOB code for last block */
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
ulg compressed_len; /* total bit length of compressed file mod 2^32 */
|
|
||||||
ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ush bi_buf;
|
|
||||||
/* Output buffer. bits are inserted starting at the bottom (least
|
|
||||||
* significant bits).
|
|
||||||
*/
|
|
||||||
int bi_valid;
|
|
||||||
/* Number of valid bits in bi_buf. All bits above the last valid bit
|
|
||||||
* are always zero.
|
|
||||||
*/
|
|
||||||
|
|
||||||
} FAR deflate_state;
|
|
||||||
|
|
||||||
/* Output a byte on the stream.
|
|
||||||
* IN assertion: there is enough room in pending_buf.
|
|
||||||
*/
|
|
||||||
#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
|
|
||||||
|
|
||||||
|
|
||||||
#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
|
|
||||||
/* Minimum amount of lookahead, except at the end of the input file.
|
|
||||||
* See deflate.c for comments about the MIN_MATCH+1.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD)
|
|
||||||
/* In order to simplify the code, particularly on 16 bit machines, match
|
|
||||||
* distances are limited to MAX_DIST instead of WSIZE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* in trees.c */
|
|
||||||
void _tr_init OF((deflate_state *s));
|
|
||||||
int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
|
|
||||||
void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len,
|
|
||||||
int eof));
|
|
||||||
void _tr_align OF((deflate_state *s));
|
|
||||||
void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
|
|
||||||
int eof));
|
|
||||||
|
|
||||||
#define d_code(dist) \
|
|
||||||
((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
|
|
||||||
/* Mapping from a distance to a distance code. dist is the distance - 1 and
|
|
||||||
* must not have side effects. _dist_code[256] and _dist_code[257] are never
|
|
||||||
* used.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef DEBUG
|
|
||||||
/* Inline versions of _tr_tally for speed: */
|
|
||||||
|
|
||||||
#if defined(GEN_TREES_H) || !defined(STDC)
|
|
||||||
extern uch _length_code[];
|
|
||||||
extern uch _dist_code[];
|
|
||||||
#else
|
|
||||||
extern const uch _length_code[];
|
|
||||||
extern const uch _dist_code[];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
# define _tr_tally_lit(s, c, flush) \
|
|
||||||
{ uch cc = (c); \
|
|
||||||
s->d_buf[s->last_lit] = 0; \
|
|
||||||
s->l_buf[s->last_lit++] = cc; \
|
|
||||||
s->dyn_ltree[cc].Freq++; \
|
|
||||||
flush = (s->last_lit == s->lit_bufsize-1); \
|
|
||||||
}
|
|
||||||
# define _tr_tally_dist(s, distance, length, flush) \
|
|
||||||
{ uch len = (length); \
|
|
||||||
ush dist = (distance); \
|
|
||||||
s->d_buf[s->last_lit] = dist; \
|
|
||||||
s->l_buf[s->last_lit++] = len; \
|
|
||||||
dist--; \
|
|
||||||
s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
|
|
||||||
s->dyn_dtree[d_code(dist)].Freq++; \
|
|
||||||
flush = (s->last_lit == s->lit_bufsize-1); \
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
|
|
||||||
# define _tr_tally_dist(s, distance, length, flush) \
|
|
||||||
flush = _tr_tally(s, distance, length)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
# descrip.mms: MMS description file for building zlib on VMS
|
|
||||||
# written by Martin P.J. Zinser <m.zinser@gsi.de>
|
|
||||||
|
|
||||||
cc_defs =
|
|
||||||
c_deb =
|
|
||||||
|
|
||||||
.ifdef __DECC__
|
|
||||||
pref = /prefix=all
|
|
||||||
.endif
|
|
||||||
|
|
||||||
OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
|
|
||||||
deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
|
|
||||||
inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
|
|
||||||
|
|
||||||
CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
|
|
||||||
|
|
||||||
all : example.exe minigzip.exe
|
|
||||||
@ write sys$output " Example applications available"
|
|
||||||
libz.olb : libz.olb($(OBJS))
|
|
||||||
@ write sys$output " libz available"
|
|
||||||
|
|
||||||
example.exe : example.obj libz.olb
|
|
||||||
link example,libz.olb/lib
|
|
||||||
|
|
||||||
minigzip.exe : minigzip.obj libz.olb
|
|
||||||
link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
|
|
||||||
|
|
||||||
clean :
|
|
||||||
delete *.obj;*,libz.olb;*
|
|
||||||
|
|
||||||
|
|
||||||
# Other dependencies.
|
|
||||||
adler32.obj : zutil.h zlib.h zconf.h
|
|
||||||
compress.obj : zlib.h zconf.h
|
|
||||||
crc32.obj : zutil.h zlib.h zconf.h
|
|
||||||
deflate.obj : deflate.h zutil.h zlib.h zconf.h
|
|
||||||
example.obj : zlib.h zconf.h
|
|
||||||
gzio.obj : zutil.h zlib.h zconf.h
|
|
||||||
infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
|
|
||||||
infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
|
|
||||||
inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
|
|
||||||
inflate.obj : zutil.h zlib.h zconf.h infblock.h
|
|
||||||
inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
|
|
||||||
infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
|
|
||||||
minigzip.obj : zlib.h zconf.h
|
|
||||||
trees.obj : deflate.h zutil.h zlib.h zconf.h
|
|
||||||
uncompr.obj : zlib.h zconf.h
|
|
||||||
zutil.obj : zutil.h zlib.h zconf.h
|
|
||||||
@ -1,556 +0,0 @@
|
|||||||
/* example.c -- usage example of the zlib compression library
|
|
||||||
* Copyright (C) 1995-1998 Jean-loup Gailly.
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* @(#) $Id$ */
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "zlib.h"
|
|
||||||
|
|
||||||
#ifdef STDC
|
|
||||||
# include <string.h>
|
|
||||||
# include <stdlib.h>
|
|
||||||
#else
|
|
||||||
extern void exit OF((int));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(VMS) || defined(RISCOS)
|
|
||||||
# define TESTFILE "foo-gz"
|
|
||||||
#else
|
|
||||||
# define TESTFILE "foo.gz"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CHECK_ERR(err, msg) { \
|
|
||||||
if (err != Z_OK) { \
|
|
||||||
fprintf(stderr, "%s error: %d\n", msg, err); \
|
|
||||||
exit(1); \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
|
|
||||||
const char hello[] = "hello, hello!";
|
|
||||||
/* "hello world" would be more standard, but the repeated "hello"
|
|
||||||
* stresses the compression code better, sorry...
|
|
||||||
*/
|
|
||||||
|
|
||||||
const char dictionary[] = "hello";
|
|
||||||
uLong dictId; /* Adler32 value of the dictionary */
|
|
||||||
|
|
||||||
void test_compress OF((Byte *compr, uLong comprLen,
|
|
||||||
Byte *uncompr, uLong uncomprLen));
|
|
||||||
void test_gzio OF((const char *out, const char *in,
|
|
||||||
Byte *uncompr, int uncomprLen));
|
|
||||||
void test_deflate OF((Byte *compr, uLong comprLen));
|
|
||||||
void test_inflate OF((Byte *compr, uLong comprLen,
|
|
||||||
Byte *uncompr, uLong uncomprLen));
|
|
||||||
void test_large_deflate OF((Byte *compr, uLong comprLen,
|
|
||||||
Byte *uncompr, uLong uncomprLen));
|
|
||||||
void test_large_inflate OF((Byte *compr, uLong comprLen,
|
|
||||||
Byte *uncompr, uLong uncomprLen));
|
|
||||||
void test_flush OF((Byte *compr, uLong *comprLen));
|
|
||||||
void test_sync OF((Byte *compr, uLong comprLen,
|
|
||||||
Byte *uncompr, uLong uncomprLen));
|
|
||||||
void test_dict_deflate OF((Byte *compr, uLong comprLen));
|
|
||||||
void test_dict_inflate OF((Byte *compr, uLong comprLen,
|
|
||||||
Byte *uncompr, uLong uncomprLen));
|
|
||||||
int main OF((int argc, char *argv[]));
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test compress() and uncompress()
|
|
||||||
*/
|
|
||||||
void test_compress(compr, comprLen, uncompr, uncomprLen)
|
|
||||||
Byte *compr, *uncompr;
|
|
||||||
uLong comprLen, uncomprLen;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
uLong len = strlen(hello)+1;
|
|
||||||
|
|
||||||
err = compress(compr, &comprLen, (const Bytef*)hello, len);
|
|
||||||
CHECK_ERR(err, "compress");
|
|
||||||
|
|
||||||
strcpy((char*)uncompr, "garbage");
|
|
||||||
|
|
||||||
err = uncompress(uncompr, &uncomprLen, compr, comprLen);
|
|
||||||
CHECK_ERR(err, "uncompress");
|
|
||||||
|
|
||||||
if (strcmp((char*)uncompr, hello)) {
|
|
||||||
fprintf(stderr, "bad uncompress\n");
|
|
||||||
exit(1);
|
|
||||||
} else {
|
|
||||||
printf("uncompress(): %s\n", (char *)uncompr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test read/write of .gz files
|
|
||||||
*/
|
|
||||||
void test_gzio(out, in, uncompr, uncomprLen)
|
|
||||||
const char *out; /* compressed output file */
|
|
||||||
const char *in; /* compressed input file */
|
|
||||||
Byte *uncompr;
|
|
||||||
int uncomprLen;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
int len = strlen(hello)+1;
|
|
||||||
gzFile file;
|
|
||||||
z_off_t pos;
|
|
||||||
|
|
||||||
file = gzopen(out, "wb");
|
|
||||||
if (file == NULL) {
|
|
||||||
fprintf(stderr, "gzopen error\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
gzputc(file, 'h');
|
|
||||||
if (gzputs(file, "ello") != 4) {
|
|
||||||
fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
if (gzprintf(file, ", %s!", "hello") != 8) {
|
|
||||||
fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
|
|
||||||
gzclose(file);
|
|
||||||
|
|
||||||
file = gzopen(in, "rb");
|
|
||||||
if (file == NULL) {
|
|
||||||
fprintf(stderr, "gzopen error\n");
|
|
||||||
}
|
|
||||||
strcpy((char*)uncompr, "garbage");
|
|
||||||
|
|
||||||
uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
|
|
||||||
if (uncomprLen != len) {
|
|
||||||
fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
if (strcmp((char*)uncompr, hello)) {
|
|
||||||
fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
|
|
||||||
exit(1);
|
|
||||||
} else {
|
|
||||||
printf("gzread(): %s\n", (char *)uncompr);
|
|
||||||
}
|
|
||||||
|
|
||||||
pos = gzseek(file, -8L, SEEK_CUR);
|
|
||||||
if (pos != 6 || gztell(file) != pos) {
|
|
||||||
fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
|
|
||||||
(long)pos, (long)gztell(file));
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (gzgetc(file) != ' ') {
|
|
||||||
fprintf(stderr, "gzgetc error\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
gzgets(file, (char*)uncompr, uncomprLen);
|
|
||||||
uncomprLen = strlen((char*)uncompr);
|
|
||||||
if (uncomprLen != 6) { /* "hello!" */
|
|
||||||
fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
if (strcmp((char*)uncompr, hello+7)) {
|
|
||||||
fprintf(stderr, "bad gzgets after gzseek\n");
|
|
||||||
exit(1);
|
|
||||||
} else {
|
|
||||||
printf("gzgets() after gzseek: %s\n", (char *)uncompr);
|
|
||||||
}
|
|
||||||
|
|
||||||
gzclose(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test deflate() with small buffers
|
|
||||||
*/
|
|
||||||
void test_deflate(compr, comprLen)
|
|
||||||
Byte *compr;
|
|
||||||
uLong comprLen;
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
c_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
|
|
||||||
CHECK_ERR(err, "deflateInit");
|
|
||||||
|
|
||||||
c_stream.next_in = (Bytef*)hello;
|
|
||||||
c_stream.next_out = compr;
|
|
||||||
|
|
||||||
while (c_stream.total_in != (uLong)len && c_stream.total_out < comprLen) {
|
|
||||||
c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
|
|
||||||
err = deflate(&c_stream, Z_NO_FLUSH);
|
|
||||||
CHECK_ERR(err, "deflate");
|
|
||||||
}
|
|
||||||
/* Finish the stream, still forcing small buffers: */
|
|
||||||
for (;;) {
|
|
||||||
c_stream.avail_out = 1;
|
|
||||||
err = deflate(&c_stream, Z_FINISH);
|
|
||||||
if (err == Z_STREAM_END) break;
|
|
||||||
CHECK_ERR(err, "deflate");
|
|
||||||
}
|
|
||||||
|
|
||||||
err = deflateEnd(&c_stream);
|
|
||||||
CHECK_ERR(err, "deflateEnd");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test inflate() with small buffers
|
|
||||||
*/
|
|
||||||
void test_inflate(compr, comprLen, uncompr, uncomprLen)
|
|
||||||
Byte *compr, *uncompr;
|
|
||||||
uLong comprLen, uncomprLen;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
z_stream d_stream; /* decompression stream */
|
|
||||||
|
|
||||||
strcpy((char*)uncompr, "garbage");
|
|
||||||
|
|
||||||
d_stream.zalloc = (alloc_func)0;
|
|
||||||
d_stream.zfree = (free_func)0;
|
|
||||||
d_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
d_stream.next_in = compr;
|
|
||||||
d_stream.avail_in = 0;
|
|
||||||
d_stream.next_out = uncompr;
|
|
||||||
|
|
||||||
err = inflateInit(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateInit");
|
|
||||||
|
|
||||||
while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
|
|
||||||
d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
|
|
||||||
err = inflate(&d_stream, Z_NO_FLUSH);
|
|
||||||
if (err == Z_STREAM_END) break;
|
|
||||||
CHECK_ERR(err, "inflate");
|
|
||||||
}
|
|
||||||
|
|
||||||
err = inflateEnd(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateEnd");
|
|
||||||
|
|
||||||
if (strcmp((char*)uncompr, hello)) {
|
|
||||||
fprintf(stderr, "bad inflate\n");
|
|
||||||
exit(1);
|
|
||||||
} else {
|
|
||||||
printf("inflate(): %s\n", (char *)uncompr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test deflate() with large buffers and dynamic change of compression level
|
|
||||||
*/
|
|
||||||
void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
|
|
||||||
Byte *compr, *uncompr;
|
|
||||||
uLong comprLen, uncomprLen;
|
|
||||||
{
|
|
||||||
z_stream c_stream; /* compression stream */
|
|
||||||
int err;
|
|
||||||
|
|
||||||
c_stream.zalloc = (alloc_func)0;
|
|
||||||
c_stream.zfree = (free_func)0;
|
|
||||||
c_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
err = deflateInit(&c_stream, Z_BEST_SPEED);
|
|
||||||
CHECK_ERR(err, "deflateInit");
|
|
||||||
|
|
||||||
c_stream.next_out = compr;
|
|
||||||
c_stream.avail_out = (uInt)comprLen;
|
|
||||||
|
|
||||||
/* At this point, uncompr is still mostly zeroes, so it should compress
|
|
||||||
* very well:
|
|
||||||
*/
|
|
||||||
c_stream.next_in = uncompr;
|
|
||||||
c_stream.avail_in = (uInt)uncomprLen;
|
|
||||||
err = deflate(&c_stream, Z_NO_FLUSH);
|
|
||||||
CHECK_ERR(err, "deflate");
|
|
||||||
if (c_stream.avail_in != 0) {
|
|
||||||
fprintf(stderr, "deflate not greedy\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Feed in already compressed data and switch to no compression: */
|
|
||||||
deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
|
|
||||||
c_stream.next_in = compr;
|
|
||||||
c_stream.avail_in = (uInt)comprLen/2;
|
|
||||||
err = deflate(&c_stream, Z_NO_FLUSH);
|
|
||||||
CHECK_ERR(err, "deflate");
|
|
||||||
|
|
||||||
/* Switch back to compressing mode: */
|
|
||||||
deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
|
|
||||||
c_stream.next_in = uncompr;
|
|
||||||
c_stream.avail_in = (uInt)uncomprLen;
|
|
||||||
err = deflate(&c_stream, Z_NO_FLUSH);
|
|
||||||
CHECK_ERR(err, "deflate");
|
|
||||||
|
|
||||||
err = deflate(&c_stream, Z_FINISH);
|
|
||||||
if (err != Z_STREAM_END) {
|
|
||||||
fprintf(stderr, "deflate should report Z_STREAM_END\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
err = deflateEnd(&c_stream);
|
|
||||||
CHECK_ERR(err, "deflateEnd");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test inflate() with large buffers
|
|
||||||
*/
|
|
||||||
void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
|
|
||||||
Byte *compr, *uncompr;
|
|
||||||
uLong comprLen, uncomprLen;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
z_stream d_stream; /* decompression stream */
|
|
||||||
|
|
||||||
strcpy((char*)uncompr, "garbage");
|
|
||||||
|
|
||||||
d_stream.zalloc = (alloc_func)0;
|
|
||||||
d_stream.zfree = (free_func)0;
|
|
||||||
d_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
d_stream.next_in = compr;
|
|
||||||
d_stream.avail_in = (uInt)comprLen;
|
|
||||||
|
|
||||||
err = inflateInit(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateInit");
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
d_stream.next_out = uncompr; /* discard the output */
|
|
||||||
d_stream.avail_out = (uInt)uncomprLen;
|
|
||||||
err = inflate(&d_stream, Z_NO_FLUSH);
|
|
||||||
if (err == Z_STREAM_END) break;
|
|
||||||
CHECK_ERR(err, "large inflate");
|
|
||||||
}
|
|
||||||
|
|
||||||
err = inflateEnd(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateEnd");
|
|
||||||
|
|
||||||
if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
|
|
||||||
fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
|
|
||||||
exit(1);
|
|
||||||
} else {
|
|
||||||
printf("large_inflate(): OK\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test deflate() with full flush
|
|
||||||
*/
|
|
||||||
void test_flush(compr, comprLen)
|
|
||||||
Byte *compr;
|
|
||||||
uLong *comprLen;
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
c_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
|
|
||||||
CHECK_ERR(err, "deflateInit");
|
|
||||||
|
|
||||||
c_stream.next_in = (Bytef*)hello;
|
|
||||||
c_stream.next_out = compr;
|
|
||||||
c_stream.avail_in = 3;
|
|
||||||
c_stream.avail_out = (uInt)*comprLen;
|
|
||||||
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");
|
|
||||||
|
|
||||||
*comprLen = c_stream.total_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test inflateSync()
|
|
||||||
*/
|
|
||||||
void test_sync(compr, comprLen, uncompr, uncomprLen)
|
|
||||||
Byte *compr, *uncompr;
|
|
||||||
uLong comprLen, uncomprLen;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
z_stream d_stream; /* decompression stream */
|
|
||||||
|
|
||||||
strcpy((char*)uncompr, "garbage");
|
|
||||||
|
|
||||||
d_stream.zalloc = (alloc_func)0;
|
|
||||||
d_stream.zfree = (free_func)0;
|
|
||||||
d_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
d_stream.next_in = compr;
|
|
||||||
d_stream.avail_in = 2; /* just read the zlib header */
|
|
||||||
|
|
||||||
err = inflateInit(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateInit");
|
|
||||||
|
|
||||||
d_stream.next_out = uncompr;
|
|
||||||
d_stream.avail_out = (uInt)uncomprLen;
|
|
||||||
|
|
||||||
inflate(&d_stream, Z_NO_FLUSH);
|
|
||||||
CHECK_ERR(err, "inflate");
|
|
||||||
|
|
||||||
d_stream.avail_in = (uInt)comprLen-2; /* read all compressed data */
|
|
||||||
err = inflateSync(&d_stream); /* but 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 */
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
err = inflateEnd(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateEnd");
|
|
||||||
|
|
||||||
printf("after inflateSync(): hel%s\n", (char *)uncompr);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test deflate() with preset dictionary
|
|
||||||
*/
|
|
||||||
void test_dict_deflate(compr, comprLen)
|
|
||||||
Byte *compr;
|
|
||||||
uLong comprLen;
|
|
||||||
{
|
|
||||||
z_stream c_stream; /* compression stream */
|
|
||||||
int err;
|
|
||||||
|
|
||||||
c_stream.zalloc = (alloc_func)0;
|
|
||||||
c_stream.zfree = (free_func)0;
|
|
||||||
c_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
|
|
||||||
CHECK_ERR(err, "deflateInit");
|
|
||||||
|
|
||||||
err = deflateSetDictionary(&c_stream,
|
|
||||||
(const Bytef*)dictionary, sizeof(dictionary));
|
|
||||||
CHECK_ERR(err, "deflateSetDictionary");
|
|
||||||
|
|
||||||
dictId = c_stream.adler;
|
|
||||||
c_stream.next_out = compr;
|
|
||||||
c_stream.avail_out = (uInt)comprLen;
|
|
||||||
|
|
||||||
c_stream.next_in = (Bytef*)hello;
|
|
||||||
c_stream.avail_in = (uInt)strlen(hello)+1;
|
|
||||||
|
|
||||||
err = deflate(&c_stream, Z_FINISH);
|
|
||||||
if (err != Z_STREAM_END) {
|
|
||||||
fprintf(stderr, "deflate should report Z_STREAM_END\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
err = deflateEnd(&c_stream);
|
|
||||||
CHECK_ERR(err, "deflateEnd");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Test inflate() with a preset dictionary
|
|
||||||
*/
|
|
||||||
void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
|
|
||||||
Byte *compr, *uncompr;
|
|
||||||
uLong comprLen, uncomprLen;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
z_stream d_stream; /* decompression stream */
|
|
||||||
|
|
||||||
strcpy((char*)uncompr, "garbage");
|
|
||||||
|
|
||||||
d_stream.zalloc = (alloc_func)0;
|
|
||||||
d_stream.zfree = (free_func)0;
|
|
||||||
d_stream.opaque = (voidpf)0;
|
|
||||||
|
|
||||||
d_stream.next_in = compr;
|
|
||||||
d_stream.avail_in = (uInt)comprLen;
|
|
||||||
|
|
||||||
err = inflateInit(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateInit");
|
|
||||||
|
|
||||||
d_stream.next_out = uncompr;
|
|
||||||
d_stream.avail_out = (uInt)uncomprLen;
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
err = inflate(&d_stream, Z_NO_FLUSH);
|
|
||||||
if (err == Z_STREAM_END) break;
|
|
||||||
if (err == Z_NEED_DICT) {
|
|
||||||
if (d_stream.adler != dictId) {
|
|
||||||
fprintf(stderr, "unexpected dictionary");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
|
|
||||||
sizeof(dictionary));
|
|
||||||
}
|
|
||||||
CHECK_ERR(err, "inflate with dict");
|
|
||||||
}
|
|
||||||
|
|
||||||
err = inflateEnd(&d_stream);
|
|
||||||
CHECK_ERR(err, "inflateEnd");
|
|
||||||
|
|
||||||
if (strcmp((char*)uncompr, hello)) {
|
|
||||||
fprintf(stderr, "bad inflate with dict\n");
|
|
||||||
exit(1);
|
|
||||||
} else {
|
|
||||||
printf("inflate with dictionary: %s\n", (char *)uncompr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Usage: example [output.gz [input.gz]]
|
|
||||||
*/
|
|
||||||
|
|
||||||
int main(argc, argv)
|
|
||||||
int argc;
|
|
||||||
char *argv[];
|
|
||||||
{
|
|
||||||
Byte *compr, *uncompr;
|
|
||||||
uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
|
|
||||||
uLong uncomprLen = comprLen;
|
|
||||||
static const char* myVersion = ZLIB_VERSION;
|
|
||||||
|
|
||||||
if (zlibVersion()[0] != myVersion[0]) {
|
|
||||||
fprintf(stderr, "incompatible zlib version\n");
|
|
||||||
exit(1);
|
|
||||||
|
|
||||||
} else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
|
|
||||||
fprintf(stderr, "warning: different zlib version\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
compr = (Byte*)calloc((uInt)comprLen, 1);
|
|
||||||
uncompr = (Byte*)calloc((uInt)uncomprLen, 1);
|
|
||||||
/* compr and uncompr are cleared to avoid reading uninitialized
|
|
||||||
* data and to ensure that uncompr compresses well.
|
|
||||||
*/
|
|
||||||
if (compr == Z_NULL || uncompr == Z_NULL) {
|
|
||||||
printf("out of memory\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
test_compress(compr, comprLen, uncompr, uncomprLen);
|
|
||||||
|
|
||||||
test_gzio((argc > 1 ? argv[1] : TESTFILE),
|
|
||||||
(argc > 2 ? argv[2] : TESTFILE),
|
|
||||||
uncompr, (int)uncomprLen);
|
|
||||||
|
|
||||||
test_deflate(compr, comprLen);
|
|
||||||
test_inflate(compr, comprLen, uncompr, uncomprLen);
|
|
||||||
|
|
||||||
test_large_deflate(compr, comprLen, uncompr, uncomprLen);
|
|
||||||
test_large_inflate(compr, comprLen, uncompr, uncomprLen);
|
|
||||||
|
|
||||||
test_flush(compr, &comprLen);
|
|
||||||
test_sync(compr, comprLen, uncompr, uncomprLen);
|
|
||||||
comprLen = uncomprLen;
|
|
||||||
|
|
||||||
test_dict_deflate(compr, comprLen);
|
|
||||||
test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
|
|
||||||
|
|
||||||
exit(0);
|
|
||||||
return 0; /* to avoid warning */
|
|
||||||
}
|
|
||||||
875
lib/zlib/gzio.c
875
lib/zlib/gzio.c
@ -1,875 +0,0 @@
|
|||||||
/* gzio.c -- IO on .gz files
|
|
||||||
* Copyright (C) 1995-1998 Jean-loup Gailly.
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*
|
|
||||||
* Compile this file with -DNO_DEFLATE to avoid the compression code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* @(#) $Id$ */
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include "zutil.h"
|
|
||||||
|
|
||||||
struct internal_state {int dummy;}; /* for buggy compilers */
|
|
||||||
|
|
||||||
#ifndef Z_BUFSIZE
|
|
||||||
# ifdef MAXSEG_64K
|
|
||||||
# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
|
|
||||||
# else
|
|
||||||
# define Z_BUFSIZE 16384
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifndef Z_PRINTF_BUFSIZE
|
|
||||||
# define Z_PRINTF_BUFSIZE 4096
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ALLOC(size) malloc(size)
|
|
||||||
#define TRYFREE(p) {if (p) free(p);}
|
|
||||||
|
|
||||||
static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
|
|
||||||
|
|
||||||
/* gzip flag byte */
|
|
||||||
#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
|
|
||||||
#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
|
|
||||||
#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
|
|
||||||
#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
|
|
||||||
#define COMMENT 0x10 /* bit 4 set: file comment present */
|
|
||||||
#define RESERVED 0xE0 /* bits 5..7: reserved */
|
|
||||||
|
|
||||||
typedef struct gz_stream {
|
|
||||||
z_stream stream;
|
|
||||||
int z_err; /* error code for last stream operation */
|
|
||||||
int z_eof; /* set if end of input file */
|
|
||||||
FILE *file; /* .gz file */
|
|
||||||
Byte *inbuf; /* input buffer */
|
|
||||||
Byte *outbuf; /* output buffer */
|
|
||||||
uLong crc; /* crc32 of uncompressed data */
|
|
||||||
char *msg; /* error message */
|
|
||||||
char *path; /* path name for debugging only */
|
|
||||||
int transparent; /* 1 if input file is not a .gz file */
|
|
||||||
char mode; /* 'w' or 'r' */
|
|
||||||
long startpos; /* start of compressed data in file (header skipped) */
|
|
||||||
} gz_stream;
|
|
||||||
|
|
||||||
|
|
||||||
local gzFile gz_open OF((const char *path, const char *mode, int fd));
|
|
||||||
local int do_flush OF((gzFile file, int flush));
|
|
||||||
local int get_byte OF((gz_stream *s));
|
|
||||||
local void check_header OF((gz_stream *s));
|
|
||||||
local int destroy OF((gz_stream *s));
|
|
||||||
local void putLong OF((FILE *file, uLong x));
|
|
||||||
local uLong getLong OF((gz_stream *s));
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Opens a gzip (.gz) file for reading or writing. The mode parameter
|
|
||||||
is as in fopen ("rb" or "wb"). The file is given either by file descriptor
|
|
||||||
or path name (if fd == -1).
|
|
||||||
gz_open return NULL if the file could not be opened or if there was
|
|
||||||
insufficient memory to allocate the (de)compression state; errno
|
|
||||||
can be checked to distinguish the two cases (if errno is zero, the
|
|
||||||
zlib error is Z_MEM_ERROR).
|
|
||||||
*/
|
|
||||||
local gzFile gz_open (path, mode, fd)
|
|
||||||
const char *path;
|
|
||||||
const char *mode;
|
|
||||||
int fd;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
int level = Z_DEFAULT_COMPRESSION; /* compression level */
|
|
||||||
int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
|
|
||||||
char *p = (char*)mode;
|
|
||||||
gz_stream *s;
|
|
||||||
char fmode[80]; /* copy of mode, without the compression level */
|
|
||||||
char *m = fmode;
|
|
||||||
|
|
||||||
if (!path || !mode) return Z_NULL;
|
|
||||||
|
|
||||||
s = (gz_stream *)ALLOC(sizeof(gz_stream));
|
|
||||||
if (!s) return Z_NULL;
|
|
||||||
|
|
||||||
s->stream.zalloc = (alloc_func)0;
|
|
||||||
s->stream.zfree = (free_func)0;
|
|
||||||
s->stream.opaque = (voidpf)0;
|
|
||||||
s->stream.next_in = s->inbuf = Z_NULL;
|
|
||||||
s->stream.next_out = s->outbuf = Z_NULL;
|
|
||||||
s->stream.avail_in = s->stream.avail_out = 0;
|
|
||||||
s->file = NULL;
|
|
||||||
s->z_err = Z_OK;
|
|
||||||
s->z_eof = 0;
|
|
||||||
s->crc = crc32(0L, Z_NULL, 0);
|
|
||||||
s->msg = NULL;
|
|
||||||
s->transparent = 0;
|
|
||||||
|
|
||||||
s->path = (char*)ALLOC(strlen(path)+1);
|
|
||||||
if (s->path == 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 == 'w' || *p == 'a') s->mode = 'w';
|
|
||||||
if (*p >= '0' && *p <= '9') {
|
|
||||||
level = *p - '0';
|
|
||||||
} else if (*p == 'f') {
|
|
||||||
strategy = Z_FILTERED;
|
|
||||||
} else if (*p == 'h') {
|
|
||||||
strategy = Z_HUFFMAN_ONLY;
|
|
||||||
} else {
|
|
||||||
*m++ = *p; /* copy the mode */
|
|
||||||
}
|
|
||||||
} while (*p++ && m != fmode + sizeof(fmode));
|
|
||||||
if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
|
|
||||||
|
|
||||||
if (s->mode == 'w') {
|
|
||||||
#ifdef NO_DEFLATE
|
|
||||||
err = Z_STREAM_ERROR;
|
|
||||||
#else
|
|
||||||
err = deflateInit2(&(s->stream), level,
|
|
||||||
Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
|
|
||||||
/* windowBits is passed < 0 to suppress zlib header */
|
|
||||||
|
|
||||||
s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
|
|
||||||
#endif
|
|
||||||
if (err != Z_OK || s->outbuf == Z_NULL) {
|
|
||||||
return destroy(s), (gzFile)Z_NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
|
|
||||||
|
|
||||||
err = inflateInit2(&(s->stream), -MAX_WBITS);
|
|
||||||
/* windowBits is passed < 0 to tell that there is no zlib header.
|
|
||||||
* Note that in this case inflate *requires* an extra "dummy" byte
|
|
||||||
* after the compressed stream in order to complete decompression and
|
|
||||||
* return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
|
|
||||||
* present after the compressed stream.
|
|
||||||
*/
|
|
||||||
if (err != Z_OK || s->inbuf == Z_NULL) {
|
|
||||||
return destroy(s), (gzFile)Z_NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
s->stream.avail_out = Z_BUFSIZE;
|
|
||||||
|
|
||||||
errno = 0;
|
|
||||||
s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
|
|
||||||
|
|
||||||
if (s->file == NULL) {
|
|
||||||
return destroy(s), (gzFile)Z_NULL;
|
|
||||||
}
|
|
||||||
if (s->mode == 'w') {
|
|
||||||
/* Write a very simple .gz header:
|
|
||||||
*/
|
|
||||||
fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
|
|
||||||
Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
|
|
||||||
s->startpos = 10L;
|
|
||||||
/* We use 10L instead of ftell(s->file) to because ftell causes an
|
|
||||||
* fflush on some systems. This version of the library doesn't use
|
|
||||||
* startpos anyway in write mode, so this initialization is not
|
|
||||||
* necessary.
|
|
||||||
*/
|
|
||||||
} else {
|
|
||||||
check_header(s); /* skip the .gz header */
|
|
||||||
s->startpos = (ftell(s->file) - s->stream.avail_in);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (gzFile)s;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Opens a gzip (.gz) file for reading or writing.
|
|
||||||
*/
|
|
||||||
gzFile ZEXPORT gzopen (path, mode)
|
|
||||||
const char *path;
|
|
||||||
const char *mode;
|
|
||||||
{
|
|
||||||
return gz_open (path, mode, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Associate a gzFile with the file descriptor fd. fd is not dup'ed here
|
|
||||||
to mimic the behavio(u)r of fdopen.
|
|
||||||
*/
|
|
||||||
gzFile ZEXPORT gzdopen (fd, mode)
|
|
||||||
int fd;
|
|
||||||
const char *mode;
|
|
||||||
{
|
|
||||||
char name[20];
|
|
||||||
|
|
||||||
if (fd < 0) return (gzFile)Z_NULL;
|
|
||||||
sprintf(name, "<fd:%d>", fd); /* for debugging */
|
|
||||||
|
|
||||||
return gz_open (name, mode, fd);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Update the compression level and strategy
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzsetparams (file, level, strategy)
|
|
||||||
gzFile file;
|
|
||||||
int level;
|
|
||||||
int strategy;
|
|
||||||
{
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
|
|
||||||
|
|
||||||
/* Make room to allow flushing */
|
|
||||||
if (s->stream.avail_out == 0) {
|
|
||||||
|
|
||||||
s->stream.next_out = s->outbuf;
|
|
||||||
if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
|
|
||||||
s->z_err = Z_ERRNO;
|
|
||||||
}
|
|
||||||
s->stream.avail_out = Z_BUFSIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return deflateParams (&(s->stream), level, strategy);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Read a byte from a gz_stream; update next_in and avail_in. Return EOF
|
|
||||||
for end of file.
|
|
||||||
IN assertion: the stream s has been sucessfully opened for reading.
|
|
||||||
*/
|
|
||||||
local int get_byte(s)
|
|
||||||
gz_stream *s;
|
|
||||||
{
|
|
||||||
if (s->z_eof) return EOF;
|
|
||||||
if (s->stream.avail_in == 0) {
|
|
||||||
errno = 0;
|
|
||||||
s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
|
|
||||||
if (s->stream.avail_in == 0) {
|
|
||||||
s->z_eof = 1;
|
|
||||||
if (ferror(s->file)) s->z_err = Z_ERRNO;
|
|
||||||
return EOF;
|
|
||||||
}
|
|
||||||
s->stream.next_in = s->inbuf;
|
|
||||||
}
|
|
||||||
s->stream.avail_in--;
|
|
||||||
return *(s->stream.next_in)++;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Check the gzip header of a gz_stream opened for reading. Set the stream
|
|
||||||
mode to transparent if the gzip magic header is not present; set s->err
|
|
||||||
to Z_DATA_ERROR if the magic header is present but the rest of the header
|
|
||||||
is incorrect.
|
|
||||||
IN assertion: the stream s has already been created sucessfully;
|
|
||||||
s->stream.avail_in is zero for the first time, but may be non-zero
|
|
||||||
for concatenated .gz files.
|
|
||||||
*/
|
|
||||||
local void check_header(s)
|
|
||||||
gz_stream *s;
|
|
||||||
{
|
|
||||||
int method; /* method byte */
|
|
||||||
int flags; /* flags byte */
|
|
||||||
uInt len;
|
|
||||||
int c;
|
|
||||||
|
|
||||||
/* Check the gzip magic header */
|
|
||||||
for (len = 0; len < 2; len++) {
|
|
||||||
c = get_byte(s);
|
|
||||||
if (c != gz_magic[len]) {
|
|
||||||
if (len != 0) s->stream.avail_in++, s->stream.next_in--;
|
|
||||||
if (c != EOF) {
|
|
||||||
s->stream.avail_in++, s->stream.next_in--;
|
|
||||||
s->transparent = 1;
|
|
||||||
}
|
|
||||||
s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
method = get_byte(s);
|
|
||||||
flags = get_byte(s);
|
|
||||||
if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
|
|
||||||
s->z_err = Z_DATA_ERROR;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Discard time, xflags and OS code: */
|
|
||||||
for (len = 0; len < 6; len++) (void)get_byte(s);
|
|
||||||
|
|
||||||
if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
|
|
||||||
len = (uInt)get_byte(s);
|
|
||||||
len += ((uInt)get_byte(s))<<8;
|
|
||||||
/* len is garbage if EOF but the loop below will quit anyway */
|
|
||||||
while (len-- != 0 && get_byte(s) != EOF) ;
|
|
||||||
}
|
|
||||||
if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
|
|
||||||
while ((c = get_byte(s)) != 0 && c != EOF) ;
|
|
||||||
}
|
|
||||||
if ((flags & COMMENT) != 0) { /* skip the .gz file comment */
|
|
||||||
while ((c = get_byte(s)) != 0 && c != EOF) ;
|
|
||||||
}
|
|
||||||
if ((flags & HEAD_CRC) != 0) { /* skip the header crc */
|
|
||||||
for (len = 0; len < 2; len++) (void)get_byte(s);
|
|
||||||
}
|
|
||||||
s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
* Cleanup then free the given gz_stream. Return a zlib error code.
|
|
||||||
Try freeing in the reverse order of allocations.
|
|
||||||
*/
|
|
||||||
local int destroy (s)
|
|
||||||
gz_stream *s;
|
|
||||||
{
|
|
||||||
int err = Z_OK;
|
|
||||||
|
|
||||||
if (!s) return Z_STREAM_ERROR;
|
|
||||||
|
|
||||||
TRYFREE(s->msg);
|
|
||||||
|
|
||||||
if (s->stream.state != NULL) {
|
|
||||||
if (s->mode == 'w') {
|
|
||||||
#ifdef NO_DEFLATE
|
|
||||||
err = Z_STREAM_ERROR;
|
|
||||||
#else
|
|
||||||
err = deflateEnd(&(s->stream));
|
|
||||||
#endif
|
|
||||||
} else if (s->mode == 'r') {
|
|
||||||
err = inflateEnd(&(s->stream));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (s->file != NULL && fclose(s->file)) {
|
|
||||||
#ifdef ESPIPE
|
|
||||||
if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
|
|
||||||
#endif
|
|
||||||
err = Z_ERRNO;
|
|
||||||
}
|
|
||||||
if (s->z_err < 0) err = s->z_err;
|
|
||||||
|
|
||||||
TRYFREE(s->inbuf);
|
|
||||||
TRYFREE(s->outbuf);
|
|
||||||
TRYFREE(s->path);
|
|
||||||
TRYFREE(s);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Reads the given number of uncompressed bytes from the compressed file.
|
|
||||||
gzread returns the number of bytes actually read (0 for end of file).
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzread (file, buf, len)
|
|
||||||
gzFile file;
|
|
||||||
voidp buf;
|
|
||||||
unsigned len;
|
|
||||||
{
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
Bytef *start = (Bytef*)buf; /* starting point for crc computation */
|
|
||||||
Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */
|
|
||||||
|
|
||||||
if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
|
|
||||||
|
|
||||||
if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
|
|
||||||
if (s->z_err == Z_STREAM_END) return 0; /* EOF */
|
|
||||||
|
|
||||||
next_out = (Byte*)buf;
|
|
||||||
s->stream.next_out = (Bytef*)buf;
|
|
||||||
s->stream.avail_out = len;
|
|
||||||
|
|
||||||
while (s->stream.avail_out != 0) {
|
|
||||||
|
|
||||||
if (s->transparent) {
|
|
||||||
/* Copy first the lookahead bytes: */
|
|
||||||
uInt n = s->stream.avail_in;
|
|
||||||
if (n > s->stream.avail_out) n = s->stream.avail_out;
|
|
||||||
if (n > 0) {
|
|
||||||
zmemcpy(s->stream.next_out, s->stream.next_in, n);
|
|
||||||
next_out += n;
|
|
||||||
s->stream.next_out = next_out;
|
|
||||||
s->stream.next_in += n;
|
|
||||||
s->stream.avail_out -= n;
|
|
||||||
s->stream.avail_in -= n;
|
|
||||||
}
|
|
||||||
if (s->stream.avail_out > 0) {
|
|
||||||
s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
|
|
||||||
s->file);
|
|
||||||
}
|
|
||||||
len -= s->stream.avail_out;
|
|
||||||
s->stream.total_in += (uLong)len;
|
|
||||||
s->stream.total_out += (uLong)len;
|
|
||||||
if (len == 0) s->z_eof = 1;
|
|
||||||
return (int)len;
|
|
||||||
}
|
|
||||||
if (s->stream.avail_in == 0 && !s->z_eof) {
|
|
||||||
|
|
||||||
errno = 0;
|
|
||||||
s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
|
|
||||||
if (s->stream.avail_in == 0) {
|
|
||||||
s->z_eof = 1;
|
|
||||||
if (ferror(s->file)) {
|
|
||||||
s->z_err = Z_ERRNO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
s->stream.next_in = s->inbuf;
|
|
||||||
}
|
|
||||||
s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
|
|
||||||
|
|
||||||
if (s->z_err == Z_STREAM_END) {
|
|
||||||
/* Check CRC and original size */
|
|
||||||
s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
|
|
||||||
start = s->stream.next_out;
|
|
||||||
|
|
||||||
if (getLong(s) != s->crc) {
|
|
||||||
s->z_err = Z_DATA_ERROR;
|
|
||||||
} else {
|
|
||||||
(void)getLong(s);
|
|
||||||
/* The uncompressed length returned by above getlong() may
|
|
||||||
* be different from s->stream.total_out) in case of
|
|
||||||
* concatenated .gz files. Check for such files:
|
|
||||||
*/
|
|
||||||
check_header(s);
|
|
||||||
if (s->z_err == Z_OK) {
|
|
||||||
uLong total_in = s->stream.total_in;
|
|
||||||
uLong total_out = s->stream.total_out;
|
|
||||||
|
|
||||||
inflateReset(&(s->stream));
|
|
||||||
s->stream.total_in = total_in;
|
|
||||||
s->stream.total_out = total_out;
|
|
||||||
s->crc = crc32(0L, Z_NULL, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (s->z_err != Z_OK || s->z_eof) break;
|
|
||||||
}
|
|
||||||
s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
|
|
||||||
|
|
||||||
return (int)(len - s->stream.avail_out);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Reads one byte from the compressed file. gzgetc returns this byte
|
|
||||||
or -1 in case of end of file or error.
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzgetc(file)
|
|
||||||
gzFile file;
|
|
||||||
{
|
|
||||||
unsigned char c;
|
|
||||||
|
|
||||||
return gzread(file, &c, 1) == 1 ? c : -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Reads bytes from the compressed file until len-1 characters are
|
|
||||||
read, or a newline character is read and transferred to buf, or an
|
|
||||||
end-of-file condition is encountered. The string is then terminated
|
|
||||||
with a null character.
|
|
||||||
gzgets returns buf, or Z_NULL in case of error.
|
|
||||||
|
|
||||||
The current implementation is not optimized at all.
|
|
||||||
*/
|
|
||||||
char * ZEXPORT gzgets(file, buf, len)
|
|
||||||
gzFile file;
|
|
||||||
char *buf;
|
|
||||||
int len;
|
|
||||||
{
|
|
||||||
char *b = buf;
|
|
||||||
if (buf == Z_NULL || len <= 0) return Z_NULL;
|
|
||||||
|
|
||||||
while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
|
|
||||||
*buf = '\0';
|
|
||||||
return b == buf && len > 0 ? Z_NULL : b;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef NO_DEFLATE
|
|
||||||
/* ===========================================================================
|
|
||||||
Writes the given number of uncompressed bytes into the compressed file.
|
|
||||||
gzwrite returns the number of bytes actually written (0 in case of error).
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzwrite (file, buf, len)
|
|
||||||
gzFile file;
|
|
||||||
const voidp buf;
|
|
||||||
unsigned len;
|
|
||||||
{
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
|
|
||||||
|
|
||||||
s->stream.next_in = (Bytef*)buf;
|
|
||||||
s->stream.avail_in = len;
|
|
||||||
|
|
||||||
while (s->stream.avail_in != 0) {
|
|
||||||
|
|
||||||
if (s->stream.avail_out == 0) {
|
|
||||||
|
|
||||||
s->stream.next_out = s->outbuf;
|
|
||||||
if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
|
|
||||||
s->z_err = Z_ERRNO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
s->stream.avail_out = Z_BUFSIZE;
|
|
||||||
}
|
|
||||||
s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
|
|
||||||
if (s->z_err != Z_OK) break;
|
|
||||||
}
|
|
||||||
s->crc = crc32(s->crc, (const Bytef *)buf, len);
|
|
||||||
|
|
||||||
return (int)(len - s->stream.avail_in);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Converts, formats, and writes the args to the compressed file under
|
|
||||||
control of the format string, as in fprintf. gzprintf returns the number of
|
|
||||||
uncompressed bytes actually written (0 in case of error).
|
|
||||||
*/
|
|
||||||
#ifdef STDC
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
|
|
||||||
{
|
|
||||||
char buf[Z_PRINTF_BUFSIZE];
|
|
||||||
va_list va;
|
|
||||||
int len;
|
|
||||||
|
|
||||||
va_start(va, format);
|
|
||||||
#ifdef HAS_vsnprintf
|
|
||||||
(void)vsnprintf(buf, sizeof(buf), format, va);
|
|
||||||
#else
|
|
||||||
(void)vsprintf(buf, format, va);
|
|
||||||
#endif
|
|
||||||
va_end(va);
|
|
||||||
len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
|
|
||||||
if (len <= 0) return 0;
|
|
||||||
|
|
||||||
return gzwrite(file, buf, (unsigned)len);
|
|
||||||
}
|
|
||||||
#else /* not ANSI C */
|
|
||||||
|
|
||||||
int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
|
|
||||||
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
|
|
||||||
gzFile file;
|
|
||||||
const char *format;
|
|
||||||
int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
|
|
||||||
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
|
|
||||||
{
|
|
||||||
char buf[Z_PRINTF_BUFSIZE];
|
|
||||||
int len;
|
|
||||||
|
|
||||||
#ifdef HAS_snprintf
|
|
||||||
snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
|
|
||||||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
|
||||||
#else
|
|
||||||
sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
|
|
||||||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
|
|
||||||
#endif
|
|
||||||
len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */
|
|
||||||
if (len <= 0) return 0;
|
|
||||||
|
|
||||||
return gzwrite(file, buf, len);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Writes c, converted to an unsigned char, into the compressed file.
|
|
||||||
gzputc returns the value that was written, or -1 in case of error.
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzputc(file, c)
|
|
||||||
gzFile file;
|
|
||||||
int c;
|
|
||||||
{
|
|
||||||
unsigned char cc = (unsigned char) c; /* required for big endian systems */
|
|
||||||
|
|
||||||
return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Writes the given null-terminated string to the compressed file, excluding
|
|
||||||
the terminating null character.
|
|
||||||
gzputs returns the number of characters written, or -1 in case of error.
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzputs(file, s)
|
|
||||||
gzFile file;
|
|
||||||
const char *s;
|
|
||||||
{
|
|
||||||
return gzwrite(file, (char*)s, (unsigned)strlen(s));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Flushes all pending output into the compressed file. The parameter
|
|
||||||
flush is as in the deflate() function.
|
|
||||||
*/
|
|
||||||
local int do_flush (file, flush)
|
|
||||||
gzFile file;
|
|
||||||
int flush;
|
|
||||||
{
|
|
||||||
uInt len;
|
|
||||||
int done = 0;
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
|
|
||||||
|
|
||||||
s->stream.avail_in = 0; /* should be zero already anyway */
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
len = Z_BUFSIZE - s->stream.avail_out;
|
|
||||||
|
|
||||||
if (len != 0) {
|
|
||||||
if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
|
|
||||||
s->z_err = Z_ERRNO;
|
|
||||||
return Z_ERRNO;
|
|
||||||
}
|
|
||||||
s->stream.next_out = s->outbuf;
|
|
||||||
s->stream.avail_out = Z_BUFSIZE;
|
|
||||||
}
|
|
||||||
if (done) break;
|
|
||||||
s->z_err = deflate(&(s->stream), flush);
|
|
||||||
|
|
||||||
/* Ignore the second of two consecutive flushes: */
|
|
||||||
if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
|
|
||||||
|
|
||||||
/* 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 || s->z_err == Z_STREAM_END);
|
|
||||||
|
|
||||||
if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
|
|
||||||
}
|
|
||||||
return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
|
|
||||||
}
|
|
||||||
|
|
||||||
int ZEXPORT gzflush (file, flush)
|
|
||||||
gzFile file;
|
|
||||||
int flush;
|
|
||||||
{
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
int err = do_flush (file, flush);
|
|
||||||
|
|
||||||
if (err) return err;
|
|
||||||
fflush(s->file);
|
|
||||||
return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
|
|
||||||
}
|
|
||||||
#endif /* NO_DEFLATE */
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Sets the starting position for the next gzread or gzwrite on the given
|
|
||||||
compressed file. The offset represents a number of bytes in the
|
|
||||||
gzseek returns the resulting offset location as measured in bytes from
|
|
||||||
the beginning of the uncompressed stream, or -1 in case of error.
|
|
||||||
SEEK_END is not implemented, returns error.
|
|
||||||
In this version of the library, gzseek can be extremely slow.
|
|
||||||
*/
|
|
||||||
z_off_t ZEXPORT gzseek (file, offset, whence)
|
|
||||||
gzFile file;
|
|
||||||
z_off_t offset;
|
|
||||||
int whence;
|
|
||||||
{
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
if (s == NULL || whence == SEEK_END ||
|
|
||||||
s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
|
|
||||||
return -1L;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (s->mode == 'w') {
|
|
||||||
#ifdef NO_DEFLATE
|
|
||||||
return -1L;
|
|
||||||
#else
|
|
||||||
if (whence == SEEK_SET) {
|
|
||||||
offset -= s->stream.total_in;
|
|
||||||
}
|
|
||||||
if (offset < 0) return -1L;
|
|
||||||
|
|
||||||
/* At this point, offset is the number of zero bytes to write. */
|
|
||||||
if (s->inbuf == Z_NULL) {
|
|
||||||
s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
|
|
||||||
zmemzero(s->inbuf, Z_BUFSIZE);
|
|
||||||
}
|
|
||||||
while (offset > 0) {
|
|
||||||
uInt size = Z_BUFSIZE;
|
|
||||||
if (offset < Z_BUFSIZE) size = (uInt)offset;
|
|
||||||
|
|
||||||
size = gzwrite(file, s->inbuf, size);
|
|
||||||
if (size == 0) return -1L;
|
|
||||||
|
|
||||||
offset -= size;
|
|
||||||
}
|
|
||||||
return (z_off_t)s->stream.total_in;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
/* Rest of function is for reading only */
|
|
||||||
|
|
||||||
/* compute absolute position */
|
|
||||||
if (whence == SEEK_CUR) {
|
|
||||||
offset += s->stream.total_out;
|
|
||||||
}
|
|
||||||
if (offset < 0) return -1L;
|
|
||||||
|
|
||||||
if (s->transparent) {
|
|
||||||
/* map to fseek */
|
|
||||||
s->stream.avail_in = 0;
|
|
||||||
s->stream.next_in = s->inbuf;
|
|
||||||
if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
|
|
||||||
|
|
||||||
s->stream.total_in = s->stream.total_out = (uLong)offset;
|
|
||||||
return offset;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* For a negative seek, rewind and use positive seek */
|
|
||||||
if ((uLong)offset >= s->stream.total_out) {
|
|
||||||
offset -= s->stream.total_out;
|
|
||||||
} else if (gzrewind(file) < 0) {
|
|
||||||
return -1L;
|
|
||||||
}
|
|
||||||
/* offset is now the number of bytes to skip. */
|
|
||||||
|
|
||||||
if (offset != 0 && s->outbuf == Z_NULL) {
|
|
||||||
s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
|
|
||||||
}
|
|
||||||
while (offset > 0) {
|
|
||||||
int size = Z_BUFSIZE;
|
|
||||||
if (offset < Z_BUFSIZE) size = (int)offset;
|
|
||||||
|
|
||||||
size = gzread(file, s->outbuf, (uInt)size);
|
|
||||||
if (size <= 0) return -1L;
|
|
||||||
offset -= size;
|
|
||||||
}
|
|
||||||
return (z_off_t)s->stream.total_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Rewinds input file.
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzrewind (file)
|
|
||||||
gzFile file;
|
|
||||||
{
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
if (s == NULL || s->mode != 'r') return -1;
|
|
||||||
|
|
||||||
s->z_err = Z_OK;
|
|
||||||
s->z_eof = 0;
|
|
||||||
s->stream.avail_in = 0;
|
|
||||||
s->stream.next_in = s->inbuf;
|
|
||||||
s->crc = crc32(0L, Z_NULL, 0);
|
|
||||||
|
|
||||||
if (s->startpos == 0) { /* not a compressed file */
|
|
||||||
rewind(s->file);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
(void) inflateReset(&s->stream);
|
|
||||||
return fseek(s->file, s->startpos, SEEK_SET);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Returns the starting position for the next gzread or gzwrite on the
|
|
||||||
given compressed file. This position represents a number of bytes in the
|
|
||||||
uncompressed data stream.
|
|
||||||
*/
|
|
||||||
z_off_t ZEXPORT gztell (file)
|
|
||||||
gzFile file;
|
|
||||||
{
|
|
||||||
return gzseek(file, 0L, SEEK_CUR);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Returns 1 when EOF has previously been detected reading the given
|
|
||||||
input stream, otherwise zero.
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzeof (file)
|
|
||||||
gzFile file;
|
|
||||||
{
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
return (s == NULL || s->mode != 'r') ? 0 : s->z_eof;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Outputs a long in LSB order to the given file
|
|
||||||
*/
|
|
||||||
local void putLong (file, x)
|
|
||||||
FILE *file;
|
|
||||||
uLong x;
|
|
||||||
{
|
|
||||||
int n;
|
|
||||||
for (n = 0; n < 4; n++) {
|
|
||||||
fputc((int)(x & 0xff), file);
|
|
||||||
x >>= 8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Reads a long in LSB order from the given gz_stream. Sets z_err in case
|
|
||||||
of error.
|
|
||||||
*/
|
|
||||||
local uLong getLong (s)
|
|
||||||
gz_stream *s;
|
|
||||||
{
|
|
||||||
uLong x = (uLong)get_byte(s);
|
|
||||||
int c;
|
|
||||||
|
|
||||||
x += ((uLong)get_byte(s))<<8;
|
|
||||||
x += ((uLong)get_byte(s))<<16;
|
|
||||||
c = get_byte(s);
|
|
||||||
if (c == EOF) s->z_err = Z_DATA_ERROR;
|
|
||||||
x += ((uLong)c)<<24;
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Flushes all pending output if necessary, closes the compressed file
|
|
||||||
and deallocates all the (de)compression state.
|
|
||||||
*/
|
|
||||||
int ZEXPORT gzclose (file)
|
|
||||||
gzFile file;
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
if (s == NULL) return Z_STREAM_ERROR;
|
|
||||||
|
|
||||||
if (s->mode == 'w') {
|
|
||||||
#ifdef NO_DEFLATE
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
#else
|
|
||||||
err = do_flush (file, Z_FINISH);
|
|
||||||
if (err != Z_OK) return destroy((gz_stream*)file);
|
|
||||||
|
|
||||||
putLong (s->file, s->crc);
|
|
||||||
putLong (s->file, s->stream.total_in);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
return destroy((gz_stream*)file);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===========================================================================
|
|
||||||
Returns the error message for the last error which occured on the
|
|
||||||
given compressed file. errnum is set to zlib error number. If an
|
|
||||||
error occured in the file system and not in the compression library,
|
|
||||||
errnum is set to Z_ERRNO and the application may consult errno
|
|
||||||
to get the exact error code.
|
|
||||||
*/
|
|
||||||
const char* ZEXPORT gzerror (file, errnum)
|
|
||||||
gzFile file;
|
|
||||||
int *errnum;
|
|
||||||
{
|
|
||||||
char *m;
|
|
||||||
gz_stream *s = (gz_stream*)file;
|
|
||||||
|
|
||||||
if (s == NULL) {
|
|
||||||
*errnum = Z_STREAM_ERROR;
|
|
||||||
return (const char*)ERR_MSG(Z_STREAM_ERROR);
|
|
||||||
}
|
|
||||||
*errnum = s->z_err;
|
|
||||||
if (*errnum == Z_OK) return (const char*)"";
|
|
||||||
|
|
||||||
m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
|
|
||||||
|
|
||||||
if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
|
|
||||||
|
|
||||||
TRYFREE(s->msg);
|
|
||||||
s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
|
|
||||||
strcpy(s->msg, s->path);
|
|
||||||
strcat(s->msg, ": ");
|
|
||||||
strcat(s->msg, m);
|
|
||||||
return (const char*)s->msg;
|
|
||||||
}
|
|
||||||
@ -1,398 +0,0 @@
|
|||||||
/* infblock.c -- interpret and process block types to last block
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "zutil.h"
|
|
||||||
#include "infblock.h"
|
|
||||||
#include "inftrees.h"
|
|
||||||
#include "infcodes.h"
|
|
||||||
#include "infutil.h"
|
|
||||||
|
|
||||||
struct inflate_codes_state {int dummy;}; /* for buggy compilers */
|
|
||||||
|
|
||||||
/* simplify the use of the inflate_huft type with some defines */
|
|
||||||
#define exop word.what.Exop
|
|
||||||
#define bits word.what.Bits
|
|
||||||
|
|
||||||
/* Table for deflate from PKZIP's appnote.txt. */
|
|
||||||
local const 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};
|
|
||||||
|
|
||||||
/*
|
|
||||||
Notes beyond the 1.93a appnote.txt:
|
|
||||||
|
|
||||||
1. Distance pointers never point before the beginning of the output
|
|
||||||
stream.
|
|
||||||
2. Distance pointers can point back across blocks, up to 32k away.
|
|
||||||
3. There is an implied maximum of 7 bits for the bit length table and
|
|
||||||
15 bits for the actual data.
|
|
||||||
4. If only one code exists, then it is encoded using one bit. (Zero
|
|
||||||
would be more efficient, but perhaps a little confusing.) If two
|
|
||||||
codes exist, they are coded using one bit each (0 and 1).
|
|
||||||
5. There is no way of sending zero distance codes--a dummy must be
|
|
||||||
sent if there are none. (History: a pre 2.0 version of PKZIP would
|
|
||||||
store blocks with no distance codes, but this was discovered to be
|
|
||||||
too harsh a criterion.) Valid only for 1.93a. 2.04c does allow
|
|
||||||
zero distance codes, which is sent as one code of zero bits in
|
|
||||||
length.
|
|
||||||
6. There are up to 286 literal/length codes. Code 256 represents the
|
|
||||||
end-of-block. Note however that the static length tree defines
|
|
||||||
288 codes just to fill out the Huffman codes. Codes 286 and 287
|
|
||||||
cannot be used though, since there is no length base or extra bits
|
|
||||||
defined for them. Similarily, there are up to 30 distance codes.
|
|
||||||
However, static trees define 32 codes (all 5 bits) to fill out the
|
|
||||||
Huffman codes, but the last two had better not show up in the data.
|
|
||||||
7. Unzip can check dynamic Huffman blocks for complete code sets.
|
|
||||||
The exception is that a single code would not be complete (see #4).
|
|
||||||
8. The five bits following the block type is really the number of
|
|
||||||
literal codes sent minus 257.
|
|
||||||
9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
|
|
||||||
(1+6+6). Therefore, to output three times the length, you output
|
|
||||||
three codes (1+1+1), whereas to output four times the same length,
|
|
||||||
you only need two codes (1+3). Hmm.
|
|
||||||
10. In the tree reconstruction algorithm, Code = Code + Increment
|
|
||||||
only if BitLength(i) is not zero. (Pretty obvious.)
|
|
||||||
11. Correction: 4 Bits: # of Bit Length codes - 4 (4 - 19)
|
|
||||||
12. Note: length code 284 can represent 227-258, but length code 285
|
|
||||||
really is 258. The last length deserves its own, short code
|
|
||||||
since it gets used a lot in very redundant files. The length
|
|
||||||
258 is special since 258 - 3 (the min match length) is 255.
|
|
||||||
13. The literal/length and distance code bit lengths are read as a
|
|
||||||
single stream of lengths. It is possible (and advantageous) for
|
|
||||||
a repeat code (16, 17, or 18) to go across the boundary between
|
|
||||||
the two sets of lengths.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
void inflate_blocks_reset(s, z, c)
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
z_streamp z;
|
|
||||||
uLongf *c;
|
|
||||||
{
|
|
||||||
if (c != 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);
|
|
||||||
s->mode = TYPE;
|
|
||||||
s->bitk = 0;
|
|
||||||
s->bitb = 0;
|
|
||||||
s->read = s->write = s->window;
|
|
||||||
if (s->checkfn != Z_NULL)
|
|
||||||
z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
|
|
||||||
Tracev((stderr, "inflate: blocks reset\n"));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
inflate_blocks_statef *inflate_blocks_new(z, c, w)
|
|
||||||
z_streamp z;
|
|
||||||
check_func c;
|
|
||||||
uInt w;
|
|
||||||
{
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
|
|
||||||
if ((s = (inflate_blocks_statef *)ZALLOC
|
|
||||||
(z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
|
|
||||||
return s;
|
|
||||||
if ((s->hufts =
|
|
||||||
(inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
|
|
||||||
{
|
|
||||||
ZFREE(z, s);
|
|
||||||
return Z_NULL;
|
|
||||||
}
|
|
||||||
if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
|
|
||||||
{
|
|
||||||
ZFREE(z, s->hufts);
|
|
||||||
ZFREE(z, s);
|
|
||||||
return Z_NULL;
|
|
||||||
}
|
|
||||||
s->end = s->window + w;
|
|
||||||
s->checkfn = c;
|
|
||||||
s->mode = TYPE;
|
|
||||||
Tracev((stderr, "inflate: blocks allocated\n"));
|
|
||||||
inflate_blocks_reset(s, z, Z_NULL);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int inflate_blocks(s, z, r)
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
z_streamp z;
|
|
||||||
int r;
|
|
||||||
{
|
|
||||||
uInt t; /* temporary storage */
|
|
||||||
uLong b; /* bit buffer */
|
|
||||||
uInt k; /* bits in bit buffer */
|
|
||||||
Bytef *p; /* input data pointer */
|
|
||||||
uInt n; /* bytes available there */
|
|
||||||
Bytef *q; /* output window write pointer */
|
|
||||||
uInt m; /* bytes to end of window or read pointer */
|
|
||||||
|
|
||||||
/* copy input/output information to locals (UPDATE macro restores) */
|
|
||||||
LOAD
|
|
||||||
|
|
||||||
/* process input based on current state */
|
|
||||||
while (1) switch (s->mode)
|
|
||||||
{
|
|
||||||
case TYPE:
|
|
||||||
NEEDBITS(3)
|
|
||||||
t = (uInt)b & 7;
|
|
||||||
s->last = t & 1;
|
|
||||||
switch (t >> 1)
|
|
||||||
{
|
|
||||||
case 0: /* stored */
|
|
||||||
Tracev((stderr, "inflate: stored block%s\n",
|
|
||||||
s->last ? " (last)" : ""));
|
|
||||||
DUMPBITS(3)
|
|
||||||
t = k & 7; /* go to byte boundary */
|
|
||||||
DUMPBITS(t)
|
|
||||||
s->mode = LENS; /* get length of stored block */
|
|
||||||
break;
|
|
||||||
case 1: /* fixed */
|
|
||||||
Tracev((stderr, "inflate: fixed codes block%s\n",
|
|
||||||
s->last ? " (last)" : ""));
|
|
||||||
{
|
|
||||||
uInt bl, bd;
|
|
||||||
inflate_huft *tl, *td;
|
|
||||||
|
|
||||||
inflate_trees_fixed(&bl, &bd, &tl, &td, z);
|
|
||||||
s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
|
|
||||||
if (s->sub.decode.codes == Z_NULL)
|
|
||||||
{
|
|
||||||
r = Z_MEM_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
DUMPBITS(3)
|
|
||||||
s->mode = CODES;
|
|
||||||
break;
|
|
||||||
case 2: /* dynamic */
|
|
||||||
Tracev((stderr, "inflate: dynamic codes block%s\n",
|
|
||||||
s->last ? " (last)" : ""));
|
|
||||||
DUMPBITS(3)
|
|
||||||
s->mode = TABLE;
|
|
||||||
break;
|
|
||||||
case 3: /* illegal */
|
|
||||||
DUMPBITS(3)
|
|
||||||
s->mode = BAD;
|
|
||||||
z->msg = (char*)"invalid block type";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case LENS:
|
|
||||||
NEEDBITS(32)
|
|
||||||
if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
|
|
||||||
{
|
|
||||||
s->mode = BAD;
|
|
||||||
z->msg = (char*)"invalid stored block lengths";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
s->sub.left = (uInt)b & 0xffff;
|
|
||||||
b = k = 0; /* dump bits */
|
|
||||||
Tracev((stderr, "inflate: stored length %u\n", s->sub.left));
|
|
||||||
s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
|
|
||||||
break;
|
|
||||||
case STORED:
|
|
||||||
if (n == 0)
|
|
||||||
LEAVE
|
|
||||||
NEEDOUT
|
|
||||||
t = 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:
|
|
||||||
NEEDBITS(14)
|
|
||||||
s->sub.trees.table = t = (uInt)b & 0x3fff;
|
|
||||||
#ifndef PKZIP_BUG_WORKAROUND
|
|
||||||
if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
|
|
||||||
{
|
|
||||||
s->mode = BAD;
|
|
||||||
z->msg = (char*)"too many length or distance symbols";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
|
|
||||||
if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
|
|
||||||
{
|
|
||||||
r = Z_MEM_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
DUMPBITS(14)
|
|
||||||
s->sub.trees.index = 0;
|
|
||||||
Tracev((stderr, "inflate: table sizes ok\n"));
|
|
||||||
s->mode = BTREE;
|
|
||||||
case BTREE:
|
|
||||||
while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
|
|
||||||
{
|
|
||||||
NEEDBITS(3)
|
|
||||||
s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
|
|
||||||
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, s->hufts, z);
|
|
||||||
if (t != Z_OK)
|
|
||||||
{
|
|
||||||
ZFREE(z, s->sub.trees.blens);
|
|
||||||
r = t;
|
|
||||||
if (r == Z_DATA_ERROR)
|
|
||||||
s->mode = BAD;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
s->sub.trees.index = 0;
|
|
||||||
Tracev((stderr, "inflate: bits tree ok\n"));
|
|
||||||
s->mode = DTREE;
|
|
||||||
case DTREE:
|
|
||||||
while (t = s->sub.trees.table,
|
|
||||||
s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
|
|
||||||
{
|
|
||||||
inflate_huft *h;
|
|
||||||
uInt i, j, c;
|
|
||||||
|
|
||||||
t = s->sub.trees.bb;
|
|
||||||
NEEDBITS(t)
|
|
||||||
h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
|
|
||||||
t = h->bits;
|
|
||||||
c = h->base;
|
|
||||||
if (c < 16)
|
|
||||||
{
|
|
||||||
DUMPBITS(t)
|
|
||||||
s->sub.trees.blens[s->sub.trees.index++] = c;
|
|
||||||
}
|
|
||||||
else /* c == 16..18 */
|
|
||||||
{
|
|
||||||
i = c == 18 ? 7 : c - 14;
|
|
||||||
j = c == 18 ? 11 : 3;
|
|
||||||
NEEDBITS(t + i)
|
|
||||||
DUMPBITS(t)
|
|
||||||
j += (uInt)b & inflate_mask[i];
|
|
||||||
DUMPBITS(i)
|
|
||||||
i = s->sub.trees.index;
|
|
||||||
t = s->sub.trees.table;
|
|
||||||
if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
|
|
||||||
(c == 16 && i < 1))
|
|
||||||
{
|
|
||||||
ZFREE(z, s->sub.trees.blens);
|
|
||||||
s->mode = BAD;
|
|
||||||
z->msg = (char*)"invalid bit length repeat";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
|
|
||||||
do {
|
|
||||||
s->sub.trees.blens[i++] = c;
|
|
||||||
} while (--j);
|
|
||||||
s->sub.trees.index = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
s->sub.trees.tb = Z_NULL;
|
|
||||||
{
|
|
||||||
uInt bl, bd;
|
|
||||||
inflate_huft *tl, *td;
|
|
||||||
inflate_codes_statef *c;
|
|
||||||
|
|
||||||
bl = 9; /* must be <= 9 for lookahead assumptions */
|
|
||||||
bd = 6; /* must be <= 9 for lookahead assumptions */
|
|
||||||
t = s->sub.trees.table;
|
|
||||||
t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
|
|
||||||
s->sub.trees.blens, &bl, &bd, &tl, &td,
|
|
||||||
s->hufts, z);
|
|
||||||
ZFREE(z, s->sub.trees.blens);
|
|
||||||
if (t != Z_OK)
|
|
||||||
{
|
|
||||||
if (t == (uInt)Z_DATA_ERROR)
|
|
||||||
s->mode = BAD;
|
|
||||||
r = t;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
Tracev((stderr, "inflate: trees ok\n"));
|
|
||||||
if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
|
|
||||||
{
|
|
||||||
r = Z_MEM_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
s->sub.decode.codes = c;
|
|
||||||
}
|
|
||||||
s->mode = CODES;
|
|
||||||
case CODES:
|
|
||||||
UPDATE
|
|
||||||
if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
|
|
||||||
return inflate_flush(s, z, r);
|
|
||||||
r = Z_OK;
|
|
||||||
inflate_codes_free(s->sub.decode.codes, z);
|
|
||||||
LOAD
|
|
||||||
Tracev((stderr, "inflate: codes end, %lu total out\n",
|
|
||||||
z->total_out + (q >= s->read ? q - s->read :
|
|
||||||
(s->end - s->read) + (q - s->window))));
|
|
||||||
if (!s->last)
|
|
||||||
{
|
|
||||||
s->mode = TYPE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
s->mode = DRY;
|
|
||||||
case DRY:
|
|
||||||
FLUSH
|
|
||||||
if (s->read != s->write)
|
|
||||||
LEAVE
|
|
||||||
s->mode = DONE;
|
|
||||||
case DONE:
|
|
||||||
r = Z_STREAM_END;
|
|
||||||
LEAVE
|
|
||||||
case BAD:
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
LEAVE
|
|
||||||
default:
|
|
||||||
r = Z_STREAM_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int inflate_blocks_free(s, z)
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
inflate_blocks_reset(s, z, Z_NULL);
|
|
||||||
ZFREE(z, s->window);
|
|
||||||
ZFREE(z, s->hufts);
|
|
||||||
ZFREE(z, s);
|
|
||||||
Tracev((stderr, "inflate: blocks freed\n"));
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void inflate_set_dictionary(s, d, n)
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
const Bytef *d;
|
|
||||||
uInt n;
|
|
||||||
{
|
|
||||||
zmemcpy(s->window, d, n);
|
|
||||||
s->read = s->write = s->window + n;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Returns true if inflate is currently at the end of a block generated
|
|
||||||
* by Z_SYNC_FLUSH or Z_FULL_FLUSH.
|
|
||||||
* IN assertion: s != Z_NULL
|
|
||||||
*/
|
|
||||||
int inflate_blocks_sync_point(s)
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
{
|
|
||||||
return s->mode == LENS;
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
/* infblock.h -- header to use infblock.c
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* WARNING: this file should *not* be used by applications. It is
|
|
||||||
part of the implementation of the compression library and is
|
|
||||||
subject to change. Applications should only use zlib.h.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct inflate_blocks_state;
|
|
||||||
typedef struct inflate_blocks_state FAR inflate_blocks_statef;
|
|
||||||
|
|
||||||
extern inflate_blocks_statef * inflate_blocks_new OF((
|
|
||||||
z_streamp z,
|
|
||||||
check_func c, /* check function */
|
|
||||||
uInt w)); /* window size */
|
|
||||||
|
|
||||||
extern int inflate_blocks OF((
|
|
||||||
inflate_blocks_statef *,
|
|
||||||
z_streamp ,
|
|
||||||
int)); /* initial return code */
|
|
||||||
|
|
||||||
extern void inflate_blocks_reset OF((
|
|
||||||
inflate_blocks_statef *,
|
|
||||||
z_streamp ,
|
|
||||||
uLongf *)); /* check value on output */
|
|
||||||
|
|
||||||
extern int inflate_blocks_free OF((
|
|
||||||
inflate_blocks_statef *,
|
|
||||||
z_streamp));
|
|
||||||
|
|
||||||
extern void inflate_set_dictionary OF((
|
|
||||||
inflate_blocks_statef *s,
|
|
||||||
const Bytef *d, /* dictionary */
|
|
||||||
uInt n)); /* dictionary length */
|
|
||||||
|
|
||||||
extern int inflate_blocks_sync_point OF((
|
|
||||||
inflate_blocks_statef *s));
|
|
||||||
@ -1,257 +0,0 @@
|
|||||||
/* infcodes.c -- process literals and length/distance pairs
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "zutil.h"
|
|
||||||
#include "inftrees.h"
|
|
||||||
#include "infblock.h"
|
|
||||||
#include "infcodes.h"
|
|
||||||
#include "infutil.h"
|
|
||||||
#include "inffast.h"
|
|
||||||
|
|
||||||
/* simplify the use of the inflate_huft type with some defines */
|
|
||||||
#define exop word.what.Exop
|
|
||||||
#define bits word.what.Bits
|
|
||||||
|
|
||||||
typedef enum { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
|
|
||||||
START, /* x: set up for LEN */
|
|
||||||
LEN, /* i: get length/literal/eob next */
|
|
||||||
LENEXT, /* i: getting length extra (have base) */
|
|
||||||
DIST, /* i: get distance next */
|
|
||||||
DISTEXT, /* i: getting distance extra */
|
|
||||||
COPY, /* o: copying bytes in window, waiting for space */
|
|
||||||
LIT, /* o: got literal, waiting for output space */
|
|
||||||
WASH, /* o: got eob, possibly still output waiting */
|
|
||||||
END, /* x: got eob and all data flushed */
|
|
||||||
BADCODE} /* x: got error */
|
|
||||||
inflate_codes_mode;
|
|
||||||
|
|
||||||
/* inflate codes private state */
|
|
||||||
struct inflate_codes_state {
|
|
||||||
|
|
||||||
/* mode */
|
|
||||||
inflate_codes_mode mode; /* current inflate_codes mode */
|
|
||||||
|
|
||||||
/* mode dependent information */
|
|
||||||
uInt len;
|
|
||||||
union {
|
|
||||||
struct {
|
|
||||||
inflate_huft *tree; /* pointer into tree */
|
|
||||||
uInt need; /* bits needed */
|
|
||||||
} code; /* if LEN or DIST, where in tree */
|
|
||||||
uInt lit; /* if LIT, literal */
|
|
||||||
struct {
|
|
||||||
uInt get; /* bits to get for extra */
|
|
||||||
uInt dist; /* distance back to copy from */
|
|
||||||
} copy; /* if EXT or COPY, where and how much */
|
|
||||||
} sub; /* submode */
|
|
||||||
|
|
||||||
/* mode independent information */
|
|
||||||
Byte lbits; /* ltree bits decoded per branch */
|
|
||||||
Byte dbits; /* dtree bits decoder per branch */
|
|
||||||
inflate_huft *ltree; /* literal/length/eob tree */
|
|
||||||
inflate_huft *dtree; /* distance tree */
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
|
|
||||||
uInt bl, bd;
|
|
||||||
inflate_huft *tl;
|
|
||||||
inflate_huft *td; /* need separate declaration for Borland C++ */
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
inflate_codes_statef *c;
|
|
||||||
|
|
||||||
if ((c = (inflate_codes_statef *)
|
|
||||||
ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
|
|
||||||
{
|
|
||||||
c->mode = START;
|
|
||||||
c->lbits = (Byte)bl;
|
|
||||||
c->dbits = (Byte)bd;
|
|
||||||
c->ltree = tl;
|
|
||||||
c->dtree = td;
|
|
||||||
Tracev((stderr, "inflate: codes new\n"));
|
|
||||||
}
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int inflate_codes(s, z, r)
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
z_streamp z;
|
|
||||||
int r;
|
|
||||||
{
|
|
||||||
uInt j; /* temporary storage */
|
|
||||||
inflate_huft *t; /* temporary pointer */
|
|
||||||
uInt e; /* extra bits or operation */
|
|
||||||
uLong b; /* bit buffer */
|
|
||||||
uInt k; /* bits in bit buffer */
|
|
||||||
Bytef *p; /* input data pointer */
|
|
||||||
uInt n; /* bytes available there */
|
|
||||||
Bytef *q; /* output window write pointer */
|
|
||||||
uInt m; /* bytes to end of window or read pointer */
|
|
||||||
Bytef *f; /* pointer to copy strings from */
|
|
||||||
inflate_codes_statef *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 */
|
|
||||||
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);
|
|
||||||
LOAD
|
|
||||||
if (r != Z_OK)
|
|
||||||
{
|
|
||||||
c->mode = r == Z_STREAM_END ? WASH : BADCODE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif /* !SLOW */
|
|
||||||
c->sub.code.need = c->lbits;
|
|
||||||
c->sub.code.tree = c->ltree;
|
|
||||||
c->mode = LEN;
|
|
||||||
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)
|
|
||||||
e = (uInt)(t->exop);
|
|
||||||
if (e == 0) /* literal */
|
|
||||||
{
|
|
||||||
c->sub.lit = t->base;
|
|
||||||
Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
|
|
||||||
"inflate: literal '%c'\n" :
|
|
||||||
"inflate: literal 0x%02x\n", t->base));
|
|
||||||
c->mode = LIT;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (e & 16) /* length */
|
|
||||||
{
|
|
||||||
c->sub.copy.get = e & 15;
|
|
||||||
c->len = t->base;
|
|
||||||
c->mode = LENEXT;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if ((e & 64) == 0) /* next table */
|
|
||||||
{
|
|
||||||
c->sub.code.need = e;
|
|
||||||
c->sub.code.tree = t + t->base;
|
|
||||||
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 = (char*)"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 */
|
|
||||||
j = c->sub.code.need;
|
|
||||||
NEEDBITS(j)
|
|
||||||
t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
|
|
||||||
DUMPBITS(t->bits)
|
|
||||||
e = (uInt)(t->exop);
|
|
||||||
if (e & 16) /* distance */
|
|
||||||
{
|
|
||||||
c->sub.copy.get = e & 15;
|
|
||||||
c->sub.copy.dist = t->base;
|
|
||||||
c->mode = DISTEXT;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if ((e & 64) == 0) /* next table */
|
|
||||||
{
|
|
||||||
c->sub.code.need = e;
|
|
||||||
c->sub.code.tree = t + t->base;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
c->mode = BADCODE; /* invalid code */
|
|
||||||
z->msg = (char*)"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 */
|
|
||||||
#ifndef __TURBOC__ /* Turbo C bug for following expression */
|
|
||||||
f = (uInt)(q - s->window) < c->sub.copy.dist ?
|
|
||||||
s->end - (c->sub.copy.dist - (q - s->window)) :
|
|
||||||
q - c->sub.copy.dist;
|
|
||||||
#else
|
|
||||||
f = q - c->sub.copy.dist;
|
|
||||||
if ((uInt)(q - s->window) < c->sub.copy.dist)
|
|
||||||
f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
|
|
||||||
#endif
|
|
||||||
while (c->len)
|
|
||||||
{
|
|
||||||
NEEDOUT
|
|
||||||
OUTBYTE(*f++)
|
|
||||||
if (f == s->end)
|
|
||||||
f = s->window;
|
|
||||||
c->len--;
|
|
||||||
}
|
|
||||||
c->mode = START;
|
|
||||||
break;
|
|
||||||
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 */
|
|
||||||
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 */
|
|
||||||
}
|
|
||||||
FLUSH
|
|
||||||
if (s->read != s->write)
|
|
||||||
LEAVE
|
|
||||||
c->mode = END;
|
|
||||||
case END:
|
|
||||||
r = Z_STREAM_END;
|
|
||||||
LEAVE
|
|
||||||
case BADCODE: /* x: got error */
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
LEAVE
|
|
||||||
default:
|
|
||||||
r = Z_STREAM_ERROR;
|
|
||||||
LEAVE
|
|
||||||
}
|
|
||||||
#ifdef NEED_DUMMY_RETURN
|
|
||||||
return Z_STREAM_ERROR; /* Some dumb compilers complain without this */
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void inflate_codes_free(c, z)
|
|
||||||
inflate_codes_statef *c;
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
ZFREE(z, c);
|
|
||||||
Tracev((stderr, "inflate: codes free\n"));
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
/* infcodes.h -- header to use infcodes.c
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* WARNING: this file should *not* be used by applications. It is
|
|
||||||
part of the implementation of the compression library and is
|
|
||||||
subject to change. Applications should only use zlib.h.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct inflate_codes_state;
|
|
||||||
typedef struct inflate_codes_state FAR inflate_codes_statef;
|
|
||||||
|
|
||||||
extern inflate_codes_statef *inflate_codes_new OF((
|
|
||||||
uInt, uInt,
|
|
||||||
inflate_huft *, inflate_huft *,
|
|
||||||
z_streamp ));
|
|
||||||
|
|
||||||
extern int inflate_codes OF((
|
|
||||||
inflate_blocks_statef *,
|
|
||||||
z_streamp ,
|
|
||||||
int));
|
|
||||||
|
|
||||||
extern void inflate_codes_free OF((
|
|
||||||
inflate_codes_statef *,
|
|
||||||
z_streamp ));
|
|
||||||
|
|
||||||
@ -1,170 +0,0 @@
|
|||||||
/* inffast.c -- process literals and length/distance pairs fast
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "zutil.h"
|
|
||||||
#include "inftrees.h"
|
|
||||||
#include "infblock.h"
|
|
||||||
#include "infcodes.h"
|
|
||||||
#include "infutil.h"
|
|
||||||
#include "inffast.h"
|
|
||||||
|
|
||||||
struct inflate_codes_state {int dummy;}; /* for buggy compilers */
|
|
||||||
|
|
||||||
/* simplify the use of the inflate_huft type with some defines */
|
|
||||||
#define exop word.what.Exop
|
|
||||||
#define bits word.what.Bits
|
|
||||||
|
|
||||||
/* macros for bit input with no checking and for returning unused bytes */
|
|
||||||
#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
|
|
||||||
#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
|
|
||||||
|
|
||||||
/* Called with number of bytes left to write in window at least 258
|
|
||||||
(the maximum string length) and number of input bytes available
|
|
||||||
at least ten. The ten bytes are six bytes for the longest length/
|
|
||||||
distance pair plus four bytes for overloading the bit buffer. */
|
|
||||||
|
|
||||||
int inflate_fast(bl, bd, tl, td, s, z)
|
|
||||||
uInt bl, bd;
|
|
||||||
inflate_huft *tl;
|
|
||||||
inflate_huft *td; /* need separate declaration for Borland C++ */
|
|
||||||
inflate_blocks_statef *s;
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
inflate_huft *t; /* temporary pointer */
|
|
||||||
uInt e; /* extra bits or operation */
|
|
||||||
uLong b; /* bit buffer */
|
|
||||||
uInt k; /* bits in bit buffer */
|
|
||||||
Bytef *p; /* input data pointer */
|
|
||||||
uInt n; /* bytes available there */
|
|
||||||
Bytef *q; /* output window write pointer */
|
|
||||||
uInt m; /* bytes to end of window or read pointer */
|
|
||||||
uInt ml; /* mask for literal/length tree */
|
|
||||||
uInt md; /* mask for distance tree */
|
|
||||||
uInt c; /* bytes to copy */
|
|
||||||
uInt d; /* distance back to copy from */
|
|
||||||
Bytef *r; /* copy source pointer */
|
|
||||||
|
|
||||||
/* load input, output, bit values */
|
|
||||||
LOAD
|
|
||||||
|
|
||||||
/* initialize masks */
|
|
||||||
ml = inflate_mask[bl];
|
|
||||||
md = inflate_mask[bd];
|
|
||||||
|
|
||||||
/* do until not enough input or output space for fast loop */
|
|
||||||
do { /* assume called with m >= 258 && n >= 10 */
|
|
||||||
/* get literal/length code */
|
|
||||||
GRABBITS(20) /* max bits for literal/length code */
|
|
||||||
if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
|
|
||||||
{
|
|
||||||
DUMPBITS(t->bits)
|
|
||||||
Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
|
|
||||||
"inflate: * literal '%c'\n" :
|
|
||||||
"inflate: * literal 0x%02x\n", t->base));
|
|
||||||
*q++ = (Byte)t->base;
|
|
||||||
m--;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
do {
|
|
||||||
DUMPBITS(t->bits)
|
|
||||||
if (e & 16)
|
|
||||||
{
|
|
||||||
/* get extra bits for length */
|
|
||||||
e &= 15;
|
|
||||||
c = t->base + ((uInt)b & inflate_mask[e]);
|
|
||||||
DUMPBITS(e)
|
|
||||||
Tracevv((stderr, "inflate: * length %u\n", c));
|
|
||||||
|
|
||||||
/* decode distance base of block to copy */
|
|
||||||
GRABBITS(15); /* max bits for distance code */
|
|
||||||
e = (t = td + ((uInt)b & md))->exop;
|
|
||||||
do {
|
|
||||||
DUMPBITS(t->bits)
|
|
||||||
if (e & 16)
|
|
||||||
{
|
|
||||||
/* get extra bits to add to distance base */
|
|
||||||
e &= 15;
|
|
||||||
GRABBITS(e) /* get extra bits (up to 13) */
|
|
||||||
d = t->base + ((uInt)b & inflate_mask[e]);
|
|
||||||
DUMPBITS(e)
|
|
||||||
Tracevv((stderr, "inflate: * distance %u\n", d));
|
|
||||||
|
|
||||||
/* do the copy */
|
|
||||||
m -= c;
|
|
||||||
if ((uInt)(q - s->window) >= d) /* offset before dest */
|
|
||||||
{ /* just copy */
|
|
||||||
r = q - d;
|
|
||||||
*q++ = *r++; c--; /* minimum count is three, */
|
|
||||||
*q++ = *r++; c--; /* so unroll loop a little */
|
|
||||||
}
|
|
||||||
else /* else offset after destination */
|
|
||||||
{
|
|
||||||
e = d - (uInt)(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)
|
|
||||||
{
|
|
||||||
t += t->base;
|
|
||||||
e = (t += ((uInt)b & inflate_mask[e]))->exop;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
z->msg = (char*)"invalid distance code";
|
|
||||||
UNGRAB
|
|
||||||
UPDATE
|
|
||||||
return Z_DATA_ERROR;
|
|
||||||
}
|
|
||||||
} while (1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if ((e & 64) == 0)
|
|
||||||
{
|
|
||||||
t += t->base;
|
|
||||||
if ((e = (t += ((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 = (char*)"invalid literal/length code";
|
|
||||||
UNGRAB
|
|
||||||
UPDATE
|
|
||||||
return Z_DATA_ERROR;
|
|
||||||
}
|
|
||||||
} while (1);
|
|
||||||
} while (m >= 258 && n >= 10);
|
|
||||||
|
|
||||||
/* not enough input or output--restore pointers and return */
|
|
||||||
UNGRAB
|
|
||||||
UPDATE
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
/* inffast.h -- header to use inffast.c
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* WARNING: this file should *not* be used by applications. It is
|
|
||||||
part of the implementation of the compression library and is
|
|
||||||
subject to change. Applications should only use zlib.h.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int inflate_fast OF((
|
|
||||||
uInt,
|
|
||||||
uInt,
|
|
||||||
inflate_huft *,
|
|
||||||
inflate_huft *,
|
|
||||||
inflate_blocks_statef *,
|
|
||||||
z_streamp ));
|
|
||||||
@ -1,151 +0,0 @@
|
|||||||
/* inffixed.h -- table for decoding fixed codes
|
|
||||||
* Generated automatically by the maketree.c program
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* WARNING: this file should *not* be used by applications. It is
|
|
||||||
part of the implementation of the compression library and is
|
|
||||||
subject to change. Applications should only use zlib.h.
|
|
||||||
*/
|
|
||||||
|
|
||||||
local uInt fixed_bl = 9;
|
|
||||||
local uInt fixed_bd = 5;
|
|
||||||
local inflate_huft fixed_tl[] = {
|
|
||||||
{{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
|
|
||||||
{{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
|
|
||||||
{{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
|
|
||||||
{{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
|
|
||||||
{{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
|
|
||||||
{{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
|
|
||||||
{{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
|
|
||||||
{{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
|
|
||||||
{{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
|
|
||||||
{{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
|
|
||||||
{{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
|
|
||||||
{{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
|
|
||||||
{{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
|
|
||||||
{{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
|
|
||||||
{{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
|
|
||||||
{{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
|
|
||||||
{{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
|
|
||||||
{{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
|
|
||||||
{{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
|
|
||||||
{{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
|
|
||||||
{{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
|
|
||||||
{{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
|
|
||||||
{{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
|
|
||||||
{{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
|
|
||||||
{{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
|
|
||||||
{{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
|
|
||||||
{{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
|
|
||||||
{{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
|
|
||||||
{{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
|
|
||||||
{{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
|
|
||||||
{{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188},
|
|
||||||
{{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252},
|
|
||||||
{{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
|
|
||||||
{{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
|
|
||||||
{{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
|
|
||||||
{{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
|
|
||||||
{{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
|
|
||||||
{{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
|
|
||||||
{{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
|
|
||||||
{{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
|
|
||||||
{{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
|
|
||||||
{{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
|
|
||||||
{{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
|
|
||||||
{{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
|
|
||||||
{{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
|
|
||||||
{{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
|
|
||||||
{{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
|
|
||||||
{{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
|
|
||||||
{{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
|
|
||||||
{{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
|
|
||||||
{{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
|
|
||||||
{{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
|
|
||||||
{{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
|
|
||||||
{{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
|
|
||||||
{{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
|
|
||||||
{{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
|
|
||||||
{{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
|
|
||||||
{{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
|
|
||||||
{{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
|
|
||||||
{{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
|
|
||||||
{{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
|
|
||||||
{{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
|
|
||||||
{{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190},
|
|
||||||
{{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254},
|
|
||||||
{{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
|
|
||||||
{{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
|
|
||||||
{{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
|
|
||||||
{{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
|
|
||||||
{{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
|
|
||||||
{{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
|
|
||||||
{{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
|
|
||||||
{{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
|
|
||||||
{{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
|
|
||||||
{{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
|
|
||||||
{{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
|
|
||||||
{{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
|
|
||||||
{{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
|
|
||||||
{{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
|
|
||||||
{{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
|
|
||||||
{{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
|
|
||||||
{{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
|
|
||||||
{{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
|
|
||||||
{{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
|
|
||||||
{{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
|
|
||||||
{{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
|
|
||||||
{{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
|
|
||||||
{{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
|
|
||||||
{{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
|
|
||||||
{{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
|
|
||||||
{{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
|
|
||||||
{{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
|
|
||||||
{{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
|
|
||||||
{{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
|
|
||||||
{{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
|
|
||||||
{{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189},
|
|
||||||
{{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253},
|
|
||||||
{{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
|
|
||||||
{{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
|
|
||||||
{{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
|
|
||||||
{{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
|
|
||||||
{{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
|
|
||||||
{{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
|
|
||||||
{{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
|
|
||||||
{{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
|
|
||||||
{{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
|
|
||||||
{{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
|
|
||||||
{{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
|
|
||||||
{{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
|
|
||||||
{{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
|
|
||||||
{{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
|
|
||||||
{{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
|
|
||||||
{{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
|
|
||||||
{{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
|
|
||||||
{{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
|
|
||||||
{{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
|
|
||||||
{{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
|
|
||||||
{{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
|
|
||||||
{{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
|
|
||||||
{{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
|
|
||||||
{{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
|
|
||||||
{{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
|
|
||||||
{{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
|
|
||||||
{{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
|
|
||||||
{{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
|
|
||||||
{{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
|
|
||||||
{{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
|
|
||||||
{{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
|
|
||||||
{{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
|
|
||||||
};
|
|
||||||
local inflate_huft fixed_td[] = {
|
|
||||||
{{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
|
|
||||||
{{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
|
|
||||||
{{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
|
|
||||||
{{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
|
|
||||||
{{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
|
|
||||||
{{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
|
|
||||||
{{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
|
|
||||||
{{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
|
|
||||||
};
|
|
||||||
@ -1,366 +0,0 @@
|
|||||||
/* inflate.c -- zlib interface to inflate modules
|
|
||||||
* Copyright (C) 1995-1998 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 */
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
METHOD, /* waiting for method byte */
|
|
||||||
FLAG, /* waiting for flag byte */
|
|
||||||
DICT4, /* four dictionary check bytes to go */
|
|
||||||
DICT3, /* three dictionary check bytes to go */
|
|
||||||
DICT2, /* two dictionary check bytes to go */
|
|
||||||
DICT1, /* one dictionary check byte to go */
|
|
||||||
DICT0, /* waiting for inflateSetDictionary */
|
|
||||||
BLOCKS, /* decompressing blocks */
|
|
||||||
CHECK4, /* four check bytes to go */
|
|
||||||
CHECK3, /* three check bytes to go */
|
|
||||||
CHECK2, /* two check bytes to go */
|
|
||||||
CHECK1, /* one check byte to go */
|
|
||||||
DONE, /* finished check, done */
|
|
||||||
BAD} /* got an error--stay here */
|
|
||||||
inflate_mode;
|
|
||||||
|
|
||||||
/* inflate private state */
|
|
||||||
struct internal_state {
|
|
||||||
|
|
||||||
/* mode */
|
|
||||||
inflate_mode mode; /* current inflate mode */
|
|
||||||
|
|
||||||
/* mode dependent information */
|
|
||||||
union {
|
|
||||||
uInt method; /* if FLAGS, method byte */
|
|
||||||
struct {
|
|
||||||
uLong was; /* computed check value */
|
|
||||||
uLong need; /* stream check value */
|
|
||||||
} check; /* if CHECK, check values to compare */
|
|
||||||
uInt marker; /* if BAD, inflateSync's marker bytes count */
|
|
||||||
} sub; /* submode */
|
|
||||||
|
|
||||||
/* mode independent information */
|
|
||||||
int nowrap; /* flag for no wrapper */
|
|
||||||
uInt wbits; /* log2(window size) (8..15, defaults to 15) */
|
|
||||||
inflate_blocks_statef
|
|
||||||
*blocks; /* current inflate_blocks state */
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
int ZEXPORT inflateReset(z)
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
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, Z_NULL);
|
|
||||||
Tracev((stderr, "inflate: reset\n"));
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int ZEXPORT inflateEnd(z)
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
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);
|
|
||||||
ZFREE(z, z->state);
|
|
||||||
z->state = Z_NULL;
|
|
||||||
Tracev((stderr, "inflate: end\n"));
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int ZEXPORT inflateInit2_(z, w, version, stream_size)
|
|
||||||
z_streamp z;
|
|
||||||
int w;
|
|
||||||
const char *version;
|
|
||||||
int stream_size;
|
|
||||||
{
|
|
||||||
if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
|
|
||||||
stream_size != sizeof(z_stream))
|
|
||||||
return Z_VERSION_ERROR;
|
|
||||||
|
|
||||||
/* initialize state */
|
|
||||||
if (z == Z_NULL)
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
z->msg = Z_NULL;
|
|
||||||
if (z->zalloc == Z_NULL)
|
|
||||||
{
|
|
||||||
z->zalloc = zcalloc;
|
|
||||||
z->opaque = (voidpf)0;
|
|
||||||
}
|
|
||||||
if (z->zfree == Z_NULL) z->zfree = zcfree;
|
|
||||||
if ((z->state = (struct internal_state FAR *)
|
|
||||||
ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
|
|
||||||
return Z_MEM_ERROR;
|
|
||||||
z->state->blocks = Z_NULL;
|
|
||||||
|
|
||||||
/* handle undocumented nowrap option (no zlib header or check) */
|
|
||||||
z->state->nowrap = 0;
|
|
||||||
if (w < 0)
|
|
||||||
{
|
|
||||||
w = - w;
|
|
||||||
z->state->nowrap = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set window size */
|
|
||||||
if (w < 8 || w > 15)
|
|
||||||
{
|
|
||||||
inflateEnd(z);
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
}
|
|
||||||
z->state->wbits = (uInt)w;
|
|
||||||
|
|
||||||
/* create inflate_blocks state */
|
|
||||||
if ((z->state->blocks =
|
|
||||||
inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w))
|
|
||||||
== Z_NULL)
|
|
||||||
{
|
|
||||||
inflateEnd(z);
|
|
||||||
return Z_MEM_ERROR;
|
|
||||||
}
|
|
||||||
Tracev((stderr, "inflate: allocated\n"));
|
|
||||||
|
|
||||||
/* reset state */
|
|
||||||
inflateReset(z);
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int ZEXPORT inflateInit_(z, version, stream_size)
|
|
||||||
z_streamp z;
|
|
||||||
const char *version;
|
|
||||||
int stream_size;
|
|
||||||
{
|
|
||||||
return inflateInit2_(z, DEF_WBITS, version, stream_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
|
|
||||||
#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
|
|
||||||
|
|
||||||
int ZEXPORT inflate(z, f)
|
|
||||||
z_streamp z;
|
|
||||||
int f;
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
uInt b;
|
|
||||||
|
|
||||||
if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
|
|
||||||
r = Z_BUF_ERROR;
|
|
||||||
while (1) switch (z->state->mode)
|
|
||||||
{
|
|
||||||
case METHOD:
|
|
||||||
NEEDBYTE
|
|
||||||
if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
|
|
||||||
{
|
|
||||||
z->state->mode = BAD;
|
|
||||||
z->msg = (char*)"unknown compression method";
|
|
||||||
z->state->sub.marker = 5; /* can't try inflateSync */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
|
|
||||||
{
|
|
||||||
z->state->mode = BAD;
|
|
||||||
z->msg = (char*)"invalid window size";
|
|
||||||
z->state->sub.marker = 5; /* can't try inflateSync */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
z->state->mode = FLAG;
|
|
||||||
case FLAG:
|
|
||||||
NEEDBYTE
|
|
||||||
b = NEXTBYTE;
|
|
||||||
if (((z->state->sub.method << 8) + b) % 31)
|
|
||||||
{
|
|
||||||
z->state->mode = BAD;
|
|
||||||
z->msg = (char*)"incorrect header check";
|
|
||||||
z->state->sub.marker = 5; /* can't try inflateSync */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Tracev((stderr, "inflate: zlib header ok\n"));
|
|
||||||
if (!(b & PRESET_DICT))
|
|
||||||
{
|
|
||||||
z->state->mode = BLOCKS;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
z->state->mode = DICT4;
|
|
||||||
case DICT4:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need = (uLong)NEXTBYTE << 24;
|
|
||||||
z->state->mode = DICT3;
|
|
||||||
case DICT3:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need += (uLong)NEXTBYTE << 16;
|
|
||||||
z->state->mode = DICT2;
|
|
||||||
case DICT2:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need += (uLong)NEXTBYTE << 8;
|
|
||||||
z->state->mode = DICT1;
|
|
||||||
case DICT1:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need += (uLong)NEXTBYTE;
|
|
||||||
z->adler = z->state->sub.check.need;
|
|
||||||
z->state->mode = DICT0;
|
|
||||||
return Z_NEED_DICT;
|
|
||||||
case DICT0:
|
|
||||||
z->state->mode = BAD;
|
|
||||||
z->msg = (char*)"need dictionary";
|
|
||||||
z->state->sub.marker = 0; /* can try inflateSync */
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
case BLOCKS:
|
|
||||||
r = inflate_blocks(z->state->blocks, z, r);
|
|
||||||
if (r == Z_DATA_ERROR)
|
|
||||||
{
|
|
||||||
z->state->mode = BAD;
|
|
||||||
z->state->sub.marker = 0; /* can try inflateSync */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (r == Z_OK)
|
|
||||||
r = f;
|
|
||||||
if (r != Z_STREAM_END)
|
|
||||||
return r;
|
|
||||||
r = f;
|
|
||||||
inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
|
|
||||||
if (z->state->nowrap)
|
|
||||||
{
|
|
||||||
z->state->mode = DONE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
z->state->mode = CHECK4;
|
|
||||||
case CHECK4:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need = (uLong)NEXTBYTE << 24;
|
|
||||||
z->state->mode = CHECK3;
|
|
||||||
case CHECK3:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need += (uLong)NEXTBYTE << 16;
|
|
||||||
z->state->mode = CHECK2;
|
|
||||||
case CHECK2:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need += (uLong)NEXTBYTE << 8;
|
|
||||||
z->state->mode = CHECK1;
|
|
||||||
case CHECK1:
|
|
||||||
NEEDBYTE
|
|
||||||
z->state->sub.check.need += (uLong)NEXTBYTE;
|
|
||||||
|
|
||||||
if (z->state->sub.check.was != z->state->sub.check.need)
|
|
||||||
{
|
|
||||||
z->state->mode = BAD;
|
|
||||||
z->msg = (char*)"incorrect data check";
|
|
||||||
z->state->sub.marker = 5; /* can't try inflateSync */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Tracev((stderr, "inflate: zlib check ok\n"));
|
|
||||||
z->state->mode = DONE;
|
|
||||||
case DONE:
|
|
||||||
return Z_STREAM_END;
|
|
||||||
case BAD:
|
|
||||||
return Z_DATA_ERROR;
|
|
||||||
default:
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
}
|
|
||||||
#ifdef NEED_DUMMY_RETURN
|
|
||||||
return Z_STREAM_ERROR; /* Some dumb compilers complain without this */
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)
|
|
||||||
z_streamp z;
|
|
||||||
const Bytef *dictionary;
|
|
||||||
uInt dictLength;
|
|
||||||
{
|
|
||||||
uInt length = dictLength;
|
|
||||||
|
|
||||||
if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
|
|
||||||
if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
|
|
||||||
z->adler = 1L;
|
|
||||||
|
|
||||||
if (length >= ((uInt)1<<z->state->wbits))
|
|
||||||
{
|
|
||||||
length = (1<<z->state->wbits)-1;
|
|
||||||
dictionary += dictLength - length;
|
|
||||||
}
|
|
||||||
inflate_set_dictionary(z->state->blocks, dictionary, length);
|
|
||||||
z->state->mode = BLOCKS;
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int ZEXPORT inflateSync(z)
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
uInt n; /* number of bytes to look at */
|
|
||||||
Bytef *p; /* pointer to bytes */
|
|
||||||
uInt m; /* number of marker bytes found in a row */
|
|
||||||
uLong r, w; /* temporaries to save total_in and total_out */
|
|
||||||
|
|
||||||
/* set up */
|
|
||||||
if (z == Z_NULL || z->state == Z_NULL)
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
if (z->state->mode != BAD)
|
|
||||||
{
|
|
||||||
z->state->mode = BAD;
|
|
||||||
z->state->sub.marker = 0;
|
|
||||||
}
|
|
||||||
if ((n = z->avail_in) == 0)
|
|
||||||
return Z_BUF_ERROR;
|
|
||||||
p = z->next_in;
|
|
||||||
m = z->state->sub.marker;
|
|
||||||
|
|
||||||
/* search */
|
|
||||||
while (n && m < 4)
|
|
||||||
{
|
|
||||||
static const Byte mark[4] = {0, 0, 0xff, 0xff};
|
|
||||||
if (*p == mark[m])
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Returns true if inflate is currently at the end of a block generated
|
|
||||||
* by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
|
|
||||||
* implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
|
|
||||||
* but removes the length bytes of the resulting empty stored block. When
|
|
||||||
* decompressing, PPP checks that at the end of input packet, inflate is
|
|
||||||
* waiting for these length bytes.
|
|
||||||
*/
|
|
||||||
int ZEXPORT inflateSyncPoint(z)
|
|
||||||
z_streamp z;
|
|
||||||
{
|
|
||||||
if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
|
|
||||||
return Z_STREAM_ERROR;
|
|
||||||
return inflate_blocks_sync_point(z->state->blocks);
|
|
||||||
}
|
|
||||||
@ -1,455 +0,0 @@
|
|||||||
/* inftrees.c -- generate Huffman trees for efficient decoding
|
|
||||||
* Copyright (C) 1995-1998 Mark Adler
|
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "zutil.h"
|
|
||||||
#include "inftrees.h"
|
|
||||||
|
|
||||||
#if !defined(BUILDFIXED) && !defined(STDC)
|
|
||||||
# define BUILDFIXED /* non ANSI compilers may not accept inffixed.h */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char inflate_copyright[] =
|
|
||||||
" inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
|
|
||||||
/*
|
|
||||||
If you use the zlib library in a product, an acknowledgment is welcome
|
|
||||||
in the documentation of your product. If for some reason you cannot
|
|
||||||
include such an acknowledgment, I would appreciate that you keep this
|
|
||||||
copyright string in the executable of your product.
|
|
||||||
*/
|
|
||||||
struct internal_state {int dummy;}; /* for buggy compilers */
|
|
||||||
|
|
||||||
/* simplify the use of the inflate_huft type with some defines */
|
|
||||||
#define exop word.what.Exop
|
|
||||||
#define bits word.what.Bits
|
|
||||||
|
|
||||||
|
|
||||||
local int huft_build OF((
|
|
||||||
uIntf *, /* code lengths in bits */
|
|
||||||
uInt, /* number of codes */
|
|
||||||
uInt, /* number of "simple" codes */
|
|
||||||
const uIntf *, /* list of base values for non-simple codes */
|
|
||||||
const uIntf *, /* list of extra bits for non-simple codes */
|
|
||||||
inflate_huft * FAR*,/* result: starting table */
|
|
||||||
uIntf *, /* maximum lookup bits (returns actual) */
|
|
||||||
inflate_huft *, /* space for trees */
|
|
||||||
uInt *, /* hufts used in space */
|
|
||||||
uIntf * )); /* space for values */
|
|
||||||
|
|
||||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
|
||||||
local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
|
|
||||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
|
||||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
|
|
||||||
/* see note #13 above about 258 */
|
|
||||||
local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
|
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
|
||||||
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
|
|
||||||
local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
|
|
||||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
|
||||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
|
||||||
8193, 12289, 16385, 24577};
|
|
||||||
local const uInt cpdext[30] = { /* Extra bits for distance codes */
|
|
||||||
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
|
||||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
|
||||||
12, 12, 13, 13};
|
|
||||||
|
|
||||||
/*
|
|
||||||
Huffman code decoding is performed using a multi-level table lookup.
|
|
||||||
The fastest way to decode is to simply build a lookup table whose
|
|
||||||
size is determined by the longest code. However, the time it takes
|
|
||||||
to build this table can also be a factor if the data being decoded
|
|
||||||
is not very long. The most common codes are necessarily the
|
|
||||||
shortest codes, so those codes dominate the decoding time, and hence
|
|
||||||
the speed. The idea is you can have a shorter table that decodes the
|
|
||||||
shorter, more probable codes, and then point to subsidiary tables for
|
|
||||||
the longer codes. The time it costs to decode the longer codes is
|
|
||||||
then traded against the time it takes to make longer tables.
|
|
||||||
|
|
||||||
This results of this trade are in the variables lbits and dbits
|
|
||||||
below. lbits is the number of bits the first level table for literal/
|
|
||||||
length codes can decode in one step, and dbits is the same thing for
|
|
||||||
the distance codes. Subsequent tables are also less than or equal to
|
|
||||||
those sizes. These values may be adjusted either when all of the
|
|
||||||
codes are shorter than that, in which case the longest code length in
|
|
||||||
bits is used, or when the shortest code is *longer* than the requested
|
|
||||||
table size, in which case the length of the shortest code in bits is
|
|
||||||
used.
|
|
||||||
|
|
||||||
There are two different values for the two tables, since they code a
|
|
||||||
different number of possibilities each. The literal/length table
|
|
||||||
codes 286 possible values, or in a flat code, a little over eight
|
|
||||||
bits. The distance table codes 30 possible values, or a little less
|
|
||||||
than five bits, flat. The optimum values for speed end up being
|
|
||||||
about one bit more than those, so lbits is 8+1 and dbits is 5+1.
|
|
||||||
The optimum values may differ though from machine to machine, and
|
|
||||||
possibly even between compilers. Your mileage may vary.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
|
|
||||||
#define BMAX 15 /* maximum bit length of any code */
|
|
||||||
|
|
||||||
local int huft_build(b, n, s, d, e, t, m, hp, hn, v)
|
|
||||||
uIntf *b; /* code lengths in bits (all assumed <= BMAX) */
|
|
||||||
uInt n; /* number of codes (assumed <= 288) */
|
|
||||||
uInt s; /* number of simple-valued codes (0..s-1) */
|
|
||||||
const uIntf *d; /* list of base values for non-simple codes */
|
|
||||||
const uIntf *e; /* list of extra bits for non-simple codes */
|
|
||||||
inflate_huft * FAR *t; /* result: starting table */
|
|
||||||
uIntf *m; /* maximum lookup bits, returns actual */
|
|
||||||
inflate_huft *hp; /* space for trees */
|
|
||||||
uInt *hn; /* hufts used in space */
|
|
||||||
uIntf *v; /* working area: values in order of bit length */
|
|
||||||
/* 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 (an over-subscribed set of
|
|
||||||
lengths), or Z_MEM_ERROR if not enough memory. */
|
|
||||||
{
|
|
||||||
|
|
||||||
uInt a; /* counter for codes of length k */
|
|
||||||
uInt c[BMAX+1]; /* bit length count table */
|
|
||||||
uInt f; /* i repeats in table every f entries */
|
|
||||||
int g; /* maximum code length */
|
|
||||||
int h; /* table level */
|
|
||||||
register uInt i; /* counter, current code */
|
|
||||||
register uInt j; /* counter */
|
|
||||||
register int k; /* number of bits in current code */
|
|
||||||
int l; /* bits per table (returned in m) */
|
|
||||||
uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */
|
|
||||||
register uIntf *p; /* pointer into c[], b[], or v[] */
|
|
||||||
inflate_huft *q; /* points to current table */
|
|
||||||
struct inflate_huft_s r; /* table entry for structure assignment */
|
|
||||||
inflate_huft *u[BMAX]; /* table stack */
|
|
||||||
register int w; /* bits before this table == (l * h) */
|
|
||||||
uInt x[BMAX+1]; /* bit offsets, then code stack */
|
|
||||||
uIntf *xp; /* pointer into x */
|
|
||||||
int y; /* number of dummy codes added */
|
|
||||||
uInt z; /* number of entries in current table */
|
|
||||||
|
|
||||||
|
|
||||||
/* Generate counts for each bit length */
|
|
||||||
p = c;
|
|
||||||
#define C0 *p++ = 0;
|
|
||||||
#define C2 C0 C0 C0 C0
|
|
||||||
#define C4 C2 C2 C2 C2
|
|
||||||
C4 /* clear c[]--assume BMAX+1 is 16 */
|
|
||||||
p = b; i = n;
|
|
||||||
do {
|
|
||||||
c[*p++]++; /* assume all entries <= BMAX */
|
|
||||||
} while (--i);
|
|
||||||
if (c[0] == n) /* null input--all zero length codes */
|
|
||||||
{
|
|
||||||
*t = (inflate_huft *)Z_NULL;
|
|
||||||
*m = 0;
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Find minimum and maximum length, bound *m by those */
|
|
||||||
l = *m;
|
|
||||||
for (j = 1; j <= BMAX; j++)
|
|
||||||
if (c[j])
|
|
||||||
break;
|
|
||||||
k = j; /* minimum code length */
|
|
||||||
if ((uInt)l < j)
|
|
||||||
l = j;
|
|
||||||
for (i = BMAX; i; i--)
|
|
||||||
if (c[i])
|
|
||||||
break;
|
|
||||||
g = i; /* maximum code length */
|
|
||||||
if ((uInt)l > i)
|
|
||||||
l = i;
|
|
||||||
*m = l;
|
|
||||||
|
|
||||||
|
|
||||||
/* Adjust last length count to fill out codes, if needed */
|
|
||||||
for (y = 1 << j; j < i; j++, y <<= 1)
|
|
||||||
if ((y -= c[j]) < 0)
|
|
||||||
return Z_DATA_ERROR;
|
|
||||||
if ((y -= c[i]) < 0)
|
|
||||||
return Z_DATA_ERROR;
|
|
||||||
c[i] += y;
|
|
||||||
|
|
||||||
|
|
||||||
/* Generate starting offsets into the value table for each length */
|
|
||||||
x[1] = j = 0;
|
|
||||||
p = c + 1; xp = x + 2;
|
|
||||||
while (--i) { /* note that i == g from above */
|
|
||||||
*xp++ = (j += *p++);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Make a table of values in order of bit lengths */
|
|
||||||
p = b; i = 0;
|
|
||||||
do {
|
|
||||||
if ((j = *p++) != 0)
|
|
||||||
v[x[j]++] = i;
|
|
||||||
} while (++i < n);
|
|
||||||
n = x[g]; /* set n to length of v */
|
|
||||||
|
|
||||||
|
|
||||||
/* Generate the Huffman codes and for each, make the table entries */
|
|
||||||
x[0] = i = 0; /* first Huffman code is zero */
|
|
||||||
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 */
|
|
||||||
q = (inflate_huft *)Z_NULL; /* ditto */
|
|
||||||
z = 0; /* ditto */
|
|
||||||
|
|
||||||
/* go through the bit lengths (k already is bits in shortest code) */
|
|
||||||
for (; k <= g; k++)
|
|
||||||
{
|
|
||||||
a = c[k];
|
|
||||||
while (a--)
|
|
||||||
{
|
|
||||||
/* here i is the Huffman code of length k bits for value *p */
|
|
||||||
/* make tables up to required level */
|
|
||||||
while (k > w + l)
|
|
||||||
{
|
|
||||||
h++;
|
|
||||||
w += l; /* previous table always l bits */
|
|
||||||
|
|
||||||
/* compute minimum size table less than or equal to l bits */
|
|
||||||
z = g - w;
|
|
||||||
z = z > (uInt)l ? l : z; /* table size upper limit */
|
|
||||||
if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */
|
|
||||||
{ /* too few codes for k-w bit table */
|
|
||||||
f -= a + 1; /* deduct codes from patterns left */
|
|
||||||
xp = c + k;
|
|
||||||
if (j < z)
|
|
||||||
while (++j < z) /* try smaller tables up to z bits */
|
|
||||||
{
|
|
||||||
if ((f <<= 1) <= *++xp)
|
|
||||||
break; /* enough codes to use up j bits */
|
|
||||||
f -= *xp; /* else deduct codes from patterns */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
z = 1 << j; /* table entries for j-bit table */
|
|
||||||
|
|
||||||
/* allocate new table */
|
|
||||||
if (*hn + z > MANY) /* (note: doesn't matter for fixed) */
|
|
||||||
return Z_MEM_ERROR; /* not enough memory */
|
|
||||||
u[h] = q = hp + *hn;
|
|
||||||
*hn += z;
|
|
||||||
|
|
||||||
/* connect to last table, if there is one */
|
|
||||||
if (h)
|
|
||||||
{
|
|
||||||
x[h] = i; /* save pattern for backing up */
|
|
||||||
r.bits = (Byte)l; /* bits to dump before this table */
|
|
||||||
r.exop = (Byte)j; /* bits in this table */
|
|
||||||
j = i >> (w - l);
|
|
||||||
r.base = (uInt)(q - u[h-1] - j); /* offset to this table */
|
|
||||||
u[h-1][j] = r; /* connect to last table */
|
|
||||||
}
|
|
||||||
else
|
|
||||||
*t = q; /* first table is returned result */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set up table entry in r */
|
|
||||||
r.bits = (Byte)(k - w);
|
|
||||||
if (p >= v + n)
|
|
||||||
r.exop = 128 + 64; /* out of values--invalid code */
|
|
||||||
else if (*p < s)
|
|
||||||
{
|
|
||||||
r.exop = (Byte)(*p < 256 ? 0 : 32 + 64); /* 256 is end-of-block */
|
|
||||||
r.base = *p++; /* simple code is just the value */
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
|
|
||||||
r.base = d[*p++ - s];
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fill code-like entries with r */
|
|
||||||
f = 1 << (k - w);
|
|
||||||
for (j = i >> w; j < z; j += f)
|
|
||||||
q[j] = r;
|
|
||||||
|
|
||||||
/* backwards increment the k-bit code i */
|
|
||||||
for (j = 1 << (k - 1); i & j; j >>= 1)
|
|
||||||
i ^= j;
|
|
||||||
i ^= j;
|
|
||||||
|
|
||||||
/* backup over finished tables */
|
|
||||||
mask = (1 << w) - 1; /* needed on HP, cc -O bug */
|
|
||||||
while ((i & mask) != x[h])
|
|
||||||
{
|
|
||||||
h--; /* don't need to update q */
|
|
||||||
w -= l;
|
|
||||||
mask = (1 << w) - 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Return Z_BUF_ERROR if we were given an incomplete table */
|
|
||||||
return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int inflate_trees_bits(c, bb, tb, hp, z)
|
|
||||||
uIntf *c; /* 19 code lengths */
|
|
||||||
uIntf *bb; /* bits tree desired/actual depth */
|
|
||||||
inflate_huft * FAR *tb; /* bits tree result */
|
|
||||||
inflate_huft *hp; /* space for trees */
|
|
||||||
z_streamp z; /* for messages */
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
uInt hn = 0; /* hufts used in space */
|
|
||||||
uIntf *v; /* work area for huft_build */
|
|
||||||
|
|
||||||
if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
|
|
||||||
return Z_MEM_ERROR;
|
|
||||||
r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL,
|
|
||||||
tb, bb, hp, &hn, v);
|
|
||||||
if (r == Z_DATA_ERROR)
|
|
||||||
z->msg = (char*)"oversubscribed dynamic bit lengths tree";
|
|
||||||
else if (r == Z_BUF_ERROR || *bb == 0)
|
|
||||||
{
|
|
||||||
z->msg = (char*)"incomplete dynamic bit lengths tree";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
}
|
|
||||||
ZFREE(z, v);
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z)
|
|
||||||
uInt nl; /* number of literal/length codes */
|
|
||||||
uInt nd; /* number of distance codes */
|
|
||||||
uIntf *c; /* that many (total) code lengths */
|
|
||||||
uIntf *bl; /* literal desired/actual bit depth */
|
|
||||||
uIntf *bd; /* distance desired/actual bit depth */
|
|
||||||
inflate_huft * FAR *tl; /* literal/length tree result */
|
|
||||||
inflate_huft * FAR *td; /* distance tree result */
|
|
||||||
inflate_huft *hp; /* space for trees */
|
|
||||||
z_streamp z; /* for messages */
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
uInt hn = 0; /* hufts used in space */
|
|
||||||
uIntf *v; /* work area for huft_build */
|
|
||||||
|
|
||||||
/* allocate work area */
|
|
||||||
if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
|
|
||||||
return Z_MEM_ERROR;
|
|
||||||
|
|
||||||
/* build literal/length tree */
|
|
||||||
r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
|
|
||||||
if (r != Z_OK || *bl == 0)
|
|
||||||
{
|
|
||||||
if (r == Z_DATA_ERROR)
|
|
||||||
z->msg = (char*)"oversubscribed literal/length tree";
|
|
||||||
else if (r != Z_MEM_ERROR)
|
|
||||||
{
|
|
||||||
z->msg = (char*)"incomplete literal/length tree";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
}
|
|
||||||
ZFREE(z, v);
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* build distance tree */
|
|
||||||
r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
|
|
||||||
if (r != Z_OK || (*bd == 0 && nl > 257))
|
|
||||||
{
|
|
||||||
if (r == Z_DATA_ERROR)
|
|
||||||
z->msg = (char*)"oversubscribed distance tree";
|
|
||||||
else if (r == Z_BUF_ERROR) {
|
|
||||||
#ifdef PKZIP_BUG_WORKAROUND
|
|
||||||
r = Z_OK;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
z->msg = (char*)"incomplete distance tree";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
}
|
|
||||||
else if (r != Z_MEM_ERROR)
|
|
||||||
{
|
|
||||||
z->msg = (char*)"empty distance tree with lengths";
|
|
||||||
r = Z_DATA_ERROR;
|
|
||||||
}
|
|
||||||
ZFREE(z, v);
|
|
||||||
return r;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* done */
|
|
||||||
ZFREE(z, v);
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* build fixed tables only once--keep them here */
|
|
||||||
#ifdef BUILDFIXED
|
|
||||||
local int fixed_built = 0;
|
|
||||||
#define FIXEDH 544 /* number of hufts used by fixed tables */
|
|
||||||
local inflate_huft fixed_mem[FIXEDH];
|
|
||||||
local uInt fixed_bl;
|
|
||||||
local uInt fixed_bd;
|
|
||||||
local inflate_huft *fixed_tl;
|
|
||||||
local inflate_huft *fixed_td;
|
|
||||||
#else
|
|
||||||
#include "inffixed.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
int inflate_trees_fixed(bl, bd, tl, td, z)
|
|
||||||
uIntf *bl; /* literal desired/actual bit depth */
|
|
||||||
uIntf *bd; /* distance desired/actual bit depth */
|
|
||||||
inflate_huft * FAR *tl; /* literal/length tree result */
|
|
||||||
inflate_huft * FAR *td; /* distance tree result */
|
|
||||||
z_streamp z; /* for memory allocation */
|
|
||||||
{
|
|
||||||
#ifdef BUILDFIXED
|
|
||||||
/* build fixed tables if not already */
|
|
||||||
if (!fixed_built)
|
|
||||||
{
|
|
||||||
int k; /* temporary variable */
|
|
||||||
uInt f = 0; /* number of hufts used in fixed_mem */
|
|
||||||
uIntf *c; /* length list for huft_build */
|
|
||||||
uIntf *v; /* work area for huft_build */
|
|
||||||
|
|
||||||
/* allocate memory */
|
|
||||||
if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
|
|
||||||
return Z_MEM_ERROR;
|
|
||||||
if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
|
|
||||||
{
|
|
||||||
ZFREE(z, c);
|
|
||||||
return Z_MEM_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* literal table */
|
|
||||||
for (k = 0; k < 144; k++)
|
|
||||||
c[k] = 8;
|
|
||||||
for (; k < 256; k++)
|
|
||||||
c[k] = 9;
|
|
||||||
for (; k < 280; k++)
|
|
||||||
c[k] = 7;
|
|
||||||
for (; k < 288; k++)
|
|
||||||
c[k] = 8;
|
|
||||||
fixed_bl = 9;
|
|
||||||
huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl,
|
|
||||||
fixed_mem, &f, v);
|
|
||||||
|
|
||||||
/* distance table */
|
|
||||||
for (k = 0; k < 30; k++)
|
|
||||||
c[k] = 5;
|
|
||||||
fixed_bd = 5;
|
|
||||||
huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd,
|
|
||||||
fixed_mem, &f, v);
|
|
||||||
|
|
||||||
/* done */
|
|
||||||
ZFREE(z, v);
|
|
||||||
ZFREE(z, c);
|
|
||||||
fixed_built = 1;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
*bl = fixed_bl;
|
|
||||||
*bd = fixed_bd;
|
|
||||||
*tl = fixed_tl;
|
|
||||||
*td = fixed_td;
|
|
||||||
return Z_OK;
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user