projects/ldc: lphobos/std/zip.d annotate

annotate lphobos/std/zip.d @ 650:aa6a0b7968f7

Added test case for bug #100 Removed dubious check for not emitting static private global in other modules without access. This should be handled properly somewhere else, it's causing unresolved global errors for stuff that should work (in MiniD)

author	Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date	Sun, 05 Oct 2008 17:28:15 +0200
parents	373489eeaf90
children

rev	line source
473 373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	1
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	2 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	3 * Read/write data in the $(LINK2 http://www.info-_zip.org, zip archive) format.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	4 * Makes use of the etc.c.zlib compression library.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	5 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	6 * Bugs:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	7 * $(UL
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	8 * $(LI Multi-disk zips not supported.)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	9 * $(LI Only Zip version 20 formats are supported.)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	10 * $(LI Only supports compression modes 0 (no compression) and 8 (deflate).)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	11 * $(LI Does not support encryption.)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	12 * )
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	13 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	14 * Macros:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	15 * WIKI = Phobos/StdZip
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	16 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	17
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	18 module std.zip;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	19
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	20 private import std.zlib;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	21 private import std.date;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	22 private import std.intrinsic;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	23
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	24 //debug=print;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	25
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	26 /** Thrown on error.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	27 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	28 class ZipException : Exception
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	29 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	30 this(char[] msg)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	31 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	32 super("ZipException: " ~ msg);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	33 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	34 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	35
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	36 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	37 * A member of the ZipArchive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	38 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	39 class ArchiveMember
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	40 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	41 ushort madeVersion = 20; /// Read Only
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	42 ushort extractVersion = 20; /// Read Only
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	43 ushort flags; /// Read/Write: normally set to 0
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	44 ushort compressionMethod; /// Read/Write: 0 for compression, 8 for deflate
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	45 std.date.DosFileTime time; /// Read/Write: Last modified time of the member. It's in the DOS date/time format.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	46 uint crc32; /// Read Only: cyclic redundancy check (CRC) value
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	47 uint compressedSize; /// Read Only: size of data of member in compressed form.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	48 uint expandedSize; /// Read Only: size of data of member in expanded form.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	49 ushort diskNumber; /// Read Only: should be 0.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	50 ushort internalAttributes; /// Read/Write
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	51 uint externalAttributes; /// Read/Write
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	52
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	53 private uint offset;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	54
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	55 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	56 * Read/Write: Usually the file name of the archive member; it is used to
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	57 * index the archive directory for the member. Each member must have a unique
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	58 * name[]. Do not change without removing member from the directory first.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	59 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	60 char[] name;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	61
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	62 ubyte[] extra; /// Read/Write: extra data for this member.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	63 char[] comment; /// Read/Write: comment associated with this member.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	64 ubyte[] compressedData; /// Read Only: data of member in compressed form.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	65 ubyte[] expandedData; /// Read/Write: data of member in uncompressed form.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	66
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	67 debug(print)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	68 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	69 void print()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	70 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	71 printf("name = '%.*s'\n", cast(int) name.length, name.ptr);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	72 printf("\tcomment = '%.*s'\n", cast(int) comment.length, comment.ptr);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	73 printf("\tmadeVersion = x%04x\n", madeVersion);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	74 printf("\textractVersion = x%04x\n", extractVersion);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	75 printf("\tflags = x%04x\n", flags);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	76 printf("\tcompressionMethod = %d\n", compressionMethod);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	77 printf("\ttime = %d\n", time);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	78 printf("\tcrc32 = x%08x\n", crc32);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	79 printf("\texpandedSize = %d\n", expandedSize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	80 printf("\tcompressedSize = %d\n", compressedSize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	81 printf("\tinternalAttributes = x%04x\n", internalAttributes);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	82 printf("\texternalAttributes = x%08x\n", externalAttributes);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	83 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	84 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	85 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	86
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	87 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	88 * Object representing the entire archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	89 * ZipArchives are collections of ArchiveMembers.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	90 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	91 class ZipArchive
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	92 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	93 ubyte[] data; /// Read Only: array representing the entire contents of the archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	94 uint endrecOffset;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	95
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	96 uint diskNumber; /// Read Only: 0 since multi-disk zip archives are not supported.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	97 uint diskStartDir; /// Read Only: 0 since multi-disk zip archives are not supported.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	98 uint numEntries; /// Read Only: number of ArchiveMembers in the directory.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	99 uint totalEntries; /// Read Only: same as totalEntries.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	100 char[] comment; /// Read/Write: the archive comment. Must be less than 65536 bytes in length.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	101
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	102 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	103 * Read Only: array indexed by the name of each member of the archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	104 * Example:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	105 * All the members of the archive can be accessed with a foreach loop:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	106 * --------------------
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	107 * ZipArchive archive = new ZipArchive(data);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	108 * foreach (ArchiveMember am; archive.directory)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	109 * {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	110 * writefln("member name is '%s'", am.name);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	111 * }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	112 * --------------------
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	113 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	114 ArchiveMember[char[]] directory;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	115
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	116 debug (print)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	117 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	118 void print()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	119 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	120 printf("\tdiskNumber = %u\n", diskNumber);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	121 printf("\tdiskStartDir = %u\n", diskStartDir);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	122 printf("\tnumEntries = %u\n", numEntries);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	123 printf("\ttotalEntries = %u\n", totalEntries);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	124 printf("\tcomment = '%.*s'\n", cast(int) comment.length, comment.ptr);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	125 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	126 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	127
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	128 /* ============ Creating a new archive =================== */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	129
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	130 /** Constructor to use when creating a new archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	131 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	132 this()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	133 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	134 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	135
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	136 /** Add de to the archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	137 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	138 void addMember(ArchiveMember de)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	139 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	140 directory[de.name] = de;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	141 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	142
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	143 /** Delete de from the archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	144 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	145 void deleteMember(ArchiveMember de)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	146 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	147 directory.remove(de.name);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	148 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	149
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	150 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	151 * Construct an archive out of the current members of the archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	152 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	153 * Fills in the properties data[], diskNumber, diskStartDir, numEntries,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	154 * totalEntries, and directory[].
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	155 * For each ArchiveMember, fills in properties crc32, compressedSize,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	156 * compressedData[].
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	157 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	158 * Returns: array representing the entire archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	159 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	160 void[] build()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	161 { uint i;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	162 uint directoryOffset;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	163
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	164 if (comment.length > 0xFFFF)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	165 throw new ZipException("archive comment longer than 65535");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	166
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	167 // Compress each member; compute size
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	168 uint archiveSize = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	169 uint directorySize = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	170 foreach (ArchiveMember de; directory)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	171 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	172 de.expandedSize = de.expandedData.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	173 switch (de.compressionMethod)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	174 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	175 case 0:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	176 de.compressedData = de.expandedData;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	177 break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	178
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	179 case 8:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	180 de.compressedData = cast(ubyte[])std.zlib.compress(cast(void[])de.expandedData);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	181 de.compressedData = de.compressedData[2 .. de.compressedData.length - 4];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	182 break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	183
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	184 default:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	185 throw new ZipException("unsupported compression method");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	186 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	187 de.compressedSize = de.compressedData.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	188 de.crc32 = std.zlib.crc32(0, cast(void[])de.expandedData);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	189
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	190 archiveSize += 30 + de.name.length +
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	191 de.extra.length +
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	192 de.compressedSize;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	193 directorySize += 46 + de.name.length +
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	194 de.extra.length +
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	195 de.comment.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	196 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	197
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	198 data = new ubyte[archiveSize + directorySize + 22 + comment.length];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	199
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	200 // Populate the data[]
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	201
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	202 // Store each archive member
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	203 i = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	204 foreach (ArchiveMember de; directory)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	205 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	206 de.offset = i;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	207 data[i .. i + 4] = cast(ubyte[])"PK\x03\x04";
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	208 putUshort(i + 4, de.extractVersion);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	209 putUshort(i + 6, de.flags);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	210 putUshort(i + 8, de.compressionMethod);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	211 putUint (i + 10, cast(uint)de.time);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	212 putUint (i + 14, de.crc32);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	213 putUint (i + 18, de.compressedSize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	214 putUint (i + 22, de.expandedData.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	215 putUshort(i + 26, cast(ushort)de.name.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	216 putUshort(i + 28, cast(ushort)de.extra.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	217 i += 30;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	218
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	219 data[i .. i + de.name.length] = cast(ubyte[])de.name[];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	220 i += de.name.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	221 data[i .. i + de.extra.length] = cast(ubyte[])de.extra[];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	222 i += de.extra.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	223 data[i .. i + de.compressedSize] = de.compressedData[];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	224 i += de.compressedSize;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	225 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	226
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	227 // Write directory
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	228 directoryOffset = i;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	229 numEntries = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	230 foreach (ArchiveMember de; directory)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	231 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	232 data[i .. i + 4] = cast(ubyte[])"PK\x01\x02";
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	233 putUshort(i + 4, de.madeVersion);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	234 putUshort(i + 6, de.extractVersion);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	235 putUshort(i + 8, de.flags);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	236 putUshort(i + 10, de.compressionMethod);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	237 putUint (i + 12, cast(uint)de.time);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	238 putUint (i + 16, de.crc32);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	239 putUint (i + 20, de.compressedSize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	240 putUint (i + 24, de.expandedSize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	241 putUshort(i + 28, cast(ushort)de.name.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	242 putUshort(i + 30, cast(ushort)de.extra.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	243 putUshort(i + 32, cast(ushort)de.comment.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	244 putUshort(i + 34, de.diskNumber);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	245 putUshort(i + 36, de.internalAttributes);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	246 putUint (i + 38, de.externalAttributes);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	247 putUint (i + 42, de.offset);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	248 i += 46;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	249
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	250 data[i .. i + de.name.length] = cast(ubyte[])de.name[];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	251 i += de.name.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	252 data[i .. i + de.extra.length] = cast(ubyte[])de.extra[];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	253 i += de.extra.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	254 data[i .. i + de.comment.length] = cast(ubyte[])de.comment[];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	255 i += de.comment.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	256 numEntries++;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	257 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	258 totalEntries = numEntries;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	259
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	260 // Write end record
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	261 endrecOffset = i;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	262 data[i .. i + 4] = cast(ubyte[])"PK\x05\x06";
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	263 putUshort(i + 4, cast(ushort)diskNumber);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	264 putUshort(i + 6, cast(ushort)diskStartDir);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	265 putUshort(i + 8, cast(ushort)numEntries);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	266 putUshort(i + 10, cast(ushort)totalEntries);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	267 putUint (i + 12, directorySize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	268 putUint (i + 16, directoryOffset);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	269 putUshort(i + 20, cast(ushort)comment.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	270 i += 22;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	271
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	272 // Write archive comment
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	273 assert(i + comment.length == data.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	274 data[i .. data.length] = cast(ubyte[])comment[];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	275
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	276 return cast(void[])data;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	277 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	278
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	279 /* ============ Reading an existing archive =================== */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	280
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	281 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	282 * Constructor to use when reading an existing archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	283 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	284 * Fills in the properties data[], diskNumber, diskStartDir, numEntries,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	285 * totalEntries, comment[], and directory[].
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	286 * For each ArchiveMember, fills in
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	287 * properties madeVersion, extractVersion, flags, compressionMethod, time,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	288 * crc32, compressedSize, expandedSize, compressedData[], diskNumber,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	289 * internalAttributes, externalAttributes, name[], extra[], comment[].
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	290 * Use expand() to get the expanded data for each ArchiveMember.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	291 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	292 * Params:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	293 * buffer = the entire contents of the archive.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	294 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	295
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	296 this(void[] buffer)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	297 { int iend;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	298 int i;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	299 int endcommentlength;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	300 uint directorySize;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	301 uint directoryOffset;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	302
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	303 this.data = cast(ubyte[]) buffer;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	304
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	305 // Find 'end record index' by searching backwards for signature
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	306 iend = data.length - 66000;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	307 if (iend < 0)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	308 iend = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	309 for (i = data.length - 22; 1; i--)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	310 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	311 if (i < iend)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	312 throw new ZipException("no end record");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	313
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	314 if (data[i .. i + 4] == cast(ubyte[])"PK\x05\x06")
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	315 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	316 endcommentlength = getUshort(i + 20);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	317 if (i + 22 + endcommentlength > data.length)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	318 continue;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	319 comment = cast(char[])data[i + 22 .. i + 22 + endcommentlength];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	320 endrecOffset = i;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	321 break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	322 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	323 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	324
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	325 // Read end record data
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	326 diskNumber = getUshort(i + 4);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	327 diskStartDir = getUshort(i + 6);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	328
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	329 numEntries = getUshort(i + 8);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	330 totalEntries = getUshort(i + 10);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	331
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	332 if (numEntries != totalEntries)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	333 throw new ZipException("multiple disk zips not supported");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	334
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	335 directorySize = getUint(i + 12);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	336 directoryOffset = getUint(i + 16);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	337
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	338 if (directoryOffset + directorySize > i)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	339 throw new ZipException("corrupted directory");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	340
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	341 i = directoryOffset;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	342 for (int n = 0; n < numEntries; n++)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	343 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	344 /* The format of an entry is:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	345 * 'PK' 1, 2
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	346 * directory info
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	347 * path
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	348 * extra data
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	349 * comment
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	350 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	351
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	352 uint offset;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	353 uint namelen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	354 uint extralen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	355 uint commentlen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	356
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	357 if (data[i .. i + 4] != cast(ubyte[])"PK\x01\x02")
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	358 throw new ZipException("invalid directory entry 1");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	359 ArchiveMember de = new ArchiveMember();
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	360 de.madeVersion = getUshort(i + 4);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	361 de.extractVersion = getUshort(i + 6);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	362 de.flags = getUshort(i + 8);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	363 de.compressionMethod = getUshort(i + 10);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	364 de.time = cast(DosFileTime)getUint(i + 12);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	365 de.crc32 = getUint(i + 16);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	366 de.compressedSize = getUint(i + 20);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	367 de.expandedSize = getUint(i + 24);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	368 namelen = getUshort(i + 28);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	369 extralen = getUshort(i + 30);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	370 commentlen = getUshort(i + 32);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	371 de.diskNumber = getUshort(i + 34);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	372 de.internalAttributes = getUshort(i + 36);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	373 de.externalAttributes = getUint(i + 38);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	374 de.offset = getUint(i + 42);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	375 i += 46;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	376
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	377 if (i + namelen + extralen + commentlen > directoryOffset + directorySize)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	378 throw new ZipException("invalid directory entry 2");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	379
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	380 de.name = cast(char[])data[i .. i + namelen];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	381 i += namelen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	382 de.extra = data[i .. i + extralen];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	383 i += extralen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	384 de.comment = cast(char[])data[i .. i + commentlen];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	385 i += commentlen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	386
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	387 directory[de.name] = de;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	388 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	389 if (i != directoryOffset + directorySize)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	390 throw new ZipException("invalid directory entry 3");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	391 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	392
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	393 /*****
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	394 * Decompress the contents of archive member de and return the expanded
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	395 * data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	396 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	397 * Fills in properties extractVersion, flags, compressionMethod, time,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	398 * crc32, compressedSize, expandedSize, expandedData[], name[], extra[].
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	399 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	400 ubyte[] expand(ArchiveMember de)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	401 { uint namelen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	402 uint extralen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	403
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	404 if (data[de.offset .. de.offset + 4] != cast(ubyte[])"PK\x03\x04")
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	405 throw new ZipException("invalid directory entry 4");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	406
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	407 // These values should match what is in the main zip archive directory
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	408 de.extractVersion = getUshort(de.offset + 4);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	409 de.flags = getUshort(de.offset + 6);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	410 de.compressionMethod = getUshort(de.offset + 8);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	411 de.time = cast(DosFileTime)getUint(de.offset + 10);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	412 de.crc32 = getUint(de.offset + 14);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	413 de.compressedSize = getUint(de.offset + 18);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	414 de.expandedSize = getUint(de.offset + 22);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	415 namelen = getUshort(de.offset + 26);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	416 extralen = getUshort(de.offset + 28);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	417
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	418 debug(print)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	419 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	420 printf("\t\texpandedSize = %d\n", de.expandedSize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	421 printf("\t\tcompressedSize = %d\n", de.compressedSize);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	422 printf("\t\tnamelen = %d\n", namelen);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	423 printf("\t\textralen = %d\n", extralen);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	424 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	425
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	426 if (de.flags & 1)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	427 throw new ZipException("encryption not supported");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	428
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	429 int i;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	430 i = de.offset + 30 + namelen + extralen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	431 if (i + de.compressedSize > endrecOffset)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	432 throw new ZipException("invalid directory entry 5");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	433
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	434 de.compressedData = data[i .. i + de.compressedSize];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	435 debug(print) arrayPrint(de.compressedData);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	436
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	437 switch (de.compressionMethod)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	438 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	439 case 0:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	440 de.expandedData = de.compressedData;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	441 return de.expandedData;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	442
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	443 case 8:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	444 // -15 is a magic value used to decompress zip files.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	445 // It has the effect of not requiring the 2 byte header
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	446 // and 4 byte trailer.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	447 de.expandedData = cast(ubyte[])std.zlib.uncompress(cast(void[])de.compressedData, de.expandedSize, -15);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	448 return de.expandedData;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	449
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	450 default:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	451 throw new ZipException("unsupported compression method");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	452 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	453 assert(0);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	454 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	455
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	456 /* ============ Utility =================== */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	457
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	458 ushort getUshort(int i)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	459 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	460 version (LittleEndian)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	461 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	462 return cast(ushort )&data[i];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	463 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	464 else
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	465 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	466 ubyte b0 = data[i];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	467 ubyte b1 = data[i + 1];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	468 return (b1 << 8) \| b0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	469 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	470 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	471
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	472 uint getUint(int i)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	473 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	474 version (LittleEndian)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	475 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	476 return cast(uint )&data[i];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	477 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	478 else
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	479 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	480 return bswap(cast(uint )&data[i]);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	481 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	482 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	483
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	484 void putUshort(int i, ushort us)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	485 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	486 version (LittleEndian)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	487 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	488 cast(ushort )&data[i] = us;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	489 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	490 else
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	491 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	492 data[i] = cast(ubyte)us;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	493 data[i + 1] = cast(ubyte)(us >> 8);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	494 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	495 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	496
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	497 void putUint(int i, uint ui)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	498 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	499 version (BigEndian)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	500 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	501 ui = bswap(ui);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	502 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	503 cast(uint )&data[i] = ui;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	504 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	505 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	506
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	507 debug(print)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	508 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	509 void arrayPrint(ubyte[] array)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	510 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	511 printf("array %p,%d\n", cast(void*)array, array.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	512 for (int i = 0; i < array.length; i++)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	513 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	514 printf("%02x ", array[i]);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	515 if (((i + 1) & 15) == 0)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	516 printf("\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	517 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	518 printf("\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	519 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	520 }

Mercurial > projects > ldc

annotate lphobos/std/zip.d @ 650:aa6a0b7968f7