Module Name: src Committed By: bouyer Date: Sun Nov 17 17:59:55 UTC 2013
Modified Files: src/distrib/sets/lists/base [netbsd-5]: mi src/distrib/sets/lists/man [netbsd-5]: mi src/usr.bin/gzip [netbsd-5]: Makefile zmore.1 Log Message: Pull up following revision(s) (requested by pettai in ticket #1889): distrib/sets/lists/base/mi: revision 1.1049 distrib/sets/lists/man/mi: revision 1.1449 usr.bin/gzip/Makefile: revision 1.17 usr.bin/gzip/Makefile: revision 1.18 usr.bin/gzip/zmore: revision 1.4 usr.bin/gzip/zmore.1: revision 1.4 Added zless(1) - comes in the lastest version of zmore(1) from OpenBSD (OKed by tron@) Add zfgrep that fell off from last update To generate a diff of this commit: cvs rdiff -u -r1.780.2.26 -r1.780.2.27 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1109.2.23 -r1.1109.2.24 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.12 -r1.12.4.1 src/usr.bin/gzip/Makefile cvs rdiff -u -r1.3 -r1.3.40.1 src/usr.bin/gzip/zmore.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.780.2.26 src/distrib/sets/lists/base/mi:1.780.2.27 --- src/distrib/sets/lists/base/mi:1.780.2.26 Thu Mar 14 19:59:50 2013 +++ src/distrib/sets/lists/base/mi Sun Nov 17 17:59:54 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.26 2013/03/14 19:59:50 riz Exp $ +# $NetBSD: mi,v 1.780.2.27 2013/11/17 17:59:54 bouyer Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1017,6 +1017,7 @@ ./usr/bin/zfgrep base-util-bin ./usr/bin/zforce base-util-bin ./usr/bin/zgrep base-util-bin +./usr/bin/zless base-util-bin ./usr/bin/zmore base-util-bin ./usr/bin/znew base-util-bin ./usr/games base-games-usr Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1109.2.23 src/distrib/sets/lists/man/mi:1.1109.2.24 --- src/distrib/sets/lists/man/mi:1.1109.2.23 Sun Jun 23 11:09:54 2013 +++ src/distrib/sets/lists/man/mi Sun Nov 17 17:59:54 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1109.2.23 2013/06/23 11:09:54 bouyer Exp $ +# $NetBSD: mi,v 1.1109.2.24 2013/11/17 17:59:54 bouyer Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -552,6 +552,7 @@ ./usr/share/man/cat1/zfgrep.0 man-util-catman .cat ./usr/share/man/cat1/zforce.0 man-util-catman .cat ./usr/share/man/cat1/zgrep.0 man-util-catman .cat +./usr/share/man/cat1/zless.0 man-util-catman .cat ./usr/share/man/cat1/zmore.0 man-util-catman .cat ./usr/share/man/cat1/znew.0 man-util-catman .cat ./usr/share/man/cat3/atari/ahdi_buildlabel.0 man-obsolete obsolete @@ -3168,6 +3169,7 @@ ./usr/share/man/html1/zfgrep.html man-util-htmlman html ./usr/share/man/html1/zforce.html man-util-htmlman html ./usr/share/man/html1/zgrep.html man-util-htmlman html +./usr/share/man/html1/zless.html man-util-htmlman html ./usr/share/man/html1/zmore.html man-util-htmlman html ./usr/share/man/html1/znew.html man-util-htmlman html ./usr/share/man/html4/aac.html man-sys-htmlman html @@ -5452,6 +5454,7 @@ ./usr/share/man/man1/zfgrep.1 man-util-man .man ./usr/share/man/man1/zforce.1 man-util-man .man ./usr/share/man/man1/zgrep.1 man-util-man .man +./usr/share/man/man1/zless.1 man-util-man .man ./usr/share/man/man1/zmore.1 man-util-man .man ./usr/share/man/man1/znew.1 man-util-man .man ./usr/share/man/man3/atari/ahdi_buildlabel.3 man-obsolete obsolete Index: src/usr.bin/gzip/Makefile diff -u src/usr.bin/gzip/Makefile:1.12 src/usr.bin/gzip/Makefile:1.12.4.1 --- src/usr.bin/gzip/Makefile:1.12 Fri Aug 29 00:02:24 2008 +++ src/usr.bin/gzip/Makefile Sun Nov 17 17:59:55 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/08/29 00:02:24 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.12.4.1 2013/11/17 17:59:55 bouyer Exp $ USE_FORT?= yes # data-driven bugs? @@ -16,14 +16,16 @@ MLINKS+= gzip.1 gunzip.1 \ gzip.1 zcat.1 \ zdiff.1 zcmp.1 \ zgrep.1 zegrep.1 \ - zgrep.1 zfgrep.1 + zgrep.1 zfgrep.1 \ + zmore.1 zless.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 + ${BINDIR}/zgrep ${BINDIR}/zfgrep \ + ${BINDIR}/zmore ${BINDIR}/zless .include <bsd.prog.mk> Index: src/usr.bin/gzip/zmore.1 diff -u src/usr.bin/gzip/zmore.1:1.3 src/usr.bin/gzip/zmore.1:1.3.40.1 --- src/usr.bin/gzip/zmore.1:1.3 Sun Dec 28 12:47:52 2003 +++ src/usr.bin/gzip/zmore.1 Sun Nov 17 17:59:55 2013 @@ -1,5 +1,5 @@ -.\" $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 $ +.\" $NetBSD: zmore.1,v 1.3.40.1 2013/11/17 17:59:55 bouyer Exp $ +.\" $OpenBSD: zmore.1,v 1.10 2009/08/16 09:41:08 sobrado Exp $ .\" .\" Copyright (c) 2003 Todd C. Miller <todd.mil...@courtesan.com> .\" @@ -19,16 +19,20 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.Dd June 23, 2003 +.Dd August 16, 2009 .Dt ZMORE 1 .Os .Sh NAME -.Nm zmore -.Nd view compressed files on a CRT +.Nm zmore , +.Nm zless +.Nd view compressed files .Sh SYNOPSIS .Nm zmore .Op Ar flags -.Op Ar file ... +.Op Ar +.Nm zless +.Op Ar flags +.Op Ar .Sh DESCRIPTION .Nm is a filter that allows the viewing of files compressed with Lempel-Ziv @@ -50,6 +54,14 @@ that are specified are passed to the use .Pa /usr/bin/more by default). .Pp +.Nm zless +is equivalent to +.Nm zmore +but uses +.Xr less 1 +as a pager instead of +.Xr more 1 . +.Pp When multiple files are specified, .Nm will pause at the end of each file and present the following prompt to the user: @@ -85,7 +97,11 @@ style compression since there is no suff Program used to display files. If unset, .Pa /usr/bin/more -is used. +is used +.Pq Nm zmore +or +.Pa /usr/bin/less +.Pq Nm zless . .El .Sh SEE ALSO .Xr compress 1 ,