Commit

HISTORY

@@ -3,7 +3,12 @@
                             =======================
 
 
-1 ADVANCECOMP VERSION 1.11 2004/07
+1 ADVANCECOMP VERSION 1.12 2004/08
+==================================
+
+
+
+2 ADVANCECOMP VERSION 1.11 2004/07
 ==================================
 
 * Fixed a FreeBSD libc compatibility issue recompressing
@@ -12,7 +17,7 @@
   compressed .zip files are tested.
 
 
-2 ADVANCECOMP VERSION 1.10 2004/04
+3 ADVANCECOMP VERSION 1.10 2004/04
 ==================================
 
 * Added support for alpha channel and the new -n option
@@ -21,22 +26,22 @@
   with some GZIP files [Christian Lestrade].
 
 
-3 ADVANCECOMP VERSION 1.9 2003/11
+4 ADVANCECOMP VERSION 1.9 2003/11
 =================================
 
 * Added support for .tgz files at advdef.
 * Added the -a option at advmng to create .mng files from
   a sequence of .png files.
 
 
-4 ADVANCECOMP VERSION 1.8 2003/10
+5 ADVANCECOMP VERSION 1.8 2003/10
 =================================
 
 * Added support for .gz files at advdef.
 * Fixed support for .png files with splitted IDATs.
 
 
-5 ADVANCECOMP VERSION 1.7 2003/08
+6 ADVANCECOMP VERSION 1.7 2003/08
 =================================
 
 * Fixed a Segmentation Fault bug on the advmng -r option on
@@ -54,7 +59,7 @@
 * Updated with automake 1.7.6.
 
 
-6 ADVANCECOMP VERSION 1.6 2003/05
+7 ADVANCECOMP VERSION 1.6 2003/05
 =================================
 
 * Added the `-x' option at the advmng utility to export .png files
@@ -64,23 +69,23 @@
 * Some fixes for the gcc 3.3 compiler.
 
 
-7 ADVANCECOMP VERSION 1.5 2003/01
+8 ADVANCECOMP VERSION 1.5 2003/01
 =================================
 
 * Splitted from AdvanceSCAN
 * Added the `advdef' compression utility.
 
 
-8 ADVANCESCAN VERSION 1.4 2002/12
+9 ADVANCESCAN VERSION 1.4 2002/12
 =================================
 
 * Fixed a bug in the advmng utility when it was called with
   more than one file in the command line. The program
   was incorrectly adding a PLTE chunk at rgb images.
 
 
-9 ADVANCESCAN VERSION 1.3 2002/11
-=================================
+10 ADVANCESCAN VERSION 1.3 2002/11
+==================================
 
 * Added the support for the transparency tRNS chunk at the
   advpng utility.
@@ -89,7 +94,7 @@
 * Minor changes at the autoconf/automake scripts.
 
 
-10 ADVANCESCAN VERSION 1.2 2002/08
+11 ADVANCESCAN VERSION 1.2 2002/08
 ==================================
 
 * Added the advpng utility to compress the PNG files.
@@ -98,14 +103,14 @@
 * Other minor fixes.
 
 
-11 ADVANCESCAN VERSION 1.1 2002/06
+12 ADVANCESCAN VERSION 1.1 2002/06
 ==================================
 
 * Fixed an infinite loop bug testing some small damaged zips.
 * Removed some warning compiling with gcc 3.1.
 
 
-12 ADVANCESCAN VERSION 1.0 2002/05
+13 ADVANCESCAN VERSION 1.0 2002/05
 ==================================
 
 * First public release.
@@ -114,7 +119,7 @@
   tests are only done if requested.
 
 
-13 ADVANCESCAN VERSION 0.6-BETA 2002/05
+14 ADVANCESCAN VERSION 0.6-BETA 2002/05
 =======================================
 
 * Added the AdvanceZIP utility.

Makefile.am

@@ -5,7 +5,8 @@ bin_PROGRAMS = advzip advpng advmng advdef
 advzip_SOURCES = \
 	rezip.cc \
 	zip.cc \
-	utility.cc \
+	file.cc \
+	data.cc \
 	siglock.cc \
 	compress.cc \
 	zipsh.cc \
@@ -34,7 +35,8 @@ advzip_SOURCES = \
 advpng_SOURCES = \
 	repng.cc \
 	pngex.cc \
-	utility.cc \
+	file.cc \
+	data.cc \
 	siglock.cc \
 	compress.cc \
 	getopt.c \
@@ -68,7 +70,8 @@ advmng_SOURCES = \
 	pngex.cc \
 	mngex.cc \
 	scroll.cc \
-	utility.cc \
+	file.cc \
+	data.cc \
 	siglock.cc \
 	compress.cc \
 	getopt.c \
