stripped and cleaned zip archive code

3 files changed, 84 insertions, 233 deletions

diff --git a/Jamfile b/Jamfile
index 7156b95d..38f99890 100644
--- a/Jamfile
+++ b/Jamfile
@@ -16,8 +16,8 @@ ALL_LOCATE_TARGET = [ FDirName $(TOP) build $(BUILD) ] ;
 
 BINDIR = [ FDirName $(TOP) dist ] ;
 
-LINKLIBS = $(FREETYPELD) -ljpeg -lz -lm ;
-FITZLIBS = libmupdf libstream libfitz librender libfonts ;
+LINKLIBS = $(FREETYPELD) -lexpat -ljpeg -lz -lm ;
+FITZLIBS = libsamus libmupdf libstream libfitz librender libfonts ;
 
 if $(HAVE_JASPER) = yes
 {
@@ -268,14 +268,11 @@ Library libmupdf :
 SubDir TOP samus ;
 
 Library libsamus :
-	# sa_zip.c
+	sa_zip.c
 	# sa_xml.c
 
 	;
 
-Main foo : sa_zip.c ;
-LinkLibraries foo : $(FITZLIBS) ;
-
 # --------------------------------------------------------------------------
 #
 # Build simple portable apps
@@ -289,6 +286,7 @@ APPLIST =
 	pdfdebug
 	pdfmerge
 	pdfselect
+	samzip
 	;
 
 for APP in $(APPLIST)
diff --git a/include/samus.h b/include/samus.h
index b1514959..c90b8cad 100644
--- a/include/samus.h
+++ b/include/samus.h
@@ -7,3 +7,31 @@
 #error "fitz.h must be included before samus.h"
 #endif
 
+/*
+ * ZIP archive
+ */
+
+typedef struct sa_zip_s sa_zip;
+typedef struct sa_zipent_s sa_zipent;
+
+struct sa_zipent_s
+{
+	unsigned offset;
+	unsigned csize;
+	unsigned usize;
+	char *name;
+};
+
+struct sa_zip_s
+{
+	fz_file *file;
+	int len;
+	sa_zipent *table;
+};
+
+fz_error *sa_openzip(sa_zip **zipp, char *filename);
+void sa_debugzip(sa_zip *zip);
+void sa_closezip(sa_zip *zip);
+fz_error *sa_openzipstream(sa_zip *zip, char *name);
+void sa_closezipstream(sa_zip *zip);
+
diff --git a/samus/sa_zip.c b/samus/sa_zip.c
index a94f82e0..d85974ac 100644
--- a/samus/sa_zip.c
+++ b/samus/sa_zip.c
@@ -9,155 +9,28 @@
 #include "fitz.h"
 #include "samus.h"
 
-typedef struct sa_zip_s sa_zip;
-typedef struct sa_zipent_s sa_zipent;
-
-struct sa_zipent_s
-{
-	unsigned offset;
-	char *name;
-	unsigned csize;
-	unsigned usize;
-};
-
-struct sa_zip_s
-{
-	fz_file *file;
-	int len, cap;
-	sa_zipent *table;
-};
-
-typedef unsigned char byte;
-typedef unsigned short ushort;
-typedef unsigned long ulong;
-
-static inline ushort read2(fz_file *f)
+static inline unsigned int read2(fz_file *f)
 {
-	byte a = fz_readbyte(f);
-	byte b = fz_readbyte(f);
+	unsigned char a = fz_readbyte(f);
+	unsigned char b = fz_readbyte(f);
 	return (b << 8) | a;
 }
 
-static inline ulong read4(fz_file *f)
+static inline unsigned int read4(fz_file *f)
 {
-	byte a = fz_readbyte(f);
-	byte b = fz_readbyte(f);
-	byte c = fz_readbyte(f);
-	byte d = fz_readbyte(f);
+	unsigned char a = fz_readbyte(f);
+	unsigned char b = fz_readbyte(f);
+	unsigned char c = fz_readbyte(f);
+	unsigned char d = fz_readbyte(f);
 	return (d << 24) | (c << 16) | (b << 8) | a;
 }
 
-static fz_error *growzip(sa_zip *zip)
-{
-	sa_zipent *newtab;
-	int newcap;
-
-	if (zip->cap)
-		newcap = zip->cap * 2;
-	else
-		newcap = 100;
-
-	newtab = fz_realloc(zip->table, newcap * sizeof(sa_zipent));
-	if (!newtab)
-		return fz_outofmem;
-
-	memset(newtab + zip->cap, 0, (newcap - zip->cap) * sizeof(sa_zipent));
-	zip->cap = newcap;
-	zip->table = newtab;
-
-	return nil;
-}
-
-static fz_error *scanzipent(sa_zip *zip, sa_zipent *ent)
-{
-	ulong csize, usize;
-	ulong namesize, metasize;
-
-	(void) read2(zip->file);	/* version */
-	(void) read2(zip->file);	/* general */
-	(void) read2(zip->file);	/* method */
-	(void) read2(zip->file);	/* time */
-	(void) read2(zip->file);	/* date */
-	(void) read4(zip->file);	/* crc-32 */
-	csize = read4(zip->file);
-	usize = read4(zip->file);
-	namesize = read2(zip->file);
-	metasize = read2(zip->file);
-
-	ent->name = fz_malloc(namesize + 1);
-	if (!ent->name)
-		return fz_outofmem;
-
-	fz_read(zip->file, ent->name, namesize);
-	ent->name[namesize] = 0;
-	ent->csize = csize;
-	ent->usize = usize;
-
-	fz_seek(zip->file, metasize, 1);
-	fz_seek(zip->file, csize, 1);
-
-	return nil;
-}
-
-static fz_error *scanzip(sa_zip *zip)
-{
-	fz_error *error;
-	ulong offset;
-	ulong sign;
-
-	fz_seek(zip->file, 0, 0);
-
-	while (1)
-	{
-		offset = fz_tell(zip->file);
-
-		sign = read4(zip->file);
-
-		switch (sign)
-		{
-
-		/* local file header */
-		case 0x04034b50:
-			if (zip->len + 1 > zip->cap)
-			{
-				error = growzip(zip);
-				if (error)
-					return error;
-			}
-
-			zip->table[zip->len].offset = offset;
-
-			error = scanzipent(zip, zip->table + zip->len);
-			if (error)
-				return error;
-
-			zip->len ++;
-
-			break;
-
-		/* data descriptor */
-		case 0x08074b50:
-			(void) read4(zip->file);	/* crc-32 */
-			(void) read4(zip->file);	/* compressed size */
-			(void) read4(zip->file);	/* uncompressed size */
-			break;
-
-		/* central directory */
-		case 0x02014b50:
-			return fz_ferror(zip->file);
-
-		default:
-			return fz_throw("ioerror: unknown zip signature");
-		}
-	}
-}
-
 static fz_error *readzipdir(sa_zip *zip, int startoffset)
 {
-	ulong sign;
-	ulong csize, usize;
-	ulong namesize, metasize, comsize;
-	ulong offset;
+	unsigned sign;
+	unsigned csize, usize;
+	unsigned namesize, metasize, comsize;
+	unsigned offset;
 	int i;
 
 	fz_seek(zip->file, startoffset, 0);
@@ -186,12 +59,12 @@ static fz_error *readzipdir(sa_zip *zip, int startoffset)
 		offset = read4(zip->file);
 
 		zip->table[i].offset = offset;
-		zip->table[i].name = fz_malloc(namesize + 1);
 		zip->table[i].csize = csize;
 		zip->table[i].usize = usize;
+
+		zip->table[i].name = fz_malloc(namesize + 1);
 		if (!zip->table[i].name)
 			return fz_outofmem;
-
 		fz_read(zip->file, zip->table[i].name, namesize);
 		zip->table[i].name[namesize] = 0;
 
@@ -204,9 +77,9 @@ static fz_error *readzipdir(sa_zip *zip, int startoffset)
 
 static fz_error *readzipendofdir(sa_zip *zip, int startoffset)
 {
-	ulong sign;
-	ulong count;
-	ulong offset;
+	unsigned sign;
+	unsigned count;
+	unsigned offset;
 
 	fz_seek(zip->file, startoffset, 0);
 
@@ -221,54 +94,44 @@ static fz_error *readzipendofdir(sa_zip *zip, int startoffset)
 	(void) read4(zip->file);	/* size of central directory */
 	offset = read4(zip->file);	/* offset to central directory */
 
-	zip->len = zip->cap = count;
-	zip->table = fz_malloc(zip->cap * sizeof(sa_zipent));
+	zip->len = count;
+	zip->table = fz_malloc(zip->len * sizeof(sa_zipent));
 	if (!zip->table)
 		return fz_outofmem;
 
-	memset(zip->table, 0, zip->cap * sizeof(sa_zipent));
+	memset(zip->table, 0, zip->len * sizeof(sa_zipent));
 
 	return readzipdir(zip, offset);
 }
 
 static fz_error *findzipendofdir(sa_zip *zip)
 {
-	byte buf[512];
-	int filesize;
-	int maxback;
-	int backread;
-	int offset;
-	int len;
-	int i;
+	char buf[512];
+	int back, maxback, filesize;
+	int n, i;
 
 	filesize = fz_seek(zip->file, 0, 2);
 	if (filesize == -1)
 		return fz_ferror(zip->file);
 
 	maxback = MIN(filesize, 0xFFFF + sizeof buf);
+	back = MIN(maxback, sizeof buf);
 
-	backread = MIN(maxback, sizeof buf);
-	while (backread < maxback)
+	while (back < maxback)
 	{
-		fz_seek(zip->file, filesize - backread, 0);
-		len = fz_read(zip->file, buf, sizeof buf);
-		if (len < 0)
+		fz_seek(zip->file, filesize - back, 0);
+		n = fz_read(zip->file, buf, sizeof buf);
+		if (n < 0)
 			return fz_ferror(zip->file);
 
-		for (i = len - 4; i > 0; i--)
-		{
-			if (buf[i+0] == 0x50 && buf[i+1] == 0x4b &&
-					buf[i+2] == 0x05 && buf[i+3] == 0x06)
-			{
-				offset = filesize - backread + i;
-				return readzipendofdir(zip, offset);
-			}
-		}
+		for (i = n - 4; i > 0; i--)
+			if (!memcmp(buf + i, "\120\113\5\6", 4))
+				return readzipendofdir(zip, filesize - back + i);
 
-		backread += sizeof buf - 4;
+		back += sizeof buf - 4;
 	}
 
-	return fz_throw("ioerror: no 'end of central directory' in zip");
+	return fz_throw("ioerror: could not find central directory in zip");
 }
 
 /*
@@ -287,22 +150,13 @@ sa_openzip(sa_zip **zipp, char *filename)
 
 	zip->file = nil;
 	zip->len = 0;
-	zip->cap = 0;
 	zip->table = nil;
 
 	error = fz_openfile(&zip->file, filename, FZ_READ);
 	if (error)
 		return error;
 
-	error = findzipendofdir(zip);
-	if (error)
-	{
-		fz_warn("%s", error->msg);
-		fz_droperror(error);
-		return scanzip(zip);
-	}
-
-	return nil;
+	return findzipendofdir(zip);
 }
 
 /*
@@ -333,8 +187,11 @@ sa_debugzip(sa_zip *zip)
 
 	for (i = 0; i < zip->len; i++)
 	{
-		printf("%6u ", zip->table[i].csize);
-		printf("%6u ", zip->table[i].usize);
+		printf("%8u ", zip->table[i].usize);
+		if (zip->table[i].usize)
+			printf("%3d%% ", zip->table[i].csize * 100 / zip->table[i].usize);
+		else
+			printf(" --- ");
 		printf("%s\n", zip->table[i].name);
 	}
 }
@@ -348,9 +205,9 @@ sa_openzipstream(sa_zip *zip, char *name)
 	fz_error *error;
 	fz_filter *filter;
 	fz_obj *obj;
-	ulong sign, version, general, method;
-	ulong csize, usize;
-	ulong namesize, metasize;
+	unsigned sign, version, general, method;
+	unsigned csize, usize;
+	unsigned namesize, metasize;
 	int t;
 	int i;
 
@@ -377,34 +234,36 @@ sa_openzipstream(sa_zip *zip, char *name)
 			namesize = read2(zip->file);
 			metasize = read2(zip->file);
 
-			fz_seek(zip->file, namesize, 1);
-			fz_seek(zip->file, metasize, 1);
-
 			if ((version & 0xff) > 45)
 				return fz_throw("ioerror: unsupported zip version");
+
 			if (general & 0x0001)
 				return fz_throw("ioerror: encrypted zip entry");
 
+			fz_seek(zip->file, namesize + metasize, 1);
+
 			switch (method)
 			{	
 			case 0:
-printf("null filter\n");
 				error = fz_newnullfilter(&filter, csize);
+				if (error)
+					return error;
 				break;
+
 			case 8:
-printf("flated filter\n");
 				error = fz_packobj(&obj, "<</ZIP true>>");
 				if (error)
 					return error;
 				error = fz_newflated(&filter, obj);
 				fz_dropobj(obj);
+				if (error)
+					return error;
 				break;
+
 			default:
-				error = fz_throw("ioerror: unsupported compression method");
+				return fz_throw("ioerror: unsupported compression method");
 				break;
 			}
-			if (error)
-				return error;
 
 			error = fz_pushfilter(zip->file, filter);
 			fz_dropfilter(filter);
@@ -427,37 +286,3 @@ sa_closezipstream(sa_zip *zip)
 	fz_popfilter(zip->file);
 }
 
-
-int main(int argc, char **argv)
-{
-	fz_error *error;
-	fz_buffer *buf;
-	sa_zip *zip;
-	int i;
-
-	error = sa_openzip(&zip, argv[1]);
-	if (error)
-		fz_abort(error);
-
-	sa_debugzip(zip);
-
-	for (i = 2; i < argc; i++)
-	{
-		error = sa_openzipstream(zip, argv[i]);
-		if (error)
-			fz_abort(error);
-		error = fz_readfile(&buf, zip->file);
-		if (error)
-			fz_abort(error);
-		sa_closezipstream(zip);
-
-		fwrite(buf->rp, 1, buf->wp - buf->rp, stdout);
-
-		fz_dropbuffer(buf);
-	}
-
-	sa_closezip(zip);
-	
-	return 0;
-}
-