Remove trailing whitespace.

94 files changed, 557 insertions, 557 deletions

diff --git a/lib/libdisk/change.c b/lib/libdisk/change.c
index 0f39179..ab5a46c 100644
--- a/lib/libdisk/change.c
+++ b/lib/libdisk/change.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: change.c,v 1.6 1995/05/24 08:59:36 jkh Exp $
+ * $Id: change.c,v 1.7 1995/05/25 06:14:45 phk Exp $
  *
  */
 
@@ -48,7 +48,7 @@ All_FreeBSD(struct disk *d)
 {
 	struct chunk *c;
 
-    again:	
+    again:
 	for (c=d->chunks->part;c;c=c->next)
 		if (c->type != unused) {
 			Delete_Chunk(d,c);
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index fbf4b0e..a7d7c85 100644
--- a/lib/libdisk/chunk.c
+++ b/lib/libdisk/chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: chunk.c,v 1.12 1995/05/11 05:22:49 phk Exp $
+ * $Id: chunk.c,v 1.13 1995/05/25 06:14:47 phk Exp $
  *
  */
 
@@ -74,7 +74,7 @@ Find_Mother_Chunk(struct chunk *chunks, u_long offset, u_long end, chunk_e type)
 void
 Free_Chunk(struct chunk *c1)
 {
-	if(!c1) return;	
+	if(!c1) return;
 	if(c1->private && c1->private_free)
 		(*c1->private_free)(c1->private);
 	if(c1->part)
@@ -202,7 +202,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 		c2->type = unused;
 		c1->flags = flags;
 		c1->subtype = subtype;
-		return 0; 
+		return 0;
 	}
 	if (type == freebsd)
 		subtype = 0xa5;
@@ -221,12 +221,12 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 		if (c2->type != unused)
 			continue;
 		if(Chunk_Inside(c2,&ct)) {
-			if (type != freebsd) 
+			if (type != freebsd)
 				goto doit;
-			if (!(flags & CHUNK_ALIGN)) 
+			if (!(flags & CHUNK_ALIGN))
 				goto doit;
-			if (offset == d->chunks->offset 
-			   && end == d->chunks->end) 
+			if (offset == d->chunks->offset
+			   && end == d->chunks->end)
 				goto doit;
 
 			/* Round down to prev cylinder */
@@ -239,7 +239,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 			/* Keep one track clear in front of parent */
 			if (offset == c1->offset)
 				offset = Next_Track_Aligned(d,offset+1);
-			
+
 			/* Work on the (end+1) */
 			size += offset;
 			/* Round up to cylinder */
@@ -249,7 +249,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 				size = c2->end+1;
 			/* Round down to cylinder */
 			size = Prev_Cyl_Aligned(d,size);
-		
+
 			/* Convert back to size */
 			size -= offset;
 
@@ -271,7 +271,7 @@ Print_Chunk(struct chunk *c1,int offset)
 	putchar('>');
 	for(;i<10;i++) putchar(' ');
 	printf("%p %8ld %8lu %8lu %-8s %-8s 0x%02x ",
-		c1, c1->offset, c1->size, c1->end, c1->name, 
+		c1, c1->offset, c1->size, c1->end, c1->name,
 		chunk_n[c1->type],c1->subtype);
 	if (c1->flags & CHUNK_ALIGN) putchar('=');
 	if (c1->flags & CHUNK_PAST_1024) putchar('>');
@@ -309,7 +309,7 @@ Delete_Chunk(struct disk *d, struct chunk *c)
 	struct chunk *c1=0,*c2,*c3;
 	chunk_e type = c->type;
 
-	if(type == whole) 
+	if(type == whole)
 		return 1;
 	if(!c1 && (type == freebsd || type == fat || type == unknown))
 		c1 = Find_Mother_Chunk(d->chunks,c->offset,c->end,extended);
@@ -334,7 +334,7 @@ Delete_Chunk(struct disk *d, struct chunk *c)
 		}
 	}
 	return 1;
-    scan:	
+    scan:
 	for(c2=c1->part;c2;c2=c2->next) {
 		if (c2->type != unused)
 			continue;
@@ -370,7 +370,7 @@ Collapse_Chunk(struct disk *d, struct chunk *c1)
 		c3->next = 0;
 		Free_Chunk(c3);
 		return 1;
-	}	
+	}
 	c3 = c1->part;
 	if(!c3)
 		return 0;
@@ -386,7 +386,7 @@ Collapse_Chunk(struct disk *d, struct chunk *c1)
 	}
 	if(c3->type == unused) {
 		c2 = new_chunk();
-		if (!c2) err(1,"malloc failed");	
+		if (!c2) err(1,"malloc failed");
 		*c2 = *c1;
 		c1->next = c2;
 		c1->disk = d;
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index f7bca32..e019752 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: create_chunk.c,v 1.18 1995/05/20 19:11:44 phk Exp $
+ * $Id: create_chunk.c,v 1.19 1995/05/24 08:59:38 jkh Exp $
  *
  */
 
@@ -40,7 +40,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 	}
 
 	/* Allocate the first swap-partition we find */
-	for (c1 = c->part; c1 ; c1 = c1->next) { 
+	for (c1 = c->part; c1 ; c1 = c1->next) {
 		if (c1->type == unused) continue;
 		if (c1->subtype != FS_SWAP) continue;
 		sprintf(c1->name,"%s%c",c->name,SWAP_PART+'a');
@@ -48,7 +48,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 	}
 
 	/* Allocate the first root-partition we find */
-	for (c1 = c->part; c1 ; c1 = c1->next) { 
+	for (c1 = c->part; c1 ; c1 = c1->next) {
 		if (c1->type == unused) continue;
 		if (!(c1->flags & CHUNK_IS_ROOT)) continue;
 		sprintf(c1->name,"%s%c",c->name,0+'a');
@@ -58,7 +58,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 	/* Try to give them the same as they had before */
 	for (c1 = c->part; c1 ; c1 = c1->next) {
 		if (strcmp(c1->name,"X")) continue;
-		for(c3 = c->part; c3 ; c3 = c3->next) 
+		for(c3 = c->part; c3 ; c3 = c3->next)
 			if (c1 != c3 && !strcmp(c3->name, c1->oname)) {
 				goto newname;
 			}
@@ -75,7 +75,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 
 		for(j=0;j<strlen(order);j++) {
 			sprintf(c1->name,"%s%c",c->name,order[j]);
-			for(c3 = c->part; c3 ; c3 = c3->next) 
+			for(c3 = c->part; c3 ; c3 = c3->next)
 				if (c1 != c3 && !strcmp(c3->name, c1->name))
 					goto match;
 			break;
@@ -124,7 +124,7 @@ Fixup_Names(struct disk *d)
 		if(!c2->oname) err(1,"malloc failed");
 		for(j=1;j<=NDOSPART;j++) {
 			sprintf(c2->oname,"%ss%d",c1->name,j);
-			for(c3 = c1->part; c3 ; c3 = c3->next) 
+			for(c3 = c1->part; c3 ; c3 = c3->next)
 				if (c3 != c2 && !strcmp(c3->name, c2->oname))
 					goto match;
 			free(c2->name);
@@ -204,7 +204,7 @@ Create_Chunk_DWIM(struct disk *d, struct chunk *parent , u_long size, chunk_e ty
 	}
 	Fixup_Names(d);
 	for (c1=parent->part; c1 ; c1 = c1->next)
-		if (c1->offset == offset) 
+		if (c1->offset == offset)
 			return c1;
 	err(1,"Serious internal trouble");
 }
@@ -215,7 +215,7 @@ MakeDev(struct chunk *c1, char *path)
 	char *p = c1->name;
 	u_long cmaj,bmaj,min,unit,part,slice;
 	char buf[BUFSIZ],buf2[BUFSIZ];
-	
+
 	*buf2 = '\0';
 
 	if(!strcmp(p,"X"))
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index f38a99f..e3899c7 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: disk.c,v 1.17 1995/05/06 03:28:29 phk Exp $
+ * $Id: disk.c,v 1.18 1995/05/08 02:08:28 phk Exp $
  *
  */
 
@@ -24,7 +24,7 @@
 #include "libdisk.h"
 
 #define DOSPTYP_EXTENDED        5
-#define DOSPTYP_ONTRACK         84      
+#define DOSPTYP_ONTRACK         84
 
 char *chunk_n[] = {
 	"whole",
@@ -99,7 +99,7 @@ Int_Open_Disk(char *name, u_long size)
 			d->flags |= DISK_ON_TRACK;
 			offset = 63;
 		}
-			
+
 	}
 	free(p);
 
@@ -140,7 +140,7 @@ Int_Open_Disk(char *name, u_long size)
 			default:
 				ce = unknown;
 				break;
-		}	
+		}
 		if (Add_Chunk(d,ds.dss_slices[i].ds_offset,
 			ds.dss_slices[i].ds_size, sname,ce,subtype,flags))
 			warn("failed to add chunk for slice %d",i - 1);
@@ -166,7 +166,7 @@ Int_Open_Disk(char *name, u_long size)
 			continue;
 		}
 		close(j);
-		
+
 		for(j=0; j <= dl.d_npartitions; j++) {
 			if (j == RAW_PART)
 				continue;
@@ -273,7 +273,7 @@ Disk_Names()
 
     disks = malloc(sizeof *disks * (1 + MAX_NO_DISKS));
     memset(disks,0,sizeof *disks * (1 + MAX_NO_DISKS));
-    k = 0;	
+    k = 0;
 	for (j = 0; device_list[j]; j++) {
 		for (i = 0; i < 10; i++) {
 			sprintf(diskname, "%s%d", device_list[j], i);
@@ -298,7 +298,7 @@ void
 Set_Boot_Mgr(struct disk *d, u_char *b)
 {
 	if (d->bootmgr)
-		free(d->bootmgr);	
+		free(d->bootmgr);
 	if (!b) {
 		d->bootmgr = 0;
 	} else {
@@ -311,11 +311,11 @@ Set_Boot_Mgr(struct disk *d, u_char *b)
 void
 Set_Boot_Blocks(struct disk *d, u_char *b1, u_char *b2)
 {
-	if (d->boot1) free(d->boot1);	
+	if (d->boot1) free(d->boot1);
 	d->boot1 = malloc(512);
 	if(!d->boot1) err(1,"malloc failed");
 	memcpy(d->boot1,b1,512);
-	if (d->boot2) free(d->boot2);	
+	if (d->boot2) free(d->boot2);
 	d->boot2 = malloc(15*512);
 	if(!d->boot2) err(1,"malloc failed");
 	memcpy(d->boot2,b2,15*512);
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index ebc4d83..6ba7bbb 100644
--- a/lib/libdisk/libdisk.h
+++ b/lib/libdisk/libdisk.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: libdisk.h,v 1.16 1995/05/12 18:49:58 phk Exp $
+ * $Id: libdisk.h,v 1.17 1995/05/25 06:14:49 phk Exp $
  *
  */
 
@@ -57,13 +57,13 @@ struct chunk {
 	int		subtype;
 	u_long		flags;
 #		define CHUNK_PAST_1024		1
-			/* this chunk cannot be booted from because it 
+			/* this chunk cannot be booted from because it
 			 * extends past cylinder 1024
 			 */
 #		define CHUNK_BSD_COMPAT	2
-			/* this chunk is in the BSD-compatibility, and has a 
+			/* this chunk is in the BSD-compatibility, and has a
 			 * short name too, ie wd0s4f -> wd0f
-         		*/ 
+         		*/
 #		define CHUNK_BAD144		4
 			/* this chunk has bad144 mapping */
 #		define CHUNK_ALIGN		8
@@ -86,14 +86,14 @@ struct chunk {
 struct disk *
 Open_Disk(char *devname);
 	/* Will open the named disk, and return populated tree.
-	 */	
+	 */
 
 struct disk *
 Clone_Disk(struct disk *disk);
 	/* Clone a copy of a tree.  Useful for "Undo" functionality
 	 */
 
-void 
+void
 Free_Disk(struct disk *disk);
 	/* Free a tree made with Open_Disk() or Clone_Disk()
 	 */
@@ -109,14 +109,14 @@ Set_Phys_Geom(struct disk *disk, u_long cyl, u_long heads, u_long sects);
 	 * The tree returned is read from the disk, using this geometry.
 	 */
 
-void 
+void
 Set_Bios_Geom(struct disk *disk, u_long cyl, u_long heads, u_long sects);
 	/* Set the geometry the bios uses.
 	 */
 
-int 
+int
 Delete_Chunk(struct disk *disk, struct chunk *);
-	/* Free a chunk of disk_space 
+	/* Free a chunk of disk_space
 	 */
 
 void
@@ -128,7 +128,7 @@ Collapse_Chunk(struct disk *disk, struct chunk *chunk);
 	/* Experimental, do not use.
 	 */
 
-int 
+int
 Create_Chunk(struct disk *disk, u_long offset, u_long size, chunk_e type, int subtype, u_long flags);
 	/* Create a chunk with the specified paramters
 	 */
@@ -138,7 +138,7 @@ All_FreeBSD(struct disk *d);
 	/* Make one FreeBSD chunk covering the entire disk
 	 */
 
-char * 
+char *
 CheckRules(struct disk *);
 	/* Return char* to warnings about broken design rules in this disklayout
 	 */
@@ -211,7 +211,7 @@ void
 MakeDevDisk(struct disk *d,char *path);
 	/* Make device nodes for all chunks on this disk */
 
-/* 
+/*
  * Implementation details  >>> DO NOT USE <<<
  */
 
@@ -233,13 +233,13 @@ void Fixup_Names(struct disk *);
 /* TODO
  *
  * Need a error string mechanism from the functions instead of warn()
- * 
+ *
  * Make sure only FreeBSD start at offset==0
- * 
+ *
  * Collapse must align.
- * 
+ *
  * Make Write_Disk(struct disk*)
- * 
+ *
  * Consider booting from OnTrack'ed disks.
  *
  * Get Bios-geom, ST506 & OnTrack from driver (or otherwise)
@@ -247,7 +247,7 @@ void Fixup_Names(struct disk *);
  * Make Create_DWIM().
  *
  * Make Is_Unchanged(struct disk *d1, struct chunk *c1)
- * 
+ *
  * don't rename slices unless we have to
  *
  *Sample output from tst01:
@@ -294,7 +294,7 @@ void Fixup_Names(struct disk *);
  *		     |        <wd0s5>
  *		     |
  *		     v
- *		  <wd0s3>	
+ *		  <wd0s3>
  *		     |
  *		     v
  *		  <wd0s4> --> <wd0s4a>
diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c
index 2c21eb4..73a321c 100644
--- a/lib/libdisk/rules.c
+++ b/lib/libdisk/rules.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: rules.c,v 1.8 1995/05/06 03:28:31 phk Exp $
+ * $Id: rules.c,v 1.9 1995/05/08 01:34:31 phk Exp $
  *
  */
 
@@ -100,7 +100,7 @@ Rule_000(struct disk *d, struct chunk *c, char *msg)
 	"Too many active children of 'whole'");
 }
 
-/* 
+/*
  * Rule#1:
  *	All children of 'whole' and 'extended'  must be track-aligned.
  *	Exception: the end can be unaligned if it matches the end of 'whole'
@@ -130,7 +130,7 @@ Rule_001(struct disk *d, struct chunk *c, char *msg)
 	}
 }
 
-/* 
+/*
  * Rule#2:
  *	Max one 'fat' as child of 'whole'
  */
@@ -153,7 +153,7 @@ Rule_002(struct disk *d, struct chunk *c, char *msg)
 	}
 }
 
-/* 
+/*
  * Rule#3:
  *	Max one extended as child of 'whole'
  */
@@ -176,7 +176,7 @@ Rule_003(struct disk *d, struct chunk *c, char *msg)
 	}
 }
 
-/* 
+/*
  * Rule#4:
  *	Max seven 'part' as children of 'freebsd'
  *	Max one FS_SWAP child per 'freebsd'
diff --git a/lib/libdisk/tst01.c b/lib/libdisk/tst01.c
index 1c0c43e..506e3b9 100644
--- a/lib/libdisk/tst01.c
+++ b/lib/libdisk/tst01.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: tst01.c,v 1.12 1995/05/11 05:22:54 phk Exp $
+ * $Id: tst01.c,v 1.13 1995/05/12 18:50:00 phk Exp $
  *
  */
 
@@ -112,9 +112,9 @@ Scan_Disk(struct disk *d)
 				printf(".%lu\nG: %lu.",l-1,l);
 				fflush(stdout);
 			}
-			i = j;	
+			i = j;
 		}
-	} 
+	}
 	close(fd);
 }
 
