split compress(1) into compress(1) and gzip(1), as suggested by millert;

ok/help millert otto

9 files changed, 402 insertions, 131 deletions

diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile
index f318902e7c1..d05f2c67c65 100644
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.19 2003/09/05 04:46:35 tedu Exp $
+#	$OpenBSD: Makefile,v 1.20 2007/01/24 10:53:43 jmc Exp $
 
 PROG=	compress
 SRCS=	main.c zopen.c gzopen.c nullopen.c
-MAN=	compress.1 zmore.1 zdiff.1 zforce.1 gzexe.1 znew.1
+MAN=	compress.1 gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1
 LINKS=	${BINDIR}/compress ${BINDIR}/uncompress \
 	${BINDIR}/compress ${BINDIR}/zcat \
 	${BINDIR}/compress ${BINDIR}/gzip \
@@ -10,12 +10,9 @@ LINKS=	${BINDIR}/compress ${BINDIR}/uncompress \
 	${BINDIR}/compress ${BINDIR}/gzcat \
 	${BINDIR}/zdiff ${BINDIR}/zcmp
 
-MLINKS= compress.1 uncompress.1 \
-	compress.1 zcat.1 \
-	compress.1 gzip.1 \
-	compress.1 gunzip.1 \
-	compress.1 gzcat.1 \
-	zdiff.1 zcmp.1
+MLINKS+=compress.1 uncompress.1 compress.1 zcat.1
+MLINKS+=gzip.1 gunzip.1 gzip.1 gzcat.1
+MLINKS+=zdiff.1 zcmp.1
 
 LDADD=-lz
 DPADD=${LIBZ}
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index e51c21157c2..92125a81b6d 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compress.1,v 1.34 2005/07/22 09:30:51 jmc Exp $
+.\"	$OpenBSD: compress.1,v 1.35 2007/01/24 10:53:43 jmc Exp $
 .\"	$NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
 .\"
 .\" Copyright (c) 1986, 1990, 1993
@@ -40,16 +40,11 @@
 .Sh NAME
 .Nm compress ,
 .Nm uncompress ,
-.Nm gzip ,
-.Nm gunzip ,
-.Nm zcat ,
-.Nm gzcat
-.Nd compress and expand data
+.Nm zcat
+.Nd compress and expand data (compress mode)
 .Sh SYNOPSIS
 .Nm compress
-.Op Fl LV
-.Nm compress
-.Op Fl 123456789cdfghlNnOqrtv
+.Op Fl 123456789cdfghLlNnOqrtVv
 .Op Fl b Ar bits
 .Op Fl o Ar filename
 .Op Fl S Ar suffix
@@ -58,68 +53,42 @@
 .Op Fl cfhlNnqrtv
 .Op Fl o Ar filename
 .Op Ar
-.Pp
-.Nm gzip
-.Op Fl LV
-.Nm gzip
-.Op Fl 123456789cdfghlNnOqrtv
-.Op Fl b Ar bits
-.Op Fl o Ar filename
-.Op Fl S Ar suffix
-.Op Ar
-.Nm gunzip
-.Op Fl cfhlNnqrtv
-.Op Fl o Ar filename
-.Op Ar
-.Pp
 .Nm zcat
 .Op Fl fghqr
 .Op Ar
-.Nm gzcat
-.Op Fl fghqr
-.Op Ar
 .Sh DESCRIPTION
 The
-.Nm compress
-and
-.Nm gzip
-utilities
-reduce the size of the named files using adaptive Lempel-Ziv coding.
-They are functionally identical, but use different algorithms for compression.
+.Nm
+utility
+reduces the size of the named files using adaptive Lempel-Ziv coding,
+in compress mode.
 If invoked as
-.Nm gzip
-or
 .Nm compress Fl g ,
