diff options
author | jkh <jkh@FreeBSD.org> | 1996-08-01 13:47:03 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-08-01 13:47:03 +0000 |
commit | c8828e74f3c111d17105e9bed360338954f02836 (patch) | |
tree | d9a1a8ea339fdb9423e3da4446f33963f744d0a7 | |
parent | 6b1c559b52e523520a110e418b96fa9cd0402be5 (diff) | |
download | FreeBSD-src-c8828e74f3c111d17105e9bed360338954f02836.zip FreeBSD-src-c8828e74f3c111d17105e9bed360338954f02836.tar.gz |
Whoops! VTYs return zero values for TIOCGSIZE! Work around this.
-rw-r--r-- | release/sysinstall/termcap.c | 4 | ||||
-rw-r--r-- | usr.sbin/sade/termcap.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/termcap.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/release/sysinstall/termcap.c b/release/sysinstall/termcap.c index 8888ee9..06aca6c 100644 --- a/release/sysinstall/termcap.c +++ b/release/sysinstall/termcap.c @@ -82,8 +82,8 @@ set_termcap(void) } if (ioctl(0, TIOCGSIZE, &ts) == -1) { msgDebug("Unable to get terminal size - errno %d\n", errno); - ts.ts_lines = OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE; + ts.ts_lines = 0; } - StatusLine = ts.ts_lines; + StatusLine = ts.ts_lines ? ts.ts_lines : (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE); return 0; } diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c index 8888ee9..06aca6c 100644 --- a/usr.sbin/sade/termcap.c +++ b/usr.sbin/sade/termcap.c @@ -82,8 +82,8 @@ set_termcap(void) } if (ioctl(0, TIOCGSIZE, &ts) == -1) { msgDebug("Unable to get terminal size - errno %d\n", errno); - ts.ts_lines = OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE; + ts.ts_lines = 0; } - StatusLine = ts.ts_lines; + StatusLine = ts.ts_lines ? ts.ts_lines : (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE); return 0; } diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c index 8888ee9..06aca6c 100644 --- a/usr.sbin/sysinstall/termcap.c +++ b/usr.sbin/sysinstall/termcap.c @@ -82,8 +82,8 @@ set_termcap(void) } if (ioctl(0, TIOCGSIZE, &ts) == -1) { msgDebug("Unable to get terminal size - errno %d\n", errno); - ts.ts_lines = OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE; + ts.ts_lines = 0; } - StatusLine = ts.ts_lines; + StatusLine = ts.ts_lines ? ts.ts_lines : (OnVTY ? VTY_STATUS_LINE : TTY_STATUS_LINE); return 0; } |