Replace the GNU gzip with a slightly modified NetBSD gzip. The

NetBSD version is a feature-to-feature re-implementation of GNU
gzip using the freely-redistributable zlib and this version is
expected to be mostly bug-to-bug compatible with the GNU
implementation.

 - Because this is a piece of mature code and we want to make
   changes so it is added directly rather than importing to
   src/contrib.
 - Connect newly added code to src/usr.bin/ and rescue/rescue
   build.
 - Disconnect the GNU gzip code from build for now, they will
   be eventually removed completely.
 - Provide two new src.conf(5) knobs, WITHOUT_BZIP2_SUPPORT and
   WITHOUT_BZIP2.

Tested by:	kris (full exp-7 pointyhat build)
Approved by:	core (importing a 4-clause BSD licensed file)
Approved by:	re (adding new utility during -HEAD code slush)

17 files changed, 3988 insertions, 0 deletions

diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile
new file mode 100644
index 0000000..0125d61
--- /dev/null
+++ b/usr.bin/gzip/Makefile
@@ -0,0 +1,36 @@
+#	$NetBSD: Makefile,v 1.10 2006/05/12 02:01:15 mrg Exp $
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+PROG=		gzip
+MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
+
+DPADD=		${LIBZ}
+LDADD=		-lz
+WARNS?=		6
+
+.if ${MK_BZIP2_SUPPORT} != "no"
+DPADD+=		${LIBBZ2}
+LDADD+=		-lbz2
+.else
+CFLAGS+=	-DNO_BZIP2_SUPPORT
+.endif
+
+SCRIPTS=	gzexe zdiff zforce zgrep zmore znew
+
+MLINKS+=	gzip.1 gunzip.1 \
+		gzip.1 gzcat.1 \
+		gzip.1 zcat.1 \
+		zdiff.1 zcmp.1 \
+		zgrep.1 zegrep.1 \
+		zgrep.1 zfgrep.1
+
+LINKS+=		${BINDIR}/gzip ${BINDIR}/gunzip \
+		${BINDIR}/gzip ${BINDIR}/gzcat \
+		${BINDIR}/gzip ${BINDIR}/zcat \
+		${BINDIR}/zdiff ${BINDIR}/zcmp \
+		${BINDIR}/zgrep ${BINDIR}/zegrep \
+		${BINDIR}/zgrep ${BINDIR}/zfgrep
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/gzip/gzexe b/usr.bin/gzip/gzexe
new file mode 100644
index 0000000..5f5424e
--- /dev/null
+++ b/usr.bin/gzip/gzexe
@@ -0,0 +1,179 @@
+#!/bin/sh -
+#
+# $NetBSD: gzexe,v 1.3 2004/05/01 08:22:41 wiz Exp $
+# $OpenBSD: gzexe,v 1.3 2003/08/05 18:22:17 deraadt Exp $
+#
+#-
+#  Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
+#
+#  Permission to use, copy, modify, and distribute this software for any
+#  purpose with or without fee is hereby granted, provided that the above
+#  copyright notice and this permission notice appear in all copies.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+#  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+#  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+#  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+#  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+#  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# $FreeBSD$
+
+# The number of lines plus one in the on-the-fly decompression script
+lines=19
+
+# A simple string to recognize already compressed files
+magic="# compressed by gzexe"
+
+# Write the decompression script to stdout
+header () {
+	# first section needs variable expansion, second not
+	cat <<- EOF
+		#!/bin/sh -
+		$magic
+		lines=$lines
+	EOF
+	cat <<- 'EOF'
+		prog=`/usr/bin/basename "$0"`
+		tmp=`/usr/bin/mktemp -d /tmp/gzexeXXXXXXXXXX` || {
+			/bin/echo "$prog: cannot create tmp dir"; exit 1
+		}
+		trap '/bin/rm -rf "$tmp"' 0
+		if /usr/bin/tail +$lines "$0" |
+		    /usr/bin/gzip -dc > "$tmp/$prog" 2> /dev/null; then
+			/bin/chmod u+x "$tmp/$prog"
+			"$tmp/$prog" ${1+"$@"}
+			ret=$?
+		else
+			/bin/echo "$prog: cannot decompress $0"
+			ret=1
+		fi
+		exit $ret
+	EOF
+}
+
+# Test if a file is compressed by checking the magic line
+compressed () {
+	test "X`sed -n 2p "$1" 2> /dev/null`" = "X$magic"
+}
+
+# Decompress a file
+decompress () {
+	tmp=`mktemp /tmp/gzexeXXXXXXXXXX` || {
+		echo "$prog: cannot create tmp file"
+		return 1
+	}
+	if ! cp "$1" "$tmp"; then
+		echo "$prog: cannot copy $1 to $tmp"
+		rm -f "$tmp"
+		return 1
+	fi
+	if ! tail +$lines "$tmp" | gzip -vdc > "$1"; then
+		echo "$prog: cannot decompress $1"
+		cp "$tmp" "$1"
+		rm -f "$tmp"
+		return 1
+	fi
+}
+
+# Perform some sanity checks on the file
+check () {
+	if test ! -e "$1"; then
+		echo "$prog: cannot compress non-existing file $1"
+		return 1
+	fi
+
+	if test ! -f "$1"; then
+		echo "$prog: cannot compress non-regular file $1"
+		return 1
+	fi
+
+	case `basename "$1"` in
+		sh | mktemp | rm | echo | tail | gzip | chmod)
+			echo "$prog: cannot compress $1, I depend on it"
+			return 1
+	esac
+
+	if test ! -x "$1"; then
+		echo "$prog: cannot compress $1, it is not executable"
+		return 1
+	fi
+
+	if test -u "$1" -o -g "$1"; then
+		echo "$prog: cannot compress $1, it has an s bit set"
+		return 1
+	fi
+}
+
+# Compress a file
+compress () {
+	tmp=`mktemp /tmp/gzexeXXXXXXXXXX` || {
+		echo "$prog: cannot create tmp file"
+		return 1
+	}
+	if ! cp "$1" "$tmp"; then
+		echo "$prog: cannot copy $1 to $tmp"
+		rm -f "$tmp"
+		return 1
+	fi
+	if ! cp "$1" "$1"~; then
+		echo "$prog: cannot create backup copy $1~"
+		rm -f "$1"~ "$tmp"
+		return 1
+	fi
+
+	# Use cp to overwrite the existing file preserving mode and owner
+	# if possible. If the file is not writable, this will produce an
+	# error.
+
+	if header "$1" > "$tmp" && gzip -vc "$1" >> "$tmp"; then
+		if ! cp "$tmp" "$1"; then
+			echo "$prog: cannot copy $tmp to $1"
+			rm -f "$tmp"
+			return 1
+		fi
+	else
+		echo "$prog: cannot compress $1"
+		rm -f "$1"~ "$tmp"
+		return 1
+	fi
+}
+
+# Is the -d flag specified?
+dflag=
+
+# Return value
+rc=0
+
+if test "X$1" = X-d; then
+	dflag=1
+	shift
+fi
+
+prog=`basename "$0"`
+USAGE="usage: $prog [-d] file ..."
+if test $# -eq 0; then
+	echo $USAGE
+	exit 1
+fi
+
+while test $# -ne 0; do
+	if test $dflag; then
+		if ! compressed "$1"; then
+			echo "$prog: $1 is not compressed"
+			rc=1;
+		elif ! decompress "$1"; then
+			rc=$?
+		fi
+	else
+		if compressed "$1"; then
+			echo "$prog: $1 is already compressed"
+			rc=1;
+		elif ! check "$1" || ! compress "$1"; then
+			rc=$?
+		fi
+	fi
+	shift
+done
+exit $rc
diff --git a/usr.bin/gzip/gzexe.1 b/usr.bin/gzip/gzexe.1
new file mode 100644
index 0000000..0195037
--- /dev/null
+++ b/usr.bin/gzip/gzexe.1
@@ -0,0 +1,73 @@
+.\"	$NetBSD: gzexe.1,v 1.3 2003/12/28 12:49:41 wiz Exp $
+.\"	$OpenBSD: gzexe.1,v 1.1 2003/07/31 07:32:47 otto Exp $
+.\"
+.\" Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" $FreeBSD$
+.Dd January 26, 2007
+.Dt GZEXE 1
+.Os
+.Sh NAME
+.Nm gzexe
+.Nd create auto-decompressing executables
+.Sh SYNOPSIS
+.Nm gzexe
+.Op Fl d
+.Ar
+.Sh DESCRIPTION
+The
+.Nm
+utility uses
+.Xr gzip 1
+to compress executables, producing executables that decompress on-the-fly
+when executed.
+This saves disk space, at the cost of slower execution times.
+The original executables are saved by copying each of them to a file with
+the same name with a
+.Sq ~
+suffix appended.
+After verifying that the compressed executables work as expected, the backup
+files can be removed.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl d
+Decompress executables previously compressed by
+.Nm .
+.El
+.Pp
+The
+.Nm
+program refuses to compress non-regular or non-executable files,
+files with a setuid or setgid bit set, files that are already
+compressed using
+.Nm
+or programs it needs to perform on-the-fly decompression:
+.Xr sh 1 ,
+.Xr mktemp 1 ,
+.Xr rm 1 ,
+.Xr echo 1 ,
+.Xr tail 1 ,
+.Xr gzip 1 ,
+and
+.Xr chmod 1 .
+.Sh SEE ALSO
+.Xr gzip 1
+.Sh CAVEATS
+The
+.Nm
+utility replaces files by overwriting them with the generated
+compressed executable.
+To be able to do this, it is required that the original files are writable.
diff --git a/usr.bin/gzip/gzip.1 b/usr.bin/gzip/gzip.1
new file mode 100644
index 0000000..b9f3a3b
--- /dev/null
+++ b/usr.bin/gzip/gzip.1
@@ -0,0 +1,202 @@
+.\"	$NetBSD: gzip.1,v 1.18 2005/09/30 13:46:56 wiz Exp $
+.\"
+.\" Copyright (c) 1997, 2003, 2004 Matthew R. Green
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.Dd January 26, 2007
+.Dt GZIP 1
+.Os
+.Sh NAME
+.Nm gzip
+.Nd compression/decompression tool using Lempel-Ziv coding (LZ77)
+.Sh SYNOPSIS
+.Nm
+.Op Fl cdfhLlNnqrtVv
+.Op Fl S Ar suffix
+.Ar file
+.Oo
+.Ar file Oo ...
+.Oc
+.Oc
+.Nm gunzip
+.Op Fl cfhLNqrtVv
+.Op Fl S Ar suffix
+.Ar file
+.Oo
+.Ar file Oo ...
+.Oc
+.Oc
+.Nm zcat
+.Op Fl fhV
+.Ar file
+.Oo
+.Ar file Oo ...
+.Oc
+.Oc
+.Sh DESCRIPTION
+The
+.Nm
+program compresses and decompresses files using Lempel-Ziv coding
+(LZ77).
+If no
+.Ar files
+are specified,
+.Nm
+will compress from standard input, or decompress to standard output.
+When in compression mode, each
+.Ar file
+will be replaced with another file with the suffix, set by the
+.Fl S Ar suffix
+option, added, if possible.
+In decompression mode, each
+.Ar file
+will be checked for existence, as will the file with the suffix
+added.
+.Pp
+If invoked as
+.Nm gunzip
+then the
+.Fl d
+option is enabled.
+If invoked as
+.Nm zcat
+or
+.Nm gzcat
+then both the
+.Fl c
+and
+.Fl d
+options are enabled.
+.Pp
+This version of
+.Nm
+is also capable of decompressing files compressed using
+.Xr compress 1
+or
+.Xr bzip2 1 .
+.Sh OPTIONS
+The following options are available:
+.Bl -tag -width XXrXXXrecursiveX
+.It Fl 1 , -fast
+.It Fl 2 , 3 , 4 , 5 , 6 , 7 , 8
+.It Fl 9 , -best
+These options change the compression level used, with the
+.Fl 1
+option being the fastest, with less compression, and the
+.Fl 9
+option being the slowest, with optimal compression.
+The default compression level is 6.
+.It Fl c , -stdout , -to-stdout
+This option specifies that output will go to the standard output
+stream, leaving files intact.
+.It Fl d , -decompress , -uncompress
+This option selects decompression rather than compression.
+.It Fl f , -force
+This option turns on force mode.
+This allows files with multiple links, overwriting of pre-existing
+files, reading from or writing to a terminal, and when combined
+with the
+.Fl c
+option, allowing non-compressed data to pass through unchanged.
+.It Fl h , -help
+This option prints a usage summary and exits.
+.It Fl L , -license
+This option prints
+.Nm
+license.
+.It Fl l , -list
+This option displays information about the file's compressed and
+uncompressed size, ratio, uncompressed name.
+With the
+.Fl v
+option, it also displays the compression method, CRC, date and time
+embedded in the file.
+.It Fl N , -name
+This option causes the stored filename in the input file to be used
+as the output file.
+.It Fl n , -no-name
+This option stops the filename from being stored in the output
+file.
+.It Fl q , -quiet
+With this option, no warnings or errors are printed.
+.It Fl r , -recursive
+This option is used to
+.Nm
+the files in a directory tree individually, using the
+.Xr fts 3
+library.
+.It Fl S Ar suffix , Fl -suffix Ar suffix
+This option changes the default suffix from .gz to
+.Ar suffix .
+.It Fl t , -test
+This option will test compressed files for integrity.
+.It Fl V , -version
+This option prints the version of the
+.Nm
+program.
+.It Fl v , -verbose
+This option turns on verbose mode, which prints the compression
+ratio for each file compressed.
+.El
+.Sh ENVIRONMENT
+If the environment variable
+.Ev GZIP
+is set, it is parsed as a white-space separated list of options
+handled before any options on the command line.
+Options on the command line will override anything in
+.Ev GZIP .
+.Sh SEE ALSO
+.Xr bzip2 1 ,
+.Xr compress 1 ,
+.Xr fts 3 ,
+.Xr zlib 3
+.Sh HISTORY
+The
+.Nm
+program was originally written by Jean-loup Gailly, licensed under
+the GNU Public Licence.
+Matthew R. Green wrote a simple front end for
+.Nx 1.3
+distribution media, based on the freely re-distributable zlib library.
+It was enhanced to be mostly feature-compatible with the original
+GNU
+.Nm
+program for
+.Nx 2.0 .
+.Pp
+This implementation of
+.Nm
+was ported based on the
+.Nx
+.Nm
+20060927, and first appeared in
+.Fx 7.0 .
+.Sh AUTHORS
+This implementation of
+.Nm
+was written by
+.An Matthew R. Green Aq mrg@eterna.com.au .
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
new file mode 100644
index 0000000..7a39696
--- /dev/null
+++ b/usr.bin/gzip/gzip.c
@@ -0,0 +1,2054 @@
+/*	$NetBSD: gzip.c,v 1.89 2006/11/13 21:57:59 mrg Exp $	*/
+
+/*-
+ * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green\n\
+     All rights reserved.\n");
+__RCSID("$FreeBSD$");
+#endif /* not lint */
+
+/*
+ * gzip.c -- GPL free gzip using zlib.
+ *
+ * RFC 1950 covers the zlib format
+ * RFC 1951 covers the deflate format
+ * RFC 1952 covers the gzip format
+ *
+ * TODO:
+ *	- use mmap where possible
+ *	- handle some signals better (remove outfile?)
+ *	- make bzip2/compress -v/-t/-l support work as well as possible
+ */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include <inttypes.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <zlib.h>
+#include <fts.h>
+#include <libgen.h>
+#include <stdarg.h>
+#include <getopt.h>
+#include <time.h>
+
+#ifndef PRIdOFF
+#define PRIdOFF PRId64
+#endif
+
+/* what type of file are we dealing with */
+enum filetype {
+	FT_GZIP,
+#ifndef NO_BZIP2_SUPPORT
+	FT_BZIP2,
+#endif
+#ifndef NO_COMPRESS_SUPPORT
+	FT_Z,
+#endif
+	FT_LAST,
+	FT_UNKNOWN
+};
+
+#ifndef NO_BZIP2_SUPPORT
+#include <bzlib.h>
+
+#define BZ2_SUFFIX	".bz2"
+#define BZIP2_MAGIC	"\102\132\150"
+#endif
+
+#ifndef NO_COMPRESS_SUPPORT
+#define Z_SUFFIX	".Z"
+#define Z_MAGIC		"\037\235"
+#endif
+
+#define GZ_SUFFIX	".gz"
+
+#define BUFLEN		(64 * 1024)
+
+#define GZIP_MAGIC0	0x1F
+#define GZIP_MAGIC1	0x8B
+#define GZIP_OMAGIC1	0x9E
+
+#define GZIP_TIMESTAMP	(off_t)4
+#define GZIP_ORIGNAME	(off_t)10
+
+#define HEAD_CRC	0x02
+#define EXTRA_FIELD	0x04
+#define ORIG_NAME	0x08
+#define COMMENT		0x10
+
+#define OS_CODE		3	/* Unix */
+
+typedef struct {
+    const char	*zipped;
+    int		ziplen;
+    const char	*normal;	/* for unzip - must not be longer than zipped */
+} suffixes_t;
+static suffixes_t suffixes[] = {
+#define	SUFFIX(Z, N) {Z, sizeof Z - 1, N}
+	SUFFIX(GZ_SUFFIX,	""),	/* Overwritten by -S .xxx */
+#ifndef SMALL
+	SUFFIX(GZ_SUFFIX,	""),
+	SUFFIX(".z",		""),
+	SUFFIX("-gz",		""),
+	SUFFIX("-z",		""),
+	SUFFIX("_z",		""),
+	SUFFIX(".taz",		".tar"),
+	SUFFIX(".tgz",		".tar"),
+#ifndef NO_BZIP2_SUPPORT
+	SUFFIX(BZ2_SUFFIX,	""),
+#endif
+#ifndef NO_COMPRESS_SUPPORT
+	SUFFIX(Z_SUFFIX,	""),
+#endif
+	SUFFIX(GZ_SUFFIX,	""),	/* Overwritten by -S "" */
+#endif /* SMALL */
+#undef SUFFIX
+};
+#define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
+
+static	const char	gzip_version[] = "FreeBSD gzip 20070126";
+
+#ifndef SMALL
+static	const char	gzip_copyright[] = \
+"   Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green\n"
+"   All rights reserved.\n"
+"\n"
+"   Redistribution and use in source and binary forms, with or without\n"
+"   modification, are permitted provided that the following conditions\n"
+"   are met:\n"
+"   1. Redistributions of source code must retain the above copyright\n"
+"      notice, this list of conditions and the following disclaimer.\n"
+"   2. Redistributions in binary form must reproduce the above copyright\n"
+"      notice, this list of conditions and the following disclaimer in the\n"
+"      documentation and/or other materials provided with the distribution.\n"
+"   3. The name of the author may not be used to endorse or promote products\n"
+"      derived from this software without specific prior written permission.\n"
+"\n"
+"   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n"
+"   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n"
+"   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n"
+"   IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n"
+"   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n"
+"   BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n"
+"   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED\n"
+"   AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n"
+"   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n"
+"   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n"
+"   SUCH DAMAGE.";
+#endif
+
+static	int	cflag;			/* stdout mode */
+static	int	dflag;			/* decompress mode */
+static	int	lflag;			/* list mode */
+static	int	numflag = 6;		/* gzip -1..-9 value */
+
+#ifndef SMALL
+static	int	fflag;			/* force mode */
+static	int	nflag;			/* don't save name/timestamp */
+static	int	Nflag;			/* don't restore name/timestamp */
+static	int	qflag;			/* quiet mode */
+static	int	rflag;			/* recursive mode */
+static	int	tflag;			/* test */
+static	int	vflag;			/* verbose mode */
+#else
+#define		qflag	0
+#define		tflag	0
+#endif
+
+static	int	exit_value = 0;		/* exit value */
+
+static	char	*infile;		/* name of file coming in */
+
+static	void	maybe_err(const char *fmt, ...)
+    __attribute__((__format__(__printf__, 1, 2)));
+#ifndef NO_BZIP2_SUPPORT
+static	void	maybe_errx(const char *fmt, ...)
+    __attribute__((__format__(__printf__, 1, 2)));
+#endif
+static	void	maybe_warn(const char *fmt, ...)
+    __attribute__((__format__(__printf__, 1, 2)));
+static	void	maybe_warnx(const char *fmt, ...)
+    __attribute__((__format__(__printf__, 1, 2)));
+static	enum filetype file_gettype(u_char *);
+#ifdef SMALL
+#define gz_compress(if, of, sz, fn, tm) gz_compress(if, of, sz)
+#endif
+static	off_t	gz_compress(int, int, off_t *, const char *, uint32_t);
+static	off_t	gz_uncompress(int, int, char *, size_t, off_t *, const char *);
+static	off_t	file_compress(char *, char *, size_t);
+static	off_t	file_uncompress(char *, char *, size_t);
+static	void	handle_pathname(char *);
+static	void	handle_file(char *, struct stat *);
+static	void	handle_stdin(void);
+static	void	handle_stdout(void);
+static	void	print_ratio(off_t, off_t, FILE *);
+static	void	print_list(int fd, off_t, const char *, time_t);
+static	void	usage(void);
+static	void	display_version(void);
+#ifndef SMALL
+static	void	display_license(void);
+#endif
+static	const suffixes_t *check_suffix(char *, int);
+static	ssize_t	read_retry(int, void *, size_t);
+
+#ifdef SMALL
+#define unlink_input(f, sb) unlink(f)
+#else
+static	off_t	cat_fd(unsigned char *, size_t, off_t *, int fd);
+static	void	prepend_gzip(char *, int *, char ***);
+static	void	handle_dir(char *);
+static	void	print_verbage(const char *, const char *, off_t, off_t);
+static	void	print_test(const char *, int);
+static	void	copymodes(int fd, const struct stat *, const char *file);
+static	int	check_outfile(const char *outfile);
+#endif
+
+#ifndef NO_BZIP2_SUPPORT
+static	off_t	unbzip2(int, int, char *, size_t, off_t *);
+#endif
+
+#ifndef NO_COMPRESS_SUPPORT
+static	FILE 	*zdopen(int);
+static	off_t	zuncompress(FILE *, FILE *, char *, size_t, off_t *);
+#endif
+
+int main(int, char **p);
+
+#ifdef SMALL
+#define getopt_long(a,b,c,d,e) getopt(a,b,c)
+#else
+static const struct option longopts[] = {
+	{ "stdout",		no_argument,		0,	'c' },
+	{ "to-stdout",		no_argument,		0,	'c' },
+	{ "decompress",		no_argument,		0,	'd' },
+	{ "uncompress",		no_argument,		0,	'd' },
+	{ "force",		no_argument,		0,	'f' },
+	{ "help",		no_argument,		0,	'h' },
+	{ "list",		no_argument,		0,	'l' },
+	{ "no-name",		no_argument,		0,	'n' },
+	{ "name",		no_argument,		0,	'N' },
+	{ "quiet",		no_argument,		0,	'q' },
+	{ "recursive",		no_argument,		0,	'r' },
+	{ "suffix",		required_argument,	0,	'S' },
+	{ "test",		no_argument,		0,	't' },
+	{ "verbose",		no_argument,		0,	'v' },
+	{ "version",		no_argument,		0,	'V' },
+	{ "fast",		no_argument,		0,	'1' },
+	{ "best",		no_argument,		0,	'9' },
+	{ "ascii",		no_argument,		0,	'a' },
+	{ "license",		no_argument,		0,	'L' },
+	{ NULL,			no_argument,		0,	0 },
+};
+#endif
+
+int
+main(int argc, char **argv)
+{
+	const char *progname = getprogname();
+#ifndef SMALL
+	char *gzip;
+	int len;
+#endif
+	int ch;
+
+	/* XXX set up signals */
+
+#ifndef SMALL
+	if ((gzip = getenv("GZIP")) != NULL)
+		prepend_gzip(gzip, &argc, &argv);
+#endif
+
+	/*
+	 * XXX
+	 * handle being called `gunzip', `zcat' and `gzcat'
+	 */
+	if (strcmp(progname, "gunzip") == 0)
+		dflag = 1;
+	else if (strcmp(progname, "zcat") == 0 ||
+		 strcmp(progname, "gzcat") == 0)
+		dflag = cflag = 1;
+
+#ifdef SMALL
+#define OPT_LIST "123456789cdhltV"
+#else
+#define OPT_LIST "123456789acdfhlLNnqrS:tVv"
+#endif
+
+	while ((ch = getopt_long(argc, argv, OPT_LIST, longopts, NULL)) != -1) {
+		switch (ch) {
+		case '1': case '2': case '3':
+		case '4': case '5': case '6':
+		case '7': case '8': case '9':
+			numflag = ch - '0';
+			break;
+		case 'c':
+			cflag = 1;
+			break;
+		case 'd':
+			dflag = 1;
+			break;
+		case 'l':
+			lflag = 1;
+			dflag = 1;
+			break;
+		case 'V':
+			display_version();
+			/* NOTREACHED */
+#ifndef SMALL
+		case 'a':
+			fprintf(stderr, "%s: option --ascii ignored on this system\n", progname);
+			break;
+		case 'f':
+			fflag = 1;
+			break;
+		case 'L':
+			display_license();
+			/* NOT REACHED */
+		case 'N':
+			nflag = 0;
+			Nflag = 1;
+			break;
+		case 'n':
+			nflag = 1;
+			Nflag = 0;
+			break;
+		case 'q':
+			qflag = 1;
+			break;
+		case 'r':
+			rflag = 1;
+			break;
+		case 'S':
+			len = strlen(optarg);
+			if (len != 0) {
+				suffixes[0].zipped = optarg;
+				suffixes[0].ziplen = len;
+			} else {
+				suffixes[NUM_SUFFIXES - 1].zipped = "";
+				suffixes[NUM_SUFFIXES - 1].ziplen = 0;
+			}
+			break;
+		case 't':
+			cflag = 1;
+			tflag = 1;
+			dflag = 1;
+			break;
+		case 'v':
+			vflag = 1;
+			break;
+#endif
+		default:
+			usage();
+			/* NOTREACHED */
+		}
+	}
+	argv += optind;
+	argc -= optind;
+
+	if (argc == 0) {
+		if (dflag)	/* stdin mode */
+			handle_stdin();
+		else		/* stdout mode */
+			handle_stdout();
+	} else {
+		do {
+			handle_pathname(argv[0]);
+		} while (*++argv);
+	}
+#ifndef SMALL
+	if (qflag == 0 && lflag && argc > 1)
+		print_list(-1, 0, "(totals)", 0);
+#endif
+	exit(exit_value);
+}
+
+/* maybe print a warning */
+void
+maybe_warn(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (qflag == 0) {
+		va_start(ap, fmt);
+		vwarn(fmt, ap);
+		va_end(ap);
+	}
+	if (exit_value == 0)
+		exit_value = 1;
+}
+
+/* ... without an errno. */
+void
+maybe_warnx(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (qflag == 0) {
+		va_start(ap, fmt);
+		vwarnx(fmt, ap);
+		va_end(ap);
+	}
+	if (exit_value == 0)
+		exit_value = 1;
+}
+
+/* maybe print an error */
+void
+maybe_err(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (qflag == 0) {
+		va_start(ap, fmt);
+		vwarn(fmt, ap);
+		va_end(ap);
+	}
+	exit(2);
+}
+
+#ifndef NO_BZIP2_SUPPORT
+/* ... without an errno. */
+void
+maybe_errx(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (qflag == 0) {
+		va_start(ap, fmt);
+		vwarnx(fmt, ap);
+		va_end(ap);
+	}
+	exit(2);
+}
+#endif
+
+#ifndef SMALL
+/* split up $GZIP and prepend it to the argument list */
+static void
+prepend_gzip(char *gzip, int *argc, char ***argv)
+{
+	char *s, **nargv, **ac;
+	int nenvarg = 0, i;
+
+	/* scan how many arguments there are */
+	for (s = gzip;;) {
+		while (*s == ' ' || *s == '\t')
+			s++;
+		if (*s == 0)
+			goto count_done;
+		nenvarg++;
+		while (*s != ' ' && *s != '\t')
+			if (*s++ == 0)
+				goto count_done;
+	}
+count_done:
+	/* punt early */
+	if (nenvarg == 0)
+		return;
+
+	*argc += nenvarg;
+	ac = *argv;
+
+	nargv = (char **)malloc((*argc + 1) * sizeof(char *));
+	if (nargv == NULL)
+		maybe_err("malloc");
+
+	/* stash this away */
+	*argv = nargv;
+
+	/* copy the program name first */
+	i = 0;
+	nargv[i++] = *(ac++);
+
+	/* take a copy of $GZIP and add it to the array */
+	s = strdup(gzip);
+	if (s == NULL)
+		maybe_err("strdup");
+	for (;;) {
+		/* Skip whitespaces. */
+		while (*s == ' ' || *s == '\t')
+			s++;
+		if (*s == 0)
+			goto copy_done;
+		nargv[i++] = s;
+		/* Find the end of this argument. */
+		while (*s != ' ' && *s != '\t')
+			if (*s++ == 0)
+				/* Argument followed by NUL. */
+				goto copy_done;
+		/* Terminate by overwriting ' ' or '\t' with NUL. */
+		*s++ = 0;
+	}
+copy_done:
+
+	/* copy the original arguments and a NULL */
+	while (*ac)
+		nargv[i++] = *(ac++);
+	nargv[i] = NULL;
+}
+#endif
+
+/* compress input to output. Return bytes read, -1 on error */
+static off_t
+gz_compress(int in, int out, off_t *gsizep, const char *origname, uint32_t mtime)
+{
+	z_stream z;
+	char *outbufp, *inbufp;
+	off_t in_tot = 0, out_tot = 0;
+	ssize_t in_size;
+	int i, error;
+	uLong crc;
+#ifdef SMALL
+	static char header[] = { GZIP_MAGIC0, GZIP_MAGIC1, Z_DEFLATED, 0,
+				 0, 0, 0, 0,
+				 0, OS_CODE };
+#endif
+
+	outbufp = malloc(BUFLEN);
+	inbufp = malloc(BUFLEN);
+	if (outbufp == NULL || inbufp == NULL) {
+		maybe_err("malloc failed");
+		goto out;
+	}
+
+	memset(&z, 0, sizeof z);
+	z.zalloc = Z_NULL;
+	z.zfree = Z_NULL;
+	z.opaque = 0;
+
+#ifdef SMALL
+	memcpy(outbufp, header, sizeof header);
+	i = sizeof header;
+#else
+	if (nflag != 0) {
+		mtime = 0;
+		origname = "";
+	}
+
+	i = snprintf(outbufp, BUFLEN, "%c%c%c%c%c%c%c%c%c%c%s", 
+		     GZIP_MAGIC0, GZIP_MAGIC1, Z_DEFLATED,
+		     *origname ? ORIG_NAME : 0,
+		     mtime & 0xff,
+		     (mtime >> 8) & 0xff,
+		     (mtime >> 16) & 0xff,
+		     (mtime >> 24) & 0xff,
+		     numflag == 1 ? 4 : numflag == 9 ? 2 : 0,
+		     OS_CODE, origname);
+	if (i >= BUFLEN)     
+		/* this need PATH_MAX > BUFLEN ... */
+		maybe_err("snprintf");
+	if (*origname)
+		i++;
+#endif
+
+	z.next_out = (unsigned char *)outbufp + i;
+	z.avail_out = BUFLEN - i;
+
+	error = deflateInit2(&z, numflag, Z_DEFLATED,
+			     (-MAX_WBITS), 8, Z_DEFAULT_STRATEGY);
+	if (error != Z_OK) {
+		maybe_warnx("deflateInit2 failed");
+		in_tot = -1;
+		goto out;
+	}
+
+	crc = crc32(0L, Z_NULL, 0);
+	for (;;) {
+		if (z.avail_out == 0) {
+			if (write(out, outbufp, BUFLEN) != BUFLEN) {
+				maybe_warn("write");
+				out_tot = -1;
+				goto out;
+			}
+
+			out_tot += BUFLEN;
+			z.next_out = (unsigned char *)outbufp;
+			z.avail_out = BUFLEN;
+		}
+
+		if (z.avail_in == 0) {
+			in_size = read(in, inbufp, BUFLEN);
+			if (in_size < 0) {
+				maybe_warn("read");
+				in_tot = -1;
+				goto out;
+			}
+			if (in_size == 0)
+				break;
+
+			crc = crc32(crc, (const Bytef *)inbufp, (unsigned)in_size);
+			in_tot += in_size;
+			z.next_in = (unsigned char *)inbufp;
+			z.avail_in = in_size;
+		}
+
+		error = deflate(&z, Z_NO_FLUSH);
+		if (error != Z_OK && error != Z_STREAM_END) {
+			maybe_warnx("deflate failed");
+			in_tot = -1;
+			goto out;
+		}
+	}
+
+	/* clean up */
+	for (;;) {
+		size_t len;
+		ssize_t w;
+
+		error = deflate(&z, Z_FINISH);
+		if (error != Z_OK && error != Z_STREAM_END) {
+			maybe_warnx("deflate failed");
+			in_tot = -1;
+			goto out;
+		}
+
+		len = (char *)z.next_out - outbufp;
+
+		w = write(out, outbufp, len);
+		if (w == -1 || (size_t)w != len) {
+			maybe_warn("write");
+			out_tot = -1;
+			goto out;
+		}
+		out_tot += len;
+		z.next_out = (unsigned char *)outbufp;
+		z.avail_out = BUFLEN;
+
+		if (error == Z_STREAM_END)
+			break;
+	}
+
+	if (deflateEnd(&z) != Z_OK) {
+		maybe_warnx("deflateEnd failed");
+		in_tot = -1;
+		goto out;
+	}
+
+	i = snprintf(outbufp, BUFLEN, "%c%c%c%c%c%c%c%c", 
+		 (int)crc & 0xff,
+		 (int)(crc >> 8) & 0xff,
+		 (int)(crc >> 16) & 0xff,
+		 (int)(crc >> 24) & 0xff,
+		 (int)in_tot & 0xff,
+		 (int)(in_tot >> 8) & 0xff,
+		 (int)(in_tot >> 16) & 0xff,
+		 (int)(in_tot >> 24) & 0xff);
+	if (i != 8)
+		maybe_err("snprintf");
+	if (write(out, outbufp, i) != i) {
+		maybe_warn("write");
+		in_tot = -1;
+	} else
+		out_tot += i;
+
+out:
+	if (inbufp != NULL)
+		free(inbufp);
+	if (outbufp != NULL)
+		free(outbufp);
+	if (gsizep)
+		*gsizep = out_tot;
+	return in_tot;
+}
+
+/*
+ * uncompress input to output then close the input.  return the
+ * uncompressed size written, and put the compressed sized read
+ * into `*gsizep'.
+ */
+static off_t
+gz_uncompress(int in, int out, char *pre, size_t prelen, off_t *gsizep,
+	      const char *filename)
+{
+	z_stream z;
+	char *outbufp, *inbufp;
+	off_t out_tot = -1, in_tot = 0;
+	uint32_t out_sub_tot = 0;
+	enum {
+		GZSTATE_MAGIC0,
+		GZSTATE_MAGIC1,
+		GZSTATE_METHOD,
+		GZSTATE_FLAGS,
+		GZSTATE_SKIPPING,
+		GZSTATE_EXTRA,
+		GZSTATE_EXTRA2,
+		GZSTATE_EXTRA3,
+		GZSTATE_ORIGNAME,
+		GZSTATE_COMMENT,
+		GZSTATE_HEAD_CRC1,
+		GZSTATE_HEAD_CRC2,
+		GZSTATE_INIT,
+		GZSTATE_READ,
+		GZSTATE_CRC,
+		GZSTATE_LEN,
+	} state = GZSTATE_MAGIC0;
+	int flags = 0, skip_count = 0;
+	int error = Z_STREAM_ERROR, done_reading = 0;
+	uLong crc = 0;
+	ssize_t wr;
+	int needmore = 0;
+
+#define ADVANCE()       { z.next_in++; z.avail_in--; }
+
+	if ((outbufp = malloc(BUFLEN)) == NULL) {
+		maybe_err("malloc failed");
+		goto out2;
+	}
+	if ((inbufp = malloc(BUFLEN)) == NULL) {
+		maybe_err("malloc failed");
+		goto out1;
+	}
+
+	memset(&z, 0, sizeof z);
+	z.avail_in = prelen;
+	z.next_in = (unsigned char *)pre;
+	z.avail_out = BUFLEN;
+	z.next_out = (unsigned char *)outbufp;
+	z.zalloc = NULL;
+	z.zfree = NULL;
+	z.opaque = 0;
+
+	in_tot = prelen;
+	out_tot = 0;
+
+	for (;;) {
+		if ((z.avail_in == 0 || needmore) && done_reading == 0) {
+			ssize_t in_size;
+
+			if (z.avail_in > 0) {
+				memmove(inbufp, z.next_in, z.avail_in);
+			}
+			z.next_in = (unsigned char *)inbufp;
+			in_size = read(in, z.next_in + z.avail_in,
+			    BUFLEN - z.avail_in);
+
+			if (in_size == -1) {
+				maybe_warn("failed to read stdin");
+				goto stop_and_fail;
+			} else if (in_size == 0) {
+				done_reading = 1;
+			}
+
+			z.avail_in += in_size;
+			needmore = 0;
+
+			in_tot += in_size;
+		}
+		if (z.avail_in == 0) {
+			if (done_reading && state != GZSTATE_MAGIC0) {
+				maybe_warnx("%s: unexpected end of file",
+					    filename);
+				goto stop_and_fail;
+			}
+			goto stop;
+		}
+		switch (state) {
+		case GZSTATE_MAGIC0:
+			if (*z.next_in != GZIP_MAGIC0) {
+				if (in_tot > 0) {
+					maybe_warnx("%s: trailing garbage "
+						    "ignored", filename);
+					goto stop;
+				}
+				maybe_warnx("input not gziped (MAGIC0)");
+				goto stop_and_fail;
+			}
+			ADVANCE();
+			state++;
+			out_sub_tot = 0;
+			crc = crc32(0L, Z_NULL, 0);
+			break;
+
+		case GZSTATE_MAGIC1:
+			if (*z.next_in != GZIP_MAGIC1 &&
+			    *z.next_in != GZIP_OMAGIC1) {
+				maybe_warnx("input not gziped (MAGIC1)");
+				goto stop_and_fail;
+			}
+			ADVANCE();
+			state++;
+			break;
+
+		case GZSTATE_METHOD:
+			if (*z.next_in != Z_DEFLATED) {
+				maybe_warnx("unknown compression method");
+				goto stop_and_fail;
+			}
+			ADVANCE();
+			state++;
+			break;
+
+		case GZSTATE_FLAGS:
+			flags = *z.next_in;
+			ADVANCE();
+			skip_count = 6;
+			state++;
+			break;
+
+		case GZSTATE_SKIPPING:
+			if (skip_count > 0) {
+				skip_count--;
+				ADVANCE();
+			} else
+				state++;
+			break;
+
+		case GZSTATE_EXTRA:
+			if ((flags & EXTRA_FIELD) == 0) {
+				state = GZSTATE_ORIGNAME;
+				break;
+			}
+			skip_count = *z.next_in;
+			ADVANCE();
+			state++;
+			break;
+
+		case GZSTATE_EXTRA2:
+			skip_count |= ((*z.next_in) << 8);
+			ADVANCE();
+			state++;
+			break;
+
+		case GZSTATE_EXTRA3:
+			if (skip_count > 0) {
+				skip_count--;
+				ADVANCE();
+			} else
+				state++;
+			break;
+
+		case GZSTATE_ORIGNAME:
+			if ((flags & ORIG_NAME) == 0) {
+				state++;
+				break;
+			}
+			if (*z.next_in == 0)
+				state++;
+			ADVANCE();
+			break;
+
+		case GZSTATE_COMMENT:
+			if ((flags & COMMENT) == 0) {
+				state++;
+				break;
+			}
+			if (*z.next_in == 0)
+				state++;
+			ADVANCE();
+			break;
+
+		case GZSTATE_HEAD_CRC1:
+			if (flags & HEAD_CRC)
+				skip_count = 2;
+			else
+				skip_count = 0;
+			state++;
+			break;
+
+		case GZSTATE_HEAD_CRC2:
+			if (skip_count > 0) {
+				skip_count--;
+				ADVANCE();
+			} else
+				state++;
+			break;
+
+		case GZSTATE_INIT:
+			if (inflateInit2(&z, -MAX_WBITS) != Z_OK) {
+				maybe_warnx("failed to inflateInit");
+				goto stop_and_fail;
+			}
+			state++;
+			break;
+
+		case GZSTATE_READ:
+			error = inflate(&z, Z_FINISH);
+			switch (error) {
+			/* Z_BUF_ERROR goes with Z_FINISH... */
+			case Z_BUF_ERROR:
+			case Z_STREAM_END:
+			case Z_OK:
+				break;
+
+			case Z_NEED_DICT:
+				maybe_warnx("Z_NEED_DICT error");
+				goto stop_and_fail;
+			case Z_DATA_ERROR:
+				maybe_warnx("data stream error");
+				goto stop_and_fail;
+			case Z_STREAM_ERROR:
+				maybe_warnx("internal stream error");
+				goto stop_and_fail;
+			case Z_MEM_ERROR:
+				maybe_warnx("memory allocation error");
+				goto stop_and_fail;
+
+			default:
+				maybe_warn("unknown error from inflate(): %d",
+				    error);
+			}
+			wr = BUFLEN - z.avail_out;
+
+			if (wr != 0) {
+				crc = crc32(crc, (const Bytef *)outbufp, (unsigned)wr);
+				if (
+#ifndef SMALL
+				    /* don't write anything with -t */
+				    tflag == 0 &&
+#endif
+				    write(out, outbufp, wr) != wr) {
+					maybe_warn("error writing to output");
+					goto stop_and_fail;
+				}
+
+				out_tot += wr;
+				out_sub_tot += wr;
+			}
+
+			if (error == Z_STREAM_END) {
+				inflateEnd(&z);
+				state++;
+			}
+
+			z.next_out = (unsigned char *)outbufp;
+			z.avail_out = BUFLEN;
+
+			break;
+		case GZSTATE_CRC:
+			{
+				uLong origcrc;
+
+				if (z.avail_in < 4) {
+					if (!done_reading) {
+						needmore = 1;
+						continue;
+					}
+					maybe_warnx("truncated input");
+					goto stop_and_fail;
+				}
+				origcrc = ((unsigned)z.next_in[0] & 0xff) |
+					((unsigned)z.next_in[1] & 0xff) << 8 |
+					((unsigned)z.next_in[2] & 0xff) << 16 |
+					((unsigned)z.next_in[3] & 0xff) << 24;
+				if (origcrc != crc) {
+					maybe_warnx("invalid compressed"
+					     " data--crc error");
+					goto stop_and_fail;
+				}
+			}
+
+			z.avail_in -= 4;
+			z.next_in += 4;
+
+			if (!z.avail_in && done_reading) {
+				goto stop;
+			}
+			state++;
+			break;
+		case GZSTATE_LEN:
+			{
+				uLong origlen;
+
+				if (z.avail_in < 4) {
+					if (!done_reading) {
+						needmore = 1;
+						continue;
+					}
+					maybe_warnx("truncated input");
+					goto stop_and_fail;
+				}
+				origlen = ((unsigned)z.next_in[0] & 0xff) |
+					((unsigned)z.next_in[1] & 0xff) << 8 |
+					((unsigned)z.next_in[2] & 0xff) << 16 |
+					((unsigned)z.next_in[3] & 0xff) << 24;
+
+				if (origlen != out_sub_tot) {
+					maybe_warnx("invalid compressed"
+					     " data--length error");
+					goto stop_and_fail;
+				}
+			}
+				
+			z.avail_in -= 4;
+			z.next_in += 4;
+
+			if (error < 0) {
+				maybe_warnx("decompression error");
+				goto stop_and_fail;
+			}
+			state = GZSTATE_MAGIC0;
+			break;
+		}
+		continue;
+stop_and_fail:
+		out_tot = -1;
+stop:
+		break;
+	}
+	if (state > GZSTATE_INIT)
+		inflateEnd(&z);
+
+	free(inbufp);
+out1:
+	free(outbufp);
+out2:
+	if (gsizep)
+		*gsizep = in_tot;
+	return (out_tot);
+}
+
+#ifndef SMALL
+/*
+ * set the owner, mode, flags & utimes using the given file descriptor.
+ * file is only used in possible warning messages.
+ */
+static void
+copymodes(int fd, const struct stat *sbp, const char *file)
+{
+	struct timeval times[2];
+	struct stat sb;
+
+	/*
+	 * If we have no info on the input, give this file some
+	 * default values and return..
+	 */
+	if (sbp == NULL) {
+		mode_t mask = umask(022);
+
+		(void)fchmod(fd, DEFFILEMODE & ~mask);
+		(void)umask(mask);
+		return; 
+	}
+	sb = *sbp;
+
+	/* if the chown fails, remove set-id bits as-per compress(1) */
+	if (fchown(fd, sb.st_uid, sb.st_gid) < 0) {
+		if (errno != EPERM)
+			maybe_warn("couldn't fchown: %s", file);
+		sb.st_mode &= ~(S_ISUID|S_ISGID);
+	}
+
+	/* we only allow set-id and the 9 normal permission bits */
+	sb.st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
+	if (fchmod(fd, sb.st_mode) < 0)
+		maybe_warn("couldn't fchmod: %s", file);
+
+	/* only try flags if they exist already */
+        if (sb.st_flags != 0 && fchflags(fd, sb.st_flags) < 0)
+		maybe_warn("couldn't fchflags: %s", file);
+
+	TIMESPEC_TO_TIMEVAL(&times[0], &sb.st_atimespec);
+	TIMESPEC_TO_TIMEVAL(&times[1], &sb.st_mtimespec);
+	if (futimes(fd, times) < 0)
+		maybe_warn("couldn't utimes: %s", file);
+}
+#endif
+
+/* what sort of file is this? */
+static enum filetype
+file_gettype(u_char *buf)
+{
+
+	if (buf[0] == GZIP_MAGIC0 &&
+	    (buf[1] == GZIP_MAGIC1 || buf[1] == GZIP_OMAGIC1))
+		return FT_GZIP;
+	else
+#ifndef NO_BZIP2_SUPPORT
+	if (memcmp(buf, BZIP2_MAGIC, 3) == 0 &&
+	    buf[3] >= '0' && buf[3] <= '9')
+		return FT_BZIP2;
+	else
+#endif
+#ifndef NO_COMPRESS_SUPPORT
+	if (memcmp(buf, Z_MAGIC, 2) == 0)
+		return FT_Z;
+	else
+#endif
+		return FT_UNKNOWN;
+}
+
+#ifndef SMALL
+/* check the outfile is OK. */
+static int
+check_outfile(const char *outfile)
+{
+	struct stat sb;
+	int ok = 1;
+
+	if (lflag == 0 && stat(outfile, &sb) == 0) {
+		if (fflag)
+			unlink(outfile);
+		else if (isatty(STDIN_FILENO)) {
+			char ans[10] = { 'n', '\0' };	/* default */
+
+			fprintf(stderr, "%s already exists -- do you wish to "
+					"overwrite (y or n)? " , outfile);
+			(void)fgets(ans, sizeof(ans) - 1, stdin);
+			if (ans[0] != 'y' && ans[0] != 'Y') {
+				fprintf(stderr, "\tnot overwritting\n");
+				ok = 0;
+			} else
+				unlink(outfile);
+		} else {
+			maybe_warnx("%s already exists -- skipping", outfile);
+			ok = 0;
+		}
+	}
+	return ok;
+}
+
+static void
+unlink_input(const char *file, const struct stat *sb)
+{
+	struct stat nsb;
+
+	if (stat(file, &nsb) != 0)
+		/* Must be gone alrady */
+		return;
+	if (nsb.st_dev != sb->st_dev || nsb.st_ino != sb->st_ino)
+		/* Definitely a different file */
+		return;
+	unlink(file);
+}
+#endif
+
+static const suffixes_t *
+check_suffix(char *file, int xlate)
+{
+	const suffixes_t *s;
+	int len = strlen(file);
+	char *sp;
+
+	for (s = suffixes; s != suffixes + NUM_SUFFIXES; s++) {
+		/* if it doesn't fit in "a.suf", don't bother */
+		if (s->ziplen >= len)
+			continue;
+		sp = file + len - s->ziplen;
+		if (strcmp(s->zipped, sp) != 0)
+			continue;
+		if (xlate)
+			strcpy(sp, s->normal);
+		return s;
+	}
+	return NULL;
+}
+
+/*
+ * compress the given file: create a corresponding .gz file and remove the
+ * original.
+ */
+static off_t
+file_compress(char *file, char *outfile, size_t outsize)
+{
+	int in;
+	int out;
+	off_t size, insize;
+#ifndef SMALL
+	struct stat isb, osb;
+	const suffixes_t *suff;
+#endif
+
+	in = open(file, O_RDONLY);
+	if (in == -1) {
+		maybe_warn("can't open %s", file);
+		return -1;
+	}
+
+	if (cflag == 0) {
+#ifndef SMALL
+		if (fstat(in, &isb) == 0) {
+			if (isb.st_nlink > 1 && fflag == 0) {
+				maybe_warnx("%s has %d other link%s -- "
+					    "skipping", file, isb.st_nlink - 1,
+					    isb.st_nlink == 1 ? "" : "s");
+				close(in);
+				return -1;
+			}
+		}
+
+		if (fflag == 0 && (suff = check_suffix(file, 0))
+		    && suff->zipped[0] != 0) {
+			maybe_warnx("%s already has %s suffix -- unchanged",
+				    file, suff->zipped);
+			close(in);
+			return -1;
+		}
+#endif
+
+		/* Add (usually) .gz to filename */
+		if ((size_t)snprintf(outfile, outsize, "%s%s",
+					file, suffixes[0].zipped) >= outsize)
+			memcpy(outfile - suffixes[0].ziplen - 1,
+				suffixes[0].zipped, suffixes[0].ziplen + 1);
+
+#ifndef SMALL
+		if (check_outfile(outfile) == 0) {
+			close(in);
+			return -1;
+		}
+#endif
+	}
+
+	if (cflag == 0) {
+		out = open(outfile, O_WRONLY | O_CREAT | O_EXCL, 0600);
+		if (out == -1) {
+			maybe_warn("could not create output: %s", outfile);
+			fclose(stdin);
+			return -1;
+		}
+	} else
+		out = STDOUT_FILENO;
+
+	insize = gz_compress(in, out, &size, basename(file), (uint32_t)isb.st_mtime);
+
+	(void)close(in);
+
+	/*
+	 * If there was an error, insize will be -1.
+	 * If we compressed to stdout, just return the size.
+	 * Otherwise stat the file and check it is the correct size.
+	 * We only blow away the file if we can stat the output and it
+	 * has the expected size.
+	 */
+	if (cflag != 0)
+		return insize == -1 ? -1 : size;
+
+#ifndef SMALL
+	if (fstat(out, &osb) != 0) {
+		maybe_warn("couldn't stat: %s", outfile);
+		goto bad_outfile;
+	}
+
+	if (osb.st_size != size) {
+		maybe_warnx("output file: %s wrong size (%" PRIdOFF
+				" != %" PRIdOFF "), deleting",
+				outfile, osb.st_size, size);
+		goto bad_outfile;
+	}
+
+	copymodes(out, &isb, outfile);
+#endif
+	if (close(out) == -1)
+		maybe_warn("couldn't close output");
+
+	/* output is good, ok to delete input */
+	unlink_input(file, &isb);
+	return size;
+
+#ifndef SMALL
+    bad_outfile:
+	if (close(out) == -1)
+		maybe_warn("couldn't close output");
+
+	maybe_warnx("leaving original %s", file);
+	unlink(outfile);
+	return size;
+#endif
+}
+
+/* uncompress the given file and remove the original */
+static off_t
+file_uncompress(char *file, char *outfile, size_t outsize)
+{
+	struct stat isb, osb;
+	off_t size;
+	ssize_t rbytes;
+	unsigned char header1[4];
+	enum filetype method;
+	int rv, fd, ofd, zfd = -1;
+#ifndef SMALL
+	time_t timestamp = 0;
+	unsigned char name[PATH_MAX + 1];
+#endif
+
+	/* gather the old name info */
+
+	fd = open(file, O_RDONLY);
+	if (fd < 0) {
+		maybe_warn("can't open %s", file);
+		goto lose;
+	}
+
+	strlcpy(outfile, file, outsize);
+	if (check_suffix(outfile, 1) == NULL && !(cflag || lflag)) {
+		maybe_warnx("%s: unknown suffix -- ignored", file);
+		goto lose;
+	}
+
+	rbytes = read(fd, header1, sizeof header1);
+	if (rbytes != sizeof header1) {
+		/* we don't want to fail here. */
+#ifndef SMALL
+		if (fflag)
+			goto lose;
+#endif
+		if (rbytes == -1)
+			maybe_warn("can't read %s", file);
+		else
+			goto unexpected_EOF;
+		goto lose;
+	}
+
+	method = file_gettype(header1);
+
+#ifndef SMALL
+	if (fflag == 0 && method == FT_UNKNOWN) {
+		maybe_warnx("%s: not in gzip format", file);
+		goto lose;
+	}
+
+#endif
+
+#ifndef SMALL
+	if (method == FT_GZIP && Nflag) {
+		unsigned char ts[4];	/* timestamp */
+
+		rv = pread(fd, ts, sizeof ts, GZIP_TIMESTAMP);
+		if (rv >= 0 && (size_t)rv < sizeof ts)
+			goto unexpected_EOF;
+		if (rv == -1) {
+			if (!fflag)
+				maybe_warn("can't read %s", file);
+			goto lose;
+		}
+		timestamp = ts[3] << 24 | ts[2] << 16 | ts[1] << 8 | ts[0];
+
+		if (header1[3] & ORIG_NAME) {
+			rbytes = pread(fd, name, sizeof name, GZIP_ORIGNAME);
+			if (rbytes < 0) {
+				maybe_warn("can't read %s", file);
+				goto lose;
+			}
+			if (name[0] != 0) {
+				/* preserve original directory name */
+				char *dp = strrchr(file, '/');
+				if (dp == NULL)
+					dp = file;
+				else
+					dp++;
+				snprintf(outfile, outsize, "%.*s%.*s",
+						(int) (dp - file), 
+						file, (int) rbytes, name);
+			}
+		}
+	}
+#endif
+	lseek(fd, 0, SEEK_SET);
+
+	if (cflag == 0 || lflag) {
+		if (fstat(fd, &isb) != 0)
+			goto lose;
+#ifndef SMALL
+		if (isb.st_nlink > 1 && lflag == 0 && fflag == 0) {
+			maybe_warnx("%s has %d other links -- skipping",
+			    file, isb.st_nlink - 1);
+			goto lose;
+		}
+		if (nflag == 0 && timestamp)
+			isb.st_mtime = timestamp;
+		if (check_outfile(outfile) == 0)
+			goto lose;
+#endif
+	}
+
+	if (cflag == 0 && lflag == 0) {
+		zfd = open(outfile, O_WRONLY|O_CREAT|O_EXCL, 0600);
+		if (zfd == STDOUT_FILENO) {
+			/* We won't close STDOUT_FILENO later... */
+			zfd = dup(zfd);
+			close(STDOUT_FILENO);
+		}
+		if (zfd == -1) {
+			maybe_warn("can't open %s", outfile);
+			goto lose;
+		}
+	} else
+		zfd = STDOUT_FILENO;
+
+#ifndef NO_BZIP2_SUPPORT
+	if (method == FT_BZIP2) {
+
+		/* XXX */
+		if (lflag) {
+			maybe_warnx("no -l with bzip2 files");
+			goto lose;
+		}
+
+		size = unbzip2(fd, zfd, NULL, 0, NULL);
+	} else
+#endif
+
+#ifndef NO_COMPRESS_SUPPORT
+	if (method == FT_Z) {
+		FILE *in, *out;
+
+		/* XXX */
+		if (lflag) {
+			maybe_warnx("no -l with Lempel-Ziv files");
+			goto lose;
+		}
+
+		if ((in = zdopen(fd)) == NULL) {
+			maybe_warn("zdopen for read: %s", file);
+			goto lose;
+		}
+
+		out = fdopen(dup(zfd), "w");
+		if (out == NULL) {
+			maybe_warn("fdopen for write: %s", outfile);
+			fclose(in);
+			goto lose;
+		}
+
+		size = zuncompress(in, out, NULL, 0, NULL);
+		/* need to fclose() if ferror() is true... */
+		if (ferror(in) | fclose(in)) {
+			maybe_warn("failed infile fclose");
+			unlink(outfile);
+			(void)fclose(out);
+		}
+		if (fclose(out) != 0) {
+			maybe_warn("failed outfile fclose");
+			unlink(outfile);
+			goto lose;
+		}
+	} else
+#endif
+
+#ifndef SMALL
+	if (method == FT_UNKNOWN) {
+		if (lflag) {
+			maybe_warnx("no -l for unknown filetypes");
+			goto lose;
+		}
+		size = cat_fd(NULL, 0, NULL, fd);
+	} else
+#endif
+	{
+		if (lflag) {
+			print_list(fd, isb.st_size, outfile, isb.st_mtime);
+			close(fd);
+			return -1;	/* XXX */
+		}
+
+		size = gz_uncompress(fd, zfd, NULL, 0, NULL, file);
+	}
+
+	if (close(fd) != 0)
+		maybe_warn("couldn't close input");
+	if (zfd != STDOUT_FILENO && close(zfd) != 0)
+		maybe_warn("couldn't close output");
+
+	if (size == -1) {
+		if (cflag == 0)
+			unlink(outfile);
+		maybe_warnx("%s: uncompress failed", file);
+		return -1;
+	}
+
+	/* if testing, or we uncompressed to stdout, this is all we need */
+#ifndef SMALL
+	if (tflag)
+		return size;
+#endif
+	/* if we are uncompressing to stdin, don't remove the file. */
+	if (cflag)
+		return size;
+
+	/*
+	 * if we create a file...
+	 */
+	/*
+	 * if we can't stat the file don't remove the file.
+	 */
+
+	ofd = open(outfile, O_RDWR, 0);
+	if (ofd == -1) {
+		maybe_warn("couldn't open (leaving original): %s",
+			   outfile);
+		return -1;
+	}
+	if (fstat(ofd, &osb) != 0) {
+		maybe_warn("couldn't stat (leaving original): %s",
+			   outfile);
+		close(ofd);
+		return -1;
+	}
+	if (osb.st_size != size) {
+		maybe_warnx("stat gave different size: %" PRIdOFF
+				" != %" PRIdOFF " (leaving original)",
+				size, osb.st_size);
+		close(ofd);
+		unlink(outfile);
+		return -1;
+	}
+	unlink_input(file, &isb);
+#ifndef SMALL
+	copymodes(ofd, &isb, outfile);
+#endif
+	close(ofd);
+	return size;
+
+    unexpected_EOF:
+	maybe_warnx("%s: unexpected end of file", file);
+    lose:
+	if (fd != -1)
+		close(fd);
+	if (zfd != -1 && zfd != STDOUT_FILENO)
+		close(fd);
+	return -1;
+}
+
+#ifndef SMALL
+static off_t
+cat_fd(unsigned char * prepend, size_t count, off_t *gsizep, int fd)
+{
+	char buf[BUFLEN];
+	off_t in_tot;
+	ssize_t w;
+
+	in_tot = count;
+	w = write(STDOUT_FILENO, prepend, count);
+	if (w == -1 || (size_t)w != count) {
+		maybe_warn("write to stdout");
+		return -1;
+	}
+	for (;;) {
+		ssize_t rv;
+
+		rv = read(fd, buf, sizeof buf);
+		if (rv == 0)
+			break;
+		if (rv < 0) {
+			maybe_warn("read from fd %d", fd);
+			break;
+		}
+
+		if (write(STDOUT_FILENO, buf, rv) != rv) {
+			maybe_warn("write to stdout");
+			break;
+		}
+		in_tot += rv;
+	}
+
+	if (gsizep)
+		*gsizep = in_tot;
+	return (in_tot);
+}
+#endif
+
+static void
+handle_stdin(void)
+{
+	unsigned char header1[4];
+	off_t usize, gsize;
+	enum filetype method;
+	ssize_t bytes_read;
+#ifndef NO_COMPRESS_SUPPORT
+	FILE *in;
+#endif
+
+#ifndef SMALL
+	if (fflag == 0 && lflag == 0 && isatty(STDIN_FILENO)) {
+		maybe_warnx("standard input is a terminal -- ignoring");
+		return;
+	}
+#endif
+
+	if (lflag) {
+		struct stat isb;
+
+		/* XXX could read the whole file, etc. */
+		if (fstat(STDIN_FILENO, &isb) < 0) {
+			maybe_warn("fstat");
+			return;
+		}
+		print_list(STDIN_FILENO, isb.st_size, "stdout", isb.st_mtime);
+		return;
+	}
+
+	bytes_read = read_retry(STDIN_FILENO, header1, sizeof header1);
+	if (bytes_read == -1) {
+		maybe_warn("can't read stdin");
+		return;
+	} else if (bytes_read != sizeof(header1)) {
+		maybe_warnx("(stdin): unexpected end of file");
+		return;
+	}
+
+	method = file_gettype(header1);
+	switch (method) {
+	default:
+#ifndef SMALL
+		if (fflag == 0) {
+			maybe_warnx("unknown compression format");
+			return;
+		}
+		usize = cat_fd(header1, sizeof header1, &gsize, STDIN_FILENO);
+		break;
+#endif
+	case FT_GZIP:
+		usize = gz_uncompress(STDIN_FILENO, STDOUT_FILENO, 
+			      (char *)header1, sizeof header1, &gsize, "(stdin)");
+		break;
+#ifndef NO_BZIP2_SUPPORT
+	case FT_BZIP2:
+		usize = unbzip2(STDIN_FILENO, STDOUT_FILENO,
+				(char *)header1, sizeof header1, &gsize);
+		break;
+#endif
+#ifndef NO_COMPRESS_SUPPORT
+	case FT_Z:
+		if ((in = zdopen(STDIN_FILENO)) == NULL) {
+			maybe_warnx("zopen of stdin");
+			return;
+		}
+
+		usize = zuncompress(in, stdout, (char *)header1, sizeof header1, &gsize);
+		fclose(in);
+		break;
+#endif
+	}
+
+#ifndef SMALL
+        if (vflag && !tflag && usize != -1 && gsize != -1)
+		print_verbage(NULL, NULL, usize, gsize);
+	if (vflag && tflag)
+		print_test("(stdin)", usize != -1);
+#endif 
+
+}
+
+static void
+handle_stdout(void)
+{
+	off_t gsize, usize;
+	struct stat sb;
+	time_t systime;
+	uint32_t mtime;
+	int ret;
+
+#ifndef SMALL
+	if (fflag == 0 && isatty(STDOUT_FILENO)) {
+		maybe_warnx("standard output is a terminal -- ignoring");
+		return;
+	}
+#endif
+	/* If stdin is a file use it's mtime, otherwise use current time */
+	ret = fstat(STDIN_FILENO, &sb);
+
+#ifndef SMALL
+	if (ret < 0) {
+		maybe_warn("Can't stat stdin");
+		return;
+	}
+#endif
+
+	if (S_ISREG(sb.st_mode))
+		mtime = (uint32_t)sb.st_mtime;
+	else {
+		systime = time(NULL);
+#ifndef SMALL
+		if (systime == -1) {
+			maybe_warn("time");
+			return;
+		} 
+#endif
+		mtime = (uint32_t)systime;
+	}
+	 		
+	usize = gz_compress(STDIN_FILENO, STDOUT_FILENO, &gsize, "", mtime);
+#ifndef SMALL
+        if (vflag && !tflag && usize != -1 && gsize != -1)
+		print_verbage(NULL, NULL, usize, gsize);
+#endif 
+}
+
+/* do what is asked for, for the path name */
+static void
+handle_pathname(char *path)
+{
+	char *opath = path, *s = NULL;
+	ssize_t len;
+	int slen;
+	struct stat sb;
+
+	/* check for stdout/stdin */
+	if (path[0] == '-' && path[1] == '\0') {
+		if (dflag)
+			handle_stdin();
+		else
+			handle_stdout();
+		return;
+	}
+
+retry:
+	if (stat(path, &sb) != 0) {
+		/* lets try <path>.gz if we're decompressing */
+		if (dflag && s == NULL && errno == ENOENT) {
+			len = strlen(path);
+			slen = suffixes[0].ziplen;
+			s = malloc(len + slen + 1);
+			if (s == NULL)
+				maybe_err("malloc");
+			memcpy(s, path, len);
+			memcpy(s + len, suffixes[0].zipped, slen + 1);
+			path = s;
+			goto retry;
+		}
+		maybe_warn("can't stat: %s", opath);
+		goto out;
+	}
+
+	if (S_ISDIR(sb.st_mode)) {
+#ifndef SMALL
+		if (rflag)
+			handle_dir(path);
+		else
+#endif
+			maybe_warnx("%s is a directory", path);
+		goto out;
+	}
+
+	if (S_ISREG(sb.st_mode))
+		handle_file(path, &sb);
+	else
+		maybe_warnx("%s is not a regular file", path);
+
+out:
+	if (s)
+		free(s);
+}
+
+/* compress/decompress a file */
+static void
+handle_file(char *file, struct stat *sbp)
+{
+	off_t usize, gsize;
+	char	outfile[PATH_MAX];
+
+	infile = file;
+	if (dflag) {
+		usize = file_uncompress(file, outfile, sizeof(outfile));
+#ifndef SMALL
+		if (vflag && tflag)
+			print_test(file, usize != -1);
+#endif
+		if (usize == -1)
+			return;
+		gsize = sbp->st_size;
+	} else {
+		gsize = file_compress(file, outfile, sizeof(outfile));
+		if (gsize == -1)
+			return;
+		usize = sbp->st_size;
+	}
+
+
+#ifndef SMALL
+	if (vflag && !tflag)
+		print_verbage(file, (cflag) ? NULL : outfile, usize, gsize);
+#endif
+}
+
+#ifndef SMALL
+/* this is used with -r to recursively descend directories */
+static void
+handle_dir(char *dir)
+{
+	char *path_argv[2];
+	FTS *fts;
+	FTSENT *entry;
+
+	path_argv[0] = dir;
+	path_argv[1] = 0;
+	fts = fts_open(path_argv, FTS_PHYSICAL, NULL);
+	if (fts == NULL) {
+		warn("couldn't fts_open %s", dir);
+		return;
+	}
+
+	while ((entry = fts_read(fts))) {
+		switch(entry->fts_info) {
+		case FTS_D:
+		case FTS_DP:
+			continue;
+
+		case FTS_DNR:
+		case FTS_ERR:
+		case FTS_NS:
+			maybe_warn("%s", entry->fts_path);
+			continue;
+		case FTS_F:
+			handle_file(entry->fts_name, entry->fts_statp);
+		}
+	}
+	(void)fts_close(fts);
+}
+#endif
+
+/* print a ratio - size reduction as a fraction of uncompressed size */
+static void
+print_ratio(off_t in, off_t out, FILE *where)
+{
+	int percent10;	/* 10 * percent */
+	off_t diff;
+	char buff[8];
+	int len;
+
+	diff = in - out/2;
+	if (diff <= 0)
+		/*
+		 * Output is more than double size of input! print -99.9%
+		 * Quite possibly we've failed to get the original size.
+		 */
+		percent10 = -999;
+	else {
+		/*
+		 * We only need 12 bits of result from the final division,
+		 * so reduce the values until a 32bit division will suffice.
+		 */
+		while (in > 0x100000) {
+			diff >>= 1;
+			in >>= 1;
+		}
+		if (in != 0)
+			percent10 = ((u_int)diff * 2000) / (u_int)in - 1000;
+		else
+			percent10 = 0;
+	}
+
+	len = snprintf(buff, sizeof buff, "%2.2d.", percent10);
+	/* Move the '.' to before the last digit */
+	buff[len - 1] = buff[len - 2];
+	buff[len - 2] = '.';
+	fprintf(where, "%5s%%", buff);
+}
+
+#ifndef SMALL
+/* print compression statistics, and the new name (if there is one!) */
+static void
+print_verbage(const char *file, const char *nfile, off_t usize, off_t gsize)
+{
+	if (file)
+		fprintf(stderr, "%s:%s  ", file,
+		    strlen(file) < 7 ? "\t\t" : "\t");
+	print_ratio(usize, gsize, stderr);
+	if (nfile)
+		fprintf(stderr, " -- replaced with %s", nfile);
+	fprintf(stderr, "\n");
+	fflush(stderr);
+}
+
+/* print test results */
+static void
+print_test(const char *file, int ok)
+{
+
+	if (exit_value == 0 && ok == 0)
+		exit_value = 1;
+	fprintf(stderr, "%s:%s  %s\n", file,
+	    strlen(file) < 7 ? "\t\t" : "\t", ok ? "OK" : "NOT OK");
+	fflush(stderr);
+}
+#endif
+
+/* print a file's info ala --list */
+/* eg:
+  compressed uncompressed  ratio uncompressed_name
+      354841      1679360  78.8% /usr/pkgsrc/distfiles/libglade-2.0.1.tar
+*/
+static void
+print_list(int fd, off_t out, const char *outfile, time_t ts)
+{
+	static int first = 1;
+#ifndef SMALL
+	static off_t in_tot, out_tot;
+	uint32_t crc = 0;
+#endif
+	off_t in = 0, rv;
+
+	if (first) {
+#ifndef SMALL
+		if (vflag)
+			printf("method  crc     date  time  ");
+#endif
+		if (qflag == 0)
+			printf("  compressed uncompressed  "
+			       "ratio uncompressed_name\n");
+	}
+	first = 0;
+
+	/* print totals? */
+#ifndef SMALL
+	if (fd == -1) {
+		in = in_tot;
+		out = out_tot;
+	} else
+#endif
+	{
+		/* read the last 4 bytes - this is the uncompressed size */
+		rv = lseek(fd, (off_t)(-8), SEEK_END);
+		if (rv != -1) {
+			unsigned char buf[8];
+			uint32_t usize;
+
+			rv = read(fd, (char *)buf, sizeof(buf));
+			if (rv == -1)
+				maybe_warn("read of uncompressed size");
+			else if (rv != sizeof(buf))
+				maybe_warnx("read of uncompressed size");
+
+			else {
+				usize = buf[4] | buf[5] << 8 |
+					buf[6] << 16 | buf[7] << 24;
+				in = (off_t)usize;
+#ifndef SMALL
+				crc = buf[0] | buf[1] << 8 |
+				      buf[2] << 16 | buf[3] << 24;
+#endif
+			}
+		}
+	}
+
+#ifndef SMALL
+	if (vflag && fd == -1)
+		printf("                            ");
+	else if (vflag) {
+		char *date = ctime(&ts);
+
+		/* skip the day, 1/100th second, and year */
+		date += 4;
+		date[12] = 0;
+		printf("%5s %08x %11s ", "defla"/*XXX*/, crc, date);
+	}
+	in_tot += in;
+	out_tot += out;
+#endif
+	printf("%12llu %12llu ", (unsigned long long)out, (unsigned long long)in);
+	print_ratio(in, out, stdout);
+	printf(" %s\n", outfile);
+}
+
+/* display the usage of NetBSD gzip */
+static void
+usage(void)
+{
+
+	fprintf(stderr, "%s\n", gzip_version);
+	fprintf(stderr,
+    "usage: %s [-" OPT_LIST "] [<file> [<file> ...]]\n"
+#ifndef SMALL
+    " -1 --fast            fastest (worst) compression\n"
+    " -2 .. -8             set compression level\n"
+    " -9 --best            best (slowest) compression\n"
+    " -c --stdout          write to stdout, keep original files\n"
+    "    --to-stdout\n"
+    " -d --decompress      uncompress files\n"
+    "    --uncompress\n"
+    " -f --force           force overwriting & compress links\n"
+    " -h --help            display this help\n"
+    " -l --list            list compressed file contents\n"
+    " -N --name            save or restore original file name and time stamp\n"
+    " -n --no-name         don't save original file name or time stamp\n"
+    " -q --quiet           output no warnings\n"
+    " -r --recursive       recursively compress files in directories\n"
+    " -S .suf              use suffix .suf instead of .gz\n"
+    "    --suffix .suf\n"
+    " -t --test            test compressed file\n"
+    " -V --version         display program version\n"
+    " -v --verbose         print extra statistics\n",
+#else
+    ,
+#endif
+	    getprogname());
+	exit(0);
+}
+
+#ifndef SMALL
+/* display the license information of FreeBSD gzip */
+static void
+display_license(void)
+{
+
+	fprintf(stderr, "%s (based on NetBSD gzip 20060927)\n", gzip_version);
+	fprintf(stderr, "%s\n", gzip_copyright);
+	exit(0);
+}
+#endif
+
+/* display the version of NetBSD gzip */
+static void
+display_version(void)
+{
+
+	fprintf(stderr, "%s\n", gzip_version);
+	exit(0);
+}
+
+#ifndef NO_BZIP2_SUPPORT
+#include "unbzip2.c"
+#endif
+#ifndef NO_COMPRESS_SUPPORT
+#include "zuncompress.c"
+#endif
+
+static ssize_t
+read_retry(int fd, void *buf, size_t sz)
+{
+	char *cp = buf;
+	size_t left = MIN(sz, (size_t) SSIZE_MAX);
+
+	while (left > 0) {
+		ssize_t ret;
+
+		ret = read(fd, cp, left);
+		if (ret == -1) {
+			return ret;
+		} else if (ret == 0) {
+			break; /* EOF */
+		}
+		cp += ret;
+		left -= ret;
+	}
+
+	return sz - left;
+}
+
diff --git a/usr.bin/gzip/unbzip2.c b/usr.bin/gzip/unbzip2.c
new file mode 100644
index 0000000..1f708c9
--- /dev/null
+++ b/usr.bin/gzip/unbzip2.c
@@ -0,0 +1,128 @@
+/*	$NetBSD: unbzip2.c,v 1.10 2006/10/03 08:20:03 simonb Exp $	*/
+
+/*-
+ * Copyright (c) 2006 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Simon Burge.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/* This file is #included by gzip.c */
+
+static off_t
+unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
+{
+	int		ret, end_of_file;
+	off_t		bytes_out = 0;
+	bz_stream	bzs;
+	static char	*inbuf, *outbuf;
+
+	if (inbuf == NULL)
+		inbuf = malloc(BUFLEN);
+	if (outbuf == NULL)
+		outbuf = malloc(BUFLEN);
+	if (inbuf == NULL || outbuf == NULL)
+	        maybe_err("malloc");
+
+	bzs.bzalloc = NULL;
+	bzs.bzfree = NULL;
+	bzs.opaque = NULL;
+
+	end_of_file = 0;
+	ret = BZ2_bzDecompressInit(&bzs, 0, 0);
+	if (ret != BZ_OK)
+	        maybe_errx("bzip2 init");
+
+	/* Prepend. */
+	bzs.avail_in = prelen;
+	bzs.next_in = pre;
+
+	if (bytes_in)
+		*bytes_in = prelen;
+
+	while (ret >= BZ_OK && ret != BZ_STREAM_END) {
+	        if (bzs.avail_in == 0 && !end_of_file) {
+			ssize_t	n;
+
+	                n = read(in, inbuf, BUFLEN);
+	                if (n < 0)
+	                        maybe_err("read");
+	                if (n == 0)
+	                        end_of_file = 1;
+	                bzs.next_in = inbuf;
+	                bzs.avail_in = n;
+			if (bytes_in)
+				*bytes_in += n;
+	        }
+
+	        bzs.next_out = outbuf;
+	        bzs.avail_out = BUFLEN;
+	        ret = BZ2_bzDecompress(&bzs);
+
+	        switch (ret) {
+	        case BZ_STREAM_END:
+	        case BZ_OK:
+	                if (ret == BZ_OK && end_of_file)
+	                        maybe_err("read");
+	                if (!tflag) {
+				ssize_t	n;
+
+	                        n = write(out, outbuf, BUFLEN - bzs.avail_out);
+	                        if (n < 0)
+	                                maybe_err("write");
+	                	bytes_out += n;
+	                }
+	                break;
+
+	        case BZ_DATA_ERROR:
+	                maybe_warnx("bzip2 data integrity error");
+			break;
+
+	        case BZ_DATA_ERROR_MAGIC:
+	                maybe_warnx("bzip2 magic number error");
+			break;
+
+	        case BZ_MEM_ERROR:
+	                maybe_warnx("bzip2 out of memory");
+			break;
+
+	        }
+	}
+
+	if (ret != BZ_STREAM_END || BZ2_bzDecompressEnd(&bzs) != BZ_OK)
+	        return (-1);
+
+	return (bytes_out);
+}
+
diff --git a/usr.bin/gzip/zdiff b/usr.bin/gzip/zdiff
new file mode 100644
index 0000000..34caf2b
--- /dev/null
+++ b/usr.bin/gzip/zdiff
@@ -0,0 +1,111 @@
+#!/bin/sh -
+#
+# $NetBSD: zdiff,v 1.3 2004/03/29 10:01:00 wiz Exp $
+# $OpenBSD: zdiff,v 1.2 2003/07/29 07:42:44 otto Exp $
+#
+#-
+# Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Sponsored in part by the Defense Advanced Research Projects
+# Agency (DARPA) and Air Force Research Laboratory, Air Force
+# Materiel Command, USAF, under agreement number F39502-99-1-0512.
+#
+# $FreeBSD$
+
+# Set $prog based on $0
+case $0 in
+	*cmp)	prog=cmp
+		;;
+	*)	prog=diff
+		;;
+esac
+USAGE="usage: z$prog [options] file1 [file2]"
+
+# Pull out any command line flags so we can pass them to diff/cmp
+# XXX - assumes there is no optarg
+flags=
+while test $# -ne 0; do
+	case "$1" in
+		--)
+			shift
+			break
+			;;
+		-*)
+			flags="$flags $1"
+			shift
+			;;
+		*)
+			break
+			;;
+	esac
+done
+
+if [ $# -eq 1 ]; then
+	# One file given, compare compressed to uncompressed
+	files="$1"
+	case "$1" in
+		*[._-][Zz])
+			files="${1%??}"
+			;;
+		*[._-]gz)
+			files="${1%???}"
+			;;
+		*.t[ag]z)
+			files="${1%??}"ar
+			;;
+		*)	echo "z$prog: unknown suffix" 1>&2
+			exit 1
+	esac
+	gzip -cdfq "$1" | $prog $flags - "$files"
+	status=$?
+elif [ $# -eq 2 ]; then
+	# Two files given, compare the two uncompressing as needed
+	case "$1" in
+		*[._-][Zz]|*[._-]gz|*.t[ag]z)
+			files=-
+			filt="gzip -cdfq $1"
+			;;
+		*)
+			files="$1"
+			;;
+	esac
+	case "$2" in
+		*[._-][Zz]|*[._-]gz|*.t[ag]z)
+			if [ "$files" = "-" ]; then
+				tmp=`mktemp -t z$prog.XXXXXXXXXX` || exit 1
+				trap "rm -f $tmp" 0 1 2 3 13 15
+				gzip -cdfq "$2" > $tmp
+				files="$files $tmp"
+			else
+				files="$files -"
+				filt="gzip -cdfq $2"
+			fi
+			;;
+		*)
+			files="$files $2"
+			;;
+	esac
+	if [ -n "$filt" ]; then
+		$filt | $prog $flags $files
+	else
+		$prog $flags $files
+	fi
+	status=$?
+else
+	echo "$USAGE" 1>&2
+	exit 1
+fi
+
+exit $status
diff --git a/usr.bin/gzip/zdiff.1 b/usr.bin/gzip/zdiff.1
new file mode 100644
index 0000000..2a6a4c8
--- /dev/null
+++ b/usr.bin/gzip/zdiff.1
@@ -0,0 +1,109 @@
+.\"	$NetBSD: zdiff.1,v 1.3 2003/12/28 12:48:03 wiz Exp $
+.\"	$OpenBSD: zdiff.1,v 1.2 2003/07/13 17:39:14 millert Exp $
+.\"
+.\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" Sponsored in part by the Defense Advanced Research Projects
+.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
+.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
+.\"
+.\" $FreeBSD$
+.Dd January 26, 2007
+.Dt ZDIFF 1
+.Os
+.Sh NAME
+.Nm zcmp ,
+.Nm zdiff
+.Nd compare compressed files
+.Sh SYNOPSIS
+.Nm zcmp
+.Op Ar options
+.Ar file
+.Op Ar file2
+.Nm zdiff
+.Op Ar options
+.Ar file
+.Op Ar file2
+.Sh DESCRIPTION
+.Nm zcmp
+and
+.Nm zdiff
+are filters that invoke
+.Xr cmp 1
+or
+.Xr diff 1
+respectively to compare compressed files.
+Such files generally have a
+.Dq Z
+or
+.Dq gz
+extension (both the
+.Xr compress 1
+and
+.Xr gzip 1
+formats are supported).
+Any
+.Ar options
+that are specified are passed to
+.Xr cmp 1
+or
+.Xr diff 1 .
+.Pp
+If only
+.Ar file1
+is specified, it is compared against a file with the same name, but
+with the extension removed.
+When both
+.Ar file1
+or
+.Ar file2
+are specified, either file may be compressed.
+.Sh ENVIRONMENT
+.Bl -tag -width "TMPDIR"
+.It Ev TMPDIR
+Directory in which to place temporary files.
+If unset,
+.Pa /tmp
+is used.
+.El
+.Sh FILES
+.Bl -tag -width "/tmp/zdiff.XXXXXXXXXX" -compact
+.It Pa /tmp/zcmp.XXXXXXXXXX
+Temporary file for
+.Nm zcmp .
+.It Pa /tmp/zdiff.XXXXXXXXXX
+Temporary file for
+.Nm zdiff .
+.El
+.Sh SEE ALSO
+.Xr cmp 1 ,
+.Xr compress 1 ,
+.Xr diff 1
+.Sh CAVEATS
+.Nm zcmp
+and
+.Nm zdiff
+rely solely on the file extension to determine what is, or is not,
+a compressed file.
+Consequently, the following are not supported as arguments:
+.Bl -dash
+.It
+directories
+.It
+device special files
+.It
+filenames indicating the standard input
+.Pq Dq \-
+.El
diff --git a/usr.bin/gzip/zforce b/usr.bin/gzip/zforce
new file mode 100644
index 0000000..3b7324c
--- /dev/null
+++ b/usr.bin/gzip/zforce
@@ -0,0 +1,55 @@
+#!/bin/sh -
+#
+# $NetBSD: zforce,v 1.2 2003/12/28 12:43:43 wiz Exp $
+# $OpenBSD: zforce,v 1.2 2003/08/05 18:22:17 deraadt Exp $
+#
+#-
+# Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# $FreeBSD$
+prog=`basename $0`
+USAGE="usage: $prog file ..."
+if test $# -eq 0; then
+	echo $USAGE
+	exit 1
+fi
+
+ret=0
+
+while test $# -ne 0; do
+	case "$1" in
+		*[._-]gz)
+			shift
+			;;
+		*.t[ag]z)
+			shift
+			;;
+		*)
+			if file "$1" |
+				grep -q "gzip compressed data" 2> /dev/null
+			then
+				n="$1".gz
+				if mv "$1" "$n" 2> /dev/null; then
+					echo "$1" -- renamed to "$n"
+				else
+					ret=1
+					echo $prog: cannot rename "$1" to "$n"
+				fi
+			fi
+			shift
+			;;
+	esac
+done
+exit $ret
diff --git a/usr.bin/gzip/zforce.1 b/usr.bin/gzip/zforce.1
new file mode 100644
index 0000000..efcc421
--- /dev/null
+++ b/usr.bin/gzip/zforce.1
@@ -0,0 +1,53 @@
+.\"	$NetBSD: zforce.1,v 1.2 2003/12/28 12:43:43 wiz Exp $
+.\"	$OpenBSD: zforce.1,v 1.1 2003/07/29 11:50:09 otto Exp $
+.\"
+.\" Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" $FreeBSD$
+.Dd January 26, 2007
+.Dt ZFORCE 1
+.Os
+.Sh NAME
+.Nm zforce
+.Nd force gzip files to have a .gz suffix
+.Sh SYNOPSIS
+.Nm zforce
+.Ar
+.Sh DESCRIPTION
+The
+.Nm
+utility renames
+.Xr gzip 1
+files to have a
+.Sq .gz
+suffix, so that
+.Xr gzip 1
+will not compress them twice.
+This can be useful if file names were truncated during a file transfer.
+Files that have an existing
+.Sq .gz ,
+.Sq -gz ,
+.Sq _gz ,
+.Sq .tgz
+or
+.Sq .taz
+suffix, or that have not been compressed by
+.Xr gzip 1 ,
+are ignored.
+.Sh SEE ALSO
+.Xr gzip 1
+.Sh CAVEATS
+.Nm
+overwrites existing files without warning.
diff --git a/usr.bin/gzip/zgrep b/usr.bin/gzip/zgrep
new file mode 100644
index 0000000..56582cf
--- /dev/null
+++ b/usr.bin/gzip/zgrep
@@ -0,0 +1,122 @@
+#!/bin/sh
+#
+# $NetBSD: zgrep,v 1.5 2006/05/03 16:48:29 yamt Exp $
+#
+# Copyright (c) 2003 Thomas Klausner.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $FreeBSD$
+
+grep=/usr/bin/grep
+zcat=/usr/bin/zcat
+
+endofopts=0
+pattern_found=0
+grep_args=""
+hyphen=0
+
+prg=$0
+
+# handle being called 'zegrep' or 'zfgrep'
+case ${prg} in
+    *zegrep)
+	grep_args="-E";;
+    *zfgrep)
+	grep_args="-F";;
+esac
+
+# skip all options and pass them on to grep taking care of options
+# with arguments, and if -e was supplied
+
+while [ $# -gt 0 -a ${endofopts} -eq 0 ]
+do
+    case $1 in
+    # from GNU grep-2.5.1 -- keep in sync!
+	-[ABCDXdefm])
+	    if [ $# -lt 2 ]
+		then
+		echo "${prg}: missing argument for $1 flag" >&2
+		exit 1
+	    fi
+	    case $1 in
+		-e)
+		    pattern="$2"
+		    pattern_found=1
+		    shift 2
+		    break
+		    ;;
+		*)
+		    ;;
+	    esac
+	    grep_args="${grep_args} $1 $2"
+	    shift 2
+	    ;;
+	--)
+	    shift
+	    endofopts=1
+	    ;;
+	-)
+	    hyphen=1
+	    shift
+	    ;;
+	-*)
+	    grep_args="${grep_args} $1"
+	    shift
+	    ;;
+	*)
+	    # pattern to grep for
+	    endofopts=1
+	    ;;
+    esac
+done
+
+# if no -e option was found, take next argument as grep-pattern
+if [ ${pattern_found} -lt 1 ]
+then
+    if [ $# -ge 1 ]; then
+	pattern="$1"
+	shift
+    elif [ ${hyphen} -gt 0 ]; then
+	pattern="-"
+    else
+	echo "${prg}: missing pattern" >&2
+	exit 1
+    fi
+fi
+
+# call grep ...
+if [ $# -lt 1 ]
+then
+    # ... on stdin
+    ${zcat} -fq - | ${grep} ${grep_args} -- "${pattern}" -
+else
+    # ... on all files given on the command line
+    while [ $# -gt 0 ]
+    do
+	${zcat} -fq -- "$1" | ${grep} -H --label="${1}" ${grep_args} -- "${pattern}" -
+	shift
+    done
+fi
+
+exit 0
diff --git a/usr.bin/gzip/zgrep.1 b/usr.bin/gzip/zgrep.1
new file mode 100644
index 0000000..2b9bf35
--- /dev/null
+++ b/usr.bin/gzip/zgrep.1
@@ -0,0 +1,98 @@
+.\" $NetBSD: zgrep.1,v 1.2 2005/09/11 23:30:20 wiz Exp $
+.\"
+.\" Copyright (c) 2003 Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.Dd January 26, 2007
+.Dt ZGREP 1
+.Os
+.Sh NAME
+.Nm zgrep ,
+.Nm zegrep ,
+.Nm zfgrep
+.Nd print lines matching a pattern in gzip-compressed files
+.Sh SYNOPSIS
+.Nm
+.Op Ar grep-flags
+.Op Fl -
+.Ar pattern
+.Op Ar files ...
+.Pp
+.Nm zegrep
+.Op Ar grep-flags
+.Op Fl -
+.Ar pattern
+.Op Ar
+.Pp
+.Nm zfgrep
+.Op Ar grep-flags
+.Op Fl -
+.Ar pattern
+.Op Ar
+.Sh DESCRIPTION
+.Nm
+runs
+.Xr grep 1
+on
+.Ar files
+or stdin, if no
+.Ar files
+argument is given, after decompressing them with
+.Xr zcat 1 .
+.Pp
+The
+.Ar grep-flags
+and
+.Ar pattern
+arguments are passed on to
+.Xr grep 1 .
+If an
+.Fl e
+flag is found in the
+.Ar grep-flags ,
+.Nm
+will not look for a
+.Ar pattern
+argument.
+.Pp
+.Nm zegrep
+calls
+.Xr egrep 1 ,
+while
+.Nm zfgrep
+calls
+.Xr fgrep 1 .
+.Sh EXIT STATUS
+In case of missing arguments or missing pattern,
+1 will be returned, otherwise 0.
+.Sh SEE ALSO
+.Xr egrep 1 ,
+.Xr fgrep 1 ,
+.Xr grep 1 ,
+.Xr gzip 1 ,
+.Xr zcat 1
+.Sh AUTHORS
+.An Thomas Klausner
+.Aq wiz@NetBSD.org
diff --git a/usr.bin/gzip/zmore b/usr.bin/gzip/zmore
new file mode 100644
index 0000000..46a4eb4
--- /dev/null
+++ b/usr.bin/gzip/zmore
@@ -0,0 +1,75 @@
+#!/bin/sh -
+#
+# $NetBSD: zmore,v 1.3 2004/03/29 09:59:42 wiz Exp $
+# $OpenBSD: zmore,v 1.4 2003/07/29 07:42:45 otto Exp $
+#
+#-
+# Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Sponsored in part by the Defense Advanced Research Projects
+# Agency (DARPA) and Air Force Research Laboratory, Air Force
+# Materiel Command, USAF, under agreement number F39502-99-1-0512.
+#
+# $FreeBSD$
+
+# Pull out any command line flags so we can pass them to more/less
+flags=
+while test $# -ne 0; do
+	case "$1" in
+		--)
+			shift
+			break
+			;;
+		-*)
+			flags="$flags $1"
+			shift
+			;;
+		*)
+			break
+			;;
+	esac
+done
+
+# No files means read from stdin
+if [ $# -eq 0 ]; then
+	gzip -cdfq 2>&1 | ${PAGER-more} $flags
+	exit 0
+fi
+
+oterm=`stty -g 2>/dev/null`
+while test $# -ne 0; do
+	gzip -cdfq "$1" 2>&1 | ${PAGER-more} $flags
+	prev="$1"
+	shift
+	if tty -s && test -n "$oterm" -a $# -gt 0; then
+		#echo -n "--More--(Next file: $1)"
+		echo -n "$prev (END) - Next: $1 "
+		trap "stty $oterm 2>/dev/null" 0 1 2 3 13 15
+		stty cbreak -echo 2>/dev/null
+		REPLY=`dd bs=1 count=1 2>/dev/null`
+		stty $oterm 2>/dev/null
+		trap - 0 1 2 3 13 15
+		echo
+		case "$REPLY" in
+			s)
+				shift
+				;;
+			e|q)
+				break
+				;;
+		esac
+	fi
+done
+exit 0
diff --git a/usr.bin/gzip/zmore.1 b/usr.bin/gzip/zmore.1
new file mode 100644
index 0000000..1bd349d
--- /dev/null
+++ b/usr.bin/gzip/zmore.1
@@ -0,0 +1,94 @@
+.\"	$NetBSD: zmore.1,v 1.3 2003/12/28 12:47:52 wiz Exp $
+.\"	$OpenBSD: zmore.1,v 1.3 2003/06/23 21:00:48 deraadt Exp $
+.\"
+.\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" Sponsored in part by the Defense Advanced Research Projects
+.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
+.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
+.\"
+.\" $FreeBSD$
+.Dd January 26, 2007
+.Dt ZMORE 1
+.Os
+.Sh NAME
+.Nm zmore
+.Nd view compressed files on a CRT
+.Sh SYNOPSIS
+.Nm zmore
+.Op Ar flags
+.Op Ar file ...
+.Sh DESCRIPTION
+.Nm
+is a filter that allows the viewing of files compressed with Lempel-Ziv
+encoding.
+Such files generally have a
+.Dq Z
+or
+.Dq gz
+extension (both the
+.Xr compress 1
+and
+.Xr gzip 1
+formats are supported).
+Any
+.Ar flags
+that are specified are passed to the user's preferred
+.Ev PAGER
+(which is
+.Pa /usr/bin/more
+by default).
+.Pp
+When multiple files are specified,
+.Nm
+will pause at the end of each file and present the following prompt to the user:
+.Bd -literal -offset indent
+prev_file (END) - Next: next_file
+.Ed
+.Pp
+Where
+.Sy prev_file
+is the file that was just displayed and
+.Sy next_file
+is the next file to be displayed.
+The following keys are recognized at the prompt:
+.Bl -tag -width "e or q" -offset indent
+.It Ic e No or Ic q
+quit
+.Nm zmore .
+.It Ic s
+skip the next file (or exit if the next file is the last).
+.El
+.Pp
+If no files are specified,
+.Nm
+will read from the standard input.
+In this mode
+.Nm
+will assume
+.Xr gzip 1
+style compression since there is no suffix on which to make a decision.
+.Sh ENVIRONMENT
+.Bl -tag -width "PAGER"
+.It Ev PAGER
+Program used to display files.
+If unset,
+.Pa /usr/bin/more
+is used.
+.El
+.Sh SEE ALSO
+.Xr compress 1 ,
+.Xr less 1 ,
+.Xr more 1
diff --git a/usr.bin/gzip/znew b/usr.bin/gzip/znew
new file mode 100644
index 0000000..e3e4cce
--- /dev/null
+++ b/usr.bin/gzip/znew
@@ -0,0 +1,138 @@
+#!/bin/ksh -
+#
+# $NetBSD: znew,v 1.2 2003/12/28 12:43:43 wiz Exp $
+# $OpenBSD: znew,v 1.2 2003/08/05 18:22:17 deraadt Exp $
+#
+#-
+# Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# $FreeBSD$
+
+# Return 0 if the first arg file size is smaller than the second, 1 otherwise.
+smaller () {
+	a=`du -k "$1" | awk '{ print $1 }'`
+	b=`du -k "$2" | awk '{ print $1 }'`
+	test $a -lt $b
+}
+
+# Check gzip integrity if the -t flag is specified
+checkfile () {
+	if test $tflag -eq 1; then
+		gzip -qt < "$1"
+	fi
+}
+
+# Decompress a file and then gzip it
+process () {
+	prefix="${1%.Z}"
+	filez="$prefix".Z
+	filegz="$prefix".gz
+
+	if test ! -e "$filez"; then
+		echo "$prog: $filez does not exist"
+		return 1
+	fi
+	if test ! -f "$filez"; then
+		echo "$prog: $filez is not a regular file"
+		return 1
+	fi
+	if test -e "$filegz" -a $fflag -eq 0; then
+		echo "$prog: $filegz already exists"
+		return 1
+	fi
+
+	tmp=`mktemp /tmp/znewXXXXXXXXXX` || {
+		echo "$prog: cannot create tmp file"
+		return 1
+	}
+	trap 'rm -f "$tmp"; exit 1' HUP INT QUIT PIPE TERM
+
+	# Do the actual work, producing a file "$tmp"
+	if uncompress -f -c < "$filez" | gzip -f $gzipflags -o "$tmp"; then
+
+		if test $kflag -eq 1 && smaller "$filez" "$tmp"; then
+			echo -n "$prog: $filez is smaller than $filegz"
+			echo "; keeping it"
+			rm -f "$tmp"
+			return 0
+		fi
+		if ! checkfile "$tmp"; then
+			echo "$prog: integrity check of $tmp failed"
+			rm -f "$tmp"
+			return 1;
+		fi
+
+		# Try to keep the mode of the original file
+		if ! cp -fp "$filez" "$filegz"; then
+			echo "$prog: warning: could not keep mode of $filez"
+		fi
+		if  ! cp "$tmp" "$filegz" 2> /dev/null; then
+			echo "$prog: warning: could not keep mode of $filez"
+			if ! cp -f "$tmp" "$filegz" 2> /dev/null; then
+				echo "$prog: could not copy $tmp to $filegz"
+				rm -f "$filegz" "$tmp"
+				return 1
+			fi
+		fi
+		if ! touch -fr "$filez" "$filegz"; then
+			echo -n "$prog: warning: could not keep timestamp of "
+			echo "$filez"
+		fi
+		rm -f "$filez" "$tmp"
+	else
+		echo "$prog: failed to process $filez"
+		rm -f "$tmp"
+		return 1
+	fi
+}
+
+prog=`basename "$0"`
+usage="usage: $prog [-ftv9K] file ..."
+
+fflag=0
+tflag=0
+kflag=0
+gzipflags=
+
+# -P flag is recognized to maintain compatibility, but ignored. Pipe mode is
+# always used
+while getopts :ftv9PK i; do
+	case $i in
+		f) fflag=1;;
+		t) tflag=1;;
+		v) gzipflags="-v $gzipflags";;
+		9) gzipflags="-9 $gzipflags";;
+		P) ;;
+		K) kflag=1;;
+		\?) echo "$usage"; exit 1;;
+	esac
+done
+
+shift OPTIND-1
+
+if test $# -eq 0; then
+	echo "$usage"
+	exit 1
+fi
+
+rc=0
+
+while test $# -ne 0; do
+	if ! process "$1"; then
+		rc=$?
+	fi
+	shift
+done
+exit $rc
diff --git a/usr.bin/gzip/znew.1 b/usr.bin/gzip/znew.1
new file mode 100644
index 0000000..0da5a62
--- /dev/null
+++ b/usr.bin/gzip/znew.1
@@ -0,0 +1,71 @@
+.\"	$NetBSD: znew.1,v 1.2 2003/12/28 12:43:43 wiz Exp $
+.\"	$OpenBSD: znew.1,v 1.1 2003/08/02 20:52:50 otto Exp $
+.\"
+.\" Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" $FreeBSD$
+.Dd January 26, 2007
+.Dt ZNEW 1
+.Os
+.Sh NAME
+.Nm znew
+.Nd convert compressed files to gzipped files
+.Sh SYNOPSIS
+.Nm
+.Op Fl ftv9K
+.Ar
+.Sh DESCRIPTION
+The
+.Nm
+utility uncompresses files compressed by
+.Xr compress 1
+and recompresses them with
+.Xr gzip 1 .
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl f
+Overwrite existing
+.Sq .gz
+files.
+Unless this option is specified,
+.Nm
+refuses to overwrite existing files.
+.It Fl t
+Test integrity of the gzipped file before deleting the original file.
+If the integrity check fails, the original
+.Sq .Z
+file is not removed.
+.It Fl v
+Print a report specifying the achieved compression ratios.
+.It Fl 9
+Use the -9 mode of
+.Xr gzip 1 ,
+achieving better compression at the cost of slower execution.
+.It Fl K
+Keep the original
+.Sq .Z
+file if it uses less disk blocks than the gzipped one.
+A disk block is 1024 bytes.
+.El
+.Sh SEE ALSO
+.Xr gzip 1
+.Sh CAVEATS
+The
+.Nm
+utility tries to maintain the file mode of the original file.
+If the original file is not writable, it is not able to do that and
+.Nm
+will print a warning.
diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c
new file mode 100644
index 0000000..82b7a47
--- /dev/null
+++ b/usr.bin/gzip/zuncompress.c
@@ -0,0 +1,390 @@
+/*	$NetBSD: zuncompress.c,v 1.6 2005/11/22 09:05:30 mrg Exp $ */
+
+/*-
+ * Copyright (c) 1985, 1986, 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis and James A. Woods, derived from original
+ * work by Spencer Thomas and Joseph Orost.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp
+ * $FreeBSD$
+ */
+
+/* This file is #included by gzip.c */
+
+static int	zread(void *, char *, int);
+
+#define	tab_prefixof(i)	(zs->zs_codetab[i])
+#define	tab_suffixof(i)	((char_type *)(zs->zs_htab))[i]
+#define	de_stack	((char_type *)&tab_suffixof(1 << BITS))
+
+#define BITS		16		/* Default bits. */
+#define HSIZE		69001		/* 95% occupancy */ /* XXX may not need HSIZE */
+#define BIT_MASK	0x1f		/* Defines for third byte of header. */
+#define BLOCK_MASK	0x80
+#define CHECK_GAP	10000		/* Ratio check interval. */
+#define BUFSIZE		(64 * 1024)
+
+/*                      
+ * Masks 0x40 and 0x20 are free.  I think 0x20 should mean that there is
+ * a fourth header byte (for expansion).
+ */             
+#define INIT_BITS	9	/* Initial number of bits/code. */
+
+/*
+ * the next two codes should not be changed lightly, as they must not
+ * lie within the contiguous general code space.
+ */
+#define	FIRST	257		/* First free entry. */
+#define	CLEAR	256		/* Table clear output code. */
+
+
+#define MAXCODE(n_bits)	((1 << (n_bits)) - 1)
+
+typedef long	code_int;
+typedef long	count_int;
+typedef u_char	char_type;
+
+static char_type magic_header[] =
+	{'\037', '\235'};	/* 1F 9D */
+
+static char_type rmask[9] =
+	{0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff};
+
+/* XXX zuncompress global */
+off_t total_compressed_bytes;
+size_t compressed_prelen;
+char *compressed_pre;
+
+struct s_zstate {
+	FILE *zs_fp;			/* File stream for I/O */
+	char zs_mode;			/* r or w */
+	enum {
+		S_START, S_MIDDLE, S_EOF
+	} zs_state;			/* State of computation */
+	int zs_n_bits;			/* Number of bits/code. */
+	int zs_maxbits;			/* User settable max # bits/code. */
+	code_int zs_maxcode;		/* Maximum code, given n_bits. */
+	code_int zs_maxmaxcode;		/* Should NEVER generate this code. */
+	count_int zs_htab [HSIZE];
+	u_short zs_codetab [HSIZE];
+	code_int zs_hsize;		/* For dynamic table sizing. */
+	code_int zs_free_ent;		/* First unused entry. */
+	/*
+	 * Block compression parameters -- after all codes are used up,
+	 * and compression rate changes, start over.
+	 */
+	int zs_block_compress;
+	int zs_clear_flg;
+	long zs_ratio;
+	count_int zs_checkpoint;
+	int zs_offset;
+	long zs_in_count;		/* Length of input. */
+	long zs_bytes_out;		/* Length of compressed output. */
+	long zs_out_count;		/* # of codes output (for debugging). */
+	char_type zs_buf[BITS];
+	union {
+		struct {
+			long zs_fcode;
+			code_int zs_ent;
+			code_int zs_hsize_reg;
+			int zs_hshift;
+		} w;			/* Write paramenters */
+		struct {
+			char_type *zs_stackp;
+			int zs_finchar;
+			code_int zs_code, zs_oldcode, zs_incode;
+			int zs_roffset, zs_size;
+			char_type zs_gbuf[BITS];
+		} r;			/* Read parameters */
+	} u;
+};
+
+static code_int	getcode(struct s_zstate *zs);
+
+static off_t
+zuncompress(FILE *in, FILE *out, char *pre, size_t prelen,
+	    off_t *compressed_bytes)
+{
+	off_t bin, bout = 0;
+	char *buf;
+
+	buf = malloc(BUFSIZE);
+	if (buf == NULL)
+		return -1;
+
+	/* XXX */
+	compressed_prelen = prelen;
+	if (prelen != 0)
+		compressed_pre = pre;
+	else
+		compressed_pre = NULL;
+
+	while ((bin = fread(buf, 1, sizeof(buf), in)) != 0) {
+		if (tflag == 0 && fwrite(buf, 1, bin, out) != (size_t)bin) {
+			free(buf);
+			return -1;
+		}
+		bout += bin;
+	}
+
+	if (compressed_bytes)
+		*compressed_bytes = total_compressed_bytes;
+
+	free(buf);
+	return bout;
+}
+
+static int
+zclose(void *zs)
+{
+	free(zs);
+	/* We leave the caller to close the fd passed to zdopen() */
+	return 0;
+}
+
+FILE *
+zdopen(int fd)
+{
+	struct s_zstate *zs;
+
+	if ((zs = calloc(1, sizeof(struct s_zstate))) == NULL)
+		return (NULL);
+
+	zs->zs_state = S_START;
+
+	/* XXX we can get rid of some of these */
+	zs->zs_hsize = HSIZE;			/* For dynamic table sizing. */
+	zs->zs_free_ent = 0;			/* First unused entry. */
+	zs->zs_block_compress = BLOCK_MASK;
+	zs->zs_clear_flg = 0;			/* XXX we calloc()'d this structure why = 0? */
+	zs->zs_ratio = 0;
+	zs->zs_checkpoint = CHECK_GAP;
+	zs->zs_in_count = 1;			/* Length of input. */
+	zs->zs_out_count = 0;			/* # of codes output (for debugging). */
+	zs->u.r.zs_roffset = 0;
+	zs->u.r.zs_size = 0;
+
+	/*
+	 * Layering compress on top of stdio in order to provide buffering,
+	 * and ensure that reads and write work with the data specified.
+	 */
+	if ((zs->zs_fp = fdopen(fd, "r")) == NULL) {
+		free(zs);
+		return NULL;
+	}
+
+	return funopen(zs, zread, NULL, NULL, zclose);
+}
+
+/*
+ * Decompress read.  This routine adapts to the codes in the file building
+ * the "string" table on-the-fly; requiring no table to be stored in the
+ * compressed file.  The tables used herein are shared with those of the
+ * compress() routine.  See the definitions above.
+ */
+static int
+zread(void *cookie, char *rbp, int num)
+{
+	u_int count, i;
+	struct s_zstate *zs;
+	u_char *bp, header[3];
+
+	if (num == 0)
+		return (0);
+
+	zs = cookie;
+	count = num;
+	bp = (u_char *)rbp;
+	switch (zs->zs_state) {
+	case S_START:
+		zs->zs_state = S_MIDDLE;
+		break;
+	case S_MIDDLE:
+		goto middle;
+	case S_EOF:
+		goto eof;
+	}
+
+	/* Check the magic number */
+	for (i = 0; i < 3 && compressed_prelen; i++, compressed_prelen--)  
+		header[i] = *compressed_pre++;
+
+	if (fread(header + i, 1, sizeof(header) - i, zs->zs_fp) !=
+		  sizeof(header) - i ||
+	    memcmp(header, magic_header, sizeof(magic_header)) != 0) {
+		errno = EFTYPE;
+		return (-1);
+	}
+	total_compressed_bytes = 0;
+	zs->zs_maxbits = header[2];	/* Set -b from file. */
+	zs->zs_block_compress = zs->zs_maxbits & BLOCK_MASK;
+	zs->zs_maxbits &= BIT_MASK;
+	zs->zs_maxmaxcode = 1L << zs->zs_maxbits;
+	if (zs->zs_maxbits > BITS) {
+		errno = EFTYPE;
+		return (-1);
+	}
+	/* As above, initialize the first 256 entries in the table. */
+	zs->zs_maxcode = MAXCODE(zs->zs_n_bits = INIT_BITS);
+	for (zs->u.r.zs_code = 255; zs->u.r.zs_code >= 0; zs->u.r.zs_code--) {
+		tab_prefixof(zs->u.r.zs_code) = 0;
+		tab_suffixof(zs->u.r.zs_code) = (char_type) zs->u.r.zs_code;
+	}
+	zs->zs_free_ent = zs->zs_block_compress ? FIRST : 256;
+
+	zs->u.r.zs_finchar = zs->u.r.zs_oldcode = getcode(zs);
+	if (zs->u.r.zs_oldcode == -1)	/* EOF already? */
+		return (0);	/* Get out of here */
+
+	/* First code must be 8 bits = char. */
+	*bp++ = (u_char)zs->u.r.zs_finchar;
+	count--;
+	zs->u.r.zs_stackp = de_stack;
+
+	while ((zs->u.r.zs_code = getcode(zs)) > -1) {
+
+		if ((zs->u.r.zs_code == CLEAR) && zs->zs_block_compress) {
+			for (zs->u.r.zs_code = 255; zs->u.r.zs_code >= 0;
+			    zs->u.r.zs_code--)
+				tab_prefixof(zs->u.r.zs_code) = 0;
+			zs->zs_clear_flg = 1;
+			zs->zs_free_ent = FIRST - 1;
+			if ((zs->u.r.zs_code = getcode(zs)) == -1)	/* O, untimely death! */
+				break;
+		}
+		zs->u.r.zs_incode = zs->u.r.zs_code;
+
+		/* Special case for KwKwK string. */
+		if (zs->u.r.zs_code >= zs->zs_free_ent) {
+			*zs->u.r.zs_stackp++ = zs->u.r.zs_finchar;
+			zs->u.r.zs_code = zs->u.r.zs_oldcode;
+		}
+
+		/* Generate output characters in reverse order. */
+		while (zs->u.r.zs_code >= 256) {
+			*zs->u.r.zs_stackp++ = tab_suffixof(zs->u.r.zs_code);
+			zs->u.r.zs_code = tab_prefixof(zs->u.r.zs_code);
+		}
+		*zs->u.r.zs_stackp++ = zs->u.r.zs_finchar = tab_suffixof(zs->u.r.zs_code);
+
+		/* And put them out in forward order.  */
+middle:		do {
+			if (count-- == 0)
+				return (num);
+			*bp++ = *--zs->u.r.zs_stackp;
+		} while (zs->u.r.zs_stackp > de_stack);
+
+		/* Generate the new entry. */
+		if ((zs->u.r.zs_code = zs->zs_free_ent) < zs->zs_maxmaxcode) {
+			tab_prefixof(zs->u.r.zs_code) = (u_short) zs->u.r.zs_oldcode;
+			tab_suffixof(zs->u.r.zs_code) = zs->u.r.zs_finchar;
+			zs->zs_free_ent = zs->u.r.zs_code + 1;
+		}
+
+		/* Remember previous code. */
+		zs->u.r.zs_oldcode = zs->u.r.zs_incode;
+	}
+	zs->zs_state = S_EOF;
+eof:	return (num - count);
+}
+
+/*-
+ * Read one code from the standard input.  If EOF, return -1.
+ * Inputs:
+ * 	stdin
+ * Outputs:
+ * 	code or -1 is returned.
+ */
+static code_int
+getcode(struct s_zstate *zs)
+{
+	code_int gcode;
+	int r_off, bits, i;
+	char_type *bp;
+
+	bp = zs->u.r.zs_gbuf;
+	if (zs->zs_clear_flg > 0 || zs->u.r.zs_roffset >= zs->u.r.zs_size ||
+	    zs->zs_free_ent > zs->zs_maxcode) {
+		/*
+		 * If the next entry will be too big for the current gcode
+		 * size, then we must increase the size.  This implies reading
+		 * a new buffer full, too.
+		 */
+		if (zs->zs_free_ent > zs->zs_maxcode) {
+			zs->zs_n_bits++;
+			if (zs->zs_n_bits == zs->zs_maxbits)	/* Won't get any bigger now. */
+				zs->zs_maxcode = zs->zs_maxmaxcode;
+			else
+				zs->zs_maxcode = MAXCODE(zs->zs_n_bits);
+		}
+		if (zs->zs_clear_flg > 0) {
+			zs->zs_maxcode = MAXCODE(zs->zs_n_bits = INIT_BITS);
+			zs->zs_clear_flg = 0;
+		}
+		/* XXX */
+		for (i = 0; i < zs->zs_n_bits && compressed_prelen; i++, compressed_prelen--)  
+			zs->u.r.zs_gbuf[i] = *compressed_pre++;
+		zs->u.r.zs_size = fread(zs->u.r.zs_gbuf + i, 1, zs->zs_n_bits - i, zs->zs_fp);
+		zs->u.r.zs_size += i;
+		if (zs->u.r.zs_size <= 0)			/* End of file. */
+			return (-1);
+		zs->u.r.zs_roffset = 0;
+
+		total_compressed_bytes += zs->u.r.zs_size;
+
+		/* Round size down to integral number of codes. */
+		zs->u.r.zs_size = (zs->u.r.zs_size << 3) - (zs->zs_n_bits - 1);
+	}
+	r_off = zs->u.r.zs_roffset;
+	bits = zs->zs_n_bits;
+
+	/* Get to the first byte. */
+	bp += (r_off >> 3);
+	r_off &= 7;
+
+	/* Get first part (low order bits). */
+	gcode = (*bp++ >> r_off);
+	bits -= (8 - r_off);
+	r_off = 8 - r_off;	/* Now, roffset into gcode word. */
+
+	/* Get any 8 bit parts in the middle (<=1 for up to 16 bits). */
+	if (bits >= 8) {
+		gcode |= *bp++ << r_off;
+		r_off += 8;
+		bits -= 8;
+	}
+
+	/* High order bits. */
+	gcode |= (*bp & rmask[bits]) << r_off;
+	zs->u.r.zs_roffset += zs->zs_n_bits;
+
+	return (gcode);
+}
+