aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sysinstall/msg.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-08-01 10:58:54 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-08-01 10:58:54 +0000
commita19596c5a8b91d474a64569b9967266ea199cff1 (patch)
treeafaaedec3fc4f42484fac5946e067d2a60975056 /usr.sbin/sysinstall/msg.c
parenta438b44b4a83ea2c03ea5e9ffdaed5b24d37d5cc (diff)
Notes
Diffstat (limited to 'usr.sbin/sysinstall/msg.c')
-rw-r--r--usr.sbin/sysinstall/msg.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 3369019cec21..d1b6b1831b0b 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: msg.c,v 1.37 1996/07/10 11:38:28 jkh Exp $
+ * $Id: msg.c,v 1.38 1996/07/31 06:20:58 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -39,9 +39,6 @@
#include <sys/ioctl.h>
#include <machine/console.h>
-#define VTY_STATLINE 24
-#define TTY_STATLINE 23
-
Boolean
isDebug(void)
{
@@ -64,7 +61,7 @@ msgYap(char *fmt, ...)
va_end(args);
attrs = getattrs(stdscr);
attrset(A_REVERSE);
- mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
+ mvaddstr(StatusLine, 0, errstr);
attrset(attrs);
refresh();
}
@@ -81,7 +78,7 @@ msgInfo(char *fmt, ...)
attrs = getattrs(stdscr);
/* NULL is a special convention meaning "erase the old stuff" */
if (!fmt) {
- move(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0);
+ move(StatusLine, 0);
clrtoeol();
return;
}
@@ -98,9 +95,9 @@ msgInfo(char *fmt, ...)
}
line[80] = '\0';
attrset(ATTR_TITLE);
- mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, line);
+ mvaddstr(StatusLine, 0, line);
attrset(attrs);
- move(OnVTY ? VTY_STATLINE : TTY_STATLINE, 79);
+ move(StatusLine, 79);
refresh();
}
@@ -120,7 +117,7 @@ msgWarn(char *fmt, ...)
attrs = getattrs(stdscr);
beep();
attrset(ATTR_TITLE);
- mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
+ mvaddstr(StatusLine, 0, errstr);
attrset(attrs);
refresh();
if (OnVTY && isDebug())
@@ -143,7 +140,7 @@ msgError(char *fmt, ...)
beep();
attrs = getattrs(stdscr);
attrset(ATTR_TITLE);
- mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
+ mvaddstr(StatusLine, 0, errstr);
attrset(attrs);
refresh();
if (OnVTY && isDebug())
@@ -166,7 +163,7 @@ msgFatal(char *fmt, ...)
beep();
attrs = getattrs(stdscr);
attrset(ATTR_TITLE);
- mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
+ mvaddstr(StatusLine, 0, errstr);
addstr(" - ");
addstr("PRESS ANY KEY TO ");
if (getpid() == 1)