summaryrefslogtreecommitdiffstats
path: root/usr.bin/more
diff options
context:
space:
mode:
authorhoek <hoek@FreeBSD.org>1998-07-26 16:15:26 +0000
committerhoek <hoek@FreeBSD.org>1998-07-26 16:15:26 +0000
commit5fda2c7571c08f54ecbfd2bc834355bf9de68f66 (patch)
treee704ffe44bdb4a57d67518f51aa96e13c329e25a /usr.bin/more
parentc9bfb10fa582a3cd7b87674a1eb9aea67ae8b286 (diff)
downloadFreeBSD-src-5fda2c7571c08f54ecbfd2bc834355bf9de68f66.zip
FreeBSD-src-5fda2c7571c08f54ecbfd2bc834355bf9de68f66.tar.gz
Fix compilation for the case where neither ioctl(TIOCGWINSZ)
nor ioctl(WIOCGETD) exist. This case doesn't occur under FreeBSD. PR: bin/5996 Submitted by: Max Euston <meuston@jmrodgers.com>
Diffstat (limited to 'usr.bin/more')
-rw-r--r--usr.bin/more/screen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/more/screen.c b/usr.bin/more/screen.c
index 83352cf..1d0f41e 100644
--- a/usr.bin/more/screen.c
+++ b/usr.bin/more/screen.c
@@ -266,13 +266,14 @@ get_term()
#ifdef TIOCGWINSZ
if (ioctl(2, TIOCGWINSZ, &w) == 0 && w.ws_row > 0)
sc_height = w.ws_row;
+ else
#else
#ifdef WIOCGETD
if (ioctl(2, WIOCGETD, &w) == 0 && w.uw_height > 0)
sc_height = w.uw_height/w.uw_vs;
+ else
#endif
#endif
- else
sc_height = tgetnum("li");
hard = (sc_height < 0 || tgetflag("hc"));
if (hard) {
OpenPOWER on IntegriCloud