diff options
| author | Paul Janzen <pjanzen@cvs.openbsd.org> | 1999-06-10 22:38:04 +0000 |
|---|---|---|
| committer | Paul Janzen <pjanzen@cvs.openbsd.org> | 1999-06-10 22:38:04 +0000 |
| commit | e1ff3b5725e84a6aaa6367f03b0f19611f098f3e (patch) | |
| tree | 58448540b9be32681cb4a1e7924a7f2fb418b574 /usr.sbin | |
| parent | 91e387e025fd867bb2fa8137068dae52cea527a5 (diff) | |
Handle PAGER in a manner consistent with the Single Unix Specification:
that is, use PAGER rather than "more" if it is defined and non-null, not
just if it is defined.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/named/man/nslookup.8 | 5 | ||||
| -rw-r--r-- | usr.sbin/named/nslookup/main.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/named/man/nslookup.8 b/usr.sbin/named/man/nslookup.8 index f69cc7147e9..c0570859078 100644 --- a/usr.sbin/named/man/nslookup.8 +++ b/usr.sbin/named/man/nslookup.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nslookup.8,v 1.4 1999/06/05 22:17:45 aaron Exp $ +.\" $OpenBSD: nslookup.8,v 1.5 1999/06/10 22:38:03 pjanzen Exp $ .\" .\" ++Copyright++ 1985, 1989 .\" - @@ -178,7 +178,8 @@ When output is directed to a file, hash marks are printed for every .sp 1 .IP "\fBview\fP \fIfilename\fP" Sorts and lists the output of previous \fBls\fP command(s) with -\fImore\fP(1). +PAGER if it is defined and non-null, or with +\fImore\fP(1) otherwise. .sp 1 .ne 4 .IP "\fBhelp\fP" diff --git a/usr.sbin/named/nslookup/main.c b/usr.sbin/named/nslookup/main.c index 98e03e8f0b5..c32792e7350 100644 --- a/usr.sbin/named/nslookup/main.c +++ b/usr.sbin/named/nslookup/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.6 1998/11/23 18:00:58 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.7 1999/06/10 22:38:03 pjanzen Exp $ */ /* * ++Copyright++ 1985, 1989 @@ -66,7 +66,7 @@ char copyright[] = static char sccsid[] = "@(#)main.c 5.42 (Berkeley) 3/3/91"; static char rcsid[] = "$From: main.c,v 8.4 1996/11/11 06:36:54 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.6 1998/11/23 18:00:58 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.7 1999/06/10 22:38:03 pjanzen Exp $"; #endif #endif /* not lint */ @@ -325,7 +325,7 @@ main(argc, argv) PrintHostInfo(stdout, "Default Server:", defaultPtr); pager = getenv("PAGER"); - if (pager == NULL) { + if (pager == NULL || *pager == '\0') { pager = _PATH_PAGERCMD; } |