Module Name: src
Committed By: pettai
Date: Tue Nov 12 21:58:37 UTC 2013
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/man: mi
src/usr.bin/gzip: Makefile zmore zmore.1
Log Message:
Added zless(1) - comes in the lastest version of zmore(1) from OpenBSD
(OKed by tron@)
To generate a diff of this commit:
cvs rdiff -u -r1.1048 -r1.1049 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1448 -r1.1449 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/gzip/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/gzip/zmore 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.1048 src/distrib/sets/lists/base/mi:1.1049
--- src/distrib/sets/lists/base/mi:1.1048 Fri Nov 1 07:48:31 2013
+++ src/distrib/sets/lists/base/mi Tue Nov 12 21:58:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1048 2013/11/01 07:48:31 mrg Exp $
+# $NetBSD: mi,v 1.1049 2013/11/12 21:58:37 pettai Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -801,6 +801,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/bin/ztest base-zfs-bin zfs
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1448 src/distrib/sets/lists/man/mi:1.1449
--- src/distrib/sets/lists/man/mi:1.1448 Tue Oct 29 09:40:43 2013
+++ src/distrib/sets/lists/man/mi Tue Nov 12 21:58:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1448 2013/10/29 09:40:43 mbalmer Exp $
+# $NetBSD: mi,v 1.1449 2013/11/12 21:58:37 pettai Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -628,6 +628,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
@@ -3682,6 +3683,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/html3lua/gpio.attach.html man-sys-htmlman html
@@ -6396,6 +6398,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.16 src/usr.bin/gzip/Makefile:1.17
--- src/usr.bin/gzip/Makefile:1.16 Tue Jun 21 13:25:45 2011
+++ src/usr.bin/gzip/Makefile Tue Nov 12 21:58:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/06/21 13:25:45 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2013/11/12 21:58:37 pettai Exp $
USE_FORT?= yes # data-driven bugs?
@@ -15,13 +15,14 @@ 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}/zmore ${BINDIR}/zless
.include <bsd.prog.mk>
Index: src/usr.bin/gzip/zmore
diff -u src/usr.bin/gzip/zmore:1.3 src/usr.bin/gzip/zmore:1.4
--- src/usr.bin/gzip/zmore:1.3 Mon Mar 29 09:59:42 2004
+++ src/usr.bin/gzip/zmore Tue Nov 12 21:58:37 2013
@@ -1,8 +1,8 @@
#!/bin/sh -
#
-# $NetBSD: zmore,v 1.3 2004/03/29 09:59:42 wiz Exp $
+# $NetBSD: zmore,v 1.4 2013/11/12 21:58:37 pettai Exp $
#
-# $OpenBSD: zmore,v 1.4 2003/07/29 07:42:45 otto Exp $
+# $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $
#
# Copyright (c) 2003 Todd C. Miller <[email protected]>
#
@@ -41,6 +41,12 @@ while test $# -ne 0; do
esac
done
+if [ `basename $0` == "zless" ] ; then
+ pager=${PAGER-less}
+else
+ pager=${PAGER-more}
+fi
+
# No files means read from stdin
if [ $# -eq 0 ]; then
gzip -cdfq 2>&1 | ${PAGER-more} $flags
Index: src/usr.bin/gzip/zmore.1
diff -u src/usr.bin/gzip/zmore.1:1.3 src/usr.bin/gzip/zmore.1:1.4
--- src/usr.bin/gzip/zmore.1:1.3 Sun Dec 28 12:47:52 2003
+++ src/usr.bin/gzip/zmore.1 Tue Nov 12 21:58:37 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.4 2013/11/12 21:58:37 pettai Exp $
+.\" $OpenBSD: zmore.1,v 1.10 2009/08/16 09:41:08 sobrado Exp $
.\"
.\" Copyright (c) 2003 Todd C. Miller <[email protected]>
.\"
@@ -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 ,
