diff options
| author |   espie <espie@openbsd.org> | 1999-07-07 06:00:24 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 1999-07-07 06:00:24 +0000 |
| commit | cbfb2a94289fa3aff7abf4dbe39afdbacc89ebbb (patch) | |
| tree | 25add661bad6766de6c3e6147d02c2efcdda4460 | |
| parent | First REAL cut at documenting bimap. (diff) | |
| download | wireguard-openbsd-cbfb2a94289fa3aff7abf4dbe39afdbacc89ebbb.tar.xz wireguard-openbsd-cbfb2a94289fa3aff7abf4dbe39afdbacc89ebbb.zip | |
show MESSAGE using PAGER
| -rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index f68849d2ef2..840a7bb093c 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,7 +1,7 @@ -/* $OpenBSD: perform.c,v 1.8 1999/07/05 09:55:40 espie Exp $ */ +/* $OpenBSD: perform.c,v 1.9 1999/07/07 06:00:24 espie Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: perform.c,v 1.8 1999/07/05 09:55:40 espie Exp $"; +static const char *rcsid = "$OpenBSD: perform.c,v 1.9 1999/07/07 06:00:24 espie Exp $"; #endif /* @@ -537,18 +537,16 @@ pkg_do(char *pkg) } if ((p = find_plist(&Plist, PLIST_DISPLAY)) != NULL) { - FILE *fp; + char *Pager; char buf[BUFSIZ]; + struct stat sbuf; + + Pager = getenv("PAGER"); + if (!Pager) + Pager = "/usr/bin/more"; snprintf(buf, sizeof buf, "%s/%s", LogDir, p->name); - fp = fopen(buf, "r"); - if (fp) { - putc('\n', stdout); - while (fgets(buf, sizeof(buf), fp)) - fputs(buf, stdout); - putc('\n', stdout); - (void) fclose(fp); - } else + if (!stat(buf,&sbuf) || vsystem("%s %s", Pager, buf)) warnx("cannot open %s as display file", buf); } |