[src/netbsd-1-4]: src/usr.bin/man pullup 1.15->1.16 (kleink)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dbeab252dc42
branches:  netbsd-1-4
changeset: 468916:dbeab252dc42
user:      perry <perry%NetBSD.org@localhost>
date:      Wed Jun 23 14:20:51 1999 +0000

description:
pullup 1.15->1.16 (kleink)

diffstat:

 usr.bin/man/man.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 3fc7c9c4c024 -r dbeab252dc42 usr.bin/man/man.c
--- a/usr.bin/man/man.c Wed Jun 23 14:15:44 1999 +0000
+++ b/usr.bin/man/man.c Wed Jun 23 14:20:51 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: man.c,v 1.15 1998/11/06 22:33:47 christos Exp $        */
+/*     $NetBSD: man.c,v 1.15.2.1 1999/06/23 14:20:51 perry Exp $       */
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)man.c      8.17 (Berkeley) 1/31/95";
 #else
-__RCSID("$NetBSD: man.c,v 1.15 1998/11/06 22:33:47 christos Exp $");
+__RCSID("$NetBSD: man.c,v 1.15.2.1 1999/06/23 14:20:51 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -148,12 +148,14 @@
                usage();
 
        if (!f_cat && !f_how && !f_where) {
-               if (!isatty(1))
+               if (!isatty(STDOUT_FILENO)) {
                        f_cat = 1;
-               else {
-                       if ((pager = getenv("PAGER")) != NULL)
+               } else {
+                       if ((pager = getenv("PAGER")) != NULL &&
+                           pager[0] != '\0')
                                pager = check_pager(pager);
-                       else    pager = _PATH_PAGER;
+                       else
+                               pager = _PATH_PAGER;
                }
        }
        /* Read the configuration file. */