diff options
| author | jkh <jkh@FreeBSD.org> | 1995-05-20 10:33:14 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-05-20 10:33:14 +0000 |
| commit | 3b6a142d8de0c7c6fc16424823c1c574c26a6019 (patch) | |
| tree | fe34e20c28206a242583f4afa84e1c0ce9c247b8 /release/sysinstall/msg.c | |
| parent | b00009a29ac9fc1ba5f3ce41b8d992a4c9b88e5e (diff) | |
| download | FreeBSD-src-3b6a142d8de0c7c6fc16424823c1c574c26a6019.zip FreeBSD-src-3b6a142d8de0c7c6fc16424823c1c574c26a6019.tar.gz | |
1. Fix a pathological bug I introduced in msgInfo(). Right idea, wrong
implementation.
2. Totally rework device registration. It's about half the size and
more powerful now.
3. Add DOS discovery.
4. Start filling in some of the strategy routines.
5. Another clean-up pass over the menus.
6. Make wizard code use Disk typedef.
If I can get the first strategy routine finished tonite, we should have a working
install (from ftp, at least) this weekend.
Diffstat (limited to 'release/sysinstall/msg.c')
| -rw-r--r-- | release/sysinstall/msg.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c index 5213ced..5acd662 100644 --- a/release/sysinstall/msg.c +++ b/release/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); |