@@ -135,7 +135,7 @@ main(int argc, char **argv)
 		exit(1);
 	}
 	d = Open_Disk(argv[1]);
-	if (!d) 
+	if (!d)
 		err(1,"Couldn't open disk %s",argv[1]);
 
 	sprintf(myprompt,"%s %s> ",argv[0],argv[1]);
@@ -192,41 +192,41 @@ main(int argc, char **argv)
 			All_FreeBSD(d);
 			continue;
 		}
-		if (!strcasecmp(*cmds,"bios") && ncmd == 4) { 
+		if (!strcasecmp(*cmds,"bios") && ncmd == 4) {
 			Set_Bios_Geom(d,
 				strtol(cmds[1],0,0),
 				strtol(cmds[2],0,0),
 				strtol(cmds[3],0,0));
 			continue;
 		}
-		if (!strcasecmp(*cmds,"phys") && ncmd == 4) { 
+		if (!strcasecmp(*cmds,"phys") && ncmd == 4) {
 			d = Set_Phys_Geom(d,
 				strtol(cmds[1],0,0),
 				strtol(cmds[2],0,0),
 				strtol(cmds[3],0,0));
 			continue;
 		}
-		if (!strcasecmp(*cmds,"collapse")) { 
+		if (!strcasecmp(*cmds,"collapse")) {
 			if (cmds[1])
 				while (Collapse_Chunk(d,
 				    (struct chunk *)strtol(cmds[1],0,0)))
 					;
-			else		
+			else
 				Collapse_Disk(d);
 			continue;
-		}	
-		if (!strcasecmp(*cmds,"list")) { 
+		}
+		if (!strcasecmp(*cmds,"list")) {
 			cp = Disk_Names();
 			printf("Disks:");
 			for(i=0;cp[i];i++) {
 				printf(" %s",cp[i]);
 				free(cp[i]);
-			}		
+			}
 			free(cp);
 			continue;
 		}
-		if (!strcasecmp(*cmds,"create") && ncmd == 6) { 
-				
+		if (!strcasecmp(*cmds,"create") && ncmd == 6) {
+
 			printf("Create=%d\n",
 				Create_Chunk(d,
 					strtol(cmds[1],0,0),
@@ -294,7 +294,7 @@ main(int argc, char **argv)
 		for(i=0;chunk_n[i];i++)
 			printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : "  ");
 		printf("\n");
-		
+
 	}
 	exit (0);
 }
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index 3b9a163..e2c0674 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: write_disk.c,v 1.11 1995/05/21 07:47:24 phk Exp $
+ * $Id: write_disk.c,v 1.12 1995/05/24 08:59:40 jkh Exp $
  *
  */
 
@@ -24,7 +24,7 @@
 #include "libdisk.h"
 
 #define DOSPTYP_EXTENDED        5
-#define BBSIZE			8192 
+#define BBSIZE			8192
 
 #define WHERE(offset,disk) (disk->flags & DISK_ON_TRACK ? offset + 63 : offset)
 int
@@ -91,7 +91,7 @@ Write_FreeBSD(int fd, struct disk *new, struct disk *old, struct chunk *c1)
 	for(i=0;i<BBSIZE/512;i++) {
 		write_block(fd,WHERE(i + c1->offset,new),buf+512*i);
 	}
-		
+
 	return 0;
 }
 
@@ -151,7 +151,7 @@ Write_Disk(struct disk *d1)
 		} else {
 			dp[j].dp_ssect = i % d1->bios_sect;
 			i -= dp[j].dp_ssect++;
-			i /= d1->bios_sect;	
+			i /= d1->bios_sect;
 			dp[j].dp_shd =  i % d1->bios_hd;
 			i -= dp[j].dp_shd;
 			i /= d1->bios_hd;
@@ -161,14 +161,14 @@ Write_Disk(struct disk *d1)
 		}
 
 #ifdef DEBUG
-		printf("S:%lu = (%x/%x/%x)", 
+		printf("S:%lu = (%x/%x/%x)",
 			c1->offset,dp[j].dp_scyl,dp[j].dp_shd,dp[j].dp_ssect);
 #endif
 
 		i = c1->end;
 		dp[j].dp_esect = i % d1->bios_sect;
 		i -= dp[j].dp_esect++;
-		i /= d1->bios_sect;	
+		i /= d1->bios_sect;
 		dp[j].dp_ehd =  i % d1->bios_hd;
 		i -= dp[j].dp_ehd;
 		i /= d1->bios_hd;
@@ -178,7 +178,7 @@ Write_Disk(struct disk *d1)
 		dp[j].dp_esect |= i >> 2;
 
 #ifdef DEBUG
-		printf("  E:%lu = (%x/%x/%x)\n", 
+		printf("  E:%lu = (%x/%x/%x)\n",
 			c1->end,dp[j].dp_ecyl,dp[j].dp_ehd,dp[j].dp_esect);
 #endif
 
@@ -199,10 +199,10 @@ Write_Disk(struct disk *d1)
 		for(i=0;i<NDOSPART;i++)
 			if (dp[i].dp_typ == 0xa5)
 				dp[i].dp_flag = 0x80;
-	
+
 	mbr = read_block(fd,WHERE(0,d1));
 	if (d1->bootmgr)
-		memcpy(mbr,d1->bootmgr,DOSPARTOFF);	
+		memcpy(mbr,d1->bootmgr,DOSPARTOFF);
 	memcpy(mbr+DOSPARTOFF,dp,sizeof *dp * NDOSPART);
 	mbr[512-2] = 0x55;
 	mbr[512-1] = 0xaa;
diff --git a/release/Makefile b/release/Makefile
index f9f9665..c2a2cb1 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.190 1995/05/29 02:20:32 phk Exp $
+#	$Id: Makefile,v 1.191 1995/05/29 10:56:33 jkh Exp $
 #
 # How to roll a release:
 #
@@ -48,7 +48,7 @@ BOOTMFSSIZE=		1075
 MFSINODE=		70000
 
 # Things which will get you into trouble if you change them
-DISTRIBUTIONS=		bin ${EXTRA_DISTS}                      
+DISTRIBUTIONS=		bin ${EXTRA_DISTS}
 MTREEFILES=		${.CURDIR}/../etc/mtree
 RD=			${RELEASEDIR}/stage
 FD=			${RELEASEDIR}/ftp
@@ -276,7 +276,7 @@ release.6:
 					TN=$$i TD=$$i ARG="." ; \
 			echo "$${i} distribution is finished."; \
 		fi ; \
-	done                                                 
+	done
 	touch release.6
 
 
@@ -299,7 +299,7 @@ release.7:
 	@echo "src distribution is finished."
 	touch release.7
 
-# Complete the bootfd 
+# Complete the bootfd
 #
 # Now, just to get this picture down once and for all:
 #
@@ -431,13 +431,13 @@ cdrom.1:
 doTARBALL:
 .if !defined(SD)
 	@echo "SD undefined in doTARBALL" ; exit 1
-.endif               
+.endif
 .if !defined(TD)
 	@echo "TB undefined in doTARBALL" ; exit 1
-.endif               
+.endif
 .if !defined(ARG)
 	@echo "ARG undefined in doTARBALL" ; exit 1
-.endif               
+.endif
 	rm -rf ${RD}/dists/${TD}/${TN}*
 	mkdir -p ${RD}/dists/${TD}
 	( cd ${SD} && \
@@ -478,7 +478,7 @@ write_mfs_in_kernel:	${.CURDIR}/write_mfs_in_kernel.c
 ckRELEASEDIR:
 .if !defined(RELEASEDIR)
 	@echo "To make a release RELEASEDIR must be defined" && false
-.endif               
+.endif
 
 doFLOPPY:
 .if !defined(FLOPPY)
diff --git a/release/libdisk/change.c b/release/libdisk/change.c
index 0f39179..ab5a46c 100644
--- a/release/libdisk/change.c
+++ b/release/libdisk/change.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: change.c,v 1.6 1995/05/24 08:59:36 jkh Exp $
+ * $Id: change.c,v 1.7 1995/05/25 06:14:45 phk Exp $
  *
  */
 
@@ -48,7 +48,7 @@ All_FreeBSD(struct disk *d)
 {
 	struct chunk *c;
 
-    again:	
+    again:
 	for (c=d->chunks->part;c;c=c->next)
 		if (c->type != unused) {
 			Delete_Chunk(d,c);
diff --git a/release/libdisk/chunk.c b/release/libdisk/chunk.c
index fbf4b0e..a7d7c85 100644
--- a/release/libdisk/chunk.c
+++ b/release/libdisk/chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: chunk.c,v 1.12 1995/05/11 05:22:49 phk Exp $
+ * $Id: chunk.c,v 1.13 1995/05/25 06:14:47 phk Exp $
  *
  */
 
@@ -74,7 +74,7 @@ Find_Mother_Chunk(struct chunk *chunks, u_long offset, u_long end, chunk_e type)
 void
 Free_Chunk(struct chunk *c1)
 {
-	if(!c1) return;	
+	if(!c1) return;
 	if(c1->private && c1->private_free)
 		(*c1->private_free)(c1->private);
 	if(c1->part)
@@ -202,7 +202,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 		c2->type = unused;
 		c1->flags = flags;
 		c1->subtype = subtype;
-		return 0; 
+		return 0;
 	}
 	if (type == freebsd)
 		subtype = 0xa5;
@@ -221,12 +221,12 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 		if (c2->type != unused)
 			continue;
 		if(Chunk_Inside(c2,&ct)) {
-			if (type != freebsd) 
+			if (type != freebsd)
 				goto doit;
-			if (!(flags & CHUNK_ALIGN)) 
+			if (!(flags & CHUNK_ALIGN))
 				goto doit;
-			if (offset == d->chunks->offset 
-			   && end == d->chunks->end) 
+			if (offset == d->chunks->offset
+			   && end == d->chunks->end)
 				goto doit;
 
 			/* Round down to prev cylinder */
@@ -239,7 +239,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 			/* Keep one track clear in front of parent */
 			if (offset == c1->offset)
 				offset = Next_Track_Aligned(d,offset+1);
-			
+
 			/* Work on the (end+1) */
 			size += offset;
 			/* Round up to cylinder */
@@ -249,7 +249,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, char *name, chunk_e type,
 				size = c2->end+1;
 			/* Round down to cylinder */
 			size = Prev_Cyl_Aligned(d,size);
-		
+
 			/* Convert back to size */
 			size -= offset;
 
@@ -271,7 +271,7 @@ Print_Chunk(struct chunk *c1,int offset)
 	putchar('>');
 	for(;i<10;i++) putchar(' ');
 	printf("%p %8ld %8lu %8lu %-8s %-8s 0x%02x ",
-		c1, c1->offset, c1->size, c1->end, c1->name, 
+		c1, c1->offset, c1->size, c1->end, c1->name,
 		chunk_n[c1->type],c1->subtype);
 	if (c1->flags & CHUNK_ALIGN) putchar('=');
 	if (c1->flags & CHUNK_PAST_1024) putchar('>');
@@ -309,7 +309,7 @@ Delete_Chunk(struct disk *d, struct chunk *c)
 	struct chunk *c1=0,*c2,*c3;
 	chunk_e type = c->type;
 
-	if(type == whole) 
+	if(type == whole)
 		return 1;
 	if(!c1 && (type == freebsd || type == fat || type == unknown))
 		c1 = Find_Mother_Chunk(d->chunks,c->offset,c->end,extended);
@@ -334,7 +334,7 @@ Delete_Chunk(struct disk *d, struct chunk *c)
 		}
 	}
 	return 1;
-    scan:	
+    scan:
 	for(c2=c1->part;c2;c2=c2->next) {
 		if (c2->type != unused)
 			continue;
@@ -370,7 +370,7 @@ Collapse_Chunk(struct disk *d, struct chunk *c1)
 		c3->next = 0;
 		Free_Chunk(c3);
 		return 1;
-	}	
+	}
 	c3 = c1->part;
 	if(!c3)
 		return 0;
@@ -386,7 +386,7 @@ Collapse_Chunk(struct disk *d, struct chunk *c1)
 	}
 	if(c3->type == unused) {
 		c2 = new_chunk();
-		if (!c2) err(1,"malloc failed");	
+		if (!c2) err(1,"malloc failed");
 		*c2 = *c1;
 		c1->next = c2;
 		c1->disk = d;
diff --git a/release/libdisk/create_chunk.c b/release/libdisk/create_chunk.c
index f7bca32..e019752 100644
--- a/release/libdisk/create_chunk.c
+++ b/release/libdisk/create_chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: create_chunk.c,v 1.18 1995/05/20 19:11:44 phk Exp $
+ * $Id: create_chunk.c,v 1.19 1995/05/24 08:59:38 jkh Exp $
  *
  */
 
@@ -40,7 +40,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 	}
 
 	/* Allocate the first swap-partition we find */
-	for (c1 = c->part; c1 ; c1 = c1->next) { 
+	for (c1 = c->part; c1 ; c1 = c1->next) {
 		if (c1->type == unused) continue;
 		if (c1->subtype != FS_SWAP) continue;
 		sprintf(c1->name,"%s%c",c->name,SWAP_PART+'a');
@@ -48,7 +48,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 	}
 
 	/* Allocate the first root-partition we find */
-	for (c1 = c->part; c1 ; c1 = c1->next) { 
+	for (c1 = c->part; c1 ; c1 = c1->next) {
 		if (c1->type == unused) continue;
 		if (!(c1->flags & CHUNK_IS_ROOT)) continue;
 		sprintf(c1->name,"%s%c",c->name,0+'a');
@@ -58,7 +58,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 	/* Try to give them the same as they had before */
 	for (c1 = c->part; c1 ; c1 = c1->next) {
 		if (strcmp(c1->name,"X")) continue;
-		for(c3 = c->part; c3 ; c3 = c3->next) 
+		for(c3 = c->part; c3 ; c3 = c3->next)
 			if (c1 != c3 && !strcmp(c3->name, c1->oname)) {
 				goto newname;
 			}
@@ -75,7 +75,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 
 		for(j=0;j<strlen(order);j++) {
 			sprintf(c1->name,"%s%c",c->name,order[j]);
-			for(c3 = c->part; c3 ; c3 = c3->next) 
+			for(c3 = c->part; c3 ; c3 = c3->next)
 				if (c1 != c3 && !strcmp(c3->name, c1->name))
 					goto match;
 			break;
@@ -124,7 +124,7 @@ Fixup_Names(struct disk *d)
 		if(!c2->oname) err(1,"malloc failed");
 		for(j=1;j<=NDOSPART;j++) {
 			sprintf(c2->oname,"%ss%d",c1->name,j);
-			for(c3 = c1->part; c3 ; c3 = c3->next) 
+			for(c3 = c1->part; c3 ; c3 = c3->next)
 				if (c3 != c2 && !strcmp(c3->name, c2->oname))
 					goto match;
 			free(c2->name);
@@ -204,7 +204,7 @@ Create_Chunk_DWIM(struct disk *d, struct chunk *parent , u_long size, chunk_e ty
 	}
 	Fixup_Names(d);
 	for (c1=parent->part; c1 ; c1 = c1->next)
-		if (c1->offset == offset) 
+		if (c1->offset == offset)
 			return c1;
 	err(1,"Serious internal trouble");
 }
@@ -215,7 +215,7 @@ MakeDev(struct chunk *c1, char *path)
 	char *p = c1->name;
 	u_long cmaj,bmaj,min,unit,part,slice;
 	char buf[BUFSIZ],buf2[BUFSIZ];
-	
+
 	*buf2 = '\0';
 
 	if(!strcmp(p,"X"))
diff --git a/release/libdisk/disk.c b/release/libdisk/disk.c
index f38a99f..e3899c7 100644
--- a/release/libdisk/disk.c
+++ b/release/libdisk/disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: disk.c,v 1.17 1995/05/06 03:28:29 phk Exp $
+ * $Id: disk.c,v 1.18 1995/05/08 02:08:28 phk Exp $
  *
  */
 
@@ -24,7 +24,7 @@
 #include "libdisk.h"
 
 #define DOSPTYP_EXTENDED        5
-#define DOSPTYP_ONTRACK         84      
+#define DOSPTYP_ONTRACK         84
 
 char *chunk_n[] = {
 	"whole",
@@ -99,7 +99,7 @@ Int_Open_Disk(char *name, u_long size)
 			d->flags |= DISK_ON_TRACK;
 			offset = 63;
 		}
-			
+
 	}
 	free(p);
 
@@ -140,7 +140,7 @@ Int_Open_Disk(char *name, u_long size)
 			default:
 				ce = unknown;
 				break;
-		}	
+		}
 		if (Add_Chunk(d,ds.dss_slices[i].ds_offset,
 			ds.dss_slices[i].ds_size, sname,ce,subtype,flags))
 			warn("failed to add chunk for slice %d",i - 1);
@@ -166,7 +166,7 @@ Int_Open_Disk(char *name, u_long size)
 			continue;
 		}
 		close(j);
-		
+
 		for(j=0; j <= dl.d_npartitions; j++) {
 			if (j == RAW_PART)
 				continue;
@@ -273,7 +273,7 @@ Disk_Names()
 
     disks = malloc(sizeof *disks * (1 + MAX_NO_DISKS));
     memset(disks,0,sizeof *disks * (1 + MAX_NO_DISKS));
-    k = 0;	
+    k = 0;
 	for (j = 0; device_list[j]; j++) {
 		for (i = 0; i < 10; i++) {
 			sprintf(diskname, "%s%d", device_list[j], i);
@@ -298,7 +298,7 @@ void
 Set_Boot_Mgr(struct disk *d, u_char *b)
 {
 	if (d->bootmgr)
-		free(d->bootmgr);	
+		free(d->bootmgr);
 	if (!b) {
 		d->bootmgr = 0;
 	} else {
@@ -311,11 +311,11 @@ Set_Boot_Mgr(struct disk *d, u_char *b)
 void
 Set_Boot_Blocks(struct disk *d, u_char *b1, u_char *b2)
 {
-	if (d->boot1) free(d->boot1);	
+	if (d->boot1) free(d->boot1);
 	d->boot1 = malloc(512);
 	if(!d->boot1) err(1,"malloc failed");
 	memcpy(d->boot1,b1,512);
-	if (d->boot2) free(d->boot2);	
+	if (d->boot2) free(d->boot2);
 	d->boot2 = malloc(15*512);
 	if(!d->boot2) err(1,"malloc failed");
 	memcpy(d->boot2,b2,15*512);
diff --git a/release/libdisk/libdisk.h b/release/libdisk/libdisk.h
index ebc4d83..6ba7bbb 100644
--- a/release/libdisk/libdisk.h
+++ b/release/libdisk/libdisk.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: libdisk.h,v 1.16 1995/05/12 18:49:58 phk Exp $
+ * $Id: libdisk.h,v 1.17 1995/05/25 06:14:49 phk Exp $
  *
  */
 
@@ -57,13 +57,13 @@ struct chunk {
 	int		subtype;
 	u_long		flags;
 #		define CHUNK_PAST_1024		1
-			/* this chunk cannot be booted from because it 
+			/* this chunk cannot be booted from because it
 			 * extends past cylinder 1024
 			 */
 #		define CHUNK_BSD_COMPAT	2
-			/* this chunk is in the BSD-compatibility, and has a 
+			/* this chunk is in the BSD-compatibility, and has a
 			 * short name too, ie wd0s4f -> wd0f
-         		*/ 
+         		*/
 #		define CHUNK_BAD144		4
 			/* this chunk has bad144 mapping */
 #		define CHUNK_ALIGN		8
@@ -86,14 +86,14 @@ struct chunk {
 struct disk *
 Open_Disk(char *devname);
 	/* Will open the named disk, and return populated tree.
-	 */	
+	 */
 
 struct disk *
 Clone_Disk(struct disk *disk);
 	/* Clone a copy of a tree.  Useful for "Undo" functionality
 	 */
 
-void 
+void
 Free_Disk(struct disk *disk);
 	/* Free a tree made with Open_Disk() or Clone_Disk()
 	 */
@@ -109,14 +109,14 @@ Set_Phys_Geom(struct disk *disk, u_long cyl, u_long heads, u_long sects);
 	 * The tree returned is read from the disk, using this geometry.
 	 */
 
-void 
+void
 Set_Bios_Geom(struct disk *disk, u_long cyl, u_long heads, u_long sects);
 	/* Set the geometry the bios uses.
 	 */
 
-int 
+int
 Delete_Chunk(struct disk *disk, struct chunk *);
-	/* Free a chunk of disk_space 
+	/* Free a chunk of disk_space
 	 */
 
 void
@@ -128,7 +128,7 @@ Collapse_Chunk(struct disk *disk, struct chunk *chunk);
 	/* Experimental, do not use.
 	 */
 
-int 
+int
 Create_Chunk(struct disk *disk, u_long offset, u_long size, chunk_e type, int subtype, u_long flags);
 	/* Create a chunk with the specified paramters
 	 */
@@ -138,7 +138,7 @@ All_FreeBSD(struct disk *d);
 	/* Make one FreeBSD chunk covering the entire disk
 	 */
 
-char * 
+char *
 CheckRules(struct disk *);
 	/* Return char* to warnings about broken design rules in this disklayout
 	 */
@@ -211,7 +211,7 @@ void
 MakeDevDisk(struct disk *d,char *path);
 	/* Make device nodes for all chunks on this disk */
 
-/* 
+/*
  * Implementation details  >>> DO NOT USE <<<
  */
 
@@ -233,13 +233,13 @@ void Fixup_Names(struct disk *);
 /* TODO
  *
  * Need a error string mechanism from the functions instead of warn()
- * 
+ *
  * Make sure only FreeBSD start at offset==0
- * 
+ *
  * Collapse must align.
- * 
+ *
  * Make Write_Disk(struct disk*)
- * 
+ *
  * Consider booting from OnTrack'ed disks.
  *
  * Get Bios-geom, ST506 & OnTrack from driver (or otherwise)
@@ -247,7 +247,7 @@ void Fixup_Names(struct disk *);
  * Make Create_DWIM().
  *
  * Make Is_Unchanged(struct disk *d1, struct chunk *c1)
- * 
+ *
  * don't rename slices unless we have to
  *
  *Sample output from tst01:
@@ -294,7 +294,7 @@ void Fixup_Names(struct disk *);
  *		     |        <wd0s5>
  *		     |
  *		     v
- *		  <wd0s3>	
+ *		  <wd0s3>
  *		     |
  *		     v
  *		  <wd0s4> --> <wd0s4a>
diff --git a/release/libdisk/rules.c b/release/libdisk/rules.c
index 2c21eb4..73a321c 100644
--- a/release/libdisk/rules.c
+++ b/release/libdisk/rules.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: rules.c,v 1.8 1995/05/06 03:28:31 phk Exp $
+ * $Id: rules.c,v 1.9 1995/05/08 01:34:31 phk Exp $
  *
  */
 
@@ -100,7 +100,7 @@ Rule_000(struct disk *d, struct chunk *c, char *msg)
 	"Too many active children of 'whole'");
 }
 
-/* 
+/*
  * Rule#1:
  *	All children of 'whole' and 'extended'  must be track-aligned.
  *	Exception: the end can be unaligned if it matches the end of 'whole'
@@ -130,7 +130,7 @@ Rule_001(struct disk *d, struct chunk *c, char *msg)
 	}
 }
 
-/* 
+/*
  * Rule#2:
  *	Max one 'fat' as child of 'whole'
  */
@@ -153,7 +153,7 @@ Rule_002(struct disk *d, struct chunk *c, char *msg)
 	}
 }
 
-/* 
+/*
  * Rule#3:
  *	Max one extended as child of 'whole'
  */
@@ -176,7 +176,7 @@ Rule_003(struct disk *d, struct chunk *c, char *msg)
 	}
 }
 
-/* 
+/*
  * Rule#4:
  *	Max seven 'part' as children of 'freebsd'
  *	Max one FS_SWAP child per 'freebsd'
diff --git a/release/libdisk/tst01.c b/release/libdisk/tst01.c
index 1c0c43e..506e3b9 100644
--- a/release/libdisk/tst01.c
+++ b/release/libdisk/tst01.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: tst01.c,v 1.12 1995/05/11 05:22:54 phk Exp $
+ * $Id: tst01.c,v 1.13 1995/05/12 18:50:00 phk Exp $
  *
  */
 
@@ -112,9 +112,9 @@ Scan_Disk(struct disk *d)
 				printf(".%lu\nG: %lu.",l-1,l);
 				fflush(stdout);
 			}
-			i = j;	
+			i = j;
 		}
-	} 
+	}
 	close(fd);
 }
 
@@ -135,7 +135,7 @@ main(int argc, char **argv)
 		exit(1);
 	}
 	d = Open_Disk(argv[1]);
