This will now compile and even scribble helpfully on your disks.

It remains to be seen how successfully.  The distribution loading code
is still not here yet, but the partition/newfs/mount/cpio-extract cycle
is as complete as it's ever going to get, modulo possible bug fixes.
The TCP/IP setup screen is also sort of here, albeit in a highly-changing
state due to the fact that per-interface information isn't being kept
right now but is being added (thanks, Gary!).

1 files changed, 10 insertions, 11 deletions

diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 7344ac6..667012b 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.9 1995/05/10 18:59:51 jkh Exp $
+ * $Id: system.c,v 1.10 1995/05/11 09:01:35 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -31,15 +31,8 @@
 static void
 handle_intr(int sig)
 {
-    dialog_clear();
-    clear();
     if (!msgYesNo("Are you sure you want to abort the installation?"))
 	systemShutdown();
-    else {
-	dialog_clear();
-	clear();
-	refresh();
-    }
 }
 
 /* Welcome the user to the system */
@@ -166,22 +159,28 @@ systemDisplayFile(char *file)
 {
     char *fname = NULL;
     char buf[FILENAME_MAX];
+    WINDOW *w;
 
     fname = systemHelpFile(file, buf);
     if (!fname) {
 	snprintf(buf, FILENAME_MAX, "The %s file is not provided on this particular floppy image.", file);
 	use_helpfile(NULL);
 	use_helpline(NULL);
+	w = dupwin(newscr);
 	dialog_mesgbox("Sorry!", buf, -1, -1);
-	dialog_clear_norefresh();
+	touchwin(w);
+	wrefresh(w);
+	delwin(w);
 	return 1;
     }
     else {
-	dialog_clear_norefresh();
 	use_helpfile(NULL);
 	use_helpline(NULL);
+	w = dupwin(newscr);
 	dialog_textbox(file, fname, LINES, COLS);
-	dialog_clear_norefresh();
+	touchwin(w);
+	wrefresh(w);
+	delwin(w);
     }
     return 0;
 }