aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sysinstall/msg.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1995-05-20 10:33:14 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1995-05-20 10:33:14 +0000
commitf10eb488f667ad2b0e855fcc2ac3747e787f9695 (patch)
treefe34e20c28206a242583f4afa84e1c0ce9c247b8 /usr.sbin/sysinstall/msg.c
parent2cf252e087dabd4f80ff2f6bec8b0313b707dd0b (diff)
Notes
Diffstat (limited to 'usr.sbin/sysinstall/msg.c')
-rw-r--r--usr.sbin/sysinstall/msg.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 5213ced6a70da..5acd662f57657 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.16 1995/05/20 07:50:20 jkh Exp $
+ * $Id: msg.c,v 1.17 1995/05/20 08:31:42 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -72,6 +72,12 @@ msgInfo(char *fmt, ...)
char *errstr;
int attrs;
+ /* NULL is a special convention meaning "erase the old stuff" */
+ if (!fmt) {
+ move(23, 0);
+ clrtoeol();
+ return;
+ }
errstr = (char *)safe_malloc(FILENAME_MAX);
va_start(args, fmt);
vsnprintf(errstr, FILENAME_MAX, fmt, args);
@@ -83,7 +89,7 @@ msgInfo(char *fmt, ...)
refresh();
if (OnVTY) {
msgDebug("Informational message `%s'\n", errstr);
- msgInfo("");
+ msgInfo(NULL);
}
free(errstr);
}
@@ -183,7 +189,7 @@ msgConfirm(char *fmt, ...)
use_helpfile(NULL);
if (OnVTY) {
msgDebug("User confirmation requested (type ALT-F1)\n");
- msgInfo("");
+ msgInfo(NULL);
}
dialog_notify(errstr);
free(errstr);
@@ -225,7 +231,7 @@ msgYesNo(char *fmt, ...)
w = dupwin(newscr);
if (OnVTY) {
msgDebug("User decision requested (type ALT-F1)\n");
- msgInfo("");
+ msgInfo(NULL);
}
ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
touchwin(w);
@@ -258,7 +264,7 @@ msgGetInput(char *buf, char *fmt, ...)
w = dupwin(newscr);
if (OnVTY) {
msgDebug("User input requested (type ALT-F1)\n");
- msgInfo("");
+ msgInfo(NULL);
}
rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
touchwin(w);