diff --git a/sbin/sysinstall/label.c b/sbin/sysinstall/label.c
index de62605a9804..ddb3f33efb99 100644
--- a/sbin/sysinstall/label.c
+++ b/sbin/sysinstall/label.c
@@ -16,6 +16,9 @@
 #include <dialog.h>
 #include "sysinstall.h"
 
+/* Forward decls */
+int disk_size(struct disklabel *);
+int getfstype(char *);
 int sectstoMb(int, int);
 
 char *partname[MAXPARTITIONS] = {"a", "b", "c", "d", "e", "f", "g", "h"};
@@ -25,358 +28,364 @@ char *partname[MAXPARTITIONS] = {"a", "b", "c", "d", "e", "f", "g", "h"};
 #define UPARTSIZES 1
 #define MOUNTPOINTS 2
 struct field {
-	int y;
-	int x;
-	int width;
-	char field[80];
+    int y;
+    int x;
+    int width;
+    char field[80];
 } field;
 
 struct field label_fields[MAXPARTITIONS][EDITABLES];
 
+void
+yelp(char *str)
+{
+    dialog_msgbox("Validation Error", str, 6, 75, 1);
+}
+
 void
 setup_label_fields(struct disklabel *lbl)
 {
-	int i;
-
-	for (i=0; i < MAXPARTITIONS; i++) {
-		label_fields[i][0].y = 4 + (i * 2);
-		label_fields[i][0].x = 15;
-		label_fields[i][0].width = 15;
-		sprintf(label_fields[i][0].field, "%s",
-				  fstypenames[lbl->d_partitions[i].p_fstype]);
-		label_fields[i][1].y = 4 + (i * 2);
-		label_fields[i][1].x = 35;
-		label_fields[i][1].width = 9;
-		sprintf(label_fields[i][1].field, "%d",
-				  sectstoMb(lbl->d_partitions[i].p_size, lbl->d_secsize));
-		label_fields[i][2].y = 4 + (i * 2);
-		label_fields[i][2].x = 45;
-		label_fields[i][2].width = 30;
-	}
-		sprintf(label_fields[0][2].field, "%s", "/");
-		sprintf(label_fields[1][2].field, "%s", "swap");
-		sprintf(label_fields[4][2].field, "%s", "/usr");
+    int i;
+    
+    for (i = 0; i < MAXPARTITIONS; i++) {
+	label_fields[i][0].y = 4 + (i * 2);
+	label_fields[i][0].x = 15;
+	label_fields[i][0].width = 15;
+	sprintf(label_fields[i][0].field, "%s",
+		fstypenames[lbl->d_partitions[i].p_fstype]);
+	label_fields[i][1].y = 4 + (i * 2);
+	label_fields[i][1].x = 35;
+	label_fields[i][1].width = 9;
+	sprintf(label_fields[i][1].field, "%d",
+		sectstoMb(lbl->d_partitions[i].p_size, lbl->d_secsize));
+	label_fields[i][2].y = 4 + (i * 2);
+	label_fields[i][2].x = 45;
+	label_fields[i][2].width = 30;
+    }
+    sprintf(label_fields[0][2].field, "%s", "/");
+    sprintf(label_fields[1][2].field, "%s", "swap");
+    sprintf(label_fields[4][2].field, "%s", "/usr");
 }
 
 void
 update_label_form(WINDOW *window, struct disklabel *lbl)
 {
-	int i;
-	long used = 0,ul;
-
-	mvwprintw(window, 2, 2, "Partition");
-	mvwprintw(window, 2, 15, "Filesystem Type");
-	mvwprintw(window, 2, 35, "Size");
-	mvwprintw(window, 2, 45, "Mount point");
-	for (i=0; i < MAXPARTITIONS; i++) {
-		mvwprintw(window, 4+(i*2), 6, "%s", partname[i]);
-		mvwprintw(window, label_fields[i][0].y, label_fields[i][0].x, "%s",
-					 &label_fields[i][0].field);
-	    if(i < 2 || i > 3) {
-				ul = strtol(label_fields[i][1].field,0,0);
-				sprintf(label_fields[i][1].field, "%lu",ul);
-				used += ul;
-		}
-		mvwprintw(window, label_fields[i][1].y, label_fields[i][1].x, "%-5s",
-					&label_fields[i][1].field); 
-		if (label_fields[i][2].field)
-			mvwprintw(window, label_fields[i][2].y, label_fields[i][2].x, "%s",
-						 &label_fields[i][2].field);
+    int i;
+    long used = 0,ul;
+    
+    mvwprintw(window, 2, 2, "Partition");
+    mvwprintw(window, 2, 15, "Filesystem Type");
+    mvwprintw(window, 2, 35, "Size");
+    mvwprintw(window, 2, 45, "Mount point");
+    for (i=0; i < MAXPARTITIONS; i++) {
+	mvwprintw(window, 4+(i*2), 6, "%s", partname[i]);
+	mvwprintw(window, label_fields[i][0].y, label_fields[i][0].x, "%s",
+		  &label_fields[i][0].field);
+	if (i < 2 || i > 3) {
+	    ul = strtol(label_fields[i][1].field,0,0);
+	    sprintf(label_fields[i][1].field, "%lu",ul);
+	    used += ul;
 	}
-	mvwprintw(window, 20, 10, "Allocated %5luMb, Unalloacted %5lu Mb",
-		used, disk_size(lbl) - used);
-
-	wrefresh(window);
+	mvwprintw(window, label_fields[i][1].y, label_fields[i][1].x, "%-5s",
+		  &label_fields[i][1].field); 
+	if (label_fields[i][2].field)
+	    mvwprintw(window, label_fields[i][2].y, label_fields[i][2].x, "%s",
+		      &label_fields[i][2].field);
+    }
+    mvwprintw(window, 20, 10, "Allocated %5luMb, Unallocated %5lu Mb",
+	      used, disk_size(lbl) - used);
+    
+    wrefresh(window);
 }
 
 
 int
 disk_size(struct disklabel *lbl)
 {
-	int size;
-
-	size = lbl->d_secsize * lbl->d_nsectors *
-	       lbl->d_ntracks * lbl->d_ncylinders;
-	return (size / 1024 / 1024);
+    int size;
+    
+    size = lbl->d_secsize * lbl->d_nsectors *
+	lbl->d_ntracks * lbl->d_ncylinders;
+    return (size / 1024 / 1024);
 }
 
 int
 sectstoMb(int nsects, int secsize)
 {
-	int size;
-
-	size = nsects * secsize;
-	if (size)
-		size /= 1024 * 1024;
-	return (size);
+    int size;
+    
+    size = nsects * secsize;
+    if (size)
+	size /= 1024 * 1024;
+    return (size);
 }
 
 int
 Mbtosects(int Mb, int secsize)
 {
-	int nsects;
-
-	nsects = (Mb * 1024 * 1024) / secsize;
-	return(nsects);
+    int nsects;
+    
+    nsects = (Mb * 1024 * 1024) / secsize;
+    return(nsects);
 }
 
 int
 rndtocylbdry(int size, int secpercyl)
 {
-	int nocyls;
-
-	nocyls = size / secpercyl;
-	if ((nocyls * secpercyl) < size)
-		nocyls++;
-	return (nocyls * secpercyl);
+    int nocyls;
+    
+    nocyls = size / secpercyl;
+    if ((nocyls * secpercyl) < size)
+	nocyls++;
+    return (nocyls * secpercyl);
 }
 
 void
 default_disklabel(struct disklabel *lbl, int avail_sects, int offset)
 {
-	int nsects;
-
-	/* Fill in default label entries */
-
-	lbl->d_magic = DISKMAGIC;
-	bcopy("INSTALLATION", lbl->d_typename, strlen("INSTALLATION"));
-	lbl->d_rpm = 3600;
-	lbl->d_interleave = 1;
-	lbl->d_trackskew = 0;
-	lbl->d_cylskew = 0;
-	lbl->d_magic2 = DISKMAGIC;
-	lbl->d_checksum = 0;
-	lbl->d_bbsize = BBSIZE;
-	lbl->d_sbsize = SBSIZE;
-	lbl->d_npartitions = 5;
-
-	/* Set up c and d as raw partitions for now */
-	lbl->d_partitions[2].p_size = avail_sects;
-	lbl->d_partitions[2].p_offset = offset;
-	lbl->d_partitions[2].p_fsize = DEFFSIZE; /* XXX */
-	lbl->d_partitions[2].p_fstype = FS_UNUSED;
-	lbl->d_partitions[2].p_frag = DEFFRAG;
-
-	lbl->d_partitions[3].p_size = lbl->d_secperunit;
-	lbl->d_partitions[3].p_offset = 0;
-	lbl->d_partitions[3].p_fsize = DEFFSIZE;
-	lbl->d_partitions[3].p_fstype = FS_UNUSED;
-	lbl->d_partitions[3].p_frag = DEFFRAG;
-
-	/* Default root */
-	nsects = rndtocylbdry(Mbtosects(DEFROOTSIZE, lbl->d_secsize),
-								 lbl->d_secpercyl);
-	offset = rndtocylbdry(offset, lbl->d_secpercyl);
-
-	lbl->d_partitions[0].p_size = nsects;
-	lbl->d_partitions[0].p_offset = offset;
-	lbl->d_partitions[0].p_fsize = DEFFSIZE;
-	lbl->d_partitions[0].p_fstype = FS_BSDFFS;
-	lbl->d_partitions[0].p_frag = DEFFRAG;
-
-	avail_sects -= nsects;
-	offset += nsects;
-	nsects = rndtocylbdry(Mbtosects(DEFSWAPSIZE, lbl->d_secsize),
-								 lbl->d_secpercyl);
-
-	lbl->d_partitions[1].p_size = nsects;
-	lbl->d_partitions[1].p_offset = offset;
-	lbl->d_partitions[1].p_fsize = DEFFSIZE;
-	lbl->d_partitions[1].p_fstype = FS_SWAP;
-	lbl->d_partitions[1].p_frag = DEFFRAG;
-
-	avail_sects -= nsects;
-	offset += nsects;
-	nsects = rndtocylbdry(Mbtosects(DEFUSRSIZE, lbl->d_secsize),
-								 lbl->d_secpercyl);
-
-	if (avail_sects > nsects)
-		nsects = avail_sects;
-
-	lbl->d_partitions[4].p_size = nsects;
-	lbl->d_partitions[4].p_offset = offset;
-	lbl->d_partitions[4].p_fsize = DEFFSIZE;
-	lbl->d_partitions[4].p_fstype = FS_BSDFFS;
-	lbl->d_partitions[4].p_frag = DEFFRAG;
+    int nsects;
+    
+    /* Fill in default label entries */
+    
+    lbl->d_magic = DISKMAGIC;
+    bcopy("INSTALLATION", lbl->d_typename, strlen("INSTALLATION"));
+    lbl->d_rpm = 3600;
+    lbl->d_interleave = 1;
+    lbl->d_trackskew = 0;
+    lbl->d_cylskew = 0;
+    lbl->d_magic2 = DISKMAGIC;
+    lbl->d_checksum = 0;
+    lbl->d_bbsize = BBSIZE;
+    lbl->d_sbsize = SBSIZE;
+    lbl->d_npartitions = 5;
+    
+    /* Set up c and d as raw partitions for now */
+    lbl->d_partitions[2].p_size = avail_sects;
+    lbl->d_partitions[2].p_offset = offset;
+    lbl->d_partitions[2].p_fsize = DEFFSIZE; /* XXX */
+    lbl->d_partitions[2].p_fstype = FS_UNUSED;
+    lbl->d_partitions[2].p_frag = DEFFRAG;
+    
+    lbl->d_partitions[3].p_size = lbl->d_secperunit;
+    lbl->d_partitions[3].p_offset = 0;
+    lbl->d_partitions[3].p_fsize = DEFFSIZE;
+    lbl->d_partitions[3].p_fstype = FS_UNUSED;
+    lbl->d_partitions[3].p_frag = DEFFRAG;
+    
+    /* Default root */
+    nsects = rndtocylbdry(Mbtosects(DEFROOTSIZE, lbl->d_secsize),
+			  lbl->d_secpercyl);
+    offset = rndtocylbdry(offset, lbl->d_secpercyl);
+    
+    lbl->d_partitions[0].p_size = nsects;
+    lbl->d_partitions[0].p_offset = offset;
+    lbl->d_partitions[0].p_fsize = DEFFSIZE;
+    lbl->d_partitions[0].p_fstype = FS_BSDFFS;
+    lbl->d_partitions[0].p_frag = DEFFRAG;
+    
+    avail_sects -= nsects;
+    offset += nsects;
+    nsects = rndtocylbdry(Mbtosects(DEFSWAPSIZE, lbl->d_secsize),
+			  lbl->d_secpercyl);
+    
+    lbl->d_partitions[1].p_size = nsects;
+    lbl->d_partitions[1].p_offset = offset;
+    lbl->d_partitions[1].p_fsize = DEFFSIZE;
+    lbl->d_partitions[1].p_fstype = FS_SWAP;
+    lbl->d_partitions[1].p_frag = DEFFRAG;
+    
+    avail_sects -= nsects;
+    offset += nsects;
+    nsects = rndtocylbdry(Mbtosects(DEFUSRSIZE, lbl->d_secsize),
+			  lbl->d_secpercyl);
+    
+    if (avail_sects > nsects)
+	nsects = avail_sects;
+    
+    lbl->d_partitions[4].p_size = nsects;
+    lbl->d_partitions[4].p_offset = offset;
+    lbl->d_partitions[4].p_fsize = DEFFSIZE;
+    lbl->d_partitions[4].p_fstype = FS_BSDFFS;
+    lbl->d_partitions[4].p_frag = DEFFRAG;
 }
 
 
 void
 edit_disklabel(struct disklabel *lbl)
 {
-	int key=0;
-	int x_pos = 0;
-	int y_pos = 0;
-	WINDOW *window;
-
-	if (use_shadow)
-		draw_shadow(stdscr, 1, 1, LINES-3, COLS-5);
-
-	window = newwin(LINES - 2, COLS - 4, 0, 0);
-	keypad(window, TRUE);
-
-	draw_box(window, 1, 1, LINES - 3, COLS - 5, dialog_attr, border_attr);
-	wattrset(window, dialog_attr);
-
-	setup_label_fields(lbl);
-	do {
-		update_label_form(window, lbl);
-		key = edit_line(window, label_fields[y_pos][x_pos].y,
-					    label_fields[y_pos][x_pos].x,
-						 label_fields[y_pos][x_pos].field,
-						 label_fields[y_pos][x_pos].width,
-						 20);
-		switch(key) {
-			case KEY_UP:
-				if (y_pos != 0)
-					y_pos--;
-				break;
-			case KEY_DOWN:
-				if (++y_pos == MAXPARTITIONS)
-					y_pos--;
-				break;
-			case '\n':
-			case TAB:
-				x_pos++;
-				if (x_pos == EDITABLES) {
-					x_pos = 0;
-					if (++y_pos == MAXPARTITIONS)
-						y_pos--;
-				}
-				break;
-			case KEY_BTAB:
-				x_pos--;
-				if (x_pos < 0) {
-					x_pos = EDITABLES - 1;
-					if (--y_pos < 0)
-						y_pos++;
-				}
-				break;
-			default:
-				break;
-		}
-	} while (key != '\033');
-	dialog_clear();
+    int key=0;
+    int x_pos = 0;
+    int y_pos = 0;
+    WINDOW *window;
+    
+    if (use_shadow)
+	draw_shadow(stdscr, 1, 1, LINES-3, COLS-5);
+    
+    window = newwin(LINES - 2, COLS - 4, 0, 0);
+    keypad(window, TRUE);
+    
+    draw_box(window, 1, 1, LINES - 3, COLS - 5, dialog_attr, border_attr);
+    wattrset(window, dialog_attr);
+    
+    setup_label_fields(lbl);
+    do {
+	update_label_form(window, lbl);
+	key = edit_line(window, label_fields[y_pos][x_pos].y,
+			label_fields[y_pos][x_pos].x,
+			label_fields[y_pos][x_pos].field,
+			label_fields[y_pos][x_pos].width,
+			20);
+	switch(key) {
+	case KEY_UP:
+	    if (y_pos != 0)
+		y_pos--;
+	    break;
+	case KEY_DOWN:
+	    if (++y_pos == MAXPARTITIONS)
+		y_pos--;
+	    break;
+	case '\n':
+	case TAB:
+	    x_pos++;
+	    if (x_pos == EDITABLES) {
+		x_pos = 0;
+		if (++y_pos == MAXPARTITIONS)
+		    y_pos--;
+	    }
+	    break;
+	case KEY_BTAB:
+	    x_pos--;
+	    if (x_pos < 0) {
+		x_pos = EDITABLES - 1;
+		if (--y_pos < 0)
+		    y_pos++;
+	    }
+	    break;
+	default:
+	    break;
+	}
+    } while (key != '\033');
+    dialog_clear();
 }
 
 int
 build_disklabel(struct disklabel *lbl)
 {
-	int i, offset;
-	int nsects;
-	int total_sects;
-
-	/* Get start of FreeBSD partition from default label */
-	offset = lbl->d_partitions[2].p_offset;
-
-	for (i=0; i < MAXPARTITIONS; i++) {
-		if (strlen(label_fields[i][MOUNTPOINTS].field) &&
-		    atoi(label_fields[i][UPARTSIZES].field)) {
-			sprintf(scratch, "%s%s", avail_disknames[inst_disk], partname[i]);
-			Fname[Nfs] = StrAlloc(scratch);
-			Fmount[Nfs] = StrAlloc(label_fields[i][MOUNTPOINTS].field);
-			Nfs++;
-			nsects = Mbtosects(atoi(label_fields[i][UPARTSIZES].field),
-							 lbl->d_secsize);
-			lbl->d_partitions[i].p_size = nsects;
-			lbl->d_partitions[i].p_offset = offset;
-			offset += nsects;
-			total_sects += nsects;
-			lbl->d_partitions[i].p_fstype = 
-				getfstype(label_fields[i][FSTYPE].field);
-			lbl->d_npartitions = i+1;
-		} else if (i < 2 || i > 3) {
-			lbl->d_partitions[i].p_size = 0;
-			lbl->d_partitions[i].p_offset = 0;
-			lbl->d_partitions[i].p_fstype = 0;
-		}
-		Debug("Part%d: %d sects, %d offset, %d end, %d type", i,
-			lbl->d_partitions[i].p_size,
-			lbl->d_partitions[i].p_offset,
-			lbl->d_partitions[i].p_size+
-				lbl->d_partitions[i].p_offset,
-			lbl->d_partitions[i].p_fstype);
+    int i, offset;
+    int nsects;
+    int total_sects;
+    
+    /* Get start of FreeBSD partition from default label */
+    offset = lbl->d_partitions[2].p_offset;
+    
+    for (i=0; i < MAXPARTITIONS; i++) {
+	if (strlen(label_fields[i][MOUNTPOINTS].field) &&
+	    atoi(label_fields[i][UPARTSIZES].field)) {
+	    sprintf(scratch, "%s%s", avail_disknames[inst_disk], partname[i]);
+	    Fname[Nfs] = StrAlloc(scratch);
+	    Fmount[Nfs] = StrAlloc(label_fields[i][MOUNTPOINTS].field);
+	    Nfs++;
+	    nsects = Mbtosects(atoi(label_fields[i][UPARTSIZES].field),
+			       lbl->d_secsize);
+	    lbl->d_partitions[i].p_size = nsects;
+	    lbl->d_partitions[i].p_offset = offset;
+	    offset += nsects;
+	    total_sects += nsects;
+	    lbl->d_partitions[i].p_fstype = 
+		getfstype(label_fields[i][FSTYPE].field);
+	    lbl->d_npartitions = i+1;
+	} else if (i < 2 || i > 3) {
+	    lbl->d_partitions[i].p_size = 0;
+	    lbl->d_partitions[i].p_offset = 0;
+	    lbl->d_partitions[i].p_fstype = 0;
 	}
-	return 0;
+	Debug("Part%d: %d sects, %d offset, %d end, %d type", i,
+	      lbl->d_partitions[i].p_size,
+	      lbl->d_partitions[i].p_offset,
+	      lbl->d_partitions[i].p_size+
+	      lbl->d_partitions[i].p_offset,
+	      lbl->d_partitions[i].p_fstype);
+    }
+    return 0;
 }
 
 int
 getfstype(char *fstype)
 {
-	int i;
-
-	for (i=0; i < FSMAXTYPES; i++)
-		if (!strcasecmp(fstype, fstypenames[i]))
-			return(i);
-	return(FS_OTHER);
+    int i;
+    
+    for (i=0; i < FSMAXTYPES; i++)
+	if (!strcasecmp(fstype, fstypenames[i]))
+	    return(i);
+    return(FS_OTHER);
 }
 
 void
 display_disklabel(int disk)
 {
-	int i, key=0;
-	WINDOW *window;
-
-	if (use_shadow)
-		draw_shadow(stdscr, 1, 1, LINES-2, COLS-2);
-	window = newwin(LINES-2, COLS-2, 1, 1);
-	keypad(window, TRUE);
-
-	draw_box(window, 1, 1, LINES - 2, COLS - 2, dialog_attr, border_attr);
-	wattrset(window, dialog_attr);
-
-	mvwprintw(window, 2, 2, "Dumping label for disk %d, %s\n", disk, avail_disklabels[disk].d_typename);
-	mvwprintw(window, 3, 2, "magic = %lu",avail_disklabels[disk].d_magic);
-	mvwprintw(window, 3, 22, "type = %x",avail_disklabels[disk].d_type);
-	mvwprintw(window, 3, 32, "subtype = %x\n",avail_disklabels[disk].d_subtype);
-	mvwprintw(window, 4, 2, "Typename = %s",avail_disklabels[disk].d_typename);
-	mvwprintw(window, 4, 38, "Packname = %s",avail_disklabels[disk].d_packname);
-	mvwprintw(window, 5, 74, "boot0 = %s",avail_disklabels[disk].d_boot0);
-	mvwprintw(window, 5, 50, "boot1 = %s\n",avail_disklabels[disk].d_boot1);
-	mvwprintw(window, 5, 2, "secsize = %ld",avail_disklabels[disk].d_secsize);
-	mvwprintw(window, 5, 20, "nsectors = %ld",avail_disklabels[disk].d_nsectors);
-	mvwprintw(window, 5, 30, "ntracks = %ld",avail_disklabels[disk].d_ntracks);
-	mvwprintw(window, 5, 50, "ncylinders = %ld\n",avail_disklabels[disk].d_ncylinders);
-	mvwprintw(window, 6, 2, "secpercyl = %ld",avail_disklabels[disk].d_secpercyl);
-	mvwprintw(window, 6, 40, "secperunit = %ld\n",avail_disklabels[disk].d_secperunit);
-	mvwprintw(window, 7, 2, "sparespertrack = %d",avail_disklabels[disk].d_sparespertrack);
-	mvwprintw(window, 7, 20, "sparespercyl = %d",avail_disklabels[disk].d_sparespercyl);
-	mvwprintw(window, 7, 40, "acylinders = %ld\n",avail_disklabels[disk].d_acylinders);
-	mvwprintw(window, 8, 2, "rpm = %d",avail_disklabels[disk].d_rpm);
-	mvwprintw(window, 8, 20, "interleave = %d",avail_disklabels[disk].d_interleave);
-	mvwprintw(window, 8, 40, "trackskew = %d",avail_disklabels[disk].d_trackskew);
-	mvwprintw(window, 8, 60, "cylskew = %d\n",avail_disklabels[disk].d_cylskew);
-	mvwprintw(window, 9, 2, "headswitch = %ld",avail_disklabels[disk].d_headswitch);
-	mvwprintw(window, 9, 30, "trkseek = %ld",avail_disklabels[disk].d_trkseek);
-	mvwprintw(window, 9, 55, "flags = %ld\n",avail_disklabels[disk].d_flags);
-	mvwprintw(window, 10, 2, "Drivedata");
-	for(i=0; i< NDDATA; i++) {
-		mvwprintw(window, 10, 11 + (i*10), " : %d = %ld",i,avail_disklabels[disk].d_drivedata[i]);
-	}
-	mvwprintw(window, 11, 2, "Spare");
-	for (i=0; i< NSPARE; i++) {
-		mvwprintw(window, 11, 7 + (i*10), " : %d = %ld",i,avail_disklabels[disk].d_spare[i]);
-	}
-	mvwprintw(window, 12, 2, "magic2 = %lu",avail_disklabels[disk].d_magic2);
-	mvwprintw(window, 12, 40, "checksum = %d\n",avail_disklabels[disk].d_checksum);
-	mvwprintw(window, 13, 2,  "npartitions = %d",avail_disklabels[disk].d_npartitions);
-	mvwprintw(window, 13, 25, "bbsize = %lu",avail_disklabels[disk].d_bbsize);
-	mvwprintw(window, 13, 50, "sbsize = %lu\n",avail_disklabels[disk].d_sbsize);
-	for (i=0; i< MAXPARTITIONS; i++) {
-		mvwprintw(window, 14+i, 2, "%d: size: %ld",i,avail_disklabels[disk].d_partitions[i].p_size);
-		mvwprintw(window, 14+i, 20, "offset: %ld",avail_disklabels[disk].d_partitions[i].p_offset);
-		mvwprintw(window, 14+i, 36, "fsize: %ld",avail_disklabels[disk].d_partitions[i].p_fsize);
-		mvwprintw(window, 14+i, 49, "fstype: %d",avail_disklabels[disk].d_partitions[i].p_fstype);
-		mvwprintw(window, 14+i, 60, "frag: %d",avail_disklabels[disk].d_partitions[i].p_frag);
-		mvwprintw(window, 14+i, 70, "cpg: %d",avail_disklabels[disk].d_partitions[i].p_cpg);
-	}
-
-	dialog_update();
-
-	while (key != '\n' && key != ' ' && key != '\033')
-		key = wgetch(window);
-	delwin(window);
-	dialog_clear();
+    int i, key=0;
+    WINDOW *window;
+    
+    if (use_shadow)
+	draw_shadow(stdscr, 1, 1, LINES-2, COLS-2);
+    window = newwin(LINES-2, COLS-2, 1, 1);
+    keypad(window, TRUE);
+    
+    draw_box(window, 1, 1, LINES - 2, COLS - 2, dialog_attr, border_attr);
+    wattrset(window, dialog_attr);
+    
+    mvwprintw(window, 2, 2, "Dumping label for disk %d, %s\n", disk, avail_disklabels[disk].d_typename);
+    mvwprintw(window, 3, 2, "magic = %lu",avail_disklabels[disk].d_magic);
+    mvwprintw(window, 3, 22, "type = %x",avail_disklabels[disk].d_type);
+    mvwprintw(window, 3, 32, "subtype = %x\n",avail_disklabels[disk].d_subtype);
+    mvwprintw(window, 4, 2, "Typename = %s",avail_disklabels[disk].d_typename);
+    mvwprintw(window, 4, 38, "Packname = %s",avail_disklabels[disk].d_packname);
+    mvwprintw(window, 5, 74, "boot0 = %s",avail_disklabels[disk].d_boot0);
+    mvwprintw(window, 5, 50, "boot1 = %s\n",avail_disklabels[disk].d_boot1);
+    mvwprintw(window, 5, 2, "secsize = %ld",avail_disklabels[disk].d_secsize);
+    mvwprintw(window, 5, 20, "nsectors = %ld",avail_disklabels[disk].d_nsectors);
+    mvwprintw(window, 5, 30, "ntracks = %ld",avail_disklabels[disk].d_ntracks);
+    mvwprintw(window, 5, 50, "ncylinders = %ld\n",avail_disklabels[disk].d_ncylinders);
+    mvwprintw(window, 6, 2, "secpercyl = %ld",avail_disklabels[disk].d_secpercyl);
+    mvwprintw(window, 6, 40, "secperunit = %ld\n",avail_disklabels[disk].d_secperunit);
+    mvwprintw(window, 7, 2, "sparespertrack = %d",avail_disklabels[disk].d_sparespertrack);
+    mvwprintw(window, 7, 20, "sparespercyl = %d",avail_disklabels[disk].d_sparespercyl);
+    mvwprintw(window, 7, 40, "acylinders = %ld\n",avail_disklabels[disk].d_acylinders);
+    mvwprintw(window, 8, 2, "rpm = %d",avail_disklabels[disk].d_rpm);
+    mvwprintw(window, 8, 20, "interleave = %d",avail_disklabels[disk].d_interleave);
+    mvwprintw(window, 8, 40, "trackskew = %d",avail_disklabels[disk].d_trackskew);
+    mvwprintw(window, 8, 60, "cylskew = %d\n",avail_disklabels[disk].d_cylskew);
+    mvwprintw(window, 9, 2, "headswitch = %ld",avail_disklabels[disk].d_headswitch);
+    mvwprintw(window, 9, 30, "trkseek = %ld",avail_disklabels[disk].d_trkseek);
+    mvwprintw(window, 9, 55, "flags = %ld\n",avail_disklabels[disk].d_flags);
+    mvwprintw(window, 10, 2, "Drivedata");
+    for (i=0; i< NDDATA; i++) {
+	mvwprintw(window, 10, 11 + (i*10), " : %d = %ld",i,avail_disklabels[disk].d_drivedata[i]);
+    }
+    mvwprintw(window, 11, 2, "Spare");
+    for (i=0; i< NSPARE; i++) {
+	mvwprintw(window, 11, 7 + (i*10), " : %d = %ld",i,avail_disklabels[disk].d_spare[i]);
+    }
+    mvwprintw(window, 12, 2, "magic2 = %lu",avail_disklabels[disk].d_magic2);
+    mvwprintw(window, 12, 40, "checksum = %d\n",avail_disklabels[disk].d_checksum);
+    mvwprintw(window, 13, 2,  "npartitions = %d",avail_disklabels[disk].d_npartitions);
+    mvwprintw(window, 13, 25, "bbsize = %lu",avail_disklabels[disk].d_bbsize);
+    mvwprintw(window, 13, 50, "sbsize = %lu\n",avail_disklabels[disk].d_sbsize);
+    for (i=0; i< MAXPARTITIONS; i++) {
+	mvwprintw(window, 14+i, 2, "%d: size: %ld",i,avail_disklabels[disk].d_partitions[i].p_size);
+	mvwprintw(window, 14+i, 20, "offset: %ld",avail_disklabels[disk].d_partitions[i].p_offset);
+	mvwprintw(window, 14+i, 36, "fsize: %ld",avail_disklabels[disk].d_partitions[i].p_fsize);
+	mvwprintw(window, 14+i, 49, "fstype: %d",avail_disklabels[disk].d_partitions[i].p_fstype);
+	mvwprintw(window, 14+i, 60, "frag: %d",avail_disklabels[disk].d_partitions[i].p_frag);
+	mvwprintw(window, 14+i, 70, "cpg: %d",avail_disklabels[disk].d_partitions[i].p_cpg);
+    }
+    
+    dialog_update();
+    
+    while (key != '\n' && key != ' ' && key != '\033')
+	key = wgetch(window);
+    delwin(window);
+    dialog_clear();
 }
 
 static int
@@ -385,9 +394,9 @@ AskWhichPartition(char *prompt)
     char buf[10];
     int i;
     *buf = 0;
-    i = AskEm(stdscr,prompt,buf,1);
-    if(i != '\n' && i != '\r') return -1;
-    if(!strchr("abefghABEFGH",*buf)) return -1;
+    i = AskEm(stdscr, prompt, buf, 2);
+    if (i != '\n' && i != '\r') return -1;
+    if (!strchr("abefghABEFGH",*buf)) return -1;
     return tolower(*buf) - 'a';
 }
 
@@ -395,192 +404,241 @@ static void
 CleanMount(int disk, int part)
 {
     int i = MP[disk][part];
-    if(Fmount[i]) {
+    if (Fmount[i]) {
 	free(Fmount[i]);
 	Fmount[i] = 0;
     }
-    if(Fname[i]) {
+    if (Fname[i]) {
 	free(Fname[i]);
 	Fname[i] = 0;
     }
-    if(Ftype[i]) {
+    if (Ftype[i]) {
 	free(Ftype[i]);
 	Ftype[i] = 0;
     }
     MP[disk][part] = 0;
 }
 
+int free_space;
+
 void
 DiskLabel()
 {
-    int i,j,done=0,diskno,flag,k;
+    int i, j, done = 0, diskno, flag, k;
     char buf[128];
-    struct disklabel *lbl,olbl;
-    u_long cyl,hd,sec,tsec;
-    u_long l1,l2,l3,l4;
-
+    struct disklabel *lbl, olbl;
+    u_long cyl, hd, sec, tsec;
+    u_long l1, l2, l3, l4;
+    
     *buf = 0;
-    i = AskEm(stdscr,"Enter number of disk to Disklabel ",buf,1);
-	printf("%d",i);
-    if(i != '\n' && i != '\r') return;
+    i = AskEm(stdscr, "Enter number of disk to Disklabel ", buf, 2);
+    printf("%d", i);
+    if (i != '\n' && i != '\r') return;
     diskno = atoi(buf);
-    if(!(diskno >= 0 && diskno < MAX_NO_DISKS && Dname[diskno])) return;
+    if (!(diskno >= 0 && diskno < MAX_NO_DISKS && Dname[diskno]))
+	return;
     olbl = *Dlbl[diskno];
     lbl = &olbl;
     cyl = lbl->d_ncylinders;
     hd = lbl->d_ntracks;
     sec = lbl->d_nsectors;
     tsec = lbl->d_secperunit;
+    free_space = lbl->d_partitions[OURPART].p_size;
     while(!done) {
 	clear(); standend();
 	j = 0;
-	mvprintw(j++,0,"%s -- Diskspace editor -- DISKLABEL",TITLE);
+	mvprintw(j++, 0, "%s -- Diskspace editor -- DISKLABEL",  TITLE);
 	j++;
-        mvprintw(j++,0,"Part  Start       End    Blocks     MB   Type       Mountpoint");
-	for(i=0;i<MAXPARTITIONS;i++) {
-	    mvprintw(j++,0,"%c ",'a'+i);
-	    if(i>=lbl->d_npartitions) continue;
+        mvprintw(j++, 0, "Part  Start       End    Blocks     MB   Type       Mountpoint");
+	for (i = 0; i < MAXPARTITIONS; i++) {
+	    mvprintw(j++, 0, "%c ", 'a'+i);
+	    if (i >= lbl->d_npartitions)
+		continue;
 	    printw(" %8u  %8u  %8u  %5u  ",
-		lbl->d_partitions[i].p_offset,
-		lbl->d_partitions[i].p_offset+
-			(lbl->d_partitions[i].p_size ? 
-			    lbl->d_partitions[i].p_size-1 : 0),
-		lbl->d_partitions[i].p_size,
-		(lbl->d_partitions[i].p_size + 1024)/2048);
-
+		   lbl->d_partitions[i].p_offset,
+		   lbl->d_partitions[i].p_offset+
+		   (lbl->d_partitions[i].p_size ? 
+		    lbl->d_partitions[i].p_size-1 : 0),
+		   lbl->d_partitions[i].p_size,
+		   (lbl->d_partitions[i].p_size + 1024)/2048);
+	    
 	    k = lbl->d_partitions[i].p_fstype;
-	    if(k > FSMAXTYPES)
-		printw("      %04x  ",k);
+	    if (k > FSMAXTYPES)
+		printw("      %04x  ", k);
 	    else
-		printw("%-10s  ",fstypenames[k]);
-	    if(i == OURPART)
+		printw("%-10s  ", fstypenames[k]);
+	    if (i == OURPART)
 		printw("<Entire FreeBSD slice>");
-	    else if(i == RAWPART)
+	    else if (i == RAWPART)
 		printw("<Entire Disk>");
-	    else if(Fmount[MP[diskno][i]])
-		printw(Fmount[MP[diskno][i]]);
+	    else {
+		if (Fmount[MP[diskno][i]])
+		    printw(Fmount[MP[diskno][i]]);
+		free_space -= lbl->d_partitions[i].p_size;
+	    }
 	}
-	mvprintw(21,0,"Commands available:");
-	mvprintw(22,0,"(S)ize  (M)ountpoint  (D)elete  (R)eread  (W)rite  (Q)uit");
-	mvprintw(23,0,"Enter Command> ");
+	mvprintw(19, 0, "Free space: %d blocks.", free_space);
+	mvprintw(21, 0, "Commands available:");
+	mvprintw(22, 0, "(S)ize  (M)ountpoint  (D)elete  (R)eread  (W)rite  (Q)uit");
+	mvprintw(23, 0, "Enter Command> ");
 	i=getch();
 	switch(i) {
-	    case 'd': case 'D':
-		j = AskWhichPartition("Delete which partition ? ");
-		if(j < 0) break;
-		CleanMount(diskno,j);
-	        lbl->d_partitions[j].p_fstype = FS_UNUSED;
-	        lbl->d_partitions[j].p_size = 0;
-	        lbl->d_partitions[j].p_offset = 0;
+	case 'd': case 'D':
+	    j = AskWhichPartition("Delete which partition? ");
+	    if (j < 0) {
+		yelp("Invalid partition");
 		break;
-	    case 's': case 'S':
-		j = AskWhichPartition("Change size of which partition ? ");
-		if(j < 0) break;
-	        if(lbl->d_partitions[j].p_fstype != FS_BSDFFS &&
-	            lbl->d_partitions[j].p_fstype != FS_UNUSED &&
-	            lbl->d_partitions[j].p_fstype != FS_SWAP) break;
-	        if(lbl->d_partitions[OURPART].p_size == 0) break;
-		l1=lbl->d_partitions[OURPART].p_offset;
-		l2=lbl->d_partitions[OURPART].p_offset +
-		    lbl->d_partitions[OURPART].p_size;
-		for (i=0;i<MAXPARTITIONS;i++) {
-		    if(i == OURPART) continue;
-		    if(i == RAWPART) continue;
-		    if(i == j) continue;
-		    if(lbl->d_partitions[i].p_size == 0) continue;
-		    if(lbl->d_partitions[i].p_offset >= l2) continue;
-		    if((lbl->d_partitions[i].p_offset+
-			lbl->d_partitions[i].p_size) <= l1) continue;
-		    l3 = lbl->d_partitions[i].p_offset - l1;
-		    l4 = l2 - (lbl->d_partitions[i].p_offset+
-                        lbl->d_partitions[i].p_size);
-		    if(l3 > 0 && l3 >= l4)
-			l2 = l1+l3;
-		    else if (l4 > 0 && l4 > l3)
-			l1 = l2-l4;
-		    else
-			l2 = l1;
-		}
-		if(!(l2-l1)) break;
-                sprintf(buf,"%lu",(l2-l1+1024L)/2048L);
-                i = AskEm(stdscr,"Size of slice in MB ",buf,10);
-                l3=strtol(buf,0,0) * 2048L;
-                if(!l3) break;
-                if(l3 > l2-l1)
-                    l3 = l2-l1;
-		lbl->d_partitions[j].p_size = l3;
-		lbl->d_partitions[j].p_offset = l1;
-		if(j == 1)
-		    lbl->d_partitions[j].p_fstype = FS_SWAP;
-		else
-		    lbl->d_partitions[j].p_fstype = FS_BSDFFS;
+	    }
+	    CleanMount(diskno, j);
+	    lbl->d_partitions[j].p_fstype = FS_UNUSED;
+	    lbl->d_partitions[j].p_size = 0;
+	    lbl->d_partitions[j].p_offset = 0;
+	    break;
 
+	case 's': case 'S':
+	    j = AskWhichPartition("Change size of which partition? ");
+	    if (j < 0) {
+		yelp("Invalid partition");
 		break;
-	    case 'r': case 'R':
-		olbl = *Dlbl[diskno];
-		/* XXX be more selective here */
-		for(i=0;i<MAXPARTITIONS;i++) 
-		    CleanMount(diskno,i);
+	    }
+	    if (lbl->d_partitions[j].p_fstype != FS_BSDFFS &&
+	       lbl->d_partitions[j].p_fstype != FS_UNUSED &&
+	       lbl->d_partitions[j].p_fstype != FS_SWAP) {
+		yelp("Invalid partition type");
 		break;
-	    case 'm': case 'M':
-		j = AskWhichPartition("Mountpoint of which partition ? ");
-		if(j < 0) break;
-	        k = lbl->d_partitions[j].p_fstype;
-		if(k != FS_BSDFFS && k != FS_MSDOS && k != FS_SWAP) break;
-		if(!lbl->d_partitions[j].p_size) break;
-		if(k == FS_SWAP)
-		    strcpy(buf,"swap");
-		else if(Fmount[MP[diskno][j]]) 
-		    strcpy(buf,Fmount[MP[diskno][j]]);
+	    }
+	    if (lbl->d_partitions[OURPART].p_size == 0) {
+		yelp("No FreeBSD partition defined?");
+		break;
+	    }
+	    l1=lbl->d_partitions[OURPART].p_offset;
+	    l2=lbl->d_partitions[OURPART].p_offset +
+		lbl->d_partitions[OURPART].p_size;
+	    for (i = 0; i < MAXPARTITIONS; i++) {
+		if (i == OURPART) continue;
+		if (i == RAWPART) continue;
+		if (i == j) continue;
+		if (lbl->d_partitions[i].p_size == 0) continue;
+		if (lbl->d_partitions[i].p_offset >= l2) continue;
+		if ((lbl->d_partitions[i].p_offset+
+		    lbl->d_partitions[i].p_size) <= l1) continue;
+		l3 = lbl->d_partitions[i].p_offset - l1;
+		l4 = l2 - (lbl->d_partitions[i].p_offset+
+			   lbl->d_partitions[i].p_size);
+		if (l3 > 0 && l3 >= l4)
+		    l2 = l1+l3;
+		else if (l4 > 0 && l4 > l3)
+		    l1 = l2-l4;
 		else
-		    *buf = 0;
-		if(k != FS_SWAP) {
-		    i = AskEm(stdscr,"Mount on directory ",buf,28);
-		    if(i != '\n' && i != '\r') break;
+		    l2 = l1;
+	    }
+	    if (!(l2 - l1)) {
+		yelp("Oh god, I'm so confused!");
+		break;
+	    }
+	    sprintf(buf, "%lu", (l2-l1+1024L)/2048L);
+	    i = AskEm(stdscr, "Size of slice in MB ", buf, 10);
+	    l3= strtol(buf, 0, 0) * 2048L;
+	    if (!l3) {
+		yelp("Invalid size given");
+		break;
+	    }
+	    if (l3 > l2 - l1)
+		l3 = l2 - l1;
+	    lbl->d_partitions[j].p_size = l3;
+	    lbl->d_partitions[j].p_offset = l1;
+	    if (j == 1)
+		lbl->d_partitions[j].p_fstype = FS_SWAP;
+	    else
+		lbl->d_partitions[j].p_fstype = FS_BSDFFS;
+	    break;
+
+	case 'r': case 'R':
+	    olbl = *Dlbl[diskno];
+	    /* XXX be more selective here */
+	    for (i = 0; i < MAXPARTITIONS; i++) 
+		CleanMount(diskno, i);
+	    break;
+
+	case 'm': case 'M':
+	    j = AskWhichPartition("Mountpoint of which partition ? ");
+	    if (j < 0) {
+		yelp("Invalid partition");
+		break;
+	    }
+	    k = lbl->d_partitions[j].p_fstype;
+	    if (k != FS_BSDFFS && k != FS_MSDOS && k != FS_SWAP) {
+		yelp("Invalid partition type");
+		break;
+	    }
+	    if (!lbl->d_partitions[j].p_size) {
+		yelp("Zero partition size");
+		break;
+	    }
+	    if (k == FS_SWAP)
+		strcpy(buf, "swap");
+	    else if (Fmount[MP[diskno][j]]) 
+		strcpy(buf, Fmount[MP[diskno][j]]);
+	    else
+		*buf = 0;
+	    if (k != FS_SWAP) {
+		i = AskEm(stdscr, "Mount on directory ", buf, 28);
+		if (i != '\n' && i != '\r') {
+		    yelp("Invalid directory name");
+		    break;
 		}
-		CleanMount(diskno,j);
-		for(k=1;k<MAX_NO_FS;k++)
-		    if(!Fmount[k])
-			break;
-		if(k >= MAX_NO_FS) break;
-		Fmount[k] = StrAlloc(buf);
-		MP[diskno][j] = k;
-		sprintf(buf,"%s%c",Dname[diskno],j+'a');
-		Fname[MP[diskno][j]] = StrAlloc(buf);
-	        if(lbl->d_partitions[j].p_fstype == FS_BSDFFS)
-		    Ftype[MP[diskno][j]] = StrAlloc("ufs");
-	        else if(lbl->d_partitions[j].p_fstype == FS_MSDOS)
-		    Ftype[MP[diskno][j]] = StrAlloc("msdos");
-	        else if(lbl->d_partitions[j].p_fstype == FS_SWAP)
-		    Ftype[MP[diskno][j]] = StrAlloc("swap");
-		Fsize[MP[diskno][j]] = (lbl->d_partitions[j].p_size+1024)/2048;
+	    }
+	    CleanMount(diskno, j);
+	    for (k = 1; k < MAX_NO_FS; k++)
+		if (!Fmount[k])
+		    break;
+	    if (k >= MAX_NO_FS) {
+		yelp("Maximum number of filesystems exceeded");
 		break;
-	    case 'w': case 'W':
-		*Dlbl[diskno] = *lbl;
-		Dlbl[diskno]->d_magic = DISKMAGIC;
-		Dlbl[diskno]->d_magic2 = DISKMAGIC;
-		Dlbl[diskno]->d_checksum = 0;
-                Dlbl[diskno]->d_checksum = dkcksum(Dlbl[diskno]);
-		*lbl= *Dlbl[diskno];
-                flag=1;
-                if (ioctl(Dfd[diskno], DIOCWLABEL, &flag) < 0)
-                        Fatal("Couldn't enable writing of labels");
-                if(ioctl(Dfd[diskno],DIOCSDINFO,Dlbl[diskno]) == -1)
-                    Fatal("Couldn't set label: %s",strerror(errno));
-                if(ioctl(Dfd[diskno],DIOCWDINFO,Dlbl[diskno]) == -1)
-                    Fatal("Couldn't write label: %s",strerror(errno));
-                flag=0; 
-                if (ioctl(Dfd[diskno], DIOCWLABEL, &flag) < 0)
-                        Fatal("Couldn't disable writing of labels");
-		break;
-	    case 'q': case 'Q':
-		if(!memcmp(lbl,Dlbl[diskno],sizeof *lbl))
-		    return;
-		/* XXX be more selective here */
-		for(i=0;i<MAXPARTITIONS;i++) 
-		    CleanMount(diskno,i);
+	    }
+	    Fmount[k] = StrAlloc(buf);
+	    MP[diskno][j] = k;
+	    sprintf(buf, "%s%c", Dname[diskno], j+'a');
+	    Fname[MP[diskno][j]] = StrAlloc(buf);
+	    if (lbl->d_partitions[j].p_fstype == FS_BSDFFS)
+		Ftype[MP[diskno][j]] = StrAlloc("ufs");
+	    else if (lbl->d_partitions[j].p_fstype == FS_MSDOS)
+		Ftype[MP[diskno][j]] = StrAlloc("msdos");
+	    else if (lbl->d_partitions[j].p_fstype == FS_SWAP)
+		Ftype[MP[diskno][j]] = StrAlloc("swap");
+	    Fsize[MP[diskno][j]] = (lbl->d_partitions[j].p_size+1024)/2048;
+	    break;
+
+	case 'w': case 'W':
+	    *Dlbl[diskno] = *lbl;
+	    Dlbl[diskno]->d_magic = DISKMAGIC;
+	    Dlbl[diskno]->d_magic2 = DISKMAGIC;
+	    Dlbl[diskno]->d_checksum = 0;
+	    Dlbl[diskno]->d_checksum = dkcksum(Dlbl[diskno]);
+	    *lbl= *Dlbl[diskno];
+	    flag=1;
+	    if (ioctl(Dfd[diskno], DIOCWLABEL, &flag) < 0)
+		Fatal("Couldn't enable writing of labels");
+	    if (ioctl(Dfd[diskno], DIOCSDINFO, Dlbl[diskno]) == -1)
+		Fatal("Couldn't set label: %s", strerror(errno));
+	    if (ioctl(Dfd[diskno], DIOCWDINFO, Dlbl[diskno]) == -1)
+		Fatal("Couldn't write label: %s", strerror(errno));
+	    flag=0; 
+	    if (ioctl(Dfd[diskno], DIOCWLABEL, &flag) < 0)
+		Fatal("Couldn't disable writing of labels");
+	    
+	    mvprintw(24, 0, "Label written successfully.");
+	    beep();
+	    break;
+
+	case 'q': case 'Q':
+	    if (!memcmp(lbl, Dlbl[diskno], sizeof *lbl))
 		return;
-		break;
+	    /* XXX be more selective here */
+	    for (i = 0; i < MAXPARTITIONS; i++)
+		CleanMount(diskno, i);
+	    return;
+	    break;
 	}
     }
 }
diff --git a/sbin/sysinstall/mbr.c b/sbin/sysinstall/mbr.c
index b74a4835a1d2..4890f0af78db 100644
--- a/sbin/sysinstall/mbr.c
+++ b/sbin/sysinstall/mbr.c
@@ -38,245 +38,245 @@ struct part_type part_types[] = PARTITION_TYPES
 char *
 part_type(int type)
 {
-	int num_types = (sizeof(part_types)/sizeof(struct part_type));
-	int next_type = 0;
-	struct part_type *ptr = part_types;
-
-	while (next_type < num_types) {
-		if(ptr->type == type)
-			return(ptr->name);
-		ptr++;
-		next_type++;
-	}
-	return("Unknown");
+    int num_types = (sizeof(part_types)/sizeof(struct part_type));
+    int next_type = 0;
+    struct part_type *ptr = part_types;
+    
+    while (next_type < num_types) {
+	if(ptr->type == type)
+	    return(ptr->name);
+	ptr++;
+	next_type++;
+    }
+    return("Unknown");
 }
 
 void
 read_dospart(int fd, struct dos_partition *dp)
 {
-	u_char buf[512];
-	if (lseek(fd, 0, SEEK_SET) == -1) 
-		Fatal("Couldn't seek for master boot record read\n");
-	if (read(fd, buf, 512) != 512) {
-		Fatal("Failed to read master boot record\n");
-	}
-	memcpy(dp,buf+DOSPARTOFF,sizeof(*dp)*NDOSPART);
+    u_char buf[512];
+    if (lseek(fd, 0, SEEK_SET) == -1) 
+	Fatal("Couldn't seek for master boot record read\n");
+    if (read(fd, buf, 512) != 512) {
+	Fatal("Failed to read master boot record\n");
+    }
+    memcpy(dp, buf+DOSPARTOFF, sizeof(*dp)*NDOSPART);
 }
 
 void
 write_dospart(int fd, struct dos_partition *dp)
 {
-	u_char buf[512];
-	int flag;
-	if (lseek(fd, 0, SEEK_SET) == -1) 
-		Fatal("Couldn't seek for master boot record read\n");
-	if (read(fd, buf, 512) != 512) {
-		Fatal("Failed to read master boot record\n");
-	}
-	memcpy(buf+DOSPARTOFF,dp,sizeof(*dp)*NDOSPART);
-	if (lseek(fd, 0, SEEK_SET) == -1) 
-		Fatal("Couldn't seek for master boot record read\n");
-	flag=1;
-	if (ioctl(fd, DIOCWLABEL, &flag) < 0)
-                Fatal("Couldn't enable writing of labels");
-	if (write(fd, buf, 512) != 512) 
-		Fatal("Failed to write master boot record\n");
-	flag=0;
-	if (ioctl(fd, DIOCWLABEL, &flag) < 0)
-                Fatal("Couldn't disable writing of labels");
+    u_char buf[512];
+    int flag;
+    if (lseek(fd, 0, SEEK_SET) == -1) 
+	Fatal("Couldn't seek for master boot record read\n");
+    if (read(fd, buf, 512) != 512) {
+	Fatal("Failed to read master boot record\n");
+    }
+    memcpy(buf+DOSPARTOFF, dp, sizeof(*dp)*NDOSPART);
+    if (lseek(fd, 0, SEEK_SET) == -1) 
+	Fatal("Couldn't seek for master boot record read\n");
+    flag=1;
+    if (ioctl(fd, DIOCWLABEL, &flag) < 0)
+	Fatal("Couldn't enable writing of labels");
+    if (write(fd, buf, 512) != 512) 
+	Fatal("Failed to write master boot record\n");
+    flag=0;
+    if (ioctl(fd, DIOCWLABEL, &flag) < 0)
+	Fatal("Couldn't disable writing of labels");
 }
 
 int
 read_mbr(int fd, struct mbr *mbr)
 {
-	if (lseek(fd, 0, SEEK_SET) == -1) {
-		sprintf(errmsg, "Couldn't seek for master boot record read\n");
-		return(-1);
-	}
-	if (read(fd, &(mbr->bootcode), MBRSIZE) == -1) {
-		sprintf(errmsg, "Failed to read master boot record\n");
-		return(-1);
-	}
-	return(0);
+    if (lseek(fd, 0, SEEK_SET) == -1) {
+	sprintf(errmsg, "Couldn't seek for master boot record read\n");
+	return(-1);
+    }
+    if (read(fd, &(mbr->bootcode), MBRSIZE) == -1) {
+	sprintf(errmsg, "Failed to read master boot record\n");
+	return(-1);
+    }
+    return(0);
 }
 
 int
 write_mbr(int fd, struct mbr *mbr)
 {
-	if (lseek(fd, 0, SEEK_SET) == -1) {
-		sprintf(errmsg, "Couldn't seek for master boot record write\n");
-		return(-1);
-	}
-
-	enable_label(fd);
-
-	if (write(fd, mbr->bootcode, MBRSIZE) == -1) {
-		sprintf(errmsg, "Failed to write master boot record\n");
-		return(-1);
-	}
-
-	disable_label(fd);
-
-	return(0);
+    if (lseek(fd, 0, SEEK_SET) == -1) {
+	sprintf(errmsg, "Couldn't seek for master boot record write\n");
+	return(-1);
+    }
+    
+    enable_label(fd);
+    
+    if (write(fd, mbr->bootcode, MBRSIZE) == -1) {
+	sprintf(errmsg, "Failed to write master boot record\n");
+	return(-1);
+    }
+    
+    disable_label(fd);
+    
+    return(0);
 }
 
 void
 show_mbr(struct mbr *mbr)
 {
-	int i, j, key = 0;
-	int x, y;
-	WINDOW *window;
-
-	if (use_shadow)
-		draw_shadow(stdscr, 1, 1, LINES-2, COLS-2);
-	window = newwin(LINES-2, COLS-2, 1, 1);
-	keypad(window, TRUE);
-
-	draw_box(window, 1, 1, LINES - 2, COLS - 2, dialog_attr, border_attr);
-	wattrset(window, dialog_attr);
-
-	for (i=0; i<NDOSPART/2; i++) {
-		for (j=0; j<NDOSPART/2; j++) {
-			x = (j * 38) + 3;
-			y = (i * 11) + 2;
-			mvwprintw(window, y, x, "Partition %d: flags = %x",
-					  (i*2)+j, mbr->dospart[(i*2)+j].dp_flag);
-			mvwprintw(window, y+1, x, "Starting at (C%d, H%d, S%d)",
-					  mbr->dospart[(i*2)+j].dp_scyl,
-					  mbr->dospart[(i*2)+j].dp_shd,
-					  mbr->dospart[(i*2)+j].dp_ssect);
-			mvwprintw(window, y+2, x, "Type: %s (%x)",
-					  part_type(mbr->dospart[(i*2)+j].dp_typ),
-		           mbr->dospart[(i*2)+j].dp_typ);
-			mvwprintw(window, y+3, x, "Ending at (C%d, H%d, S%d)",
-					  mbr->dospart[(i*2)+j].dp_ecyl,
-					  mbr->dospart[(i*2)+j].dp_ehd,
-					  mbr->dospart[(i*2)+j].dp_esect);
-			mvwprintw(window, y+4, x, "Absolute start sector %ld",
-					  mbr->dospart[(i*2)+j].dp_start);
-			mvwprintw(window, y+5, x, "Size (in sectors) %ld", mbr->dospart[(i*2)+j].dp_size);
-		}
+    int i, j, key = 0;
+    int x, y;
+    WINDOW *window;
+    
+    if (use_shadow)
+	draw_shadow(stdscr, 1, 1, LINES-2, COLS-2);
+    window = newwin(LINES-2, COLS-2, 1, 1);
+    keypad(window, TRUE);
+    
+    draw_box(window, 1, 1, LINES - 2, COLS - 2, dialog_attr, border_attr);
+    wattrset(window, dialog_attr);
+    
+    for (i=0; i<NDOSPART/2; i++) {
+	for (j=0; j<NDOSPART/2; j++) {
+	    x = (j * 38) + 3;
+	    y = (i * 11) + 2;
+	    mvwprintw(window, y, x, "Partition %d: flags = %x",
+		      (i*2)+j, mbr->dospart[(i*2)+j].dp_flag);
+	    mvwprintw(window, y+1, x, "Starting at (C%d, H%d, S%d)",
+		      mbr->dospart[(i*2)+j].dp_scyl,
+		      mbr->dospart[(i*2)+j].dp_shd,
+		      mbr->dospart[(i*2)+j].dp_ssect);
+	    mvwprintw(window, y+2, x, "Type: %s (%x)",
+		      part_type(mbr->dospart[(i*2)+j].dp_typ),
+		      mbr->dospart[(i*2)+j].dp_typ);
+	    mvwprintw(window, y+3, x, "Ending at (C%d, H%d, S%d)",
+		      mbr->dospart[(i*2)+j].dp_ecyl,
+		      mbr->dospart[(i*2)+j].dp_ehd,
+		      mbr->dospart[(i*2)+j].dp_esect);
+	    mvwprintw(window, y+4, x, "Absolute start sector %ld",
+		      mbr->dospart[(i*2)+j].dp_start);
+	    mvwprintw(window, y+5, x, "Size (in sectors) %ld", mbr->dospart[(i*2)+j].dp_size);
 	}
-	dialog_update();
-
-	while (key != '\n' && key != ' ' && key != '\033')
-		key = wgetch(window);
-
-	delwin(window);
-	dialog_clear();
+    }
+    dialog_update();
+    
+    while (key != '\n' && key != ' ' && key != '\033')
+	key = wgetch(window);
+    
+    delwin(window);
+    dialog_clear();
 }
 
 int
 clear_mbr(struct mbr *mbr, char *bootcode)
 {
-	int i;
-   int fd;
-
-	/*
-	 * If installing to the whole disk
-	 * then clobber any existing bootcode.
-	 */
-
-	sprintf(scratch, "\nLoading MBR code from %s\n", bootcode);
-	dialog_msgbox(TITLE, scratch, 5, 60, 0);
-	fd = open(bootcode, O_RDONLY);
-	if (fd < 0) {
-		sprintf(errmsg, "Couldn't open boot file %s\n", bootcode);
-		return(-1);
-	}  
-
-	if (read(fd, mbr->bootcode, MBRSIZE) < 0) {
-		sprintf(errmsg, "Couldn't read from boot file %s\n", bootcode);
-		return(-1);
-	}
-			
-	if (close(fd) == -1) {
-		sprintf(errmsg, "Couldn't close boot file %s\n", bootcode);
-		return(-1);
-	}  
-
-	/* Create an empty partition table */
-
-	for (i=0; i < NDOSPART; i++) {
-		mbr->dospart[i].dp_flag = 0;
-		mbr->dospart[i].dp_shd = 0;
-		mbr->dospart[i].dp_ssect = 0;
-		mbr->dospart[i].dp_scyl = 0;
-		mbr->dospart[i].dp_typ = 0;
-		mbr->dospart[i].dp_ehd = 0;
-		mbr->dospart[i].dp_esect = 0;
-		mbr->dospart[i].dp_ecyl = 0;
-		mbr->dospart[i].dp_start = 0;
-		mbr->dospart[i].dp_size = 0;
-	}
-
-	mbr->magic = MBR_MAGIC;
-
-	dialog_clear();
-	return(0);
+    int i;
+    int fd;
+    
+    /*
+     * If installing to the whole disk
+     * then clobber any existing bootcode.
+     */
+    
+    sprintf(scratch, "\nLoading MBR code from %s\n", bootcode);
+    dialog_msgbox(TITLE, scratch, 5, 60, 0);
+    fd = open(bootcode, O_RDONLY);
+    if (fd < 0) {
+	sprintf(errmsg, "Couldn't open boot file %s\n", bootcode);
+	return(-1);
+    }  
+    
+    if (read(fd, mbr->bootcode, MBRSIZE) < 0) {
+	sprintf(errmsg, "Couldn't read from boot file %s\n", bootcode);
+	return(-1);
+    }
+    
+    if (close(fd) == -1) {
+	sprintf(errmsg, "Couldn't close boot file %s\n", bootcode);
+	return(-1);
+    }
+    
+    /* Create an empty partition table */
+    
+    for (i=0; i < NDOSPART; i++) {
+	mbr->dospart[i].dp_flag = 0;
+	mbr->dospart[i].dp_shd = 0;
+	mbr->dospart[i].dp_ssect = 0;
+	mbr->dospart[i].dp_scyl = 0;
+	mbr->dospart[i].dp_typ = 0;
+	mbr->dospart[i].dp_ehd = 0;
+	mbr->dospart[i].dp_esect = 0;
+	mbr->dospart[i].dp_ecyl = 0;
+	mbr->dospart[i].dp_start = 0;
+	mbr->dospart[i].dp_size = 0;
+    }
+    
+    mbr->magic = MBR_MAGIC;
+    
+    dialog_clear();
+    return(0);
 }
 
 int
 build_mbr(struct mbr *mbr, char *bootcode, struct disklabel *lb)
 {
-	int i;
-	struct dos_partition *dp = &mbr->dospart[inst_part];
-
-	if (whole_disk) {
-		/* Install to entire disk */
-		if (clear_mbr(mbr, bootcode) == -1)
-			return(-1);
-		dp->dp_scyl = 0;
-		dp->dp_shd = 1;
-		dp->dp_ssect = 1;
-		dp->dp_ecyl = lb->d_ncylinders - 1;
-		dp->dp_ehd = lb->d_ntracks - 1;
-		dp->dp_esect = lb->d_nsectors;
-		dp->dp_start = (dp->dp_scyl * lb->d_ntracks * lb->d_nsectors) + 
-						   (dp->dp_shd * lb->d_nsectors) +
-		               dp->dp_ssect - 1;
-		dp->dp_size = (lb->d_nsectors * lb->d_ntracks * lb->d_ncylinders) -
-							dp->dp_start;
-	}
-
-	/* Validate partition - XXX need to spend some time making this robust */
-	if (!dp->dp_start) {
-		strcpy(errmsg, "The start address of the selected partition is 0\n");
-		return(-1);
-	}
-
-	/* Set partition type to FreeBSD and make it the only active partition */
-
-	for (i=0; i < NDOSPART; i++)
-		mbr->dospart[i].dp_flag &= ~ACTIVE;
-	dp->dp_typ = DOSPTYP_386BSD;
-	dp->dp_flag = ACTIVE;
-
-	return(0);
+    int i;
+    struct dos_partition *dp = &mbr->dospart[inst_part];
+    
+    if (whole_disk) {
+	/* Install to entire disk */
+	if (clear_mbr(mbr, bootcode) == -1)
+	    return(-1);
+	dp->dp_scyl = 0;
+	dp->dp_shd = 1;
+	dp->dp_ssect = 1;
+	dp->dp_ecyl = lb->d_ncylinders - 1;
+	dp->dp_ehd = lb->d_ntracks - 1;
+	dp->dp_esect = lb->d_nsectors;
+	dp->dp_start = (dp->dp_scyl * lb->d_ntracks * lb->d_nsectors) + 
+	    (dp->dp_shd * lb->d_nsectors) +
+		dp->dp_ssect - 1;
+	dp->dp_size =
+	    (lb->d_nsectors * lb->d_ntracks * lb->d_ncylinders) - dp->dp_start;
+    }
+    
+    /* Validate partition - XXX need to spend some time making this robust */
+    if (!dp->dp_start) {
+	strcpy(errmsg, "The start address of the selected partition is 0\n");
+	return(-1);
+    }
+    
+    /* Set partition type to FreeBSD and make it the only active partition */
+    
+    for (i=0; i < NDOSPART; i++)
+	mbr->dospart[i].dp_flag &= ~ACTIVE;
+    dp->dp_typ = DOSPTYP_386BSD;
+    dp->dp_flag = ACTIVE;
+    
+    return(0);
 }
 
 void
 edit_mbr(struct mbr *mbr, struct disklabel *label)
 {
-
-	dialog_msgbox("DOS partition table editor", 
-		"This editor is still under construction :-)", 10, 75, 1);
-	show_mbr(mbr);
+    
+    dialog_msgbox("DOS partition table editor", 
+		  "This editor is still under construction :-)", 10, 75, 1);
+    show_mbr(mbr);
 }
 
 void
 Fdisk()
 {
-    int i,j,done=0,diskno,flag;
+    int i, j, done=0, diskno, flag;
     char buf[128];
     struct dos_partition dp[NDOSPART];
     struct disklabel *lbl;
-    u_long cyl,hd,sec,tsec;
-    u_long l,l1,l2,l3,l4;
-
+    u_long cyl, hd, sec, tsec;
+    u_long l, l1, l2, l3, l4;
+    
     *buf = 0;
-    i = AskEm(stdscr,"Enter number of disk to Fdisk ",buf,1);
-	printf("%d",i);
+    i = AskEm(stdscr, "Enter number of disk to Fdisk ", buf, 2);
+    printf("%d", i);
     if(i != '\n' && i != '\r') return;
     diskno = atoi(buf);
     if(!(diskno >= 0 && diskno < MAX_NO_DISKS && Dname[diskno])) return;
@@ -287,176 +287,181 @@ Fdisk()
     sec = lbl->d_nsectors;
     tsec = Dlbl[diskno]->d_partitions[RAWPART].p_size;
     cyl = tsec/(hd*sec);
-    read_dospart(Dfd[diskno],dp);
+    read_dospart(Dfd[diskno], dp);
     while(!done) {
 	clear(); standend();
 	j = 0;
-	mvprintw(j++,0,"%s -- Diskspace editor -- FDISK",TITLE);
+	mvprintw(j++, 0, "%s -- Diskspace editor -- FDISK", TITLE);
 	j++;
-	mvprintw(j++,0,
-	    "Geometry:  %lu Cylinders, %lu Heads, %lu Sectors, %luMb",
-	    cyl,hd,sec,(tsec+1024)/2048);
+	mvprintw(j++, 0,
+		 "Geometry:  %lu Cylinders, %lu Heads, %lu Sectors, %luMb",
+		 cyl, hd, sec, (tsec+1024)/2048);
 	j++;
-	for(i=0;i<NDOSPART;i++,j+=3) {
-	    mvprintw(j++,0,"%d ",i+1);
+	for(i=0;i<NDOSPART;i++, j+=3) {
+	    mvprintw(j++, 0, "%d ", i+1);
 #if 0
 	    printw("[%02x %02x %02x %02x %02x %02x %02x %02x %08lx %08lx]\n",
-		dp[i].dp_flag, dp[i].dp_shd, dp[i].dp_ssect, dp[i].dp_scyl,
-		dp[i].dp_typ, dp[i].dp_ehd, dp[i].dp_esect, dp[i].dp_ecyl,
-		dp[i].dp_start, dp[i].dp_size);
+		   dp[i].dp_flag, dp[i].dp_shd, dp[i].dp_ssect, dp[i].dp_scyl,
+		   dp[i].dp_typ, dp[i].dp_ehd, dp[i].dp_esect, dp[i].dp_ecyl,
+		   dp[i].dp_start, dp[i].dp_size);
 #endif
 	    if(!dp[i].dp_size) {
 		printw("Unused");
 		continue;
 	    }
-	    printw("Boot?=%s",dp[i].dp_flag == 0x80 ? "Yes" : "No ");
+	    printw("Boot?=%s", dp[i].dp_flag == 0x80 ? "Yes" : "No ");
 	    printw("   Type=%s\n", part_type(dp[i].dp_typ));
 	    printw("  Phys=(c%d/h%d/s%d..c%d/h%d/s%d)",
-		DPCYL(dp[i].dp_scyl,dp[i].dp_ssect),dp[i].dp_shd,
-			DPSECT(dp[i].dp_ssect),
-		DPCYL(dp[i].dp_ecyl,dp[i].dp_esect),dp[i].dp_ehd,
-			DPSECT(dp[i].dp_esect));
+		   DPCYL(dp[i].dp_scyl, dp[i].dp_ssect), dp[i].dp_shd,
+		   DPSECT(dp[i].dp_ssect),
+		   DPCYL(dp[i].dp_ecyl, dp[i].dp_esect), dp[i].dp_ehd,
+		   DPSECT(dp[i].dp_esect));
 	    printw("   Sector=(%lu..%lu)\n",
-		dp[i].dp_start, dp[i].dp_size + dp[i].dp_start-1);
-	    printw("  Size=%lu MB, %lu Cylinders",(dp[i].dp_size+1024L)/2048L,
-		dp[i].dp_size/lbl->d_secpercyl);
+		   dp[i].dp_start, dp[i].dp_size + dp[i].dp_start-1);
+	    printw("  Size=%lu MB, %lu Cylinders", (dp[i].dp_size+1024L)/2048L,
+		   dp[i].dp_size/lbl->d_secpercyl);
 	    l = dp[i].dp_size%lbl->d_secpercyl;
 	    if(l) {
 		printw(" + %lu Tracks", l/lbl->d_nsectors);
 		l = l % lbl->d_nsectors;
 		if(l) {
-		    printw(" + %lu Sectors",l);
+		    printw(" + %lu Sectors", l);
 		}
 	    }
 	}
-	mvprintw(21,0,"Commands available:");
-	mvprintw(22,0,"(D)elete  (E)dit  (R)eread  (W)rite  (Q)uit");
-	mvprintw(23,0,"Enter Command> ");
+	mvprintw(21, 0, "Commands available:");
+	mvprintw(22, 0, "(D)elete  (E)dit  (R)eread  (W)rite  (Q)uit");
+	mvprintw(23, 0, "Enter Command> ");
 	i=getch();
 	switch(i) {
-	    case 'r': case 'R':
-		read_dospart(Dfd[diskno],dp);
-		break;
-	    case 'e': case 'E':
-		*buf = 0;
-		i = AskEm(stdscr,"Edit which Slice ? ",buf,1);
-		if(i != '\n' && i != '\r') break;
-		l = strtol(buf,0,0);
-		if(l < 1 || l > NDOSPART) break;
-		l1=sec; l2=tsec;
-		for(i=0;i<NDOSPART;i++) {
-		    if((i+1) == l) continue;
-		    if(!dp[i].dp_size) continue;
-		    if(dp[i].dp_start > l2) continue;
-		    if((dp[i].dp_start + dp[i].dp_size) <= l1) continue;
-		    if(dp[i].dp_start > l1)
-		        l3 = dp[i].dp_start - l1;
-		    else
-			l3 = 0;
-		    if(l2 > (dp[i].dp_start + dp[i].dp_size))
-		        l4 = l2 - (dp[i].dp_start + dp[i].dp_size);
-		    else
-			l4 = 0;
-		    if(l3 >= l4)
-			l2 = dp[i].dp_start;
-		    else
-			l1 = dp[i].dp_start + dp[i].dp_size;
-		}
-		sprintf(buf,"%lu",(l2-l1+1024L)/2048L);
-		i = AskEm(stdscr,"Size of slice in MB ",buf,10);
-		l3=strtol(buf,0,0) * 2048L;
-		if(!l3) break;
-		if(l3 > l2-l1)
-		    l3 = l2-l1;
-		if((l1+l3) % lbl->d_secpercyl) { /* Special for cyl==0 */
-		    l3 += lbl->d_secpercyl - ((l1+l3) % lbl->d_secpercyl);
-		}
-		if(l3+l1 > tsec)
-		    l3 = tsec - l1;
-		dp[l-1].dp_start=l1;
-		dp[l-1].dp_size=l3;
 
-		l3 += l1 - 1;
+	case 'r': case 'R':
+	    read_dospart(Dfd[diskno], dp);
+	    break;
 
-		l2 = l1 / (sec*hd);
-		if(l2>1023) l2 = 1023;
-		dp[l-1].dp_scyl = (l2 & 0xff); 
-		dp[l-1].dp_ssect = (l2 >> 2) & 0xc0;
-		l1 -= l2*sec*hd;
-		l2 = l1 / sec;
-		dp[l-1].dp_shd = l2;
-		l1 -= l2*sec;
-		dp[l-1].dp_ssect |= (l1+1) & 0x3f;
+	case 'e': case 'E':
+	    *buf = 0;
+	    i = AskEm(stdscr, "Edit which Slice ? ", buf, 2);
+	    if(i != '\n' && i != '\r') break;
+	    l = strtol(buf, 0, 0);
+	    if(l < 1 || l > NDOSPART) break;
+	    l1=sec; l2=tsec;
+	    for(i=0;i<NDOSPART;i++) {
+		if((i+1) == l) continue;
+		if(!dp[i].dp_size) continue;
+		if(dp[i].dp_start > l2) continue;
+		if((dp[i].dp_start + dp[i].dp_size) <= l1) continue;
+		if(dp[i].dp_start > l1)
+		    l3 = dp[i].dp_start - l1;
+		else
+		    l3 = 0;
+		if(l2 > (dp[i].dp_start + dp[i].dp_size))
+		    l4 = l2 - (dp[i].dp_start + dp[i].dp_size);
+		else
+		    l4 = 0;
+		if(l3 >= l4)
+		    l2 = dp[i].dp_start;
+		else
+		    l1 = dp[i].dp_start + dp[i].dp_size;
+	    }
+	    sprintf(buf, "%lu", (l2-l1+1024L)/2048L);
+	    i = AskEm(stdscr, "Size of slice in MB ", buf, 10);
+	    l3=strtol(buf, 0, 0) * 2048L;
+	    if(!l3) break;
+	    if(l3 > l2-l1)
+		l3 = l2-l1;
+	    if((l1+l3) % lbl->d_secpercyl) { /* Special for cyl==0 */
+		l3 += lbl->d_secpercyl - ((l1+l3) % lbl->d_secpercyl);
+	    }
+	    if(l3+l1 > tsec)
+		l3 = tsec - l1;
+	    dp[l-1].dp_start=l1;
+	    dp[l-1].dp_size=l3;
+	    
+	    l3 += l1 - 1;
+	    
+	    l2 = l1 / (sec*hd);
+	    if(l2>1023) l2 = 1023;
+	    dp[l-1].dp_scyl = (l2 & 0xff); 
+	    dp[l-1].dp_ssect = (l2 >> 2) & 0xc0;
+	    l1 -= l2*sec*hd;
+	    l2 = l1 / sec;
+	    dp[l-1].dp_shd = l2;
+	    l1 -= l2*sec;
+	    dp[l-1].dp_ssect |= (l1+1) & 0x3f;
+	    
+	    l2 = l3 / (sec*hd);
+	    if(l2>1023) l2 = 1023;
+	    dp[l-1].dp_ecyl = (l2 & 0xff); 
+	    dp[l-1].dp_esect = (l2 >> 2) & 0xc0;
+	    l3 -= l2*sec*hd;
+	    l2 = l3 / sec;
+	    dp[l-1].dp_ehd = l2;
+	    l3 -= l2*sec;
+	    dp[l-1].dp_esect |= (l3+1) & 0x3f;
+	    
+	    l4 = dp[l-1].dp_typ;
+	    if(!l4) l4 = MBR_PTYPE_FreeBSD;
+	    sprintf(buf, "0x%lx", l4);
+	    i = AskEm(stdscr, "Type of slice (0xa5=FreeBSD) ", buf, 5);
+	    l3 = strtol(buf, 0, 0);
+	    if(l3 == MBR_PTYPE_FreeBSD) {
+		for(i=0;i<NDOSPART;i++)
+		    if(i != (l-1) && dp[i].dp_typ== MBR_PTYPE_FreeBSD)
+			memset(&dp[i], 0, sizeof dp[i]);
+		sprintf(buf, "0x80");
+	    } else {
+		sprintf(buf, "0");
+	    }
+	    dp[l-1].dp_typ=l3;
+	    i = AskEm(stdscr, "Bootflag (0x80 for YES) ", buf, 5);
+	    dp[l-1].dp_flag=strtol(buf, 0, 0);
+	    break;
 
-		l2 = l3 / (sec*hd);
-		if(l2>1023) l2 = 1023;
-		dp[l-1].dp_ecyl = (l2 & 0xff); 
-		dp[l-1].dp_esect = (l2 >> 2) & 0xc0;
-		l3 -= l2*sec*hd;
-		l2 = l3 / sec;
-		dp[l-1].dp_ehd = l2;
-		l3 -= l2*sec;
-		dp[l-1].dp_esect |= (l3+1) & 0x3f;
+	case 'd': case 'D':
+	    *buf = 0;
+	    i = AskEm(stdscr, "Delete which Slice ? ",  buf,  2);
+	    if(i != '\n' && i != '\r') break;
+	    l = strtol(buf, 0, 0);
+	    if(l < 1 || l > NDOSPART) break;
+	    memset(&dp[l-1], 0, sizeof dp[l-1]);
+	    break;
 
-		l4 = dp[l-1].dp_typ;
-		if(!l4) l4 = MBR_PTYPE_FreeBSD;
-		sprintf(buf,"0x%lx",l4);
-		i = AskEm(stdscr,"Type of slice (0xa5=FreeBSD) ",buf,5);
-		l3 = strtol(buf,0,0);
-		if(l3 == MBR_PTYPE_FreeBSD) {
-		    for(i=0;i<NDOSPART;i++)
-			if(i != (l-1) && dp[i].dp_typ== MBR_PTYPE_FreeBSD)
-			    memset(&dp[i],0,sizeof dp[i]);
-		    sprintf(buf,"0x80");
-		} else {
-		    sprintf(buf,"0");
+	case 'w': case 'W':
+	    strcpy(buf, "N");
+	    i = AskEm(stdscr, "Confirm write ", buf, 2);
+	    if(*buf != 'y' && *buf != 'Y') break;
+	    write_dospart(Dfd[diskno], dp);
+	    Dlbl[diskno]->d_partitions[OURPART].p_offset = 0;
+	    Dlbl[diskno]->d_partitions[OURPART].p_size = 0;
+	    for(i=0;i<NDOSPART;i++) {
+		if(dp[i].dp_typ == MBR_PTYPE_FreeBSD) {
+		    Dlbl[diskno]->d_partitions[OURPART].p_offset = 
+			dp[i].dp_start;
+		    Dlbl[diskno]->d_partitions[OURPART].p_size = 
+			dp[i].dp_size;
 		}
-		dp[l-1].dp_typ=l3;
-		i = AskEm(stdscr,"Bootflag (0x80 for YES) ",buf,5);
-		dp[l-1].dp_flag=strtol(buf,0,0);
-		break;
-	    case 'd': case 'D':
-		*buf = 0;
-		i = AskEm(stdscr,"Delete which Slice ? ",buf,1);
-		if(i != '\n' && i != '\r') break;
-		l = strtol(buf,0,0);
-		if(l < 1 || l > NDOSPART) break;
-		memset(&dp[l-1],0,sizeof dp[l-1]);
-		break;
-	    case 'w': case 'W':
-		strcpy(buf,"N");
-		i = AskEm(stdscr,"Confirm write ",buf,1);
-		if(*buf != 'y' && *buf != 'Y') break;
-		write_dospart(Dfd[diskno],dp);
-		Dlbl[diskno]->d_partitions[OURPART].p_offset = 0;
-		Dlbl[diskno]->d_partitions[OURPART].p_size = 0;
-		for(i=0;i<NDOSPART;i++) {
-		    if(dp[i].dp_typ == MBR_PTYPE_FreeBSD) {
-			Dlbl[diskno]->d_partitions[OURPART].p_offset = 
-				dp[i].dp_start;
-			Dlbl[diskno]->d_partitions[OURPART].p_size = 
-				dp[i].dp_size;
-		    }
-		}
-		Dlbl[diskno]->d_magic = DISKMAGIC;
-		Dlbl[diskno]->d_magic2 = DISKMAGIC;
-		Dlbl[diskno]->d_checksum = 0;
-		Dlbl[diskno]->d_checksum = dkcksum(Dlbl[diskno]);
-		flag=1;
-		enable_label(Dfd[diskno]);
-		if(ioctl(Dfd[diskno],DIOCSDINFO,Dlbl[diskno]) == -1)
-		    Fatal("Couldn't set label: %s",strerror(errno));
-		if(ioctl(Dfd[diskno],DIOCWDINFO,Dlbl[diskno]) == -1)
-		    Fatal("Couldn't write label: %s",strerror(errno));
-		flag=0;
-		disable_label(Dfd[diskno]);
-		
-		if (Dlbl[diskno]->d_partitions[OURPART].p_size) 
-		    build_bootblocks(Dfd[diskno],lbl,dp);
-		break;
-	    case 'q': case 'Q':
-		return;
-		break;
+	    }
+	    Dlbl[diskno]->d_magic = DISKMAGIC;
+	    Dlbl[diskno]->d_magic2 = DISKMAGIC;
+	    Dlbl[diskno]->d_checksum = 0;
+	    Dlbl[diskno]->d_checksum = dkcksum(Dlbl[diskno]);
+	    flag=1;
+	    enable_label(Dfd[diskno]);
+	    if(ioctl(Dfd[diskno], DIOCSDINFO, Dlbl[diskno]) == -1)
+		Fatal("Couldn't set label: %s", strerror(errno));
+	    if(ioctl(Dfd[diskno], DIOCWDINFO, Dlbl[diskno]) == -1)
+		Fatal("Couldn't write label: %s", strerror(errno));
+	    flag=0;
+	    disable_label(Dfd[diskno]);
+	    
+	    if (Dlbl[diskno]->d_partitions[OURPART].p_size) 
+		build_bootblocks(Dfd[diskno], lbl, dp);
+	    break;
+
+	case 'q': case 'Q':
+	    return;
+	    break;
 	}
     }
 }
diff --git a/sbin/sysinstall/stage1.c b/sbin/sysinstall/stage1.c
index 137ddc7ca7a8..76fa8cac3d80 100644
--- a/sbin/sysinstall/stage1.c
+++ b/sbin/sysinstall/stage1.c
@@ -50,9 +50,12 @@ int whole_disk = 0;
 int custom_install = 0;
 int dialog_active = 0;
 
-void exit_sysinstall();
-void exit_prompt();
+/* Forward decls */
+void exit_sysinstall(void);
+void exit_prompt(void);
 extern char *part_type(int);
+void Fdisk(void);
+void DiskLabel(void);
 
 char selection[30];
 char boot1[] = BOOT1;
diff --git a/sbin/sysinstall/sysinstall.h b/sbin/sysinstall/sysinstall.h
index 859147f8f116..cd199a40549a 100644
--- a/sbin/sysinstall/sysinstall.h
+++ b/sbin/sysinstall/sysinstall.h
@@ -37,7 +37,7 @@
 
 #define SCRATCHSIZE 1024
 #define ERRMSGSIZE 256
-#define DEFROOTSIZE 16
+#define DEFROOTSIZE 18
 #define DEFSWAPSIZE 16
 #define DEFUSRSIZE 80
 #define DEFFSIZE 1024