-the deflate mode of compression is chosen by default;
-otherwise the older method of compression
-.Pq compress mode
-is used.
-.Pp
-Each
-.Ar file
-is renamed to the same name plus the extension
-.Dq .Z ,
-or
-.Dq .gz
-(in deflate mode).
+the deflate mode of compression is chosen;
+see
+.Xr gzip 1
+for more information.
+Each file is renamed to the same name plus the extension
+.Dq .Z .
 As many of the modification time, access time, file flags, file mode,
 user ID, and group ID as allowed by permissions are retained in the
 new file.
-If compression would not reduce the size of a
-.Ar file ,
+If compression would not reduce the size of a file,
 the file is ignored (unless
 .Fl f
 is used).
 .Pp
 The
 .Nm uncompress
-and
-.Nm gunzip
-utilities restore compressed files to their original form, renaming the
+utility restores compressed files to their original form, renaming the
 files by removing the extension (or by using the stored name if the
 .Fl N
 flag is specified).
-When decompressing, the following extensions are recognized:
+It has the ability to restore files compressed by both
+.Nm
+and
+.Xr gzip 1 ,
+recognising the following extensions:
 .Dq .Z ,
 .Dq -Z ,
 .Dq _Z ,
@@ -145,11 +114,6 @@ The
 command is equivalent in functionality to
 .Nm uncompress
 .Fl c .
