summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/compress/zmore6
-rw-r--r--usr.bin/compress/zmore.126
2 files changed, 10 insertions, 22 deletions
diff --git a/usr.bin/compress/zmore b/usr.bin/compress/zmore
index 98522ef9da6..3d1d38bcf0f 100644
--- a/usr.bin/compress/zmore
+++ b/usr.bin/compress/zmore
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $
+# $OpenBSD: zmore,v 1.7 2014/05/07 21:42:50 zhuk Exp $
#
# Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
#
@@ -40,9 +40,9 @@ while test $# -ne 0; do
done
if [ `basename $0` == "zless" ] ; then
- pager=${PAGER-less}
+ pager=less
else
- pager=${PAGER-more}
+ pager=more
fi
# No files means read from stdin
diff --git a/usr.bin/compress/zmore.1 b/usr.bin/compress/zmore.1
index 752131a06c4..36159c26778 100644
--- a/usr.bin/compress/zmore.1
+++ b/usr.bin/compress/zmore.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zmore.1,v 1.10 2009/08/16 09:41:08 sobrado Exp $
+.\" $OpenBSD: zmore.1,v 1.11 2014/05/07 21:42:50 zhuk Exp $
.\"
.\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
.\"
@@ -18,7 +18,7 @@
.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
.\"
-.Dd $Mdocdate: August 16 2009 $
+.Dd $Mdocdate: May 7 2014 $
.Dt ZMORE 1
.Os
.Sh NAME
@@ -47,11 +47,11 @@ and
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).
+that are specified are passed to
+.Xr more 1
+or
+.Xr less 1 ,
+respectively.
.Pp
.Nm zless
is equivalent to
@@ -90,18 +90,6 @@ In this mode
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
-.Pq Nm zmore
-or
-.Pa /usr/bin/less
-.Pq Nm zless .
-.El
.Sh SEE ALSO
.Xr compress 1 ,
.Xr gzip 1 ,