summaryrefslogtreecommitdiffstats
path: root/usr.bin/man/man.c
diff options
context:
space:
mode:
authorpjanzen <pjanzen@openbsd.org>1999-06-10 22:37:54 +0000
committerpjanzen <pjanzen@openbsd.org>1999-06-10 22:37:54 +0000
commit489bd11220009e47a7f49d3c6a8659d109df9779 (patch)
tree440ce97e78cb827471d513a2a32d1e59c96a2ecf /usr.bin/man/man.c
parentfix unaligned copy's end condition (diff)
downloadwireguard-openbsd-489bd11220009e47a7f49d3c6a8659d109df9779.tar.xz
wireguard-openbsd-489bd11220009e47a7f49d3c6a8659d109df9779.zip
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.bin/man/man.c')
-rw-r--r--usr.bin/man/man.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c
index 6113244e275..7a35112010a 100644
--- a/usr.bin/man/man.c
+++ b/usr.bin/man/man.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man.c,v 1.12 1998/11/16 06:28:32 deraadt Exp $ */
+/* $OpenBSD: man.c,v 1.13 1999/06/10 22:38:02 pjanzen Exp $ */
/* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-static char rcsid[] = "$OpenBSD: man.c,v 1.12 1998/11/16 06:28:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: man.c,v 1.13 1999/06/10 22:38:02 pjanzen Exp $";
#endif
#endif /* not lint */
@@ -163,7 +163,7 @@ main(argc, argv)
if (!f_cat && !f_how && !f_where)
if (!isatty(1))
f_cat = 1;
- else if ((pager = getenv("PAGER")) != NULL)
+ else if ((pager = getenv("PAGER")) != NULL && (*pager != '\0'))
pager = check_pager(pager);
else
pager = _PATH_PAGER;