@@ -100,7 +103,8 @@ advmng_SOURCES = \
 
 advdef_SOURCES = \
 	redef.cc \
-	utility.cc \
+	file.cc \
+	data.cc \
 	siglock.cc \
 	compress.cc \
 	getopt.c \
@@ -139,7 +143,7 @@ EXTRA_DIST = \
 	doc/advdef.html doc/advzip.html doc/advpng.html doc/advmng.html doc/history.html doc/readme.html doc/authors.html doc/install.html \
 	configure.dos configure.windows configure.darwin autogen.sh noautomake.sh \
 	7z/README \
-	check.lst \
+	test/test.lst \
 	test/mappy.png \
 	test/mappy.mng \
 	test/basn2c08.png \
@@ -155,7 +159,8 @@ noinst_HEADERS = \
 	mngex.h \
 	scroll.h \
 	compress.h \
-	utility.h \
+	file.h \
+	data.h \
 	zip.h \
 	except.h \
 	siglock.h \
@@ -211,7 +216,7 @@ noinst_HEADERS = \
 man_MANS = doc/advdef.1 doc/advzip.1 doc/advpng.1 doc/advmng.1
 
 clean-local:
-	rm -f new.lst check.zip mappy.mng mappy.png
+	rm -f check.lst check.zip mappy.mng mappy.png
 	rm -f basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png
 	rm -f advdef.exe advzip.exe advpng.exe advmng.exe
 	rm -f mappy*.png
@@ -251,48 +256,48 @@ HISTORY: doc/history.txt
 doc/copying.txt: COPYING
 	cat $< | todos > $@
 
-check-local: advzip check.lst
+check-local: advzip test/test.lst
 	@./advzip -a -1 check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip > new.lst
+	@./advzip -L check.zip > check.lst
 	@./advzip -t -p check.zip
 	@./advzip -a -2 check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip >> new.lst
+	@./advzip -L check.zip >> check.lst
 	@./advzip -t -p check.zip
 	@./advzip -a -3 check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip >> new.lst
+	@./advzip -L check.zip >> check.lst
 	@./advzip -t -p check.zip
 	@./advzip -a -4 check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip >> new.lst
+	@./advzip -L check.zip >> check.lst
 	@./advzip -t -p check.zip
 	@./advzip -a -1 -N check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip >> new.lst
+	@./advzip -L check.zip >> check.lst
 	@./advzip -t -p check.zip
 	@./advzip -a -2 -N check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip >> new.lst
+	@./advzip -L check.zip >> check.lst
 	@./advzip -t -p check.zip
 	@./advzip -a -3 -N check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip >> new.lst
+	@./advzip -L check.zip >> check.lst
 	@./advzip -t -p check.zip
 	@./advzip -a -4 -N check.zip $(srcdir)/COPYING
-	@./advzip -L check.zip >> new.lst
+	@./advzip -L check.zip >> check.lst
 	@./advzip -t -p check.zip
 	@cp $(srcdir)/test/mappy.mng .
 	@./advmng -v -z -1 -f -S 8 mappy.mng
-	@./advmng -L mappy.mng >> new.lst
+	@./advmng -L mappy.mng >> check.lst
 	@./advmng -v -x -1 mappy.mng
 	@./advmng -v -a 30 -1 -S 8 mappy.mng mappy-*.png
-	@./advmng -L mappy.mng >> new.lst
+	@./advmng -L mappy.mng >> check.lst
 	@./advmng -v -a 30 -n -1 -S 8 mappy.mng mappy-*.png
-	@./advmng -L mappy.mng >> new.lst
+	@./advmng -L mappy.mng >> check.lst
 	@./advmng -v -a 30 -n -r -1 -S 8 mappy.mng mappy-*.png
-	@./advmng -L mappy.mng >> new.lst
+	@./advmng -L mappy.mng >> check.lst
 	@cp $(srcdir)/test/mappy.png .
 	@./advpng -f -z mappy.png
-	@./advpng -L mappy.png >> new.lst
+	@./advpng -L mappy.png >> check.lst
 	@cp $(srcdir)/test/basn2c08.png $(srcdir)/test/basn3p01.png $(srcdir)/test/basn3p02.png $(srcdir)/test/basn3p04.png $(srcdir)/test/basn3p08.png $(srcdir)/test/basn6a08.png .
 	@./advpng -f -z basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png
-	@./advpng -L basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png >> new.lst
-	@cmp new.lst $(srcdir)/check.lst
+	@./advpng -L basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png >> check.lst
+	@cmp check.lst $(srcdir)/test/test.lst
 	@echo Success!
 
 DISTDOS_ROOT = \