gzip package

R=dsymonds
DELTA=559  (559 added, 0 deleted, 0 changed)
OCL=29993
CL=30005

5 files changed, 568 insertions, 0 deletions

diff --git a/src/lib/Make.deps b/src/lib/Make.deps
index 50f91eea2..77c4089a0 100644
--- a/src/lib/Make.deps
+++ b/src/lib/Make.deps
@@ -1,6 +1,8 @@
 bignum.install: fmt.install
 bufio.install: io.install os.install utf8.install
 bytes.install: utf8.install
+compress/flate.install: bufio.install fmt.install io.install os.install strconv.install
+compress/gzip.install: bufio.install compress/flate.install hash.install hash/crc32.install io.install os.install
 container/list.install:
 container/vector.install:
 crypto/aes.install: os.install
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 6627f586e..8b6b9a8ee 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -15,6 +15,8 @@ DIRS=\
 	bignum\
 	bufio\
 	bytes\
+	compress/flate\
+	compress/gzip\
 	container/list\
 	container/vector\
 	crypto/aes\
diff --git a/src/lib/compress/gzip/Makefile b/src/lib/compress/gzip/Makefile
new file mode 100644
index 000000000..514118ae0
--- /dev/null
+++ b/src/lib/compress/gzip/Makefile
@@ -0,0 +1,60 @@
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# DO NOT EDIT.  Automatically generated by gobuild.
+# gobuild -m >Makefile
+
+D=/compress/
+
+include $(GOROOT)/src/Make.$(GOARCH)
+AR=gopack
+
+default: packages
+
+clean:
+	rm -rf *.[$(OS)] *.a [$(OS)].out _obj
+
+test: packages
+	gotest
+
+coverage: packages
+	gotest
+	6cov -g `pwd` | grep -v '_test\.go:'
+
+%.$O: %.go
+	$(GC) -I_obj $*.go
+
+%.$O: %.c
+	$(CC) $*.c
+
+%.$O: %.s
+	$(AS) $*.s
+
+O1=\
+	gunzip.$O\
+
+
+phases: a1
+_obj$D/gzip.a: phases
+
+a1: $(O1)
+	$(AR) grc _obj$D/gzip.a gunzip.$O
+	rm -f $(O1)
+
+
+newpkg: clean
+	mkdir -p _obj$D
+	$(AR) grc _obj$D/gzip.a
+
+$(O1): newpkg
+$(O2): a1
+
+nuke: clean
+	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/gzip.a
+
+packages: _obj$D/gzip.a
+
+install: packages
+	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
+	cp _obj$D/gzip.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/gzip.a
diff --git a/src/lib/compress/gzip/gunzip.go b/src/lib/compress/gzip/gunzip.go
new file mode 100644
index 000000000..32cc3ecb0
--- /dev/null
+++ b/src/lib/compress/gzip/gunzip.go
@@ -0,0 +1,236 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The gzip package implements reading (and eventually writing) of
+// gzip format compressed files, as specified in RFC 1952.
+package gzip
+
+import (
+	"bufio";
+	"compress/flate";
+	"hash";
+	"hash/crc32";
+	"io";
+	"os";
+)
+
+const (
+	gzipID1 = 0x1f;
+	gzipID2 = 0x8b;
+
+	gzipDeflate = 8;
+
+	flagText = 1<<0;
+	flagHdrCrc = 1<<1;
+	flagExtra = 1<<2;
+	flagName = 1<<3;
+	flagComment = 1<<4;
+)
+
+func makeReader(r io.Reader) flate.Reader {
+	if rr, ok := r.(flate.Reader); ok {
+		return rr;
+	}
+	return bufio.NewReader(r);
+}
+
+var HeaderError os.Error = os.ErrorString("invalid gzip header")
+var ChecksumError os.Error = os.ErrorString("gzip checksum error")
+
+// A GzipInflater is an io.Reader that can be read to retrieve
+// uncompressed data from a gzip-format compressed file.
+// The gzip file stores a header giving metadata about the compressed file.
+// That header is exposed as the fields of the GzipInflater struct.
+//
+// In general, a gzip file can be a concatenation of gzip files,
+// each with its own header.  Reads from the GzipInflater
+// return the concatenation of the uncompressed data of each.
+// Only the first header is recorded in the GzipInflater fields.
+//
+// Gzip files store a length and checksum of the uncompressed data.
+// The GzipInflater will return a ChecksumError when Read
+// reaches the end of the uncompressed data if it does not
+// have the expected length or checksum.  Clients should treat data
+// returned by Read as tentative until they receive the successful
+// (zero length, nil error) Read marking the end of the data.
+type GzipInflater struct {
+	Comment string;	// comment
+	Extra []byte;		// "extra data"
+	Mtime uint32;		// modification time (seconds since January 1, 1970)
+	Name string;		// file name
+	OS byte;			// operating system type
+
+	r flate.Reader;
+	inflater io.Reader;
+	digest hash.Hash32;
+	size uint32;
+	flg byte;
+	buf [512]byte;
+	err os.Error;
+	eof bool;
+}
+
+func (z *GzipInflater) readHeader(save bool) os.Error
+
+// NewGzipInflater creates a new GzipInflater reading the given reader.
+// The implementation buffers input and may read more data than necessary from r.
+func NewGzipInflater(r io.Reader) (*GzipInflater, os.Error) {
+	z := new(GzipInflater);
+	z.r = makeReader(r);
+	z.digest = crc32.NewIEEE();
+	if err := z.readHeader(true); err != nil {
+		z.err = err;
+		return nil, err;
+	}
+	return z, nil;
+}
+
+func get4(p []byte) uint32 {
+	return uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24;
+}
+
+func (z *GzipInflater) readString() (string, os.Error) {
+	var err os.Error;
+	for i := 0;; i++ {
+		if i >= len(z.buf) {
+			return "", HeaderError;
+		}
+		z.buf[i], err = z.r.ReadByte();
+		if err != nil {
+			return "", err;
+		}
+		if z.buf[i] == 0 {
+			return string(z.buf[0:i]), nil;
+		}
+	}
+	panic("not reached");
+}
+
+func (z *GzipInflater) read2() (uint32, os.Error) {
+	_, err := z.r.Read(z.buf[0:2]);
+	if err != nil {
+		return 0, err;
+	}
+	return uint32(z.buf[0]) | uint32(z.buf[1])<<8, nil;
+}
+
+func (z *GzipInflater) readHeader(save bool) os.Error {
+	n, err := io.FullRead(z.r, z.buf[0:10]);
+	if err != nil {
+		if n != 0 && err == io.ErrEOF {
+			return HeaderError;
+		}
+		return err;
+	}
+	if z.buf[0] != gzipID1 || z.buf[1] != gzipID2 || z.buf[2] != gzipDeflate {
+		return HeaderError;
+	}
+	z.flg = z.buf[3];
+	if save {
+		z.Mtime = get4(z.buf[4:8]);
+		// z.buf[8] is xfl, ignored
+		z.OS = z.buf[9];
+	}
+	z.digest.Reset();
+	z.digest.Write(z.buf[0:10]);
+	
+	if z.flg & flagExtra != 0{
+		n, err := z.read2();
+		if err != nil {
+			return err;
+		}
+		data := make([]byte, n);
+		var nn int;
+		if nn, err = io.FullRead(z.r, data); err != nil {
+			return err;
+		}
+		if save {
+			z.Extra = data;
+		}
+	}
+
+	var s string;
+	if z.flg & flagName != 0 {
+		if s, err = z.readString(); err != nil {
+			return err;
+		}
+		if save {
+			z.Name = s;
+		}
+	}
+
+	if z.flg & flagComment != 0 {
+		if s, err = z.readString(); err != nil {
+			return err;
+		}
+		if save {
+			z.Comment = s;
+		}
+	}
+
+	if z.flg & flagHdrCrc != 0 {
+		n, err := z.read2();
+		if err != nil {
+			return err;
+		}
+		sum := z.digest.Sum32() & 0xFFFF;
+		if n != sum {
+			return HeaderError;
+		}
+	}
+
+	z.digest.Reset();
+	z.inflater = flate.NewInflater(z.r);
+	return nil;
+}
+
+func (z *GzipInflater) Read(p []byte) (n int, err os.Error) {
+	if z.err != nil {
+		return 0, z.err;
+	}
+	if z.eof || len(p) == 0 {
+		return 0, nil;
+	}
+
+	n, err = z.inflater.Read(p);
+	z.digest.Write(p[0:n]);
+	z.size += uint32(n);
+	if n != 0 || err != nil {
+		z.err = err;
+		return;
+	}
+
+	// Finished file; check checksum + size.
+	if _, err := io.FullRead(z.r, z.buf[0:8]); err != nil {
+		z.err = err;
+		return 0, err;
+	}
+	if err != nil {
+		z.err = err;
+		return 0, err;
+	}
+	crc32, isize := get4(z.buf[0:4]), get4(z.buf[4:8]);
+	sum := z.digest.Sum32();
+	if sum != crc32 || isize != z.size {
+		z.err = ChecksumError;
+		return 0, z.err;
+	}
+
+	// File is ok; is there another?
+	switch err = z.readHeader(false); {
+	case err == io.ErrEOF:
+		err = nil;
+		z.eof = true;
+		return;
+	case err != nil:
+		z.err = err;
+		return;
+	}
+
+	// Yes.  Reset and read from it.
+	z.digest.Reset();
+	z.size = 0;
+	return z.Read(p);
+}
+
diff --git a/src/lib/compress/gzip/gunzip_test.go b/src/lib/compress/gzip/gunzip_test.go
new file mode 100644
index 000000000..a481de927
--- /dev/null
+++ b/src/lib/compress/gzip/gunzip_test.go
@@ -0,0 +1,268 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package gzip
+
+import (
+	"compress/gzip";
+	"fmt";
+	"io";
+	"testing";
+	"os";
+)
+
+type gzipTest struct {
+	name string;
+	raw string;
+	gzip []byte;
+	err os.Error;
+}
+
+var gzipTests = []gzipTest {
+	gzipTest {	// has 1 empty fixed-huffman block
+		"empty.txt",
+		"",
+		[]byte {
+			0x1f, 0x8b, 0x08, 0x08, 0xf7, 0x5e, 0x14, 0x4a,
+			0x00, 0x03, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e,
+			0x74, 0x78, 0x74, 0x00, 0x03, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		nil
+	},
+	gzipTest {	// has 1 non-empty fixed huffman block
+		"hello.txt",
+		"hello world\n",
+		[]byte {
+			0x1f, 0x8b, 0x08, 0x08, 0xc8, 0x58, 0x13, 0x4a,
+			0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
+			0x74, 0x78, 0x74, 0x00, 0xcb, 0x48, 0xcd, 0xc9,
+			0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
+			0x02, 0x00, 0x2d, 0x3b, 0x08, 0xaf, 0x0c, 0x00,
+			0x00, 0x00,
+		},
+		nil
+	},
+	gzipTest {	// concatenation
+		"hello.txt",
+		"hello world\n"
+		"hello world\n",
+		[]byte {
+			0x1f, 0x8b, 0x08, 0x08, 0xc8, 0x58, 0x13, 0x4a,
+			0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
+			0x74, 0x78, 0x74, 0x00, 0xcb, 0x48, 0xcd, 0xc9,
+			0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
+			0x02, 0x00, 0x2d, 0x3b, 0x08, 0xaf, 0x0c, 0x00,
+			0x00, 0x00,
+			0x1f, 0x8b, 0x08, 0x08, 0xc8, 0x58, 0x13, 0x4a,
+			0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
+			0x74, 0x78, 0x74, 0x00, 0xcb, 0x48, 0xcd, 0xc9,
+			0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
+			0x02, 0x00, 0x2d, 0x3b, 0x08, 0xaf, 0x0c, 0x00,
+			0x00, 0x00,
+		},
+		nil
+	},
+	gzipTest {	// has dynamic huffman blocks
+		"gettysburg",
+		"  Four score and seven years ago our fathers brought forth on\n"
+		"this continent, a new nation, conceived in Liberty, and dedicated\n"
+		"to the proposition that all men are created equal.\n"
+		"  Now we are engaged in a great Civil War, testing whether that\n"
+		"nation, or any nation so conceived and so dedicated, can long\n"
+		"endure.\n"
+		"  We are met on a great battle-field of that war.\n"
+		"  We have come to dedicate a portion of that field, as a final\n"
+		"resting place for those who here gave their lives that that\n"
+		"nation might live.  It is altogether fitting and proper that\n"
+		"we should do this.\n"
+		"  But, in a larger sense, we can not dedicate — we can not\n"
+		"consecrate — we can not hallow — this ground.\n"
+		"  The brave men, living and dead, who struggled here, have\n"
+		"consecrated it, far above our poor power to add or detract.\n"
+		"The world will little note, nor long remember what we say here,\n"
+		"but it can never forget what they did here.\n"
+		"  It is for us the living, rather, to be dedicated here to the\n"
+		"unfinished work which they who fought here have thus far so\n"
+		"nobly advanced.  It is rather for us to be here dedicated to\n"
+		"the great task remaining before us — that from these honored\n"
+		"dead we take increased devotion to that cause for which they\n"
+		"gave the last full measure of devotion —\n"
+		"  that we here highly resolve that these dead shall not have\n"
+		"died in vain — that this nation, under God, shall have a new\n"
+		"birth of freedom — and that government of the people, by the\n"
+		"people, for the people, shall not perish from this earth.\n"
+		"\n"
+		"Abraham Lincoln, November 19, 1863, Gettysburg, Pennsylvania\n",
+		[]byte {
+			0x1f, 0x8b, 0x08, 0x08, 0xd1, 0x12, 0x2b, 0x4a,
+			0x00, 0x03, 0x67, 0x65, 0x74, 0x74, 0x79, 0x73,
+			0x62, 0x75, 0x72, 0x67, 0x00, 0x65, 0x54, 0xcd,
+			0x6e, 0xd4, 0x30, 0x10, 0xbe, 0xfb, 0x29, 0xe6,
+			0x01, 0x42, 0xa5, 0x0a, 0x09, 0xc1, 0x11, 0x90,
+			0x40, 0x48, 0xa8, 0xe2, 0x80, 0xd4, 0xf3, 0x24,
+			0x9e, 0x24, 0x56, 0xbd, 0x9e, 0xc5, 0x76, 0x76,
+			0x95, 0x1b, 0x0f, 0xc1, 0x13, 0xf2, 0x24, 0x7c,
+			0x63, 0x77, 0x9b, 0x4a, 0x5c, 0xaa, 0x6e, 0x6c,
+			0xcf, 0x7c, 0x7f, 0x33, 0x44, 0x5f, 0x74, 0xcb,
+			0x54, 0x26, 0xcd, 0x42, 0x9c, 0x3c, 0x15, 0xb9,
+			0x48, 0xa2, 0x5d, 0x38, 0x17, 0xe2, 0x45, 0xc9,
+			0x4e, 0x67, 0xae, 0xab, 0xe0, 0xf7, 0x98, 0x75,
+			0x5b, 0xd6, 0x4a, 0xb3, 0xe6, 0xba, 0x92, 0x26,
+			0x57, 0xd7, 0x50, 0x68, 0xd2, 0x54, 0x43, 0x92,
+			0x54, 0x07, 0x62, 0x4a, 0x72, 0xa5, 0xc4, 0x35,
+			0x68, 0x1a, 0xec, 0x60, 0x92, 0x70, 0x11, 0x4f,
+			0x21, 0xd1, 0xf7, 0x30, 0x4a, 0xae, 0xfb, 0xd0,
+			0x9a, 0x78, 0xf1, 0x61, 0xe2, 0x2a, 0xde, 0x55,
+			0x25, 0xd4, 0xa6, 0x73, 0xd6, 0xb3, 0x96, 0x60,
+			0xef, 0xf0, 0x9b, 0x2b, 0x71, 0x8c, 0x74, 0x02,
+			0x10, 0x06, 0xac, 0x29, 0x8b, 0xdd, 0x25, 0xf9,
+			0xb5, 0x71, 0xbc, 0x73, 0x44, 0x0f, 0x7a, 0xa5,
+			0xab, 0xb4, 0x33, 0x49, 0x0b, 0x2f, 0xbd, 0x03,
+			0xd3, 0x62, 0x17, 0xe9, 0x73, 0xb8, 0x84, 0x48,
+			0x8f, 0x9c, 0x07, 0xaa, 0x52, 0x00, 0x6d, 0xa1,
+			0xeb, 0x2a, 0xc6, 0xa0, 0x95, 0x76, 0x37, 0x78,
+			0x9a, 0x81, 0x65, 0x7f, 0x46, 0x4b, 0x45, 0x5f,
+			0xe1, 0x6d, 0x42, 0xe8, 0x01, 0x13, 0x5c, 0x38,
+			0x51, 0xd4, 0xb4, 0x38, 0x49, 0x7e, 0xcb, 0x62,
+			0x28, 0x1e, 0x3b, 0x82, 0x93, 0x54, 0x48, 0xf1,
+			0xd2, 0x7d, 0xe4, 0x5a, 0xa3, 0xbc, 0x99, 0x83,
+			0x44, 0x4f, 0x3a, 0x77, 0x36, 0x57, 0xce, 0xcf,
+			0x2f, 0x56, 0xbe, 0x80, 0x90, 0x9e, 0x84, 0xea,
+			0x51, 0x1f, 0x8f, 0xcf, 0x90, 0xd4, 0x60, 0xdc,
+			0x5e, 0xb4, 0xf7, 0x10, 0x0b, 0x26, 0xe0, 0xff,
+			0xc4, 0xd1, 0xe5, 0x67, 0x2e, 0xe7, 0xc8, 0x93,
+			0x98, 0x05, 0xb8, 0xa8, 0x45, 0xc0, 0x4d, 0x09,
+			0xdc, 0x84, 0x16, 0x2b, 0x0d, 0x9a, 0x21, 0x53,
+			0x04, 0x8b, 0xd2, 0x0b, 0xbd, 0xa2, 0x4c, 0xa7,
+			0x60, 0xee, 0xd9, 0xe1, 0x1d, 0xd1, 0xb7, 0x4a,
+			0x30, 0x8f, 0x63, 0xd5, 0xa5, 0x8b, 0x33, 0x87,
+			0xda, 0x1a, 0x18, 0x79, 0xf3, 0xe3, 0xa6, 0x17,
+			0x94, 0x2e, 0xab, 0x6e, 0xa0, 0xe3, 0xcd, 0xac,
+			0x50, 0x8c, 0xca, 0xa7, 0x0d, 0x76, 0x37, 0xd1,
+			0x23, 0xe7, 0x05, 0x57, 0x8b, 0xa4, 0x22, 0x83,
+			0xd9, 0x62, 0x52, 0x25, 0xad, 0x07, 0xbb, 0xbf,
+			0xbf, 0xff, 0xbc, 0xfa, 0xee, 0x20, 0x73, 0x91,
+			0x29, 0xff, 0x7f, 0x02, 0x71, 0x62, 0x84, 0xb5,
+			0xf6, 0xb5, 0x25, 0x6b, 0x41, 0xde, 0x92, 0xb7,
+			0x76, 0x3f, 0x91, 0x91, 0x31, 0x1b, 0x41, 0x84,
+			0x62, 0x30, 0x0a, 0x37, 0xa4, 0x5e, 0x18, 0x3a,
+			0x99, 0x08, 0xa5, 0xe6, 0x6d, 0x59, 0x22, 0xec,
+			0x33, 0x39, 0x86, 0x26, 0xf5, 0xab, 0x66, 0xc8,
+			0x08, 0x20, 0xcf, 0x0c, 0xd7, 0x47, 0x45, 0x21,
+			0x0b, 0xf6, 0x59, 0xd5, 0xfe, 0x5c, 0x8d, 0xaa,
+			0x12, 0x7b, 0x6f, 0xa1, 0xf0, 0x52, 0x33, 0x4f,
+			0xf5, 0xce, 0x59, 0xd3, 0xab, 0x66, 0x10, 0xbf,
+			0x06, 0xc4, 0x31, 0x06, 0x73, 0xd6, 0x80, 0xa2,
+			0x78, 0xc2, 0x45, 0xcb, 0x03, 0x65, 0x39, 0xc9,
+			0x09, 0xd1, 0x06, 0x04, 0x33, 0x1a, 0x5a, 0xf1,
+			0xde, 0x01, 0xb8, 0x71, 0x83, 0xc4, 0xb5, 0xb3,
+			0xc3, 0x54, 0x65, 0x33, 0x0d, 0x5a, 0xf7, 0x9b,
+			0x90, 0x7c, 0x27, 0x1f, 0x3a, 0x58, 0xa3, 0xd8,
+			0xfd, 0x30, 0x5f, 0xb7, 0xd2, 0x66, 0xa2, 0x93,
+			0x1c, 0x28, 0xb7, 0xe9, 0x1b, 0x0c, 0xe1, 0x28,
+			0x47, 0x26, 0xbb, 0xe9, 0x7d, 0x7e, 0xdc, 0x96,
+			0x10, 0x92, 0x50, 0x56, 0x7c, 0x06, 0xe2, 0x27,
+			0xb4, 0x08, 0xd3, 0xda, 0x7b, 0x98, 0x34, 0x73,
+			0x9f, 0xdb, 0xf6, 0x62, 0xed, 0x31, 0x41, 0x13,
+			0xd3, 0xa2, 0xa8, 0x4b, 0x3a, 0xc6, 0x1d, 0xe4,
+			0x2f, 0x8c, 0xf8, 0xfb, 0x97, 0x64, 0xf4, 0xb6,
+			0x2f, 0x80, 0x5a, 0xf3, 0x56, 0xe0, 0x40, 0x50,
+			0xd5, 0x19, 0xd0, 0x1e, 0xfc, 0xca, 0xe5, 0xc9,
+			0xd4, 0x60, 0x00, 0x81, 0x2e, 0xa3, 0xcc, 0xb6,
+			0x52, 0xf0, 0xb4, 0xdb, 0x69, 0x99, 0xce, 0x7a,
+			0x32, 0x4c, 0x08, 0xed, 0xaa, 0x10, 0x10, 0xe3,
+			0x6f, 0xee, 0x99, 0x68, 0x95, 0x9f, 0x04, 0x71,
+			0xb2, 0x49, 0x2f, 0x62, 0xa6, 0x5e, 0xb4, 0xef,
+			0x02, 0xed, 0x4f, 0x27, 0xde, 0x4a, 0x0f, 0xfd,
+			0xc1, 0xcc, 0xdd, 0x02, 0x8f, 0x08, 0x16, 0x54,
+			0xdf, 0xda, 0xca, 0xe0, 0x82, 0xf1, 0xb4, 0x31,
+			0x7a, 0xa9, 0x81, 0xfe, 0x90, 0xb7, 0x3e, 0xdb,
+			0xd3, 0x35, 0xc0, 0x20, 0x80, 0x33, 0x46, 0x4a,
+			0x63, 0xab, 0xd1, 0x0d, 0x29, 0xd2, 0xe2, 0x84,
+			0xb8, 0xdb, 0xfa, 0xe9, 0x89, 0x44, 0x86, 0x7c,
+			0xe8, 0x0b, 0xe6, 0x02, 0x6a, 0x07, 0x9b, 0x96,
+			0xd0, 0xdb, 0x2e, 0x41, 0x4c, 0xa1, 0xd5, 0x57,
+			0x45, 0x14, 0xfb, 0xe3, 0xa6, 0x72, 0x5b, 0x87,
+			0x6e, 0x0c, 0x6d, 0x5b, 0xce, 0xe0, 0x2f, 0xe2,
+			0x21, 0x81, 0x95, 0xb0, 0xe8, 0xb6, 0x32, 0x0b,
+			0xb2, 0x98, 0x13, 0x52, 0x5d, 0xfb, 0xec, 0x63,
+			0x17, 0x8a, 0x9e, 0x23, 0x22, 0x36, 0xee, 0xcd,
+			0xda, 0xdb, 0xcf, 0x3e, 0xf1, 0xc7, 0xf1, 0x01,
+			0x12, 0x93, 0x0a, 0xeb, 0x6f, 0xf2, 0x02, 0x15,
+			0x96, 0x77, 0x5d, 0xef, 0x9c, 0xfb, 0x88, 0x91,
+			0x59, 0xf9, 0x84, 0xdd, 0x9b, 0x26, 0x8d, 0x80,
+			0xf9, 0x80, 0x66, 0x2d, 0xac, 0xf7, 0x1f, 0x06,
+			0xba, 0x7f, 0xff, 0xee, 0xed, 0x40, 0x5f, 0xa5,
+			0xd6, 0xbd, 0x8c, 0x5b, 0x46, 0xd2, 0x7e, 0x48,
+			0x4a, 0x65, 0x8f, 0x08, 0x42, 0x60, 0xf7, 0x0f,
+			0xb9, 0x16, 0x0b, 0x0c, 0x1a, 0x06, 0x00, 0x00,
+		},
+		nil
+	},
+	gzipTest {	// has 1 non-empty fixed huffman block then garbage
+		"hello.txt",
+		"hello world\n",
+		[]byte {
+			0x1f, 0x8b, 0x08, 0x08, 0xc8, 0x58, 0x13, 0x4a,
+			0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
+			0x74, 0x78, 0x74, 0x00, 0xcb, 0x48, 0xcd, 0xc9,
+			0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
+			0x02, 0x00, 0x2d, 0x3b, 0x08, 0xaf, 0x0c, 0x00,
+			0x00, 0x00, 'g', 'a', 'r', 'b', 'a', 'g', 'e', '!',
+		},
+		HeaderError,
+	},
+	gzipTest {	// has 1 non-empty fixed huffman block but corrupt checksum
+		"hello.txt",
+		"hello world\n",
+		[]byte {
+			0x1f, 0x8b, 0x08, 0x08, 0xc8, 0x58, 0x13, 0x4a,
+			0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
+			0x74, 0x78, 0x74, 0x00, 0xcb, 0x48, 0xcd, 0xc9,
+			0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
+			0x02, 0x00, 0xff, 0xff, 0xff, 0xff, 0x0c, 0x00,
+			0x00, 0x00,
+		},
+		ChecksumError,
+	},
+	gzipTest {	// has 1 non-empty fixed huffman block but corrupt size
+		"hello.txt",
+		"hello world\n",
+		[]byte {
+			0x1f, 0x8b, 0x08, 0x08, 0xc8, 0x58, 0x13, 0x4a,
+			0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
+			0x74, 0x78, 0x74, 0x00, 0xcb, 0x48, 0xcd, 0xc9,
+			0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
+			0x02, 0x00, 0x2d, 0x3b, 0x08, 0xaf, 0xff, 0x00,
+			0x00, 0x00,
+		},
+		ChecksumError,
+	},
+}
+
+func TestGzipInflater(t *testing.T) {
+	b := new(io.ByteBuffer);
+	for i, tt := range gzipTests {
+		in := io.NewByteReader(tt.gzip);
+		gzip, err := NewGzipInflater(in);
+		if err != nil {
+			t.Errorf("%s: NewGzipInflater: %s", tt.name, err);
+			continue;
+		}
+		if tt.name != gzip.Name {
+			t.Errorf("%s: got name %s", tt.name, gzip.Name);
+		}
+		b.Reset();
+		n, err := io.Copy(gzip, b);
+		if err != tt.err {
+			t.Errorf("%s: io.Copy: %s want %s", tt.name, err, tt.err);
+		}
+		s := string(b.Data());
+		if s != tt.raw {
+			t.Errorf("%s: got %d-byte %q want %d-byte %q", tt.name, n, s, len(tt.raw), tt.raw);
+		}
+	}
+}
+