diff options
author | ache <ache@FreeBSD.org> | 1994-11-19 00:09:00 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1994-11-19 00:09:00 +0000 |
commit | b07ce32e95ca665d9f14f883040fa3fdf1805681 (patch) | |
tree | bdb6b52a63e328d3d4970814c2b6afedab8345d0 /sbin/sysinstall/stage1.c | |
parent | 1e4e71f6b0c73e90024d8e7112a2a60e935155c5 (diff) | |
download | FreeBSD-src-b07ce32e95ca665d9f14f883040fa3fdf1805681.zip FreeBSD-src-b07ce32e95ca665d9f14f883040fa3fdf1805681.tar.gz |
Fix more dialog bugs and core dumps introduced by previous commiter
Diffstat (limited to 'sbin/sysinstall/stage1.c')
-rw-r--r-- | sbin/sysinstall/stage1.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sbin/sysinstall/stage1.c b/sbin/sysinstall/stage1.c index aee2f36..198f16e 100644 --- a/sbin/sysinstall/stage1.c +++ b/sbin/sysinstall/stage1.c @@ -205,14 +205,12 @@ select_disk() dialog_clear_norefresh(); if (dialog_menu("FreeBSD Installation", scratch, -1, -1, min(5,no_disks+1), no_disks+1, options, selection)) { - dialog_clear_norefresh(); - sprintf(scratch,"\n\n\nYou selected cancel\n\n"); + sprintf(scratch,"You selected cancel."); AskAbort(scratch); valid = 0; + continue; } - dialog_clear(); - choice = atoi(selection); if (choice == no_disks+1) valid = 1; @@ -222,6 +220,7 @@ select_disk() else disk_list[choice-1].selected = 1; } while (!valid); + dialog_clear(); return(0); } @@ -256,31 +255,33 @@ configure_disks() dialog_clear_norefresh(); if (dialog_menu("FreeBSD Installation", scratch, -1, -1, min(5,items), items, options, selection)) { - dialog_clear_norefresh(); - sprintf(scratch,"\n\n\nYou selected cancel\n\n"); + sprintf(scratch,"You selected cancel."); AskAbort(scratch); valid = 0; + continue; } - dialog_clear(); choice = atoi(selection); if (choice == items) valid = 1; else { if (edit_mbr(disks[choice-1]) == -1) { - sprintf(scratch, "The following error occured while\nediting the master boot record.\n\n%s", errmsg); + sprintf(scratch, "The following error occured while\nediting the master boot record.\n%s", errmsg); AskAbort(scratch); valid = 0; + continue; }; disk_list[disks[choice-1]].inst_part = select_partition(disks[choice-1]); if (edit_disklabel(disks[choice-1]) == -1) { - sprintf(scratch, "The following error occured while\nediting the disklabel.\n\n%s", errmsg); + sprintf(scratch, "The following error occured while\nediting the disklabel.\n%s", errmsg); AskAbort(scratch); valid = 0; + continue; } } } while (!valid); - + dialog_clear(); } + int select_partition(int disk) { @@ -302,7 +303,6 @@ select_partition(int disk) if (dialog_menu(TITLE, scratch, -1, -1, 4, 4, options, selection)) { sprintf(scratch,"You did not select a valid partition"); - dialog_clear_norefresh(); AskAbort(scratch); valid = 0; } |