-The
-.Nm gzcat
-command is equivalent in functionality to
-.Nm gunzip
-.Fl c .
 .Pp
 If renaming the files would cause files to be overwritten and the standard
 input device is a terminal, the user is prompted (on the standard error
@@ -166,7 +130,7 @@ not removed, and the attributes of the input file are not retained.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl 1...9
-Use deflate scheme with compression factor of
+Use the deflate scheme, with compression factor of
 .Fl 1
 to
 .Fl 9 .
@@ -189,8 +153,6 @@ code limit
 Compressed or uncompressed output is written to the standard output.
 No files are modified (force
 .Nm zcat
-or
-.Nm gzcat
 mode).
 .It Fl d
 Decompress the source files instead of compressing them (force
@@ -208,20 +170,17 @@ and if the option
 is also given, copy the input data without change
 to the standard output: let
 .Nm zcat
-or
-.Nm gzcat
 behave as
 .Xr cat 1 .
 .It Fl g
-Use deflate scheme which reportedly provides better compression rates (force
-.Nm gzip
+Use the deflate scheme, which reportedly provides better compression rates
+(force
+.Xr gzip 1
 mode).
-This flag need not be specified when invoked as
-.Nm gzip
-or
-.Nm gzcat .
 .It Fl h
 Print a short help message.
+.It Fl L
+Print the license.
 .It Fl l
 List information for the specified compressed files.
 The following information is listed:
@@ -257,28 +216,33 @@ is printed instead).
 .It Fl N
 When compressing, save the original file name and time stamp in the
 compressed file.
-This information is saved by default when the deflate scheme is used.
+This information is saved by default when the deflate scheme
+.Pf ( Fl g )
+is used.
 When uncompressing or listing, use the time stamp and file name stored
 in the compressed file, if any, for the uncompressed version.
 .It Fl n
 When compressing, do not save the original file name and time stamp.
-This information is saved by default when the deflate scheme is used.
+This information is saved by default when the deflate scheme
+.Pf ( Fl g )
+is used.
 When uncompressing, do not restore the original file name and time stamp.
 By default, the uncompressed file inherits the time stamp of the
 compressed version and the uncompressed file name is generated from
 the name of the compressed file name as described above.
 .It Fl O
-Use old compression method.
+Use compress mode
+(the default).
 .It Fl o Ar filename
 Set the output file name.
 .It Fl q
-Be quiet, suppress all messages.
+Be quiet: suppress all messages.
 .It Fl r
-Recursive mode,
+Recursive mode:
 .Nm
 will descend into specified directories.
 .It Fl S Ar suffix
-Set suffix for compressed files.
+Set the suffix for compressed files.
 .It Fl t
 Test the integrity of each file leaving any files intact.
 .It Fl V
@@ -289,7 +253,6 @@ and exit.
 Print the percentage reduction of each file and other information.
 .El
 .Pp
-In normal mode,
 .Nm
 uses a modified Lempel-Ziv algorithm
 .Pq LZW .
@@ -318,20 +281,10 @@ This allows the algorithm to adapt to the next
 .Dq block
 of the file.
 .Pp
-.Nm gzip
-uses a slightly different version of the Lempel-Ziv algorithm
-.Pq LZ77 .
-Common substrings are replaced by pointers to previous strings,
-and are found using a hash table.
-Unique substrings are emitted as a string of literal bytes,
-and compressed as Huffman trees.
-.Pp
 The
 .Fl b
 flag is omitted for
 .Nm uncompress
-or
-.Nm gunzip
 since the
 .Ar bits
 parameter specified during compression
@@ -344,22 +297,22 @@ input, the number of
 .Ar bits
 per code, and the distribution of common substrings.
 Typically, text such as source code or English is reduced by 50 \- 60% using
-.Nm
-and by 60 \- 70% using
-.Nm gzip .
+.Nm .
 Compression is generally much better than that achieved by Huffman
 coding (as used in the historical command pack), or adaptive Huffman
 coding (as used in the historical command compact), and takes less
 time to compute.
 .Pp
 The
-.Nm
+.Nm compress ,
+.Nm uncompress ,
 and
-.Nm gzip
+.Nm zcat
 utilities exit with 0 on success; 1 if an error occurred;
 or 2 if a warning occurred.
 .Sh SEE ALSO
 .Xr gzexe 1 ,
+.Xr gzip 1 ,
 .Xr zdiff 1 ,
 .Xr zforce 1 ,
 .Xr zmore 1 ,
@@ -374,41 +327,16 @@ or 2 if a warning occurred.
 .%V 17:6
 .%P pp. 8\-19
 .Re
-.Pp
-.Bl -tag -width 12n -compact
-.It RFC 1950
-ZLIB Compressed Data Format Specification.
-.It RFC 1951
-DEFLATE Compressed Data Format Specification.
-.It RFC 1952
-GZIP File Format Specification.
-.El
 .Sh STANDARDS
 The
 .Nm
 utility is compliant with the
 .St -p1003.2-92
 specification.
-.Pp
-The
-.Nm gzip
-and
-.Nm gunzip
-utilities are extensions.
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.3 .
-The deflate compression support was added in
+Deflate compression support was added in
 .Ox 2.1 .
-Full
-.Nm gzip
-compatibility was added in
-.Ox 3.4 .
-The
-.Sq g
-in this version of
-.Nm gzip
-stands for
-.Dq gratis .
diff --git a/usr.bin/compress/gzexe.1 b/usr.bin/compress/gzexe.1
index f781383ad12..40d5156bffa 100644
--- a/usr.bin/compress/gzexe.1
+++ b/usr.bin/compress/gzexe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gzexe.1,v 1.3 2005/09/30 06:50:44 otto Exp $
+.\"	$OpenBSD: gzexe.1,v 1.4 2007/01/24 10:53:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
 .\"
@@ -64,6 +64,7 @@ or programs it needs to perform on-the-fly decompression:
 and
 .Xr chmod 1 .
 .Sh SEE ALSO
+.Xr compress 1 ,
 .Xr gzip 1
 .Sh CAVEATS
 The
diff --git a/usr.bin/compress/gzip.1 b/usr.bin/compress/gzip.1
new file mode 100644
index 00000000000..7791021cd16
--- /dev/null
+++ b/usr.bin/compress/gzip.1
@@ -0,0 +1,340 @@
+.\"	$OpenBSD: gzip.1,v 1.1 2007/01/24 10:53:43 jmc Exp $
+.\"
+.\" Copyright (c) 1986, 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" 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.
+.\"
+.\"     @(#)compress.1	8.2 (Berkeley) 4/18/94
+.\"
+.Dd April 18, 1994
+.Dt GZIP 1
+.Os
+.Sh NAME
+.Nm gzip ,
+.Nm gunzip ,
+.Nm gzcat
+.Nd compress and expand data (deflate mode)
+.Sh SYNOPSIS
+.Nm gzip
+.Op Fl 123456789cdfghLlNnOqrtVv
+.Op Fl b Ar bits
+.Op Fl o Ar filename
+.Op Fl S Ar suffix
+.Op Ar
+.Nm gunzip
+.Op Fl cfhlNnqrtv
+.Op Fl o Ar filename
+.Op Ar
+.Nm gzcat
+.Op Fl fghqr
+.Op Ar
+.Sh DESCRIPTION
+The
+.Nm
+utility
+reduces the size of the named files using adaptive Lempel-Ziv coding,
+in deflate mode.
+If invoked as
+.Nm gzip -O ,
+the compress mode of compression is chosen;
+see
+.Xr compress 1
+for more information.
+Each file is renamed to the same name plus the extension
+.Dq .gz .
+As many of the modification time, access time, file flags, file mode,
+user ID, and group ID as allowed by permissions are retained in the
+new file.
+If compression would not reduce the size of a file,
+the file is ignored (unless
+.Fl f
+is used).
+.Pp
+The
+.Nm gunzip
+utility restores compressed files to their original form, renaming the
+files by removing the extension (or by using the stored name if the
+.Fl N
+flag is specified).
+It has the ability to restore files compressed by both
+.Nm
+and
+.Xr compress 1 ,
+recognising the following extensions:
+.Dq .Z ,
+.Dq -Z ,
+.Dq _Z ,
+.Dq .gz ,
+.Dq -gz ,
+.Dq _gz ,
+.Dq .tgz ,
+.Dq -tgz ,
+.Dq _tgz ,
+.Dq .taz ,
+.Dq -taz ,
+and
+.Dq _taz .
+Extensions ending in
+.Dq tgz
+and
+.Dq taz
+are not removed when decompressing, instead they are converted to
+.Dq tar .
+.Pp
+The
+.Nm gzcat
+command is equivalent in functionality to
+.Nm gunzip
+.Fl c .
+.Pp
+If renaming the files would cause files to be overwritten and the standard
+input device is a terminal, the user is prompted (on the standard error
+output) for confirmation.
+If prompting is not possible or confirmation is not received, the files
+are not overwritten.
+.Pp
+If no files are specified, the standard input is compressed or uncompressed
+to the standard output.
+If either the input or output files are not regular files, the checks for
+reduction in size and file overwriting are not performed, the input file is
+not removed, and the attributes of the input file are not retained.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl 1...9
+Use the deflate scheme, with compression factor of
+.Fl 1
+to
+.Fl 9 .
+Compression factor
+.Fl 1
+is the fastest, but provides a poorer level of compression.
+Compression factor
+.Fl 9
+provides the best level of compression, but is relatively slow.
+The default is
+.Fl 6 .
+This option implies
+.Fl g .
+.It Fl b Ar bits
+Specify the
+.Ar bits
+code limit
+.Pq see below .
+.It Fl c
+Compressed or uncompressed output is written to the standard output.
+No files are modified (force
+.Nm gzcat
+mode).
+.It Fl d
+Decompress the source files instead of compressing them (force
+.Nm gunzip
+mode).
+.It Fl f
+Force compression of
+.Ar file ,
+even if it is not actually reduced in size.
+Additionally, files are overwritten without prompting for confirmation.
+If the input data is not in a format recognized by
+.Nm
+and if the option
+.Fl c
+is also given, copy the input data without change
+to the standard output: let
+.Nm gzcat
+behave as
+.Xr cat 1 .
+.It Fl g
+Use the deflate scheme, which reportedly provides better compression rates
+(the default).
+.It Fl h
+Print a short help message.
+.It Fl L
+Print the license.
+.It Fl l
+List information for the specified compressed files.
+The following information is listed:
+.Bl -tag -width "compression ratio"
+.It compressed size
+Size of the compressed file.
+.It uncompressed size
+Size of the file when uncompressed.
+.It compression ratio
+Ratio of the difference between the compressed and uncompressed
+sizes to the uncompressed size.
+.It uncompressed name
+Name the file will be saved as when uncompressing.
+.El
+.Pp
+If the
+.Fl v
+option is specified, the following additional information is printed:
+.Bl -tag -width "compression method"
+.It compression method
+Name of the method used to compress the file.
+.It crc
+32-bit CRC
+.Pq cyclic redundancy code
+of the uncompressed file.
+.It "time stamp"
+Date and time corresponding to the last data modification time
+(mtime) of the compressed file (if the
+.Fl n
+option is specified, the time stamp stored in the compressed file
+is printed instead).
+.El
+.It Fl N
+When compressing, save the original file name and time stamp in the
+compressed file.
+This information is saved by default.
+When uncompressing or listing, use the time stamp and file name stored
+in the compressed file, if any, for the uncompressed version.
+.It Fl n
+When compressing, do not save the original file name and time stamp.
+This information is saved by default.
+When uncompressing, do not restore the original file name and time stamp.
+By default, the uncompressed file inherits the time stamp of the
+compressed version and the uncompressed file name is generated from
+the name of the compressed file name as described above.
+.It Fl O
+Use old compression method
+(force
+.Xr compress 1
+mode).
+.It Fl o Ar filename
+Set the output file name.
+.It Fl q
+Be quiet: suppress all messages.
+.It Fl r
+Recursive mode:
+.Nm
+will descend into specified directories.
+.It Fl S Ar suffix
+Set the suffix for compressed files.
+.It Fl t
+Test the integrity of each file leaving any files intact.
+.It Fl V
+Display the program version
+.Pq RCS IDs of the source files
+and exit.
+.It Fl v
+Print the percentage reduction of each file and other information.
+.El
+.Pp
+.Nm
+uses a modified Lempel-Ziv algorithm
+.Pq LZW .
+Common substrings are replaced by pointers to previous strings,
+and are found using a hash table.
+Unique substrings are emitted as a string of literal bytes,
+and compressed as Huffman trees.
+When code 512 is reached, the algorithm switches to 10-bit codes and
+continues to use more bits until the
+limit specified by the
+.Fl b
+flag is reached.
+.Ar bits
+must be between 9 and 16
+.Pq the default is 16 .
+.Pp
+After the
+.Ar bits
+limit is reached,
+.Nm
+periodically checks the compression ratio.
+If it is increasing,
+.Nm
+continues to use the existing code dictionary.
+However, if the compression ratio decreases,
+.Nm
+discards the table of substrings and rebuilds it from scratch.
+This allows the algorithm to adapt to the next
+.Dq block
+of the file.
+.Pp
+The
+.Fl b
+flag is omitted for
+.Nm gunzip
+since the
+.Ar bits
+parameter specified during compression
+is encoded within the output, along with
+a magic number to ensure that neither decompression of random data nor
+recompression of compressed data is attempted.
+.Pp
+The amount of compression obtained depends on the size of the
+input, the number of
+.Ar bits
+per code, and the distribution of common substrings.
+Typically, text such as source code or English is reduced by 60 \- 70% using
+.Nm .
+Compression is generally much better than that achieved by Huffman
+coding (as used in the historical command pack), or adaptive Huffman
+coding (as used in the historical command compact), and takes less
+time to compute.
+.Pp
+The
+.Nm gzip ,
+.Nm gunzip ,
+and
+.Nm gzcat
+utilities exit with 0 on success; 1 if an error occurred;
+or 2 if a warning occurred.
+.Sh SEE ALSO
+.Xr compress 1 ,
+.Xr gzexe 1 ,
+.Xr gzsig 1 ,
+.Xr zdiff 1 ,
+.Xr zforce 1 ,
+.Xr zmore 1 ,
+.Xr znew 1 ,
+.Xr compress 3
+.Pp
+.Bl -tag -width 12n -compact
+.It RFC 1950
+ZLIB Compressed Data Format Specification.
+.It RFC 1951
+DEFLATE Compressed Data Format Specification.
+.It RFC 1952
+GZIP File Format Specification.
+.El
+.Sh HISTORY
+.Nm gzip
+compatibility was added to
+.Xr compress 1
+in
+.Ox 3.4 .
+The
+.Sq g
+in this version of
+.Nm gzip
+stands for
+.Dq gratis .
diff --git a/usr.bin/compress/zdiff.1 b/usr.bin/compress/zdiff.1
index 71dc555821f..ce07af8bf37 100644
--- a/usr.bin/compress/zdiff.1
+++ b/usr.bin/compress/zdiff.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zdiff.1,v 1.4 2005/07/22 09:13:24 jmc Exp $
+.\"	$OpenBSD: zdiff.1,v 1.5 2007/01/24 10:53:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -88,7 +88,8 @@ Temporary file for
 .Sh SEE ALSO
 .Xr cmp 1 ,
 .Xr compress 1 ,
-.Xr diff 1
+.Xr diff 1 ,
+.Xr gzip 1
 .Sh CAVEATS
 .Nm zcmp
 and
diff --git a/usr.bin/compress/zforce.1 b/usr.bin/compress/zforce.1
index 81916e94c37..65a4ac25de2 100644
--- a/usr.bin/compress/zforce.1
+++ b/usr.bin/compress/zforce.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zforce.1,v 1.1 2003/07/29 11:50:09 otto Exp $
+.\"	$OpenBSD: zforce.1,v 1.2 2007/01/24 10:53:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
 .\"
@@ -45,6 +45,7 @@ suffix, or that have not been compressed by
 .Xr gzip 1 ,
 are ignored.
 .Sh SEE ALSO
+.Xr compress 1 ,
 .Xr gzip 1
 .Sh CAVEATS
 .Nm
diff --git a/usr.bin/compress/zmore.1 b/usr.bin/compress/zmore.1
index 1108740a4e3..d9c67a45cd9 100644
--- a/usr.bin/compress/zmore.1
+++ b/usr.bin/compress/zmore.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zmore.1,v 1.5 2006/05/26 17:26:33 jmc Exp $
+.\"	$OpenBSD: zmore.1,v 1.6 2007/01/24 10:53:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -88,5 +88,6 @@ is used.
 .El
 .Sh SEE ALSO
 .Xr compress 1 ,
+.Xr gzip 1 ,
 .Xr less 1 ,
 .Xr more 1
diff --git a/usr.bin/compress/znew.1 b/usr.bin/compress/znew.1
index 2d5033f33e1..423308c433a 100644
--- a/usr.bin/compress/znew.1
+++ b/usr.bin/compress/znew.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: znew.1,v 1.2 2005/07/22 09:34:16 jmc Exp $
+.\"	$OpenBSD: znew.1,v 1.3 2007/01/24 10:53:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Otto Moerbeek <otto@drijf.net>
 .\"
@@ -59,6 +59,7 @@ file is not removed.
 Print a report specifying the achieved compression ratios.
 .El
 .Sh SEE ALSO
+.Xr compress 1 ,
 .Xr gzip 1
 .Sh CAVEATS
 The
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index 1af0d2be3e8..15bcaf1ce34 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zopen.3,v 1.6 2003/06/03 02:56:07 millert Exp $
+.\"	$OpenBSD: zopen.3,v 1.7 2007/01/24 10:53:43 jmc Exp $
 .\"	$NetBSD: zopen.3,v 1.3 1995/03/26 09:44:49 glass Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -132,6 +132,7 @@ or
 .Xr funopen 3 .
 .Sh SEE ALSO
 .Xr compress 1 ,
+.Xr gzip 1 ,
 .Xr fopen 3 ,
 .Xr funopen 3
 .Sh HISTORY