-	if (!d) 
+	if (!d)
 		err(1,"Couldn't open disk %s",argv[1]);
 
 	sprintf(myprompt,"%s %s> ",argv[0],argv[1]);
@@ -192,41 +192,41 @@ main(int argc, char **argv)
 			All_FreeBSD(d);
 			continue;
 		}
-		if (!strcasecmp(*cmds,"bios") && ncmd == 4) { 
+		if (!strcasecmp(*cmds,"bios") && ncmd == 4) {
 			Set_Bios_Geom(d,
 				strtol(cmds[1],0,0),
 				strtol(cmds[2],0,0),
 				strtol(cmds[3],0,0));
 			continue;
 		}
-		if (!strcasecmp(*cmds,"phys") && ncmd == 4) { 
+		if (!strcasecmp(*cmds,"phys") && ncmd == 4) {
 			d = Set_Phys_Geom(d,
 				strtol(cmds[1],0,0),
 				strtol(cmds[2],0,0),
 				strtol(cmds[3],0,0));
 			continue;
 		}
-		if (!strcasecmp(*cmds,"collapse")) { 
+		if (!strcasecmp(*cmds,"collapse")) {
 			if (cmds[1])
 				while (Collapse_Chunk(d,
 				    (struct chunk *)strtol(cmds[1],0,0)))
 					;
-			else		
+			else
 				Collapse_Disk(d);
 			continue;
-		}	
-		if (!strcasecmp(*cmds,"list")) { 
+		}
+		if (!strcasecmp(*cmds,"list")) {
 			cp = Disk_Names();
 			printf("Disks:");
 			for(i=0;cp[i];i++) {
 				printf(" %s",cp[i]);
 				free(cp[i]);
-			}		
+			}
 			free(cp);
 			continue;
 		}
-		if (!strcasecmp(*cmds,"create") && ncmd == 6) { 
-				
+		if (!strcasecmp(*cmds,"create") && ncmd == 6) {
+
 			printf("Create=%d\n",
 				Create_Chunk(d,
 					strtol(cmds[1],0,0),
@@ -294,7 +294,7 @@ main(int argc, char **argv)
 		for(i=0;chunk_n[i];i++)
 			printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : "  ");
 		printf("\n");
-		
+
 	}
 	exit (0);
 }
diff --git a/release/libdisk/write_disk.c b/release/libdisk/write_disk.c
index 3b9a163..e2c0674 100644
--- a/release/libdisk/write_disk.c
+++ b/release/libdisk/write_disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: write_disk.c,v 1.11 1995/05/21 07:47:24 phk Exp $
+ * $Id: write_disk.c,v 1.12 1995/05/24 08:59:40 jkh Exp $
  *
  */
 
@@ -24,7 +24,7 @@
 #include "libdisk.h"
 
 #define DOSPTYP_EXTENDED        5
-#define BBSIZE			8192 
+#define BBSIZE			8192
 
 #define WHERE(offset,disk) (disk->flags & DISK_ON_TRACK ? offset + 63 : offset)
 int
@@ -91,7 +91,7 @@ Write_FreeBSD(int fd, struct disk *new, struct disk *old, struct chunk *c1)
 	for(i=0;i<BBSIZE/512;i++) {
 		write_block(fd,WHERE(i + c1->offset,new),buf+512*i);
 	}
-		
+
 	return 0;
 }
 
@@ -151,7 +151,7 @@ Write_Disk(struct disk *d1)
 		} else {
 			dp[j].dp_ssect = i % d1->bios_sect;
 			i -= dp[j].dp_ssect++;
-			i /= d1->bios_sect;	
+			i /= d1->bios_sect;
 			dp[j].dp_shd =  i % d1->bios_hd;
 			i -= dp[j].dp_shd;
 			i /= d1->bios_hd;
@@ -161,14 +161,14 @@ Write_Disk(struct disk *d1)
 		}
 
 #ifdef DEBUG
-		printf("S:%lu = (%x/%x/%x)", 
+		printf("S:%lu = (%x/%x/%x)",
 			c1->offset,dp[j].dp_scyl,dp[j].dp_shd,dp[j].dp_ssect);
 #endif
 
 		i = c1->end;
 		dp[j].dp_esect = i % d1->bios_sect;
 		i -= dp[j].dp_esect++;
-		i /= d1->bios_sect;	
+		i /= d1->bios_sect;
 		dp[j].dp_ehd =  i % d1->bios_hd;
 		i -= dp[j].dp_ehd;
 		i /= d1->bios_hd;
@@ -178,7 +178,7 @@ Write_Disk(struct disk *d1)
 		dp[j].dp_esect |= i >> 2;
 
 #ifdef DEBUG
-		printf("  E:%lu = (%x/%x/%x)\n", 
+		printf("  E:%lu = (%x/%x/%x)\n",
 			c1->end,dp[j].dp_ecyl,dp[j].dp_ehd,dp[j].dp_esect);
 #endif
 
@@ -199,10 +199,10 @@ Write_Disk(struct disk *d1)
 		for(i=0;i<NDOSPART;i++)
 			if (dp[i].dp_typ == 0xa5)
 				dp[i].dp_flag = 0x80;
-	
+
 	mbr = read_block(fd,WHERE(0,d1));
 	if (d1->bootmgr)
-		memcpy(mbr,d1->bootmgr,DOSPARTOFF);	
+		memcpy(mbr,d1->bootmgr,DOSPARTOFF);
 	memcpy(mbr+DOSPARTOFF,dp,sizeof *dp * NDOSPART);
 	mbr[512-2] = 0x55;
 	mbr[512-1] = 0xaa;
diff --git a/release/sysinstall/attr.c b/release/sysinstall/attr.c
index cee86fb..5cd7f50 100644
--- a/release/sysinstall/attr.c
+++ b/release/sysinstall/attr.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media_strategy.c,v 1.28 1995/05/26 20:30:59 jkh Exp $
+ * $Id: attr.c,v 1.1 1995/05/27 10:38:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -57,10 +57,10 @@ attr_parse(Attribs **attr, char *file)
     enum { LOOK, COMMENT, NAME, VALUE, COMMIT } state;
     FILE *fp;
     static int 		lno;
-    
+
     num_attribs = n = v = lno = 0;
     state = LOOK;
-    
+
     if ((fp = fopen(file, "r")) == NULL) {
 	msgConfirm("Cannot open the information file `%s': %s (%d)", file, strerror(errno), errno);
 	return 0;
@@ -86,12 +86,12 @@ attr_parse(Attribs **attr, char *file)
 	    else
 		msgFatal("Invalid character '%c' at line %d\n", ch, lno);
 	    break;
-	    
+
 	case COMMENT:
 	    if (ch == '\n')
 		state = LOOK;
 	    break;
-	    
+
 	case NAME:
 	    if (ch == '\n') {
 		hold_n[n] = '\0';
@@ -107,7 +107,7 @@ attr_parse(Attribs **attr, char *file)
 	    else
 		hold_n[n++] = ch;
 	    break;
-	    
+
 	case VALUE:
 	    if (v == 0 && isspace(ch))
 		continue;
@@ -136,7 +136,7 @@ attr_parse(Attribs **attr, char *file)
 		    hold_v[v++] = ch;
 	    }
 	    break;
-	    
+
 	case COMMIT:
 	    (*attr)[num_attribs].name = strdup(hold_n);
 	    (*attr)[num_attribs++].value = strdup(hold_v);
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index b67406a..dbb5fb8 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/sysinstall/cdrom.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: cdrom.c,v 1.4 1995/05/28 07:05:21 phk Exp $
+ * $Id: cdrom.c,v 1.5 1995/05/29 11:01:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c
index 57f6213..5d132c4 100644
--- a/release/sysinstall/command.c
+++ b/release/sysinstall/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: command.c,v 1.9 1995/05/20 13:24:33 jkh Exp $
+ * $Id: command.c,v 1.10 1995/05/29 11:01:05 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 980bc57..09209fd 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.13 1995/05/29 11:01:06 jkh Exp $
+ * $Id: config.c,v 1.14 1995/05/29 13:37:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -246,7 +246,7 @@ configSysconfig(void)
 		lines[i] = (char *)malloc(strlen(v->name) + strlen(v->value) + 3);
 		sprintf(lines[i], "%s=\"%s\"\n", v->name, v->value);
 	    }
-	    
+
 	}
     }
     fp = fopen("/etc/sysconfig", "w");
diff --git a/release/sysinstall/decode.c b/release/sysinstall/decode.c
index 1297fd6..cf1eaee 100644
--- a/release/sysinstall/decode.c
+++ b/release/sysinstall/decode.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: decode.c,v 1.3 1995/05/16 02:52:57 jkh Exp $
+ * $Id: decode.c,v 1.4 1995/05/17 14:39:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -96,7 +96,7 @@ dispatch(DMenuItem *tmp, char *name)
 
     case DMENU_CANCEL:
 	return TRUE;
-	
+
     case DMENU_SET_VARIABLE:
 	variable_set((char *)tmp->ptr);
 	break;
@@ -127,7 +127,7 @@ decode_and_dispatch_multiple(DMenu *menu, char *names)
 
 	cp = index(names, '\n');
 	if (cp)
-	   *cp++ = 0; 
+	   *cp++ = 0;
 	/* Were no options actually selected? */
 	if (!*names)
 	    return FALSE;
diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c
index 48c10e4..14225fb 100644
--- a/release/sysinstall/devices.c
+++ b/release/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.33 1995/05/28 09:31:31 jkh Exp $
+ * $Id: devices.c,v 1.34 1995/05/29 11:01:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -282,7 +282,7 @@ deviceGetAll(void)
     end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
     for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) {
 	/* If it's not a link entry, forget it */
-	if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK) 
+	if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK)
 	    continue;
 	/* Eliminate network devices that don't make sense */
 	if (!strncmp(ifptr->ifr_name, "tun", 3)
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index 35a3e0e..3aeb539 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.28 1995/05/25 18:48:23 jkh Exp $
+ * $Id: disks.c,v 1.29 1995/05/28 20:28:09 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index ad91eb8..f01c5b5 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.33 1995/05/29 13:37:42 jkh Exp $
+ * $Id: dist.c,v 1.34 1995/05/29 14:38:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -268,7 +268,7 @@ distExtract(char *parent, Distribution *me)
 		msgConfirm("Cannot load information file for %s distribution!\nPlease verify that your media is valid and try again.", dist);
 		return FALSE;
 	    }
-   
+
 	    if (isDebug())
 		msgDebug("Looking for attribute `pieces'\n");
 	    tmp = attr_match(dist_attr, "pieces");
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c
index 2b77da0..636408a 100644
--- a/release/sysinstall/dmenu.c
+++ b/release/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: dmenu.c,v 1.9 1995/05/17 14:39:41 jkh Exp $
+ * $Id: dmenu.c,v 1.10 1995/05/24 17:49:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/dos.c b/release/sysinstall/dos.c
index 9cf2cd3..5bd31f0 100644
--- a/release/sysinstall/dos.c
+++ b/release/sysinstall/dos.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: dos.c,v 1.3 1995/05/28 03:04:54 jkh Exp $
+ * $Id: dos.c,v 1.4 1995/05/29 11:01:11 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index 865a635..bf9265a 100644
--- a/release/sysinstall/floppy.c
+++ b/release/sysinstall/floppy.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: floppy.c,v 1.4 1995/05/29 00:50:01 jkh Exp $
+ * $Id: floppy.c,v 1.5 1995/05/29 11:01:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -87,14 +87,14 @@ getRootFloppy(void)
     while (floppyDev == NULL || fd == -1) {
 	Device **devs;
 	int cnt;
-		    
+
 	devs = deviceFind(NULL, DEVICE_TYPE_FLOPPY);
 	cnt = deviceCount(devs);
 	if (cnt == 1)
 	    floppyDev = devs[0];
 	else if (cnt > 1) {
 	    DMenu *menu;
-	    
+
 	    menu = deviceCreateMenu(&MenuMediaFloppy, DEVICE_TYPE_FLOPPY, floppyChoiceHook);
 	    menu->title = "Please insert the ROOT floppy";
 	    dmenuOpenSimple(menu);
@@ -125,7 +125,7 @@ mediaInitFloppy(Device *dev)
 	return FALSE;
     }
     msgConfirm("Please insert media into %s and press return", dev->description);
-    msgDebug("initFloppy:  mount floppy %s on /mnt\n", dev->devname); 
+    msgDebug("initFloppy:  mount floppy %s on /mnt\n", dev->devname);
     dosargs.fspec = dev->devname;
     if (mount(MOUNT_MSDOS, "/mnt", 0, (caddr_t)&dosargs) == -1) {
 	msgConfirm("Error mounting floppy %s (%s) on /mnt : %s\n", dev->name,
diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c
index 59060b6..99e064f 100644
--- a/release/sysinstall/ftp.c
+++ b/release/sysinstall/ftp.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ftp.c,v 1.11 1995/05/27 06:19:59 phk Exp $
+ * $Id: ftp.c,v 1.12 1995/05/29 11:01:16 jkh Exp $
  *
  */
 
@@ -44,7 +44,7 @@ debug(FTP_t ftp, const char *fmt, ...)
 #endif
     (void) vsnprintf(p+strlen(p), sizeof p - strlen(p), fmt, ap);
     va_end(ap);
-    
+
 #ifdef STANDALONE_FTP
     write(ftp->fd_debug,p,strlen(p));
 #else
@@ -67,7 +67,7 @@ get_a_line(FTP_t ftp)
 {
     static char buf[BUFSIZ];
     int i,j;
-    
+
     for(i=0;i<BUFSIZ;) {
 	j = read(ftp->fd_ctrl,buf+i,1);
 	if (j != 1)
@@ -89,7 +89,7 @@ get_a_number(FTP_t ftp, char **q)
 {
     char *p;
     int i = -1,j;
-    
+
     while(1) {
 	p = get_a_line(ftp);
 	if (!(isdigit(p[0]) && isdigit(p[1]) && isdigit(p[2])))
@@ -97,8 +97,8 @@ get_a_number(FTP_t ftp, char **q)
 	if (i == -1 && p[3] == '-') {
 	    i = atoi(p);
 	    continue;
-	} 
-	if (p[3] != ' ' && p[3] != '\t') 
+	}
+	if (p[3] != ' ' && p[3] != '\t')
 	    continue;
 	j = atoi(p);
 	if (i == -1) {
@@ -127,12 +127,12 @@ cmd(FTP_t ftp, const char *fmt, ...)
 {
     char p[BUFSIZ];
     int i;
-    
+
     va_list ap;
     va_start(ap, fmt);
     (void) vsnprintf(p, sizeof p, fmt, ap);
     va_end(ap);
-    
+
     debug(ftp, "send <%s>\n",p);
     strcat(p,"\r\n");
     if (writes(ftp->fd_ctrl,p))
@@ -145,7 +145,7 @@ FTP_t
 FtpInit()
 {
     FTP_t ftp;
-    
+
     ftp = malloc(sizeof *ftp);
     if (!ftp)
 	return ftp;
@@ -173,18 +173,18 @@ FtpOpen(FTP_t ftp, char *host, char *user, char *passwd)
     int 			s;
     unsigned long 		temp;
     int i;
-    
+
     if (ftp->state != init)
 	return botch(ftp,"FtpOpen","init");
-    
+
     if (!user)
 	user = "ftp";
-    
+
     if (!passwd)
 	passwd = "??@??(FreeBSD:libftp)";	/* XXX */
-    
+
     debug(ftp, "FtpOpen(ftp, %s, %s, %s)\n", host, user, passwd);
-    
+
     temp = inet_addr(host);
     if (temp != INADDR_NONE)
     {
@@ -202,33 +202,33 @@ FtpOpen(FTP_t ftp, char *host, char *user, char *passwd)
 	ftp->addrtype = sin.sin_family = he->h_addrtype;
 	bcopy(he->h_addr, (char *)&sin.sin_addr, he->h_length);
     }
-    
+
     sin.sin_port = htons(21);
-    
+
     if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0)
     {
 	debug(ftp, "Socket open failed: %s (%i)\n", strerror(errno), errno);
 	return s;
     }
-    
+
     if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 	debug(ftp,"Connection failed: %s (%i)\n", strerror(errno), errno);
 	(void)close(s);
 	return -1;
     }
-    
+
     ftp->fd_ctrl = s;
-    
+
     debug(ftp, "open (%d)\n",get_a_number(ftp,0));
-    
+
     i = cmd(ftp,"USER %s",user);
-    if (i >= 300 && i < 400) 
+    if (i >= 300 && i < 400)
 	i = cmd(ftp,"PASS %s",passwd);
     if (i >= 299)
 	return -1;
     ftp->state = isopen;
     return 0;
-    
+
 #if 0
 fail:
     close(ftp->fd_ctrl);
@@ -240,9 +240,9 @@ fail:
 void
 FtpClose(FTP_t ftp)
 {
-    if (ftp->state != isopen) 
+    if (ftp->state != isopen)
 	botch(ftp,"FtpClose","open");
-    
+
     debug(ftp, "FtpClose(ftp)\n");
     writes(ftp->fd_ctrl,"QUIT\r\n");
     close(ftp->fd_ctrl); ftp->fd_ctrl = -1;
@@ -254,7 +254,7 @@ int
 FtpChdir(FTP_t ftp, char *dir)
 {
     int i;
-    if (ftp->state != isopen) 
+    if (ftp->state != isopen)
 	return botch(ftp,"FtpChdir","open");
     i = cmd(ftp,"CWD %s",dir);
     return 0;
@@ -267,9 +267,9 @@ FtpGet(FTP_t ftp, char *file)
     char *q;
     unsigned char addr[6];
     struct sockaddr_in sin;
-    
+
     debug(ftp, "FtpGet(ftp,%s)\n",file);
-    if (ftp->state != isopen) 
+    if (ftp->state != isopen)
 	return botch(ftp,"FtpGet","open");
     if(ftp->binary) {
 	i = cmd(ftp,"TYPE I");
@@ -294,13 +294,13 @@ FtpGet(FTP_t ftp, char *file)
 	    q++;
 	    addr[i] = strtol(q,&q,10);
 	}
-	
+
 	sin.sin_family = ftp->addrtype;
 	bcopy(addr, (char *)&sin.sin_addr, 4);
 	bcopy(addr+4, (char *)&sin.sin_port, 2);
 	debug(ftp, "Opening active socket to %s : %u\n", inet_ntoa(sin.sin_addr), htons(sin.sin_port));
 
-	if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0) 
+	if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0)
 	    return -1;
 
 	debug(ftp, "Connecting to %s:%u\n", inet_ntoa(sin.sin_addr), htons(sin.sin_port));
@@ -309,7 +309,7 @@ FtpGet(FTP_t ftp, char *file)
 	    debug(ftp, "connect: %s (%d)\n", strerror(errno), errno);
 	    return -1;
 	}
-	
+
 	i = cmd(ftp,"RETR %s",file);
 	if (i > 299)
 	    return -1;
@@ -324,7 +324,7 @@ FtpGet(FTP_t ftp, char *file)
 int
 FtpEOF(FTP_t ftp)
 {
-    if (ftp->state != xfer) 
+    if (ftp->state != xfer)
 	return botch(ftp,"FtpEOF","xfer");
     debug(ftp, "FtpEOF(ftp)\n");
     close(ftp->fd_xfer); ftp->fd_xfer = -1;
@@ -336,16 +336,16 @@ FtpEOF(FTP_t ftp)
 
 /* main.c */
 
-int 
+int
 main(int argc, char **argv)
 {
     FTP_t ftp;
     int i;
     char c;
-    
+
     ftp = FtpInit();
     if (!ftp) err(1,"FtpInit()");
-    
+
     FtpDebug(ftp,1);
     i = FtpOpen(ftp, "ref.tfs.com", "ftp", "phk-libftp@");
     if (i) err(1,"FtpOpen(%d)",i);
diff --git a/release/sysinstall/ftp_strat.c b/release/sysinstall/ftp_strat.c
index b6fa553..e352bbd 100644
--- a/release/sysinstall/ftp_strat.c
+++ b/release/sysinstall/ftp_strat.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: ftp_strat.c,v 1.4 1995/05/27 23:39:30 phk Exp $
+ * $Id: ftp_strat.c,v 1.5 1995/05/29 11:01:19 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c
index 891318d..a2ccbce 100644
--- a/release/sysinstall/globals.c
+++ b/release/sysinstall/globals.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: globals.c,v 1.7 1995/05/24 22:37:41 jkh Exp $
+ * $Id: globals.c,v 1.8 1995/05/25 18:48:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 478c7cd..48f75f1 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.68 1995/05/29 13:37:43 jkh Exp $
+ * $Id: install.c,v 1.69 1995/05/30 05:50:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 6e7f8e5..e4533734 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.29 1995/05/28 23:12:06 jkh Exp $
+ * $Id: label.c,v 1.30 1995/05/29 00:50:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -181,7 +181,7 @@ new_part(char *mpoint, Boolean newfs, u_long size)
 	    return ret;
     for (target = size; target; target--) {
 	for (divisor = 4096 ; divisor > 1023; divisor--) {
-	    if (!(target % divisor)) { 
+	    if (!(target % divisor)) {
 		sprintf(ret->newfs_cmd + strlen(ret->newfs_cmd), " -u %ld",divisor);
 		return ret;
 	    }
@@ -549,7 +549,7 @@ diskLabelEditor(char *str)
 		    safe_free(p);
 		} else {
 		    tmp->private = p;
-		}	
+		}
 		tmp->private_free = safe_free;
 		record_label_chunks();
 	    }
diff --git a/release/sysinstall/lang.c b/release/sysinstall/lang.c
index e78c97f..5da8401 100644
--- a/release/sysinstall/lang.c
+++ b/release/sysinstall/lang.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: lang.c,v 1.4 1995/05/19 16:58:55 jkh Exp $
+ * $Id: lang.c,v 1.5 1995/05/24 21:42:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -50,7 +50,7 @@ lang_set_Danish(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("da_DK.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1,
 			 "cons25l1-m", termcap_cons25l1_m);
 }
@@ -60,7 +60,7 @@ lang_set_Dutch(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("nl_NL.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1, "cons25l1-m", termcap_cons25l1_m);
 }
 
@@ -69,7 +69,7 @@ lang_set_English(char *str)
 {
     systemChangeFont(font_cp850_8x16);
     systemChangeLang("en_US.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25", termcap_cons25, "cons25-m", termcap_cons25_m);
 }
 
@@ -78,7 +78,7 @@ lang_set_French(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("fr_FR.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1, "cons25l1-m", termcap_cons25l1_m);
 }
 
@@ -87,7 +87,7 @@ lang_set_German(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("de_DE.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1, "cons25l1-m", termcap_cons25l1_m);
 }
 
@@ -96,7 +96,7 @@ lang_set_Italian(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("it_IT.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1, "cons25l1-m", termcap_cons25l1_m);
 }
 
@@ -106,7 +106,7 @@ lang_set_Japanese(char *str)
 {
     systemChangeFont(font_cp850_8x16); /* must prepare JIS X0201 font? */
     systemChangeLang("ja_JP.ROMAJI");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25", termcap_cons25, "cons25-m", termcap_cons25_m);
 }
 
@@ -115,7 +115,7 @@ lang_set_Norwegian(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("no_NO.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1, "cons25l1-m", termcap_cons25l1_m);
 }
 
@@ -124,7 +124,7 @@ lang_set_Russian(char *str)
 {
     systemChangeFont(font_cp866_8x16);
     systemChangeLang("ru_SU.KOI8-R");
-    systemChangeScreenmap(koi8_r2cp866);	
+    systemChangeScreenmap(koi8_r2cp866);
     systemChangeTerminal("cons25r", termcap_cons25r, "cons25r-m", termcap_cons25r_m);
 }
 
@@ -133,7 +133,7 @@ lang_set_Spanish(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("es_ES.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1, "cons25l1-m", termcap_cons25l1_m);
 }
 
@@ -142,6 +142,6 @@ lang_set_Swedish(char *str)
 {
     systemChangeFont(font_iso_8x16);
     systemChangeLang("sv_SV.ISO8859-1");
-    systemChangeScreenmap(default_scrnmap);	
+    systemChangeScreenmap(default_scrnmap);
     systemChangeTerminal("cons25l1", termcap_cons25l1, "cons25l1-m", termcap_cons25l1_m);
 }
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c
index 7660258..649f1ad 100644
--- a/release/sysinstall/main.c
+++ b/release/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.10 1995/05/24 17:49:17 jkh Exp $
+ * $Id: main.c,v 1.11 1995/05/28 09:31:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index 2d9ba18..03ec86b 100644
--- a/release/sysinstall/media.c
+++ b/release/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media.c,v 1.22 1995/05/29 11:01:27 jkh Exp $
+ * $Id: media.c,v 1.23 1995/05/30 05:13:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 3008e98..6811a91 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.39 1995/05/29 11:58:16 jkh Exp $
+ * $Id: menus.c,v 1.40 1995/05/30 05:13:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -206,7 +206,7 @@ To specify a URL not in this list, chose \"other\".",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.physics.usyd.edu.au/FreeBSD/2.0.5-ALPHA", 0, 0			},
       { "Finland", "nic.funet.fi",
 	DMENU_SET_VARIABLE,	"ftp=ftp://nic.funet.fi/pub/unix/FreeBSD/2.0.5-ALPHA", 0, 0			},
-      { "France", "ftp.ibp.fr", 
+      { "France", "ftp.ibp.fr",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.ibp.fr/pub/FreeBSD/2.0.5-ALPHA", 0, 0				},
       { "Germany", "ftp.uni-duisburg.de",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.uni-duisburg.de/pub/unix/FreeBSD/2.0.5-ALPHA", 0,		},
@@ -214,7 +214,7 @@ To specify a URL not in this list, chose \"other\".",
 	DMENU_SET_VARIABLE,	"ftp=ftp://orgchem.weizmann.ac.il/pub/FreeBSD-2.0.5-ALPHA", 0, 0		},
       { "Japan", "ftp.sra.co.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.sra.co.jp/pub/os/FreeBSD/distribution/2.0.5-ALPHA", 0, 0		},
-      { "Japan #2", "ftp.mei.co.jp", 
+      { "Japan #2", "ftp.mei.co.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/2.0.5-ALPHA", 0, 0		},
       { "Japan #3", "ftp.waseda.ac.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.waseda.ac.jp/pub/FreeBSD/2.0.5-ALPHA", 0, 0			},
@@ -430,7 +430,7 @@ When you're finished, select Cancel.",
     "XF86.hlp",
     { { "Basic", "Basic component menu (required)",
 	DMENU_SUBMENU, &MenuXF86SelectCore, 0, 0	},
-      { "Server", "X server menu", 
+      { "Server", "X server menu",
 	DMENU_SUBMENU, &MenuXF86SelectServer, 0, 0	},
       { "Fonts", "Font set menu",
 	DMENU_SUBMENU, &MenuXF86SelectFonts, 0, 0	},
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index f1b8066..49d68f9 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $Id: misc.c,v 1.9 1995/05/25 01:22:19 jkh Exp $
+ * $Id: misc.c,v 1.10 1995/05/29 11:01:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -10,8 +10,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -234,7 +234,7 @@ Mount(char *mountp, void *dev)
 	return 1;
     }
     if (isDebug())
-	msgDebug("mount %s %s\n", device, mountpoint); 
+	msgDebug("mount %s %s\n", device, mountpoint);
     bzero(&ufsargs, sizeof(ufsargs));
     ufsargs.fspec = device;
     if (mount(MOUNT_UFS, mountpoint, 0, (caddr_t)&ufsargs) == -1) {
@@ -265,7 +265,7 @@ Mount_DOS(char *mountp, void *dev)
 	msgConfirm("Unable to make directory mountpoint for %s!", mountpoint);
 	return 1;
     }
-    msgDebug("mount %s %s\n", device, mountpoint); 
+    msgDebug("mount %s %s\n", device, mountpoint);
     ufsargs.fspec = device;
     if (mount(MOUNT_MSDOS, mountpoint, 0, (caddr_t)&ufsargs) == -1) {
 	msgConfirm("Error mounting %s on %s : %s\n", device, mountpoint, strerror(errno));
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index 5930d14..0d3791c 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.26 1995/05/29 01:43:18 jkh Exp $
+ * $Id: msg.c,v 1.27 1995/05/29 11:01:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c
index 2258162..950896e 100644
--- a/release/sysinstall/network.c
+++ b/release/sysinstall/network.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: network.c,v 1.4 1995/05/29 01:43:20 jkh Exp $
+ * $Id: network.c,v 1.5 1995/05/29 11:01:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c
index 044e959..f752aca 100644
--- a/release/sysinstall/nfs.c
+++ b/release/sysinstall/nfs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: nfs.c,v 1.2 1995/05/29 11:01:35 jkh Exp $
+ * $Id: nfs.c,v 1.3 1995/05/30 05:13:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 42da9c4..e18bcf8 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.39 1995/05/28 09:31:39 jkh Exp $
+ * $Id: sysinstall.h,v 1.40 1995/05/29 11:01:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -215,7 +215,7 @@ typedef struct _devPriv {
 extern int		DebugFD;		/* Where diagnostic output goes			*/
 extern Boolean		OnCDROM;		/* Are we running off of a CDROM?		*/
 extern Boolean		OnSerial;		/* Are we on a serial console?			*/
-extern Boolean		SystemWasInstalled;	/* Did we install it?				*/ 
+extern Boolean		SystemWasInstalled;	/* Did we install it?				*/
 extern Boolean		RunningAsInit;		/* Are we running stand-alone?			*/
 extern Boolean		DialogActive;		/* Is the dialog() stuff up?			*/
 extern Boolean		ColorDisplay;		/* Are we on a color display?			*/
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index 2e55385..8f68a42 100644
--- a/release/sysinstall/system.c
+++ b/release/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.41 1995/05/29 02:13:31 phk Exp $
+ * $Id: system.c,v 1.42 1995/05/29 11:01:39 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -217,7 +217,7 @@ systemHelpFile(char *file, char *buf)
 	    strcpy(oldfile, buf);
 	    return buf;
 	}
-    }	
+    }
     /* Fall back to normal imperialistic mode :-) */
     cp = "en_US.ISO8859-1";
     snprintf(buf, FILENAME_MAX, "%s/%s", cp, file);
diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c
index ac288b5..a60f48f 100644
--- a/release/sysinstall/tape.c
+++ b/release/sysinstall/tape.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: tape.c,v 1.3 1995/05/28 03:05:04 jkh Exp $
+ * $Id: tape.c,v 1.4 1995/05/29 11:01:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 22c3294..ea2cf3e 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.27 1995/05/29 11:01:41 jkh Exp $
+ * $Id: tcpip.c,v 1.28 1995/05/29 12:32:41 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -8,8 +8,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -206,7 +206,7 @@ tcpOpenDialog(Device *devp)
     /* Initialise vars from previous device values */
     if (devp->private) {
 	DevInfo *di = (DevInfo *)devp->private;
-	
+
 	strcpy(ipaddr, di->ipaddr);
 	strcpy(netmask, di->netmask);
 	strcpy(extras, di->extras);
@@ -265,7 +265,7 @@ tcpOpenDialog(Device *devp)
     last = obj;
     while (last->next)
 	last = last->next;
-    
+
     /* Find the first object in the list */
     first = obj;
     while (first->prev)
@@ -371,7 +371,7 @@ tcpOpenDialog(Device *devp)
 	default:
 	    beep();
 	}
-	
+
 	/* BODGE ALERT! */
 	if (((tmp = index(hostname, '.')) != NULL) && (strlen(domainname)==0)) {
 	    strncpy(domainname, tmp + 1, strlen(tmp + 1));
@@ -384,7 +384,7 @@ tcpOpenDialog(Device *devp)
     dialog_clear();
     refresh();
     use_helpfile(NULL);
-    
+
     /* We actually need to inform the rest of sysinstall about this
        data now - if the user hasn't selected cancel, save the stuff
        out to the environment via the variable_set layers */
diff --git a/release/sysinstall/termcap.c b/release/sysinstall/termcap.c
index ef70a75..384e532 100644
--- a/release/sysinstall/termcap.c
+++ b/release/sysinstall/termcap.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 1994, Paul Richards.
- * 
+ *
  * All rights reserved.
- * 
+ *
  * This software may be used, modified, copied, distributed, and sold, in both
  * source and binary form provided that the above copyright and these terms
  * are retained, verbatim, as the first lines of this file.  Under no
diff --git a/release/sysinstall/ufs.c b/release/sysinstall/ufs.c
index 55a2701..9ad4a81 100644
--- a/release/sysinstall/ufs.c
+++ b/release/sysinstall/ufs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: ufs.c,v 1.2 1995/05/27 23:39:35 phk Exp $
+ * $Id: ufs.c,v 1.3 1995/05/29 11:01:42 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/variable.c b/release/sysinstall/variable.c
index 4ff9499..d2b9799 100644
--- a/release/sysinstall/variable.c
+++ b/release/sysinstall/variable.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: variable.c,v 1.3 1995/05/26 20:45:20 jkh Exp $
+ * $Id: variable.c,v 1.4 1995/05/27 10:47:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c
index a3f9285..81c2b0f 100644
--- a/release/sysinstall/wizard.c
+++ b/release/sysinstall/wizard.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: wizard.c,v 1.3 1995/05/17 14:40:00 jkh Exp $
+ * $Id: wizard.c,v 1.4 1995/05/20 10:33:14 jkh Exp $
  *
  */
 
@@ -86,10 +86,10 @@ Scan_Disk(Disk *d)
     char device[64];
     u_long l;
     int i,j,fd;
-    
+
     strcpy(device,"/dev/r");
     strcat(device,d->name);
-    
+
     fd = open(device,O_RDWR);
     if (fd < 0) {
 	msgWarn("open(%s) failed", device);
@@ -108,9 +108,9 @@ Scan_Disk(Disk *d)
 		printf(".%lu\nG: %lu.",l-1,l);
 		fflush(stdout);
 	    }
-	    i = j;	
+	    i = j;
 	}
-    } 
+    }
     close(fd);
 }
 
@@ -123,7 +123,7 @@ slice_wizard(Disk *d)
     char *p,*q=0;
     char **cp,*cmds[200];
     int ncmd,i;
-    
+
     sprintf(myprompt,"%s> ", d->name);
     while(1) {
 	printf("--==##==--\n");
@@ -158,41 +158,41 @@ slice_wizard(Disk *d)
 	    All_FreeBSD(d);
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"bios") && ncmd == 4) { 
+	if (!strcasecmp(*cmds,"bios") && ncmd == 4) {
 	    Set_Bios_Geom(d,
 			  strtol(cmds[1],0,0),
 			  strtol(cmds[2],0,0),
 			  strtol(cmds[3],0,0));
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"phys") && ncmd == 4) { 
+	if (!strcasecmp(*cmds,"phys") && ncmd == 4) {
 	    d = Set_Phys_Geom(d,
 			      strtol(cmds[1],0,0),
 			      strtol(cmds[2],0,0),
 			      strtol(cmds[3],0,0));
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"collapse")) { 
+	if (!strcasecmp(*cmds,"collapse")) {
 	    if (cmds[1])
 		while (Collapse_Chunk(d,
 				      (struct chunk *)strtol(cmds[1],0,0)))
 		    ;
-	    else		
+	    else
 		Collapse_Disk(d);
 	    continue;
-	}	
-	if (!strcasecmp(*cmds,"list")) { 
+	}
+	if (!strcasecmp(*cmds,"list")) {
 	    cp = Disk_Names();
 	    printf("Disks:");
 	    for(i=0;cp[i];i++) {
 		printf(" %s",cp[i]);
 		free(cp[i]);
-	    }		
+	    }
 	    free(cp);
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"create") && ncmd == 6) { 
-	    
+	if (!strcasecmp(*cmds,"create") && ncmd == 6) {
+
 	    printf("Create=%d\n",
 		   Create_Chunk(d,
 				strtol(cmds[1],0,0),
@@ -260,6 +260,6 @@ slice_wizard(Disk *d)
 	for(i=0;chunk_n[i];i++)
 	    printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : "  ");
 	printf("\n");
-	
+
     }
 }
diff --git a/usr.sbin/sade/command.c b/usr.sbin/sade/command.c
index 57f6213..5d132c4 100644
--- a/usr.sbin/sade/command.c
+++ b/usr.sbin/sade/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: command.c,v 1.9 1995/05/20 13:24:33 jkh Exp $
+ * $Id: command.c,v 1.10 1995/05/29 11:01:05 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 980bc57..09209fd 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.13 1995/05/29 11:01:06 jkh Exp $
+ * $Id: config.c,v 1.14 1995/05/29 13:37:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -246,7 +246,7 @@ configSysconfig(void)
 		lines[i] = (char *)malloc(strlen(v->name) + strlen(v->value) + 3);
 		sprintf(lines[i], "%s=\"%s\"\n", v->name, v->value);
 	    }
-	    
+
 	}
     }
     fp = fopen("/etc/sysconfig", "w");
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index 48c10e4..14225fb 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.33 1995/05/28 09:31:31 jkh Exp $
+ * $Id: devices.c,v 1.34 1995/05/29 11:01:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -282,7 +282,7 @@ deviceGetAll(void)
     end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
     for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) {
 	/* If it's not a link entry, forget it */
-	if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK) 
+	if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK)
 	    continue;
 	/* Eliminate network devices that don't make sense */
 	if (!strncmp(ifptr->ifr_name, "tun", 3)
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index 35a3e0e..3aeb539 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.28 1995/05/25 18:48:23 jkh Exp $
+ * $Id: disks.c,v 1.29 1995/05/28 20:28:09 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c
index 2b77da0..636408a 100644
--- a/usr.sbin/sade/dmenu.c
+++ b/usr.sbin/sade/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: dmenu.c,v 1.9 1995/05/17 14:39:41 jkh Exp $
+ * $Id: dmenu.c,v 1.10 1995/05/24 17:49:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/globals.c b/usr.sbin/sade/globals.c
index 891318d..a2ccbce 100644
--- a/usr.sbin/sade/globals.c
+++ b/usr.sbin/sade/globals.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: globals.c,v 1.7 1995/05/24 22:37:41 jkh Exp $
+ * $Id: globals.c,v 1.8 1995/05/25 18:48:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 478c7cd..48f75f1 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.68 1995/05/29 13:37:43 jkh Exp $
+ * $Id: install.c,v 1.69 1995/05/30 05:50:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 6e7f8e5..e4533734 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.29 1995/05/28 23:12:06 jkh Exp $
+ * $Id: label.c,v 1.30 1995/05/29 00:50:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -181,7 +181,7 @@ new_part(char *mpoint, Boolean newfs, u_long size)
 	    return ret;
     for (target = size; target; target--) {
 	for (divisor = 4096 ; divisor > 1023; divisor--) {
-	    if (!(target % divisor)) { 
+	    if (!(target % divisor)) {
 		sprintf(ret->newfs_cmd + strlen(ret->newfs_cmd), " -u %ld",divisor);
 		return ret;
 	    }
@@ -549,7 +549,7 @@ diskLabelEditor(char *str)
 		    safe_free(p);
 		} else {
 		    tmp->private = p;
-		}	
+		}
 		tmp->private_free = safe_free;
 		record_label_chunks();
 	    }
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index 7660258..649f1ad 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.10 1995/05/24 17:49:17 jkh Exp $
+ * $Id: main.c,v 1.11 1995/05/28 09:31:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 3008e98..6811a91 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.39 1995/05/29 11:58:16 jkh Exp $
+ * $Id: menus.c,v 1.40 1995/05/30 05:13:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -206,7 +206,7 @@ To specify a URL not in this list, chose \"other\".",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.physics.usyd.edu.au/FreeBSD/2.0.5-ALPHA", 0, 0			},
       { "Finland", "nic.funet.fi",
 	DMENU_SET_VARIABLE,	"ftp=ftp://nic.funet.fi/pub/unix/FreeBSD/2.0.5-ALPHA", 0, 0			},
-      { "France", "ftp.ibp.fr", 
+      { "France", "ftp.ibp.fr",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.ibp.fr/pub/FreeBSD/2.0.5-ALPHA", 0, 0				},
       { "Germany", "ftp.uni-duisburg.de",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.uni-duisburg.de/pub/unix/FreeBSD/2.0.5-ALPHA", 0,		},
@@ -214,7 +214,7 @@ To specify a URL not in this list, chose \"other\".",
 	DMENU_SET_VARIABLE,	"ftp=ftp://orgchem.weizmann.ac.il/pub/FreeBSD-2.0.5-ALPHA", 0, 0		},
       { "Japan", "ftp.sra.co.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.sra.co.jp/pub/os/FreeBSD/distribution/2.0.5-ALPHA", 0, 0		},
-      { "Japan #2", "ftp.mei.co.jp", 
+      { "Japan #2", "ftp.mei.co.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/2.0.5-ALPHA", 0, 0		},
       { "Japan #3", "ftp.waseda.ac.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.waseda.ac.jp/pub/FreeBSD/2.0.5-ALPHA", 0, 0			},
@@ -430,7 +430,7 @@ When you're finished, select Cancel.",
     "XF86.hlp",
     { { "Basic", "Basic component menu (required)",
 	DMENU_SUBMENU, &MenuXF86SelectCore, 0, 0	},
-      { "Server", "X server menu", 
+      { "Server", "X server menu",
 	DMENU_SUBMENU, &MenuXF86SelectServer, 0, 0	},
       { "Fonts", "Font set menu",
 	DMENU_SUBMENU, &MenuXF86SelectFonts, 0, 0	},
diff --git a/usr.sbin/sade/misc.c b/usr.sbin/sade/misc.c
index f1b8066..49d68f9 100644
--- a/usr.sbin/sade/misc.c
+++ b/usr.sbin/sade/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $Id: misc.c,v 1.9 1995/05/25 01:22:19 jkh Exp $
+ * $Id: misc.c,v 1.10 1995/05/29 11:01:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -10,8 +10,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -234,7 +234,7 @@ Mount(char *mountp, void *dev)
 	return 1;
     }
     if (isDebug())
-	msgDebug("mount %s %s\n", device, mountpoint); 
+	msgDebug("mount %s %s\n", device, mountpoint);
     bzero(&ufsargs, sizeof(ufsargs));
     ufsargs.fspec = device;
     if (mount(MOUNT_UFS, mountpoint, 0, (caddr_t)&ufsargs) == -1) {
@@ -265,7 +265,7 @@ Mount_DOS(char *mountp, void *dev)
 	msgConfirm("Unable to make directory mountpoint for %s!", mountpoint);
 	return 1;
     }
-    msgDebug("mount %s %s\n", device, mountpoint); 
+    msgDebug("mount %s %s\n", device, mountpoint);
     ufsargs.fspec = device;
     if (mount(MOUNT_MSDOS, mountpoint, 0, (caddr_t)&ufsargs) == -1) {
 	msgConfirm("Error mounting %s on %s : %s\n", device, mountpoint, strerror(errno));
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 5930d14..0d3791c 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/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.26 1995/05/29 01:43:18 jkh Exp $
+ * $Id: msg.c,v 1.27 1995/05/29 11:01:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 42da9c4..e18bcf8 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.39 1995/05/28 09:31:39 jkh Exp $
+ * $Id: sysinstall.h,v 1.40 1995/05/29 11:01:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -215,7 +215,7 @@ typedef struct _devPriv {
 extern int		DebugFD;		/* Where diagnostic output goes			*/
 extern Boolean		OnCDROM;		/* Are we running off of a CDROM?		*/
 extern Boolean		OnSerial;		/* Are we on a serial console?			*/
-extern Boolean		SystemWasInstalled;	/* Did we install it?				*/ 
+extern Boolean		SystemWasInstalled;	/* Did we install it?				*/
 extern Boolean		RunningAsInit;		/* Are we running stand-alone?			*/
 extern Boolean		DialogActive;		/* Is the dialog() stuff up?			*/
 extern Boolean		ColorDisplay;		/* Are we on a color display?			*/
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index 2e55385..8f68a42 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/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.41 1995/05/29 02:13:31 phk Exp $
+ * $Id: system.c,v 1.42 1995/05/29 11:01:39 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -217,7 +217,7 @@ systemHelpFile(char *file, char *buf)
 	    strcpy(oldfile, buf);
 	    return buf;
 	}
-    }	
+    }
     /* Fall back to normal imperialistic mode :-) */
     cp = "en_US.ISO8859-1";
     snprintf(buf, FILENAME_MAX, "%s/%s", cp, file);
diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c
index ef70a75..384e532 100644
--- a/usr.sbin/sade/termcap.c
+++ b/usr.sbin/sade/termcap.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 1994, Paul Richards.
- * 
+ *
  * All rights reserved.
- * 
+ *
  * This software may be used, modified, copied, distributed, and sold, in both
  * source and binary form provided that the above copyright and these terms
  * are retained, verbatim, as the first lines of this file.  Under no
diff --git a/usr.sbin/sade/variable.c b/usr.sbin/sade/variable.c
index 4ff9499..d2b9799 100644
--- a/usr.sbin/sade/variable.c
+++ b/usr.sbin/sade/variable.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: variable.c,v 1.3 1995/05/26 20:45:20 jkh Exp $
+ * $Id: variable.c,v 1.4 1995/05/27 10:47:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c
index a3f9285..81c2b0f 100644
--- a/usr.sbin/sade/wizard.c
+++ b/usr.sbin/sade/wizard.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: wizard.c,v 1.3 1995/05/17 14:40:00 jkh Exp $
+ * $Id: wizard.c,v 1.4 1995/05/20 10:33:14 jkh Exp $
  *
  */
 
@@ -86,10 +86,10 @@ Scan_Disk(Disk *d)
     char device[64];
     u_long l;
     int i,j,fd;
-    
+
     strcpy(device,"/dev/r");
     strcat(device,d->name);
-    
+
     fd = open(device,O_RDWR);
     if (fd < 0) {
 	msgWarn("open(%s) failed", device);
@@ -108,9 +108,9 @@ Scan_Disk(Disk *d)
 		printf(".%lu\nG: %lu.",l-1,l);
 		fflush(stdout);
 	    }
-	    i = j;	
+	    i = j;
 	}
-    } 
+    }
     close(fd);
 }
 
@@ -123,7 +123,7 @@ slice_wizard(Disk *d)
     char *p,*q=0;
     char **cp,*cmds[200];
     int ncmd,i;
-    
+
     sprintf(myprompt,"%s> ", d->name);
     while(1) {
 	printf("--==##==--\n");
@@ -158,41 +158,41 @@ slice_wizard(Disk *d)
 	    All_FreeBSD(d);
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"bios") && ncmd == 4) { 
+	if (!strcasecmp(*cmds,"bios") && ncmd == 4) {
 	    Set_Bios_Geom(d,
 			  strtol(cmds[1],0,0),
 			  strtol(cmds[2],0,0),
 			  strtol(cmds[3],0,0));
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"phys") && ncmd == 4) { 
+	if (!strcasecmp(*cmds,"phys") && ncmd == 4) {
 	    d = Set_Phys_Geom(d,
 			      strtol(cmds[1],0,0),
 			      strtol(cmds[2],0,0),
 			      strtol(cmds[3],0,0));
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"collapse")) { 
+	if (!strcasecmp(*cmds,"collapse")) {
 	    if (cmds[1])
 		while (Collapse_Chunk(d,
 				      (struct chunk *)strtol(cmds[1],0,0)))
 		    ;
-	    else		
+	    else
 		Collapse_Disk(d);
 	    continue;
-	}	
-	if (!strcasecmp(*cmds,"list")) { 
+	}
+	if (!strcasecmp(*cmds,"list")) {
 	    cp = Disk_Names();
 	    printf("Disks:");
 	    for(i=0;cp[i];i++) {
 		printf(" %s",cp[i]);
 		free(cp[i]);
-	    }		
+	    }
 	    free(cp);
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"create") && ncmd == 6) { 
-	    
+	if (!strcasecmp(*cmds,"create") && ncmd == 6) {
+
 	    printf("Create=%d\n",
 		   Create_Chunk(d,
 				strtol(cmds[1],0,0),
@@ -260,6 +260,6 @@ slice_wizard(Disk *d)
 	for(i=0;chunk_n[i];i++)
 	    printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : "  ");
 	printf("\n");
-	
+
     }
 }
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index b67406a..dbb5fb8 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: cdrom.c,v 1.4 1995/05/28 07:05:21 phk Exp $
+ * $Id: cdrom.c,v 1.5 1995/05/29 11:01:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/command.c b/usr.sbin/sysinstall/command.c
index 57f6213..5d132c4 100644
--- a/usr.sbin/sysinstall/command.c
+++ b/usr.sbin/sysinstall/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: command.c,v 1.9 1995/05/20 13:24:33 jkh Exp $
+ * $Id: command.c,v 1.10 1995/05/29 11:01:05 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 980bc57..09209fd 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.13 1995/05/29 11:01:06 jkh Exp $
+ * $Id: config.c,v 1.14 1995/05/29 13:37:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -246,7 +246,7 @@ configSysconfig(void)
 		lines[i] = (char *)malloc(strlen(v->name) + strlen(v->value) + 3);
 		sprintf(lines[i], "%s=\"%s\"\n", v->name, v->value);
 	    }
-	    
+
 	}
     }
     fp = fopen("/etc/sysconfig", "w");
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index 48c10e4..14225fb 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.33 1995/05/28 09:31:31 jkh Exp $
+ * $Id: devices.c,v 1.34 1995/05/29 11:01:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -282,7 +282,7 @@ deviceGetAll(void)
     end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
     for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) {
 	/* If it's not a link entry, forget it */
-	if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK) 
+	if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK)
 	    continue;
 	/* Eliminate network devices that don't make sense */
 	if (!strncmp(ifptr->ifr_name, "tun", 3)
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 35a3e0e..3aeb539 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.28 1995/05/25 18:48:23 jkh Exp $
+ * $Id: disks.c,v 1.29 1995/05/28 20:28:09 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index ad91eb8..f01c5b5 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.33 1995/05/29 13:37:42 jkh Exp $
+ * $Id: dist.c,v 1.34 1995/05/29 14:38:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -268,7 +268,7 @@ distExtract(char *parent, Distribution *me)
 		msgConfirm("Cannot load information file for %s distribution!\nPlease verify that your media is valid and try again.", dist);
 		return FALSE;
 	    }
-   
+
 	    if (isDebug())
 		msgDebug("Looking for attribute `pieces'\n");
 	    tmp = attr_match(dist_attr, "pieces");
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index 2b77da0..636408a 100644
--- a/usr.sbin/sysinstall/dmenu.c
+++ b/usr.sbin/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: dmenu.c,v 1.9 1995/05/17 14:39:41 jkh Exp $
+ * $Id: dmenu.c,v 1.10 1995/05/24 17:49:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/dos.c b/usr.sbin/sysinstall/dos.c
index 9cf2cd3..5bd31f0 100644
--- a/usr.sbin/sysinstall/dos.c
+++ b/usr.sbin/sysinstall/dos.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: dos.c,v 1.3 1995/05/28 03:04:54 jkh Exp $
+ * $Id: dos.c,v 1.4 1995/05/29 11:01:11 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c
index 865a635..bf9265a 100644
--- a/usr.sbin/sysinstall/floppy.c
+++ b/usr.sbin/sysinstall/floppy.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: floppy.c,v 1.4 1995/05/29 00:50:01 jkh Exp $
+ * $Id: floppy.c,v 1.5 1995/05/29 11:01:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -87,14 +87,14 @@ getRootFloppy(void)
     while (floppyDev == NULL || fd == -1) {
 	Device **devs;
 	int cnt;
-		    
+
 	devs = deviceFind(NULL, DEVICE_TYPE_FLOPPY);
 	cnt = deviceCount(devs);
 	if (cnt == 1)
 	    floppyDev = devs[0];
 	else if (cnt > 1) {
 	    DMenu *menu;
-	    
+
 	    menu = deviceCreateMenu(&MenuMediaFloppy, DEVICE_TYPE_FLOPPY, floppyChoiceHook);
 	    menu->title = "Please insert the ROOT floppy";
 	    dmenuOpenSimple(menu);
@@ -125,7 +125,7 @@ mediaInitFloppy(Device *dev)
 	return FALSE;
     }
     msgConfirm("Please insert media into %s and press return", dev->description);
-    msgDebug("initFloppy:  mount floppy %s on /mnt\n", dev->devname); 
+    msgDebug("initFloppy:  mount floppy %s on /mnt\n", dev->devname);
     dosargs.fspec = dev->devname;
     if (mount(MOUNT_MSDOS, "/mnt", 0, (caddr_t)&dosargs) == -1) {
 	msgConfirm("Error mounting floppy %s (%s) on /mnt : %s\n", dev->name,
diff --git a/usr.sbin/sysinstall/ftp.c b/usr.sbin/sysinstall/ftp.c
index 59060b6..99e064f 100644
--- a/usr.sbin/sysinstall/ftp.c
+++ b/usr.sbin/sysinstall/ftp.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ftp.c,v 1.11 1995/05/27 06:19:59 phk Exp $
+ * $Id: ftp.c,v 1.12 1995/05/29 11:01:16 jkh Exp $
  *
  */
 
@@ -44,7 +44,7 @@ debug(FTP_t ftp, const char *fmt, ...)
 #endif
     (void) vsnprintf(p+strlen(p), sizeof p - strlen(p), fmt, ap);
     va_end(ap);
-    
+
 #ifdef STANDALONE_FTP
     write(ftp->fd_debug,p,strlen(p));
 #else
@@ -67,7 +67,7 @@ get_a_line(FTP_t ftp)
 {
     static char buf[BUFSIZ];
     int i,j;
-    
+
     for(i=0;i<BUFSIZ;) {
 	j = read(ftp->fd_ctrl,buf+i,1);
 	if (j != 1)
@@ -89,7 +89,7 @@ get_a_number(FTP_t ftp, char **q)
 {
     char *p;
     int i = -1,j;
-    
+
     while(1) {
 	p = get_a_line(ftp);
 	if (!(isdigit(p[0]) && isdigit(p[1]) && isdigit(p[2])))
@@ -97,8 +97,8 @@ get_a_number(FTP_t ftp, char **q)
 	if (i == -1 && p[3] == '-') {
 	    i = atoi(p);
 	    continue;
-	} 
-	if (p[3] != ' ' && p[3] != '\t') 
+	}
+	if (p[3] != ' ' && p[3] != '\t')
 	    continue;
 	j = atoi(p);
 	if (i == -1) {
@@ -127,12 +127,12 @@ cmd(FTP_t ftp, const char *fmt, ...)
 {
     char p[BUFSIZ];
     int i;
-    
+
     va_list ap;
     va_start(ap, fmt);
     (void) vsnprintf(p, sizeof p, fmt, ap);
     va_end(ap);
-    
+
     debug(ftp, "send <%s>\n",p);
     strcat(p,"\r\n");
     if (writes(ftp->fd_ctrl,p))
@@ -145,7 +145,7 @@ FTP_t
 FtpInit()
 {
     FTP_t ftp;
-    
+
     ftp = malloc(sizeof *ftp);
     if (!ftp)
 	return ftp;
@@ -173,18 +173,18 @@ FtpOpen(FTP_t ftp, char *host, char *user, char *passwd)
     int 			s;
     unsigned long 		temp;
     int i;
-    
+
     if (ftp->state != init)
 	return botch(ftp,"FtpOpen","init");
-    
+
     if (!user)
 	user = "ftp";
-    
+
     if (!passwd)
 	passwd = "??@??(FreeBSD:libftp)";	/* XXX */
-    
+
     debug(ftp, "FtpOpen(ftp, %s, %s, %s)\n", host, user, passwd);
-    
+
     temp = inet_addr(host);
     if (temp != INADDR_NONE)
     {
@@ -202,33 +202,33 @@ FtpOpen(FTP_t ftp, char *host, char *user, char *passwd)
 	ftp->addrtype = sin.sin_family = he->h_addrtype;
 	bcopy(he->h_addr, (char *)&sin.sin_addr, he->h_length);
     }
-    
+
     sin.sin_port = htons(21);
-    
+
     if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0)
     {
 	debug(ftp, "Socket open failed: %s (%i)\n", strerror(errno), errno);
 	return s;
     }
-    
+
     if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 	debug(ftp,"Connection failed: %s (%i)\n", strerror(errno), errno);
 	(void)close(s);
 	return -1;
     }
-    
+
     ftp->fd_ctrl = s;
-    
+
     debug(ftp, "open (%d)\n",get_a_number(ftp,0));
-    
+
     i = cmd(ftp,"USER %s",user);
-    if (i >= 300 && i < 400) 
+    if (i >= 300 && i < 400)
 	i = cmd(ftp,"PASS %s",passwd);
     if (i >= 299)
 	return -1;
     ftp->state = isopen;
     return 0;
-    
+
 #if 0
 fail:
     close(ftp->fd_ctrl);
@@ -240,9 +240,9 @@ fail:
 void
 FtpClose(FTP_t ftp)
 {
-    if (ftp->state != isopen) 
+    if (ftp->state != isopen)
 	botch(ftp,"FtpClose","open");
-    
+
     debug(ftp, "FtpClose(ftp)\n");
     writes(ftp->fd_ctrl,"QUIT\r\n");
     close(ftp->fd_ctrl); ftp->fd_ctrl = -1;
@@ -254,7 +254,7 @@ int
 FtpChdir(FTP_t ftp, char *dir)
 {
     int i;
-    if (ftp->state != isopen) 
+    if (ftp->state != isopen)
 	return botch(ftp,"FtpChdir","open");
     i = cmd(ftp,"CWD %s",dir);
     return 0;
@@ -267,9 +267,9 @@ FtpGet(FTP_t ftp, char *file)
     char *q;
     unsigned char addr[6];
     struct sockaddr_in sin;
-    
+
     debug(ftp, "FtpGet(ftp,%s)\n",file);
-    if (ftp->state != isopen) 
+    if (ftp->state != isopen)
 	return botch(ftp,"FtpGet","open");
     if(ftp->binary) {
 	i = cmd(ftp,"TYPE I");
@@ -294,13 +294,13 @@ FtpGet(FTP_t ftp, char *file)
 	    q++;
 	    addr[i] = strtol(q,&q,10);
 	}
-	
+
 	sin.sin_family = ftp->addrtype;
 	bcopy(addr, (char *)&sin.sin_addr, 4);
 	bcopy(addr+4, (char *)&sin.sin_port, 2);
 	debug(ftp, "Opening active socket to %s : %u\n", inet_ntoa(sin.sin_addr), htons(sin.sin_port));
 
-	if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0) 
+	if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0)
 	    return -1;
 
 	debug(ftp, "Connecting to %s:%u\n", inet_ntoa(sin.sin_addr), htons(sin.sin_port));
@@ -309,7 +309,7 @@ FtpGet(FTP_t ftp, char *file)
 	    debug(ftp, "connect: %s (%d)\n", strerror(errno), errno);
 	    return -1;
 	}
-	
+
 	i = cmd(ftp,"RETR %s",file);
 	if (i > 299)
 	    return -1;
@@ -324,7 +324,7 @@ FtpGet(FTP_t ftp, char *file)
 int
 FtpEOF(FTP_t ftp)
 {
-    if (ftp->state != xfer) 
+    if (ftp->state != xfer)
 	return botch(ftp,"FtpEOF","xfer");
     debug(ftp, "FtpEOF(ftp)\n");
     close(ftp->fd_xfer); ftp->fd_xfer = -1;
@@ -336,16 +336,16 @@ FtpEOF(FTP_t ftp)
 
 /* main.c */
 
-int 
+int
 main(int argc, char **argv)
 {
     FTP_t ftp;
     int i;
     char c;
-    
+
     ftp = FtpInit();
     if (!ftp) err(1,"FtpInit()");
-    
+
     FtpDebug(ftp,1);
     i = FtpOpen(ftp, "ref.tfs.com", "ftp", "phk-libftp@");
     if (i) err(1,"FtpOpen(%d)",i);
diff --git a/usr.sbin/sysinstall/globals.c b/usr.sbin/sysinstall/globals.c
index 891318d..a2ccbce 100644
--- a/usr.sbin/sysinstall/globals.c
+++ b/usr.sbin/sysinstall/globals.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: globals.c,v 1.7 1995/05/24 22:37:41 jkh Exp $
+ * $Id: globals.c,v 1.8 1995/05/25 18:48:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 478c7cd..48f75f1 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.68 1995/05/29 13:37:43 jkh Exp $
+ * $Id: install.c,v 1.69 1995/05/30 05:50:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 6e7f8e5..e4533734 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.29 1995/05/28 23:12:06 jkh Exp $
+ * $Id: label.c,v 1.30 1995/05/29 00:50:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -181,7 +181,7 @@ new_part(char *mpoint, Boolean newfs, u_long size)
 	    return ret;
     for (target = size; target; target--) {
 	for (divisor = 4096 ; divisor > 1023; divisor--) {
-	    if (!(target % divisor)) { 
+	    if (!(target % divisor)) {
 		sprintf(ret->newfs_cmd + strlen(ret->newfs_cmd), " -u %ld",divisor);
 		return ret;
 	    }
@@ -549,7 +549,7 @@ diskLabelEditor(char *str)
 		    safe_free(p);
 		} else {
 		    tmp->private = p;
-		}	
+		}
 		tmp->private_free = safe_free;
 		record_label_chunks();
 	    }
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c
index 7660258..649f1ad 100644
--- a/usr.sbin/sysinstall/main.c
+++ b/usr.sbin/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.10 1995/05/24 17:49:17 jkh Exp $
+ * $Id: main.c,v 1.11 1995/05/28 09:31:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 2d9ba18..03ec86b 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media.c,v 1.22 1995/05/29 11:01:27 jkh Exp $
+ * $Id: media.c,v 1.23 1995/05/30 05:13:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 3008e98..6811a91 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.39 1995/05/29 11:58:16 jkh Exp $
+ * $Id: menus.c,v 1.40 1995/05/30 05:13:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -206,7 +206,7 @@ To specify a URL not in this list, chose \"other\".",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.physics.usyd.edu.au/FreeBSD/2.0.5-ALPHA", 0, 0			},
       { "Finland", "nic.funet.fi",
 	DMENU_SET_VARIABLE,	"ftp=ftp://nic.funet.fi/pub/unix/FreeBSD/2.0.5-ALPHA", 0, 0			},
-      { "France", "ftp.ibp.fr", 
+      { "France", "ftp.ibp.fr",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.ibp.fr/pub/FreeBSD/2.0.5-ALPHA", 0, 0				},
       { "Germany", "ftp.uni-duisburg.de",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.uni-duisburg.de/pub/unix/FreeBSD/2.0.5-ALPHA", 0,		},
@@ -214,7 +214,7 @@ To specify a URL not in this list, chose \"other\".",
 	DMENU_SET_VARIABLE,	"ftp=ftp://orgchem.weizmann.ac.il/pub/FreeBSD-2.0.5-ALPHA", 0, 0		},
       { "Japan", "ftp.sra.co.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.sra.co.jp/pub/os/FreeBSD/distribution/2.0.5-ALPHA", 0, 0		},
-      { "Japan #2", "ftp.mei.co.jp", 
+      { "Japan #2", "ftp.mei.co.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/2.0.5-ALPHA", 0, 0		},
       { "Japan #3", "ftp.waseda.ac.jp",
 	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.waseda.ac.jp/pub/FreeBSD/2.0.5-ALPHA", 0, 0			},
@@ -430,7 +430,7 @@ When you're finished, select Cancel.",
     "XF86.hlp",
     { { "Basic", "Basic component menu (required)",
 	DMENU_SUBMENU, &MenuXF86SelectCore, 0, 0	},
-      { "Server", "X server menu", 
+      { "Server", "X server menu",
 	DMENU_SUBMENU, &MenuXF86SelectServer, 0, 0	},
       { "Fonts", "Font set menu",
 	DMENU_SUBMENU, &MenuXF86SelectFonts, 0, 0	},
diff --git a/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c
index f1b8066..49d68f9 100644
--- a/usr.sbin/sysinstall/misc.c
+++ b/usr.sbin/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $Id: misc.c,v 1.9 1995/05/25 01:22:19 jkh Exp $
+ * $Id: misc.c,v 1.10 1995/05/29 11:01:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -10,8 +10,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -234,7 +234,7 @@ Mount(char *mountp, void *dev)
 	return 1;
     }
     if (isDebug())
-	msgDebug("mount %s %s\n", device, mountpoint); 
+	msgDebug("mount %s %s\n", device, mountpoint);
     bzero(&ufsargs, sizeof(ufsargs));
     ufsargs.fspec = device;
     if (mount(MOUNT_UFS, mountpoint, 0, (caddr_t)&ufsargs) == -1) {
@@ -265,7 +265,7 @@ Mount_DOS(char *mountp, void *dev)
 	msgConfirm("Unable to make directory mountpoint for %s!", mountpoint);
 	return 1;
     }
-    msgDebug("mount %s %s\n", device, mountpoint); 
+    msgDebug("mount %s %s\n", device, mountpoint);
     ufsargs.fspec = device;
     if (mount(MOUNT_MSDOS, mountpoint, 0, (caddr_t)&ufsargs) == -1) {
 	msgConfirm("Error mounting %s on %s : %s\n", device, mountpoint, strerror(errno));
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 5930d14..0d3791c 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.26 1995/05/29 01:43:18 jkh Exp $
+ * $Id: msg.c,v 1.27 1995/05/29 11:01:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/network.c b/usr.sbin/sysinstall/network.c
index 2258162..950896e 100644
--- a/usr.sbin/sysinstall/network.c
+++ b/usr.sbin/sysinstall/network.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: network.c,v 1.4 1995/05/29 01:43:20 jkh Exp $
+ * $Id: network.c,v 1.5 1995/05/29 11:01:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c
index 044e959..f752aca 100644
--- a/usr.sbin/sysinstall/nfs.c
+++ b/usr.sbin/sysinstall/nfs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: nfs.c,v 1.2 1995/05/29 11:01:35 jkh Exp $
+ * $Id: nfs.c,v 1.3 1995/05/30 05:13:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 42da9c4..e18bcf8 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.39 1995/05/28 09:31:39 jkh Exp $
+ * $Id: sysinstall.h,v 1.40 1995/05/29 11:01:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -215,7 +215,7 @@ typedef struct _devPriv {
 extern int		DebugFD;		/* Where diagnostic output goes			*/
 extern Boolean		OnCDROM;		/* Are we running off of a CDROM?		*/
 extern Boolean		OnSerial;		/* Are we on a serial console?			*/
-extern Boolean		SystemWasInstalled;	/* Did we install it?				*/ 
+extern Boolean		SystemWasInstalled;	/* Did we install it?				*/
 extern Boolean		RunningAsInit;		/* Are we running stand-alone?			*/
 extern Boolean		DialogActive;		/* Is the dialog() stuff up?			*/
 extern Boolean		ColorDisplay;		/* Are we on a color display?			*/
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index 2e55385..8f68a42 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.41 1995/05/29 02:13:31 phk Exp $
+ * $Id: system.c,v 1.42 1995/05/29 11:01:39 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -217,7 +217,7 @@ systemHelpFile(char *file, char *buf)
 	    strcpy(oldfile, buf);
 	    return buf;
 	}
-    }	
+    }
     /* Fall back to normal imperialistic mode :-) */
     cp = "en_US.ISO8859-1";
     snprintf(buf, FILENAME_MAX, "%s/%s", cp, file);
diff --git a/usr.sbin/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c
index ac288b5..a60f48f 100644
--- a/usr.sbin/sysinstall/tape.c
+++ b/usr.sbin/sysinstall/tape.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: tape.c,v 1.3 1995/05/28 03:05:04 jkh Exp $
+ * $Id: tape.c,v 1.4 1995/05/29 11:01:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 22c3294..ea2cf3e 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.27 1995/05/29 11:01:41 jkh Exp $
+ * $Id: tcpip.c,v 1.28 1995/05/29 12:32:41 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -8,8 +8,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -206,7 +206,7 @@ tcpOpenDialog(Device *devp)
     /* Initialise vars from previous device values */
     if (devp->private) {
 	DevInfo *di = (DevInfo *)devp->private;
-	
+
 	strcpy(ipaddr, di->ipaddr);
 	strcpy(netmask, di->netmask);
 	strcpy(extras, di->extras);
@@ -265,7 +265,7 @@ tcpOpenDialog(Device *devp)
     last = obj;
     while (last->next)
 	last = last->next;
-    
+
     /* Find the first object in the list */
     first = obj;
     while (first->prev)
@@ -371,7 +371,7 @@ tcpOpenDialog(Device *devp)
 	default:
 	    beep();
 	}
-	
+
 	/* BODGE ALERT! */
 	if (((tmp = index(hostname, '.')) != NULL) && (strlen(domainname)==0)) {
 	    strncpy(domainname, tmp + 1, strlen(tmp + 1));
@@ -384,7 +384,7 @@ tcpOpenDialog(Device *devp)
     dialog_clear();
     refresh();
     use_helpfile(NULL);
-    
+
     /* We actually need to inform the rest of sysinstall about this
        data now - if the user hasn't selected cancel, save the stuff
        out to the environment via the variable_set layers */
diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c
index ef70a75..384e532 100644
--- a/usr.sbin/sysinstall/termcap.c
+++ b/usr.sbin/sysinstall/termcap.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 1994, Paul Richards.
- * 
+ *
  * All rights reserved.
- * 
+ *
  * This software may be used, modified, copied, distributed, and sold, in both
  * source and binary form provided that the above copyright and these terms
  * are retained, verbatim, as the first lines of this file.  Under no
diff --git a/usr.sbin/sysinstall/ufs.c b/usr.sbin/sysinstall/ufs.c
index 55a2701..9ad4a81 100644
--- a/usr.sbin/sysinstall/ufs.c
+++ b/usr.sbin/sysinstall/ufs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: ufs.c,v 1.2 1995/05/27 23:39:35 phk Exp $
+ * $Id: ufs.c,v 1.3 1995/05/29 11:01:42 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -15,8 +15,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c
index 4ff9499..d2b9799 100644
--- a/usr.sbin/sysinstall/variable.c
+++ b/usr.sbin/sysinstall/variable.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: variable.c,v 1.3 1995/05/26 20:45:20 jkh Exp $
+ * $Id: variable.c,v 1.4 1995/05/27 10:47:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -13,8 +13,8 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer, 
- *    verbatim and that no modifications are made prior to this 
+ *    notice, this list of conditions and the following disclaimer,
+ *    verbatim and that no modifications are made prior to this
  *    point in the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c
index a3f9285..81c2b0f 100644
--- a/usr.sbin/sysinstall/wizard.c
+++ b/usr.sbin/sysinstall/wizard.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: wizard.c,v 1.3 1995/05/17 14:40:00 jkh Exp $
+ * $Id: wizard.c,v 1.4 1995/05/20 10:33:14 jkh Exp $
  *
  */
 
@@ -86,10 +86,10 @@ Scan_Disk(Disk *d)
     char device[64];
     u_long l;
     int i,j,fd;
-    
+
     strcpy(device,"/dev/r");
     strcat(device,d->name);
-    
+
     fd = open(device,O_RDWR);
     if (fd < 0) {
 	msgWarn("open(%s) failed", device);
@@ -108,9 +108,9 @@ Scan_Disk(Disk *d)
 		printf(".%lu\nG: %lu.",l-1,l);
 		fflush(stdout);
 	    }
-	    i = j;	
+	    i = j;
 	}
-    } 
+    }
     close(fd);
 }
 
@@ -123,7 +123,7 @@ slice_wizard(Disk *d)
     char *p,*q=0;
     char **cp,*cmds[200];
     int ncmd,i;
-    
+
     sprintf(myprompt,"%s> ", d->name);
     while(1) {
 	printf("--==##==--\n");
@@ -158,41 +158,41 @@ slice_wizard(Disk *d)
 	    All_FreeBSD(d);
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"bios") && ncmd == 4) { 
+	if (!strcasecmp(*cmds,"bios") && ncmd == 4) {
 	    Set_Bios_Geom(d,
 			  strtol(cmds[1],0,0),
 			  strtol(cmds[2],0,0),
 			  strtol(cmds[3],0,0));
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"phys") && ncmd == 4) { 
+	if (!strcasecmp(*cmds,"phys") && ncmd == 4) {
 	    d = Set_Phys_Geom(d,
 			      strtol(cmds[1],0,0),
 			      strtol(cmds[2],0,0),
 			      strtol(cmds[3],0,0));
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"collapse")) { 
+	if (!strcasecmp(*cmds,"collapse")) {
 	    if (cmds[1])
 		while (Collapse_Chunk(d,
 				      (struct chunk *)strtol(cmds[1],0,0)))
 		    ;
-	    else		
+	    else
 		Collapse_Disk(d);
 	    continue;
-	}	
-	if (!strcasecmp(*cmds,"list")) { 
+	}
+	if (!strcasecmp(*cmds,"list")) {
 	    cp = Disk_Names();
 	    printf("Disks:");
 	    for(i=0;cp[i];i++) {
 		printf(" %s",cp[i]);
 		free(cp[i]);
-	    }		
+	    }
 	    free(cp);
 	    continue;
 	}
-	if (!strcasecmp(*cmds,"create") && ncmd == 6) { 
-	    
+	if (!strcasecmp(*cmds,"create") && ncmd == 6) {
+
 	    printf("Create=%d\n",
 		   Create_Chunk(d,
 				strtol(cmds[1],0,0),
@@ -260,6 +260,6 @@ slice_wizard(Disk *d)
 	for(i=0;chunk_n[i];i++)
 	    printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : "  ");
 	printf("\n");
-	
+
     }
 }