Remove trailing whitespace.

439 files changed, 2866 insertions, 2860 deletions

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 3dd59dde2d24..6b21829ae90b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -21,23 +21,23 @@ SUBDIR= ac accton adduser amd arp bootparamd chown chroot cron crunch ctm \
 .if   make(clean) || make(cleandir)
 SUBDIR+=apm apmconf bad144 cdplay config config.new fdformat fdwrite \
 	fdcontrol iostat kbdcontrol lptcontrol mixer ncrcontrol rtprio \
-	sgsc spkrtest vidcontrol 
+	sgsc spkrtest vidcontrol
 .elif ${MACHINE} == "hp300"
-SUBDIR+=config iostat 
+SUBDIR+=config iostat
 .elif ${MACHINE} == "i386"
 SUBDIR+=apm apmconf bad144 cdplay config fdformat fdwrite fdcontrol iostat \
 	kbdcontrol lptcontrol mixer ncrcontrol rtprio sgsc spkrtest \
 	vidcontrol
 .elif ${MACHINE} == "luna68k"
-SUBDIR+=config iostat 
+SUBDIR+=config iostat
 .elif ${MACHINE} == "mips"
-SUBDIR+=config iostat 
+SUBDIR+=config iostat
 .elif ${MACHINE} == "sparc"
-SUBDIR+=config.new eeprom 
+SUBDIR+=config.new eeprom
 .elif ${MACHINE} == "tahoe"
-SUBDIR+=config iostat 
+SUBDIR+=config iostat
 .elif ${MACHINE} == "vax"
-SUBDIR+=bad144 config iostat 
+SUBDIR+=bad144 config iostat
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/XNSrouted/af.c b/usr.sbin/XNSrouted/af.c
index 6c81b47fcad7..f6d59c8a544f 100644
--- a/usr.sbin/XNSrouted/af.c
+++ b/usr.sbin/XNSrouted/af.c
@@ -92,7 +92,7 @@ xnnet_netmatch(sxn1, sxn2)
 xnnet_portmatch(sns)
 	register struct sockaddr_ns *sns;
 {
-	
+
 	return (ntohs(sns->sns_addr.x_port) == IDPPORT_RIF );
 }
 
@@ -116,7 +116,7 @@ xnnet_output(flags, sns, size)
 		sns->sns_addr.x_port = htons(IDPPORT_RIF);
 #ifdef DEBUG
 	if(do_output || ntohs(msg->rip_cmd) == RIPCMD_REQUEST)
-#endif	
+#endif
 	/*
 	 * Kludge to allow us to get routes out to machines that
 	 * don't know their addresses yet; send to that address on
@@ -125,16 +125,16 @@ xnnet_output(flags, sns, size)
 	 if (ns_neteqnn(sns->sns_addr.x_net, ns_zeronet)) {
 	 	extern  struct interface *ifnet;
 	 	register struct interface *ifp;
-		
+
 		for (ifp = ifnet; ifp; ifp = ifp->int_next) {
-			sns->sns_addr.x_net = 
+			sns->sns_addr.x_net =
 				satons_addr(ifp->int_addr).x_net;
 			(void) sendto(s, msg, size, flags,
 			    (struct sockaddr *)sns, sizeof (*sns));
 		}
 		return;
 	}
-	
+
 	(void) sendto(s, msg, size, flags,
 	    (struct sockaddr *)sns, sizeof (*sns));
 }
@@ -149,7 +149,7 @@ xnnet_checkhost(sns)
 {
 	register struct interface *ifp = if_ifwithnet(sns);
 	/*
-	 * We want this route if there is no more than one 
+	 * We want this route if there is no more than one
 	 * point to point interface with this network.
 	 */
 	if (ifp == 0 || (ifp->int_flags & IFF_POINTOPOINT)==0) return (1);
diff --git a/usr.sbin/XNSrouted/if.c b/usr.sbin/XNSrouted/if.c
index 422f75753ed0..a06c7c15a21a 100644
--- a/usr.sbin/XNSrouted/if.c
+++ b/usr.sbin/XNSrouted/if.c
@@ -88,7 +88,7 @@ if_ifwithdstaddr(addr)
 }
 
 /*
- * Find the interface on the network 
+ * Find the interface on the network
  * of the specified address.
  */
 struct interface *
diff --git a/usr.sbin/XNSrouted/input.c b/usr.sbin/XNSrouted/input.c
index b64fca215233..14d352ffc085 100644
--- a/usr.sbin/XNSrouted/input.c
+++ b/usr.sbin/XNSrouted/input.c
@@ -49,14 +49,14 @@ union ns_net net;
 {
 	static struct sockaddr_ns sxn;
 	extern char ether_broadcast_addr[6];
-	
+
 	bzero(&sxn, sizeof (struct sockaddr_ns));
 	sxn.sns_family = AF_NS;
 	sxn.sns_len = sizeof (sxn);
 	sxn.sns_addr.x_net = net;
 	sxn.sns_addr.x_host = *(union ns_host *)ether_broadcast_addr;
 	return( (struct sockaddr *)&sxn);
-	
+
 }
 
 /*
@@ -72,13 +72,13 @@ rip_input(from, size)
 	int newsize;
 	struct afswitch *afp;
 
-	
+
 	ifp = 0;
 	TRACE_INPUT(ifp, from, size);
 	if (from->sa_family >= AF_MAX)
 		return;
 	afp = &afswitch[from->sa_family];
-	
+
 	size -= sizeof (u_short)	/* command */;
 	n = msg->rip_nets;
 
@@ -91,7 +91,7 @@ rip_input(from, size)
 				break;
 			size -= sizeof (struct netinfo);
 
-			/* 
+			/*
 			 * A single entry with rip_dst == DSTNETS_ALL and
 			 * metric ``infinity'' means ``all routes''.
 			 */
diff --git a/usr.sbin/XNSrouted/main.c b/usr.sbin/XNSrouted/main.c
index 601a0050d6f2..f350ae4e376b 100644
--- a/usr.sbin/XNSrouted/main.c
+++ b/usr.sbin/XNSrouted/main.c
@@ -60,7 +60,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/5/93";
 int	supplier = -1;		/* process should supply updates */
 extern int gateway;
 
-struct	rip *msg = (struct rip *) &packet[sizeof (struct idp)]; 
+struct	rip *msg = (struct rip *) &packet[sizeof (struct idp)];
 void	hup(), fkexit(), timer();
 
 main(argc, argv)
@@ -70,7 +70,7 @@ main(argc, argv)
 	int cc;
 	struct sockaddr from;
 	u_char retry;
-	
+
 	argv0 = argv;
 	argv++, argc--;
 	while (argc > 0 && **argv == '-') {
@@ -93,7 +93,7 @@ main(argc, argv)
 			tracepackets++;
 			argv++, argc--;
 			ftrace = stderr;
-			tracing = 1; 
+			tracing = 1;
 			continue;
 		}
 		if (strcmp(*argv, "-g") == 0) {
@@ -110,8 +110,8 @@ main(argc, argv)
 			"usage: xnsrouted [ -s ] [ -q ] [ -t ] [ -g ] [ -l ]\n");
 		exit(1);
 	}
-	
-	
+
+
 #ifndef DEBUG
 	if (!tracepackets)
 		daemon(0, 0);
@@ -161,11 +161,11 @@ main(argc, argv)
 	signal(SIGINT, hup);
 	signal(SIGEMT, fkexit);
 	timer();
-	
 
-	for (;;) 
+
+	for (;;)
 		process(s);
-	
+
 }
 
 process(fd)
@@ -185,7 +185,7 @@ process(fd)
 	    fprintf(ftrace,"rcv %d bytes on %s ", cc, xns_ntoa(&idp->idp_dna));
 	    fprintf(ftrace," from %s\n", xns_ntoa(&idp->idp_sna));
 	}
-	
+
 	if (noteremoterequests && !ns_neteqnn(idp->idp_sna.x_net, ns_zeronet)
 		&& !ns_neteq(idp->idp_sna, idp->idp_dna))
 	{
@@ -194,7 +194,7 @@ process(fd)
 		       xns_nettoa(idp->idp_dna.x_net),
 		       xns_nettoa(idp->idp_sna.x_net));
 	}
-			
+
 	/* We get the IDP header in front of the RIF packet*/
 	cc -= sizeof (struct idp);
 #define	mask(s)	(1<<((s)-1))
@@ -204,7 +204,7 @@ process(fd)
 }
 
 getsocket(type, proto, sns)
-	int type, proto; 
+	int type, proto;
 	struct sockaddr_ns *sns;
 {
 	int domain = sns->sns_family;
diff --git a/usr.sbin/XNSrouted/protocol.h b/usr.sbin/XNSrouted/protocol.h
index 72b0ddb0a05d..372340abb8ac 100644
--- a/usr.sbin/XNSrouted/protocol.h
+++ b/usr.sbin/XNSrouted/protocol.h
@@ -50,7 +50,7 @@ struct rip {
 	u_short	rip_cmd;		/* request/response */
 	struct netinfo rip_nets[1];	/* variable length */
 };
- 
+
 /*
  * Packet types.
  */
diff --git a/usr.sbin/XNSrouted/startup.c b/usr.sbin/XNSrouted/startup.c
index bcb5615ff6d9..595970671bda 100644
--- a/usr.sbin/XNSrouted/startup.c
+++ b/usr.sbin/XNSrouted/startup.c
@@ -180,10 +180,10 @@ ifinit()
 			}
 			ifs.int_dstaddr = *brdaddr;
 		}
-		/* 
-		 * already known to us? 
+		/*
+		 * already known to us?
 		 * what makes a POINTOPOINT if unique is its dst addr,
-		 * NOT its source address 
+		 * NOT its source address
 		 */
 		if ( ((ifs.int_flags & IFF_POINTOPOINT) &&
 			if_ifwithdstaddr(&ifs.int_dstaddr)) ||
@@ -243,7 +243,7 @@ addrouteforif(ifp)
 		int (*match)();
 		register struct interface *ifp2 = ifnet;
 		register struct interface *ifprev = ifnet;
-		
+
 		dst = &ifp->int_dstaddr;
 
 		/* Search for interfaces with the same net */
diff --git a/usr.sbin/XNSrouted/timer.c b/usr.sbin/XNSrouted/timer.c
index 32c2bff9dc56..dd91e6da4106 100644
--- a/usr.sbin/XNSrouted/timer.c
+++ b/usr.sbin/XNSrouted/timer.c
@@ -67,7 +67,7 @@ again:
 		for (; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {
 			/*
 			 * We don't advance time on a routing entry for
-			 * a passive gateway or that for our only interface. 
+			 * a passive gateway or that for our only interface.
 			 * The latter is excused because we don't act as
 			 * a routing information supplier and hence would
 			 * time it out.  This is fair as if it's down
diff --git a/usr.sbin/XNSrouted/tools/query.c b/usr.sbin/XNSrouted/tools/query.c
index 7deeac032011..71b37339b152 100644
--- a/usr.sbin/XNSrouted/tools/query.c
+++ b/usr.sbin/XNSrouted/tools/query.c
@@ -74,7 +74,7 @@ char *argv[];
 	struct sockaddr from;
 	int fromlen = sizeof(from);
 	struct timeval notime;
-	
+
 	if (argc < 2) {
 		printf("usage: query hosts...\n");
 		exit(1);
@@ -96,7 +96,7 @@ char *argv[];
 	bzero(&notime, sizeof(notime));
 	signal(SIGALRM, timeout);
 	alarm(WTIME);
-	while (!timedout || 
+	while (!timedout ||
 	    select(20, &bits, 0, 0, &notime) > 0) {
 		struct nspacket {
 			struct idp hdr;
@@ -191,7 +191,7 @@ timeout()
 	timedout = 1;
 }
 getsocket(type, proto)
-	int type, proto; 
+	int type, proto;
 {
 	struct sockaddr_ns *sns = &myaddr;
 	int domain = sns->sns_family;
diff --git a/usr.sbin/XNSrouted/trace.c b/usr.sbin/XNSrouted/trace.c
index 385bb9bf0b40..859d991365ae 100644
--- a/usr.sbin/XNSrouted/trace.c
+++ b/usr.sbin/XNSrouted/trace.c
@@ -305,9 +305,9 @@ struct ns_addr *addr;
 
     (void)sprintf(buf, "%s#%x:%x:%x:%x:%x:%x",
 	xns_nettoa(addr->x_net),
-	addr->x_host.c_host[0], addr->x_host.c_host[1], 
-	addr->x_host.c_host[2], addr->x_host.c_host[3], 
+	addr->x_host.c_host[0], addr->x_host.c_host[1],
+	addr->x_host.c_host[2], addr->x_host.c_host[3],
 	addr->x_host.c_host[4], addr->x_host.c_host[5]);
-	
+
     return(buf);
 }
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index bf98701a813f..030590940abf 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -1,20 +1,20 @@
 /*
  *      Copyright (c) 1994 Christopher G. Demetriou.
  *      @(#)Copyright (c) 1994, Simon J. Gerraty.
- *      
+ *
  *      This is free software.  It comes with NO WARRANTY.
- *      Permission to use, modify and distribute this source code 
+ *      Permission to use, modify and distribute this source code
  *      is granted subject to the following conditions.
- *      1/ that the above copyright notice and this notice 
- *      are preserved in all copies and that due credit be given 
- *      to the author.  
- *      2/ that any changes to this code are clearly commented 
- *      as such so that the author does not get blamed for bugs 
+ *      1/ that the above copyright notice and this notice
+ *      are preserved in all copies and that due credit be given
+ *      to the author.
+ *      2/ that any changes to this code are clearly commented
+ *      as such so that the author does not get blamed for bugs
  *      other than his own.
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ac.c,v 1.1 1994/09/26 22:12:27 davidg Exp $";
+static char rcsid[] = "$Id: ac.c,v 1.2 1994/11/14 20:26:52 ache Exp $";
 #endif
 
 #include <sys/types.h>
@@ -120,7 +120,7 @@ add_tty(name)
 	register char *rcp;
 
 	Flags |= AC_T;
-	
+
 	if ((tp = NEW(struct tty_list)) == NULL)
 		err(1, "malloc");
 	tp->len = 0;				/* full match */
@@ -149,7 +149,7 @@ do_tty(name)
 {
 	struct tty_list *tp;
 	int def_ret = 0;
-	
+
 	for (tp = Ttys; tp != NULL; tp = tp->next) {
 		if (tp->ret == 0)		/* specific don't */
 			def_ret = 1;		/* default do */
@@ -206,7 +206,7 @@ update_user(head, name, secs)
 	 */
 	if (Flags & AC_U)
 		return head;
-	
+
 	if ((up = NEW(struct user_list)) == NULL)
 		err(1, "malloc");
 	up->next = head;
@@ -275,11 +275,11 @@ main(argc, argv)
 		 */
 		if (access(_PATH_WTMP, 0) != 0 && errno == ENOENT)
 			return 0;
-		
+
 		fp = file(_PATH_WTMP);
 	}
 	ac(fp);
-	
+
 	return 0;
 }
 
@@ -324,7 +324,7 @@ show_today(users, logins, secs)
 
 	/* restore the missing second */
 	yesterday++;
-	
+
 	for (lp = logins; lp != NULL; lp = lp->next) {
 		secs = yesterday - lp->usr.ut_time;
 		Users = update_user(Users, lp->usr.ut_name, secs);
@@ -351,7 +351,7 @@ log_out(head, up)
 {
 	struct utmp_list *lp, *lp2, *tlp;
 	time_t secs;
-	
+
 	for (lp = head, lp2 = NULL; lp != NULL; )
 		if (*up->ut_line == '~' || strncmp(lp->usr.ut_line, up->ut_line,
 		    sizeof (up->ut_line)) == 0) {
@@ -408,13 +408,13 @@ log_in(head, up)
 	if (up->ut_host[0] == ':') {
 		/*
 		 * SunOS 4.0.2 does not treat ":0.0" as special but we
-		 * do. 
+		 * do.
 		 */
 		if (on_console(head))
 			return head;
 		/*
 		 * ok, no recorded login, so they were here when wtmp
-		 * started!  Adjust ut_time! 
+		 * started!  Adjust ut_time!
 		 */
 		up->ut_time = FirstTime;
 		/*
@@ -462,7 +462,7 @@ ac(fp)
 	struct tm *ltm;
 	time_t secs;
 	int day = -1;
-	
+
 	while (fread((char *)&usr, sizeof(usr), 1, fp) == 1) {
 		if (!FirstTime)
 			FirstTime = usr.ut_time;
@@ -515,7 +515,7 @@ ac(fp)
 	(void)fclose(fp);
 	usr.ut_time = time((time_t *)0);
 	(void)strcpy(usr.ut_line, "~");
-	
+
 	if (Flags & AC_D) {
 		ltm = localtime(&usr.ut_time);
 		if (day >= 0 && day != ltm->tm_yday) {
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index c65ef680afc4..5784dbf778f8 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -67,7 +67,7 @@ main(argc, argv)
 	argv += optind;
 
 	switch(argc) {
-	case 0: 
+	case 0:
 		if (acct(NULL)) {
 			(void)fprintf(stderr,
 			    "accton: %s\n", strerror(errno));
diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c
index 6dfdc1401bcb..73f39a828e0c 100644
--- a/usr.sbin/amd/amd/afs_ops.c
+++ b/usr.sbin/amd/amd/afs_ops.c
@@ -37,7 +37,7 @@
  *
  *	@(#)afs_ops.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: afs_ops.c,v 5.2.2.4 1992/05/31 16:36:36 jsp Exp $
+ * $Id: afs_ops.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $
  *
  */
 
@@ -136,7 +136,7 @@ char *opts;
 	/*
 	 * get fhandle of remote path for automount point
 	 */
-	
+
 	fhp = root_fh(dir);
 	if (!fhp) {
 		plog(XLOG_FATAL, "Can't find root file handle for %s", dir);
@@ -420,7 +420,7 @@ static void union_mounted(mf)
 mntfs *mf;
 {
 	int i;
-	
+
 	afs_mkcacheref(mf);
 
 	/*
diff --git a/usr.sbin/amd/amd/host_ops.c b/usr.sbin/amd/amd/host_ops.c
index ba0dedb43154..d290fb62377b 100644
--- a/usr.sbin/amd/amd/host_ops.c
+++ b/usr.sbin/amd/amd/host_ops.c
@@ -37,7 +37,7 @@
  *
  *	@(#)host_ops.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: host_ops.c,v 5.2.2.2 1992/05/31 16:36:08 jsp Exp $
+ * $Id: host_ops.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $
  *
  */
 
@@ -98,7 +98,7 @@ am_opts *fo;
 	if (!fo->opt_rfs)
 		fo->opt_rfs = "/";
 
-	
+
 	return (*nfs_ops.fs_match)(fo);
 }
 
diff --git a/usr.sbin/amd/amd/info_hes.c b/usr.sbin/amd/amd/info_hes.c
index 875cfe7257b8..513eda7a4622 100644
--- a/usr.sbin/amd/amd/info_hes.c
+++ b/usr.sbin/amd/amd/info_hes.c
@@ -37,7 +37,7 @@
  *
  *	@(#)info_hes.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: info_hes.c,v 5.2.2.1 1992/02/09 15:08:29 jsp beta $
+ * $Id: info_hes.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $
  *
  */
 
@@ -293,7 +293,7 @@ int anslen;
 				      sizeof(struct in_addr));
 				server.sin_family = AF_INET;
 				server.sin_port = htons(NAMESERVER_PORT);
-					
+
 				if (connect(s, &server,
 					    sizeof(struct sockaddr)) < 0) {
 					(void) close(s);
@@ -482,7 +482,7 @@ char *name;
 {
 	char *end_pos;
 	short targ_len, cur_len;
-	
+
 	targ_len = strlen(hs_domain);
 	cur_len = strlen(name);
 	if (cur_len <= targ_len)
diff --git a/usr.sbin/amd/amd/info_passwd.c b/usr.sbin/amd/amd/info_passwd.c
index 3123e38c8d96..694dd53294b1 100644
--- a/usr.sbin/amd/amd/info_passwd.c
+++ b/usr.sbin/amd/amd/info_passwd.c
@@ -37,7 +37,7 @@
  *
  *	@(#)info_passwd.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: info_passwd.c,v 5.2.2.1 1992/02/09 15:08:33 jsp beta $
+ * $Id: info_passwd.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $
  *
  */
 
@@ -113,7 +113,7 @@ time_t *tp;
 		*user++ = '\0';
 		/*
 		 * Find start of host "path".  If no / then Invalid...
-		 */ 
+		 */
 		p = strchr(dir+1, '/');
 		if (!p)
 			goto enoent;
diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c
index 6f2acb383907..21c8d3187eff 100644
--- a/usr.sbin/amd/amd/map.c
+++ b/usr.sbin/amd/amd/map.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: map.c,v 5.2.2.1 1992/02/09 15:08:36 jsp beta $
+ * $Id: map.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $
  */
 
 #ifndef lint
@@ -122,7 +122,7 @@ int nsize;
 	return 1;
 }
 
-	
+
 /*
  * The root of the mount tree.
  */
diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c
index 2155f19cfa4b..1004644eff0c 100644
--- a/usr.sbin/amd/amd/mapc.c
+++ b/usr.sbin/amd/amd/mapc.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: mapc.c,v 5.2.2.1 1992/02/09 15:08:38 jsp beta $
+ * $Id: mapc.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $
  */
 
 #ifndef lint
@@ -164,7 +164,7 @@ qelem map_list_head = { &map_list_head, &map_list_head };
 /*
  * Configuration
  */
- 
+
 /* ROOT MAP */
 static int root_init P((char*, time_t*));
 
diff --git a/usr.sbin/amd/amd/misc_rpc.c b/usr.sbin/amd/amd/misc_rpc.c
index 0fb10c8ad741..e982f786f092 100644
--- a/usr.sbin/amd/amd/misc_rpc.c
+++ b/usr.sbin/amd/amd/misc_rpc.c
@@ -37,7 +37,7 @@
  *
  *	@(#)misc_rpc.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: misc_rpc.c,v 5.2.2.1 1992/02/09 15:08:40 jsp beta $
+ * $Id: misc_rpc.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $
  *
  */
 
@@ -172,23 +172,23 @@ AUTH *auth;
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -245,23 +245,23 @@ xdr_pointer(xdrs,objpp,obj_size,xdr_obj)
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -273,41 +273,41 @@ struct rpc_errtab {
 };
 
 static struct rpc_errtab  rpc_errlist[] = {
-	{ RPC_SUCCESS, 
-		"RPC: Success" }, 
-	{ RPC_CANTENCODEARGS, 
+	{ RPC_SUCCESS,
+		"RPC: Success" },
+	{ RPC_CANTENCODEARGS,
 		"RPC: Can't encode arguments" },
-	{ RPC_CANTDECODERES, 
+	{ RPC_CANTDECODERES,
 		"RPC: Can't decode result" },
-	{ RPC_CANTSEND, 
+	{ RPC_CANTSEND,
 		"RPC: Unable to send" },
-	{ RPC_CANTRECV, 
+	{ RPC_CANTRECV,
 		"RPC: Unable to receive" },
-	{ RPC_TIMEDOUT, 
+	{ RPC_TIMEDOUT,
 		"RPC: Timed out" },
-	{ RPC_VERSMISMATCH, 
+	{ RPC_VERSMISMATCH,
 		"RPC: Incompatible versions of RPC" },
-	{ RPC_AUTHERROR, 
+	{ RPC_AUTHERROR,
 		"RPC: Authentication error" },
-	{ RPC_PROGUNAVAIL, 
+	{ RPC_PROGUNAVAIL,
 		"RPC: Program unavailable" },
-	{ RPC_PROGVERSMISMATCH, 
+	{ RPC_PROGVERSMISMATCH,
 		"RPC: Program/version mismatch" },
-	{ RPC_PROCUNAVAIL, 
+	{ RPC_PROCUNAVAIL,
 		"RPC: Procedure unavailable" },
-	{ RPC_CANTDECODEARGS, 
+	{ RPC_CANTDECODEARGS,
 		"RPC: Server can't decode arguments" },
-	{ RPC_SYSTEMERROR, 
+	{ RPC_SYSTEMERROR,
 		"RPC: Remote system error" },
-	{ RPC_UNKNOWNHOST, 
+	{ RPC_UNKNOWNHOST,
 		"RPC: Unknown host" },
 /*	{ RPC_UNKNOWNPROTO,
 		"RPC: Unknown protocol" },*/
-	{ RPC_PMAPFAILURE, 
+	{ RPC_PMAPFAILURE,
 		"RPC: Port mapper failure" },
-	{ RPC_PROGNOTREGISTERED, 
+	{ RPC_PROGNOTREGISTERED,
 		"RPC: Program not registered"},
-	{ RPC_FAILED, 
+	{ RPC_FAILED,
 		"RPC: Failed (unspecified error)"}
 };
 
diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index 15974b3018e1..1d92974bf2ff 100644
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: nfs_ops.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $
+ * $Id: nfs_ops.c,v 1.2 1995/02/13 01:56:22 wpaul Exp $
  */
 
 #ifndef lint
@@ -448,7 +448,7 @@ mntfs *mf;
 	if (!mf->mf_private) {
 		int error;
 		struct fhstatus fhs;
-	
+
 		char *colon = strchr(mf->mf_info, ':');
 		if (colon == 0)
 			return ENOENT;
diff --git a/usr.sbin/amd/amd/nfs_start.c b/usr.sbin/amd/amd/nfs_start.c
index 13d36a14ee8b..aad227d1ce63 100644
--- a/usr.sbin/amd/amd/nfs_start.c
+++ b/usr.sbin/amd/amd/nfs_start.c
@@ -37,7 +37,7 @@
  *
  *	@(#)nfs_start.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: nfs_start.c,v 5.2.2.1 1992/02/09 15:08:51 jsp beta $
+ * $Id: nfs_start.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $
  *
  */
 
@@ -282,7 +282,7 @@ static serv_state run_rpc(P_void)
 			if (readfds & (1 << fwd_sock)) {
 				readfds &= ~(1 << fwd_sock);
 #endif
-				--nsel;	
+				--nsel;
 				do {
 					fwd_reply();
 				} while (rpc_pending_now() > 0);
@@ -345,7 +345,7 @@ int ppid;
 		return 1;
 	}
 
-	if ((nfsxprt = svcudp_create(so)) == NULL || 
+	if ((nfsxprt = svcudp_create(so)) == NULL ||
 			(amqp = svcudp_create(so)) == NULL) {
 		plog(XLOG_FATAL, "cannot create rpc/udp service");
 		return 2;
diff --git a/usr.sbin/amd/amd/nfs_subr.c b/usr.sbin/amd/amd/nfs_subr.c
index 297cf9330617..def2db145265 100644
--- a/usr.sbin/amd/amd/nfs_subr.c
+++ b/usr.sbin/amd/amd/nfs_subr.c
@@ -37,7 +37,7 @@
  *
  *	@(#)nfs_subr.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: nfs_subr.c,v 5.2.2.1 1992/02/09 15:08:53 jsp beta $
+ * $Id: nfs_subr.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $
  *
  */
 
@@ -88,7 +88,7 @@ struct attrstat **attrpp;
 }
 
 /*ARGSUSED*/
-voidp 
+voidp
 nfsproc_null_2(argp, rqstp)
 voidp argp;
 struct svc_req *rqstp;
@@ -166,7 +166,7 @@ struct svc_req *rqstp;
 
 
 /*ARGSUSED*/
-voidp 
+voidp
 nfsproc_root_2(argp, rqstp)
 voidp argp;
 struct svc_req *rqstp;
@@ -283,7 +283,7 @@ struct svc_req *rqstp;
 
 
 /*ARGSUSED*/
-voidp 
+voidp
 nfsproc_writecache_2(argp, rqstp)
 voidp argp;
 struct svc_req *rqstp;
diff --git a/usr.sbin/amd/amd/restart.c b/usr.sbin/amd/amd/restart.c
index 52a9c87d54bf..421c2a1fe3ec 100644
--- a/usr.sbin/amd/amd/restart.c
+++ b/usr.sbin/amd/amd/restart.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: restart.c,v 5.2.2.1 1992/02/09 15:08:59 jsp beta $
+ * $Id: restart.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $
  *
  */
 
@@ -122,7 +122,7 @@ void restart()
 				mo.opt_rfs = strdup(cp+1);
 				*cp = ':';
 			} else if (fs_ops->ffserver == find_nfs_srvr) {
-				/* 
+				/*
 				 * Prototype 4.4 BSD used to end up here -
 				 * might as well keep the workaround for now
 				 */
diff --git a/usr.sbin/amd/amd/rpc_fwd.c b/usr.sbin/amd/amd/rpc_fwd.c
index aaf1e0ae6847..a2e49ef99406 100644
--- a/usr.sbin/amd/amd/rpc_fwd.c
+++ b/usr.sbin/amd/amd/rpc_fwd.c
@@ -37,7 +37,7 @@
  *
  *	@(#)rpc_fwd.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: rpc_fwd.c,v 5.2.2.1 1992/02/09 15:09:01 jsp beta $
+ * $Id: rpc_fwd.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $
  *
  */
 
@@ -136,7 +136,7 @@ static rpc_forward *fwd_alloc()
 
 	/*
 	 * Set the time to live field
-	 * Timeout in 43 seconds 
+	 * Timeout in 43 seconds
 	 */
 	p->rf_ttl = now + 43;
 
@@ -293,7 +293,7 @@ fwd_fun cb;
 	 * rest of "p" otherwise nasty things happen later...
 	 */
 #ifdef DEBUG
-	{ char dq[20]; 
+	{ char dq[20];
 	dlog("Sending packet id %#x to %s.%d", p->rf_xid, inet_dquad(dq, fwdto->sin_addr.s_addr), ntohs(fwdto->sin_port));
 	}
 #endif /* DEBUG */
diff --git a/usr.sbin/amd/amd/srvr_nfs.c b/usr.sbin/amd/amd/srvr_nfs.c
index 4987c95d44ff..a025640827d4 100644
--- a/usr.sbin/amd/amd/srvr_nfs.c
+++ b/usr.sbin/amd/amd/srvr_nfs.c
@@ -37,7 +37,7 @@
  *
  *	@(#)srvr_nfs.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: srvr_nfs.c,v 5.2.2.1 1992/02/09 15:09:06 jsp beta $
+ * $Id: srvr_nfs.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $
  *
  */
 
@@ -245,7 +245,7 @@ static void nfs_keepalive P((fserver*));
 static void recompute_portmap P((fserver *fs));
 static void recompute_portmap(fs)
 fserver *fs;
-{				
+{
 	int error;
 
 	if (nfs_auth)
@@ -357,7 +357,7 @@ int done;
 			if (np->np_mountd_inval)
 				recompute_portmap(fs);
 
-#ifdef DEBUG	
+#ifdef DEBUG
 			found_map++;
 #endif /* DEBUG */
 			break;
diff --git a/usr.sbin/amd/amd/umount_fs.c b/usr.sbin/amd/amd/umount_fs.c
index 2c3e73d81f41..66b413bddc4a 100644
--- a/usr.sbin/amd/amd/umount_fs.c
+++ b/usr.sbin/amd/amd/umount_fs.c
@@ -37,7 +37,7 @@
  *
  *	@(#)umount_fs.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: umount_fs.c,v 5.2.2.1 1992/02/09 15:09:10 jsp beta $
+ * $Id: umount_fs.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $
  *
  */
 
@@ -189,7 +189,7 @@ char *fs_name;
 		if (!error) {
 		        free_mntlist(mlist);
 			mp = mlist = read_mtab(fs_name);
-			
+
 			/*
 			 * Search the mount table looking for
 			 * the correct (ie last) matching entry
@@ -201,7 +201,7 @@ char *fs_name;
 					mp_save = mp;
 				mp = mp->mnext;
 			}
-			
+
 			if (mp_save) {
 				mnt_free(mp_save->mnt);
 				mp_save->mnt = 0;
diff --git a/usr.sbin/amd/amd/wire.c b/usr.sbin/amd/amd/wire.c
index ea6d3dac3f36..f1103e8f360c 100644
--- a/usr.sbin/amd/amd/wire.c
+++ b/usr.sbin/amd/amd/wire.c
@@ -37,7 +37,7 @@
  *
  *	@(#)wire.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: wire.c,v 5.2.2.1 1992/02/09 15:09:15 jsp beta $
+ * $Id: wire.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $
  *
  */
 
@@ -185,9 +185,9 @@ char *getwire()
 			 * Figure out the subnet's network address
 			 */
 			subnet = address & netmask;
-		  
+
 #ifdef IN_CLASSA
-			subnet = ntohl(subnet); 
+			subnet = ntohl(subnet);
 
 			if (IN_CLASSA(subnet)) {
 				mask = IN_CLASSA_NET;
@@ -243,7 +243,7 @@ char *getwire()
 
 out:
 	if (sk >= 0)
-		(void) close(sk); 
+		(void) close(sk);
 	if (netname)
 		return netname;
 	return strdup(NO_SUBNET);
diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c
index d3749bc7c28a..68363ed50761 100644
--- a/usr.sbin/amd/amq/amq.c
+++ b/usr.sbin/amd/amq/amq.c
@@ -37,7 +37,7 @@
  *
  *	@(#)amq.c	8.1 (Berkeley) 6/7/93
  *
- * $Id: amq.c,v 5.2.2.1 1992/02/09 15:09:16 jsp beta $
+ * $Id: amq.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $
  *
  */
 
@@ -54,7 +54,7 @@ char copyright[] = "\
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$Id: amq.c,v 5.2.2.1 1992/02/09 15:09:16 jsp beta $";
+static char rcsid[] = "$Id: amq.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $";
 static char sccsid[] = "@(#)amq.c	8.1 (Berkeley) 6/7/93";
 #endif /* not lint */
 
@@ -115,7 +115,7 @@ printf("%-*.*s %-*.*s %-*.*s %s\n\t%-5d %-7d %-6d %-7d %-7d %-6d %02d/%02d/%02d
 			*mt->mt_directory ? mt->mt_directory : "/",	/* XXX */
 			*twid, *twid,
 			mt->mt_type,
-			*mwid, *mwid, 
+			*mwid, *mwid,
 			mt->mt_mountinfo,
 			mt->mt_mountpoint,
 
@@ -370,7 +370,7 @@ char *argv[];
 		if (unmount_flag)
 			errs = 1;
 	}
-	
+
 	if (errs) {
 show_usage:
 		fprintf(stderr, "\
@@ -607,7 +607,7 @@ Usage: %s [-h host] [[-f] [-m] [-v] [-s]] | [[-u] directory ...]] |\n\
 }
 
 /*
- * udpresport creates a datagram socket and attempts to bind it to a 
+ * udpresport creates a datagram socket and attempts to bind it to a
  * secure port.
  * returns: The bound socket, or -1 to indicate an error.
  */
diff --git a/usr.sbin/amd/config/Makefile.irix3 b/usr.sbin/amd/config/Makefile.irix3
index 165e0e47485d..9f208bb205df 100644
--- a/usr.sbin/amd/config/Makefile.irix3
+++ b/usr.sbin/amd/config/Makefile.irix3
@@ -1,13 +1,13 @@
 #	@(#)Makefile.irix3	8.1 (Berkeley) 6/6/93
 #
-# $Id: Makefile.irix3,v 5.2 1992/05/31 16:40:22 jsp Exp $
+# $Id: Makefile.irix3,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $
 #
 # Extra Makefile definitions for IRIX
 #
 
 # For 3.3.x and earlier we might need to indicate the Sun and BSD include
 # paths.
- 
+
 DEBUG = #-g -DDEBUG
 CCOPTS = -I/usr/include/sun -I/usr/include/bsd
 RESOLV = -lrpcsvc -lsun -lbsd
diff --git a/usr.sbin/amd/config/mtab_file.c b/usr.sbin/amd/config/mtab_file.c
index 8101f71dc4bd..5a82cd7eb627 100644
--- a/usr.sbin/amd/config/mtab_file.c
+++ b/usr.sbin/amd/config/mtab_file.c
@@ -37,7 +37,7 @@
  *
  *	@(#)mtab_file.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: mtab_file.c,v 5.2.2.1 1992/02/09 15:10:42 jsp beta $
+ * $Id: mtab_file.c,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $
  *
  */
 
@@ -71,7 +71,7 @@ static FILE *mnt_file;
  * opening mtab may fail with ENFILE.  So, go to sleep
  * for a second and try again. (Yes - this has happened to me.)
  *
- * Note that this *may* block the automounter, oh well. 
+ * Note that this *may* block the automounter, oh well.
  * If we get to this state then things are badly wrong anyway...
  *
  * Give the system 10 seconds to recover but then give up.
diff --git a/usr.sbin/amd/config/os-convex.h b/usr.sbin/amd/config/os-convex.h
index ade6c4c0c61d..224655530171 100644
--- a/usr.sbin/amd/config/os-convex.h
+++ b/usr.sbin/amd/config/os-convex.h
@@ -37,7 +37,7 @@
  *
  *	@(#)os-convex.h	8.1 (Berkeley) 6/6/93
  *
- * $Id: os-convex.h,v 5.2.2.1 1992/02/09 15:10:16 jsp beta $
+ * $Id: os-convex.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $
  *
  * Convex C220, version 7.1 definitions for Amd (automounter)
  *         from Eitan Mizrotsky <eitan@shum.huji.ac.il>
@@ -48,33 +48,33 @@
  * Does the compiler grok void *
  */
 #undef	VOIDP
- 
+
 /*
  * Which version of the Sun RPC library we are using
  * This is the implementation release number, not
  * the protocol revision number.
  */
 #define	RPC_3
- 
+
 /*
  * Which version of the NFS interface are we using.
  * This is the implementation release number, not
  * the protocol revision number.
  */
 #define	NFS_3
- 
+
 /*
  * Byte ordering
  */
 #undef ARCH_ENDIAN
 #define	ARCH_ENDIAN	"big"
- 
+
 /*
  * Name of filesystem types
  */
 #define	MOUNT_TYPE_UFS	MOUNT_UFS
 #define MOUNT_TYPE_NFS	MOUNT_NFS
- 
- 
+
+
 #define strrchr rindex
 #define strchr  index
diff --git a/usr.sbin/amd/config/os-irix4.h b/usr.sbin/amd/config/os-irix4.h
index ee2f8cb29102..31cb6b175327 100644
--- a/usr.sbin/amd/config/os-irix4.h
+++ b/usr.sbin/amd/config/os-irix4.h
@@ -37,7 +37,7 @@
  *
  *	@(#)os-irix4.h	8.1 (Berkeley) 6/6/93
  *
- * $Id: os-irix4.h,v 5.2 1992/05/31 16:40:22 jsp Exp $
+ * $Id: os-irix4.h,v 1.1.1.1 1994/05/26 05:22:10 rgrimes Exp $
  *
  * IRIX 4.0.X definitions for Amd (automounter)
  * Contributed by Scott R. Presnell <srp@cgl.ucsf.edu>
@@ -144,7 +144,7 @@
 /*
  * Under Irix, mount type "auto" is probed by statfs() in df.  A statfs() of
  * a direct mount causes that mount to fire.  So change the  mount type in
- * /etc/mtab to "ignore" to stop that (this is what SGI does for their 
+ * /etc/mtab to "ignore" to stop that (this is what SGI does for their
  * automounter.  Use the old FASCIST define for this.
  */
 #define FASCIST_DF_COMMAND MNTTYPE_IGNORE
diff --git a/usr.sbin/amd/fsinfo/fsi_data.h b/usr.sbin/amd/fsinfo/fsi_data.h
index 3fc10c4549e6..5ee39c20d38b 100644
--- a/usr.sbin/amd/fsinfo/fsi_data.h
+++ b/usr.sbin/amd/fsinfo/fsi_data.h
@@ -37,7 +37,7 @@
  *
  *	@(#)fsi_data.h	8.1 (Berkeley) 6/6/93
  *
- * $Id: fsi_data.h,v 5.2.2.1 1992/02/09 15:09:53 jsp beta $
+ * $Id: fsi_data.h,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $
  *
  */
 
@@ -84,7 +84,7 @@ struct auto_tree {
 	char *t_defaults;
 	qelem *t_mount;
 };
-	
+
 /*
  * A host
  */
diff --git a/usr.sbin/amd/fsinfo/fsi_dict.c b/usr.sbin/amd/fsinfo/fsi_dict.c
index 5067e7993484..3aced3da7677 100644
--- a/usr.sbin/amd/fsinfo/fsi_dict.c
+++ b/usr.sbin/amd/fsinfo/fsi_dict.c
@@ -37,7 +37,7 @@
  *
  *	@(#)fsi_dict.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: fsi_dict.c,v 5.2.2.1 1992/02/09 15:09:43 jsp beta $
+ * $Id: fsi_dict.c,v 1.1.1.1 1994/05/26 05:22:17 rgrimes Exp $
  *
  */
 
@@ -51,7 +51,7 @@ static int dict_hash(k)
 char *k;
 {
 	unsigned int h;
-	
+
 	for (h = 0; *k; h += *k++)
 		;
 	return h % DICTHASH;
diff --git a/usr.sbin/amd/fsinfo/fsi_util.c b/usr.sbin/amd/fsinfo/fsi_util.c
index c0d8088e8db8..f6371ca0b09d 100644
--- a/usr.sbin/amd/fsinfo/fsi_util.c
+++ b/usr.sbin/amd/fsinfo/fsi_util.c
@@ -34,7 +34,7 @@
  *
  *	@(#)fsi_util.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: fsi_util.c,v 5.2.2.1 1992/02/09 15:09:39 jsp beta $
+ * $Id: fsi_util.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $
  *
  */
 
@@ -72,7 +72,7 @@ char *s, *s1, *s2, *s3, *s4;
 	fprintf(stderr, "%s:%d: ", l->i_file, l->i_line);
 	fprintf(stderr, s, s1, s2, s3, s4);
 	fputc('\n', stderr);
-	
+
 }
 
 void fatal(s, s1, s2, s3, s4)
diff --git a/usr.sbin/amd/fsinfo/wr_atab.c b/usr.sbin/amd/fsinfo/wr_atab.c
index 3e079652eac9..95e942644bb7 100644
--- a/usr.sbin/amd/fsinfo/wr_atab.c
+++ b/usr.sbin/amd/fsinfo/wr_atab.c
@@ -37,7 +37,7 @@
  *
  *	@(#)wr_atab.c	8.1 (Berkeley) 6/6/93
  *
- * $Id: wr_atab.c,v 5.2.2.1 1992/02/09 15:09:44 jsp beta $
+ * $Id: wr_atab.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $
  *
  */
 
@@ -261,7 +261,7 @@ char *def;
 			errors += pref_close(af);
 		}
 	}
-	
+
 	return errors;
 }
 
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 93ef8862362a..2781a610a830 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -5,9 +5,9 @@
  *
  * 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. Under no circumstances is the author 
- * responsible for the proper functioning of this software, nor does 
- * the author assume any responsibility for damages incurred with its 
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
  * use.
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 	int i, j, fd;
 	int sleep = 0, all_info = 1, batt_status = 0, batt_life = 0, ac_status = 0;
 	char *cmdname;
-	
+
 	main_argc = argc;
 	main_argv = argv;
 	if ((cmdname = strrchr(argv[0], '/')) != NULL) {
diff --git a/usr.sbin/apmconf/apmconf.c b/usr.sbin/apmconf/apmconf.c
index f3e1376f37a0..b5890330dfc7 100644
--- a/usr.sbin/apmconf/apmconf.c
+++ b/usr.sbin/apmconf/apmconf.c
@@ -5,9 +5,9 @@
  *
  * 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. Under no circumstances is the author 
- * responsible for the proper functioning of this software, nor does 
- * the author assume any responsibility for damages incurred with its 
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
  * use.
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
@@ -27,7 +27,7 @@ static int		haltcpu = 0, nothaltcpu = 0;
 static int		main_argc;
 static char		**main_argv;
 
-static void 
+static void
 parse_option(void)
 {
 	int	i, option;
@@ -120,8 +120,8 @@ nothaltcpu_apm(int dh)
 		exit(1);
 	}
 }
-int 
-main(int argc, char *argv[]) 
+int
+main(int argc, char *argv[])
 {
 	int		i, dh;
 	FILE		*fp;
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 2182dc843db3..44703ea12544 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -165,7 +165,7 @@ struct	{
 }	m_rtmsg;
 
 /*
- * Set an individual arp entry 
+ * Set an individual arp entry
  */
 set(argc, argv)
 	int argc;
@@ -279,7 +279,7 @@ get(host)
 }
 
 /*
- * Delete an arp entry 
+ * Delete an arp entry
  */
 delete(host, info)
 	char *host;
diff --git a/usr.sbin/bad144/bad144.c b/usr.sbin/bad144/bad144.c
index 97757fe69a42..f22324b2f52c 100644
--- a/usr.sbin/bad144/bad144.c
+++ b/usr.sbin/bad144/bad144.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)bad144.c	8.1 (Berkeley) 6/6/93";
  *
  * It is preferable to write the bad information with a standard formatter,
  * but this program will do.
- * 
+ *
  * RP06 sectors are marked as bad by inverting the format bit in the
  * header; on other drives the valid-sector bit is cleared.
  */
@@ -131,7 +131,7 @@ bad_scan(argc, argv, dp, f, bstart, bend)
 	}
 
 	/* scan the entire disk a sector at a time.  Because of all the
-	 * clustering in the kernel, we cannot scan a track at a time, 
+	 * clustering in the kernel, we cannot scan a track at a time,
 	 * If we do, we may have to read twice over the block to find
 	 * exactly which one failed, and it may not fail second time.
 	 */
@@ -162,7 +162,7 @@ bad_scan(argc, argv, dp, f, bstart, bend)
 	*argv = &nargv[0];
 	i = 0;
 	n = ioctl(f,DIOCSBADSCAN,&i);
-	if (n < 0) 
+	if (n < 0)
 		perror("Couldn't reset disk from \"badscan\" mode");
 }
 
@@ -238,7 +238,7 @@ usage:
 	f = open(name, !sflag && argc == 1? O_RDONLY : O_RDWR);
 	if (f < 0)
 		Perror(name);
-	if (read(f, label, sizeof(label)) < 0) 
+	if (read(f, label, sizeof(label)) < 0)
 		Perror("read");
 	for (dp = (struct disklabel *)(label + LABELOFFSET);
 	    dp < (struct disklabel *)
@@ -408,7 +408,7 @@ usage:
 	if (nflag == 0 && (dp->d_flags & D_BADSECT) == 0) {
 		dp->d_flags |= D_BADSECT;
 		dp->d_checksum = 0;
-		dp->d_checksum = dkcksum(dp);  
+		dp->d_checksum = dkcksum(dp);
 		if (ioctl(f, DIOCWDINFO, dp) < 0) {
 			fprintf(stderr,
 		"Can't write disklabel to enable bad sector handling: %s\n",
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index 3d7e3477f11f..dd85c805c6f1 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.3 1995/03/01 20:36:17 jkh Exp $
+#	$Id: Makefile,v 1.4 1995/03/02 21:59:51 wpaul Exp $
 
 PROG=	bootparamd
 SRCS=	bootparam_prot_xdr.c bootparam_prot_svc.c bootparamd.c main.c
@@ -18,7 +18,7 @@ bootparam_prot_xdr.c: bootparam_prot.h
 	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
 	rpcgen  -c -o bootparam_prot_xdr.c bootparam_prot.x
 
-bootparam_prot.h: 
+bootparam_prot.h:
 	rm -f bootparam_prot.x
 	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
 	rpcgen  -h -o bootparam_prot.h bootparam_prot.x
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index d91b0532a797..ed088be9e89f 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -1,11 +1,11 @@
 /*
 
-This code is not copyright, and is placed in the public domain. Feel free to 
+This code is not copyright, and is placed in the public domain. Feel free to
 use and modify. Please send modifications and/or suggestions + bug fixes to
 
         Klas Heggemann <klas@nada.kth.se>
 
-	$Id$
+	$Id: bootparamd.c,v 1.1.1.1 1995/02/26 23:40:52 wpaul Exp $
 
 */
 
@@ -31,34 +31,34 @@ static char askname[MAX_MACHINE_NAME];
 static char path[MAX_PATH_LEN];
 static char domain_name[MAX_MACHINE_NAME];
 
-  
+
 bp_whoami_res *
 bootparamproc_whoami_1(whoami)
 bp_whoami_arg *whoami;
 {
   long haddr;
   static bp_whoami_res res;
-  if (debug) 
-    fprintf(stderr,"whoami got question for %d.%d.%d.%d\n", 
+  if (debug)
+    fprintf(stderr,"whoami got question for %d.%d.%d.%d\n",
 	    255 &  whoami->client_address.bp_address_u.ip_addr.net,
 	    255 & whoami->client_address.bp_address_u.ip_addr.host,
 	    255 &  whoami->client_address.bp_address_u.ip_addr.lh,
 	    255 &  whoami->client_address.bp_address_u.ip_addr.impno);
-  if (dolog) 
-    syslog(LOG_NOTICE, "whoami got question for %d.%d.%d.%d\n", 
+  if (dolog)
+    syslog(LOG_NOTICE, "whoami got question for %d.%d.%d.%d\n",
 	    255 &  whoami->client_address.bp_address_u.ip_addr.net,
 	    255 & whoami->client_address.bp_address_u.ip_addr.host,
 	    255 &  whoami->client_address.bp_address_u.ip_addr.lh,
 	    255 &  whoami->client_address.bp_address_u.ip_addr.impno);
 
-  bcopy((char *)&whoami->client_address.bp_address_u.ip_addr, (char *)&haddr, 
+  bcopy((char *)&whoami->client_address.bp_address_u.ip_addr, (char *)&haddr,
 	sizeof(haddr));
   he = gethostbyaddr((char *)&haddr,sizeof(haddr),AF_INET);
   if ( ! he ) goto failed;
 
   if (debug) fprintf(stderr,"This is host %s\n", he->h_name);
   if (dolog) syslog(LOG_NOTICE,"This is host %s\n", he->h_name);
-  
+
   strcpy(askname, he->h_name);
   if (checkhost(askname, hostname) ) {
     res.client_name = hostname;
@@ -70,7 +70,7 @@ bp_whoami_arg *whoami;
       bcopy( &route_addr, &res.router_address.bp_address_u.ip_addr, 4);
     }
     if (debug) fprintf(stderr,
-		       "Returning %s   %s    %d.%d.%d.%d\n", 
+		       "Returning %s   %s    %d.%d.%d.%d\n",
 		       res.client_name,
 		       res.domain_name,
 		       255 &  res.router_address.bp_address_u.ip_addr.net,
@@ -78,7 +78,7 @@ bp_whoami_arg *whoami;
 		       255 &  res.router_address.bp_address_u.ip_addr.lh,
 		       255 & res.router_address.bp_address_u.ip_addr.impno);
     if (dolog) syslog(LOG_NOTICE,
-		       "Returning %s   %s    %d.%d.%d.%d\n", 
+		       "Returning %s   %s    %d.%d.%d.%d\n",
 		       res.client_name,
 		       res.domain_name,
 		       255 &  res.router_address.bp_address_u.ip_addr.net,
@@ -102,11 +102,11 @@ bp_getfile_arg *getfile;
   char *where, *index();
   static bp_getfile_res res;
 
-  if (debug) 
+  if (debug)
     fprintf(stderr,"getfile got question for \"%s\" and file \"%s\"\n",
 	    getfile->client_name, getfile->file_id);
 
-  if (dolog) 
+  if (dolog)
     syslog(LOG_NOTICE,"getfile got question for \"%s\" and file \"%s\"\n",
 	    getfile->client_name, getfile->file_id);
 
@@ -137,14 +137,14 @@ bp_getfile_arg *getfile;
 	bzero(&res.server_address.bp_address_u.ip_addr,4);
       } else goto failed;
     }
-    if (debug) 
+    if (debug)
       fprintf(stderr, "returning server:%s path:%s address: %d.%d.%d.%d\n",
 	     res.server_name, res.server_path,
 	     255 &  res.server_address.bp_address_u.ip_addr.net,
 	     255 & res.server_address.bp_address_u.ip_addr.host,
 	     255 &  res.server_address.bp_address_u.ip_addr.lh,
 	     255 & res.server_address.bp_address_u.ip_addr.impno);
-    if (dolog) 
+    if (dolog)
       syslog(LOG_NOTICE, "returning server:%s path:%s address: %d.%d.%d.%d\n",
 	     res.server_name, res.server_path,
 	     255 &  res.server_address.bp_address_u.ip_addr.net,
@@ -155,14 +155,14 @@ bp_getfile_arg *getfile;
   }
   failed:
   if (debug) fprintf(stderr, "getfile failed for %s\n", getfile->client_name);
-  if (dolog) syslog(LOG_NOTICE, 
+  if (dolog) syslog(LOG_NOTICE,
 		    "getfile failed for %s\n", getfile->client_name);
   return(NULL);
 }
 
 /*    getthefile return 1 and fills the buffer with the information
       of the file, e g "host:/export/root/client" if it can be found.
-      If the host is in the database, but the file is not, the buffer 
+      If the host is in the database, but the file is not, the buffer
       will be empty. (This makes it possible to give the special
       empty answer for the file "dump")   */
 
@@ -218,7 +218,7 @@ char *fileid, *buffer;
     }
     /* skip to next entry */
     if ( match ) break;
-    pch = ch = getc(bpf); 
+    pch = ch = getc(bpf);
     while ( ! ( ch == '\n' && pch != '\\') && ch != EOF) {
       pch = ch; ch = getc(bpf);
     }
@@ -238,8 +238,8 @@ char *fileid, *buffer;
 	    strcpy(buffer, where);                   /* found file */
 	    res = 1; break;
 	  }
-	} else {  
-	  while (isspace(ch) && ch != '\n') ch = getc(bpf); 
+	} else {
+	  while (isspace(ch) && ch != '\n') ch = getc(bpf);
 	                                             /* read to end of line */
 	  if ( ch == '\n' ) {                        /* didn't find it */
 	    res = -1; break;                         /* but host is there */
@@ -319,7 +319,7 @@ char *hostname;
       return(res);
     }
     /* skip to next entry */
-    pch = ch = getc(bpf); 
+    pch = ch = getc(bpf);
     while ( ! ( ch == '\n' && pch != '\\') && ch != EOF) {
       pch = ch; ch = getc(bpf);
     }
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index 70381c880168..1e3d30f4c835 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -1,12 +1,12 @@
 /*
 
-This code is not copyright, and is placed in the public domain. Feel free to 
+This code is not copyright, and is placed in the public domain. Feel free to
 use and modify. Please send modifications and/or suggestions + bug fixes to
 
         Klas Heggemann <klas@nada.kth.se>
 
 
-	$Id$
+	$Id: main.c,v 1.1.1.1 1995/02/26 23:40:52 wpaul Exp $
 
 */
 
@@ -73,7 +73,7 @@ char **argv;
 	    break;
 	  case 's':
 	    dolog = 1;
-#ifndef LOG_DAEMON 
+#ifndef LOG_DAEMON
 	    openlog(progname, 0 , 0);
 #else
 	    openlog(progname, 0 , LOG_DAEMON);
@@ -81,7 +81,7 @@ char **argv;
 #endif
 	    break;
 	  default:
-	    fprintf(stderr, 
+	    fprintf(stderr,
 		    "Usage: %s [-d ] [ -s ] [ -r router ] [ -f bootparmsfile ]\n");
 	    exit(1);
 	  }
@@ -117,7 +117,7 @@ char **argv;
 	    close(s);
 	  }
 	}
-	    
+
 
 	(void)pmap_unset(BOOTPARAMPROG, BOOTPARAMVERS);
 
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index 61ed1188005a..bc447616d6e6 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -1,9 +1,9 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.3 1995/03/01 20:36:20 jkh Exp $
+#	$Id: Makefile,v 1.4 1995/03/02 22:00:33 wpaul Exp $
 
 PROG=	callbootd
 SRCS=	bootparam_prot_xdr.c bootparam_prot_clnt.c callbootd.c
-NOMAN=	
+NOMAN=
 CFLAGS+= -I.
 CLEANFILES= bootparam_prot_clnt.c bootparam_prot_xdr.c  \
 	    bootparam_prot.h bootparam_prot.x
@@ -18,7 +18,7 @@ bootparam_prot_xdr.c: bootparam_prot.h
 	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
 	rpcgen  -c -o bootparam_prot_xdr.c bootparam_prot.x
 
-bootparam_prot.h: 
+bootparam_prot.h:
 	rm -f bootparam_prot.x
 	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
 	rpcgen  -h -o bootparam_prot.h bootparam_prot.x
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index 421bb3cfb06f..18cfac355e1f 100644
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -1,11 +1,11 @@
 /*
 
-This code is not copyright, and is placed in the public domain. Feel free to 
+This code is not copyright, and is placed in the public domain. Feel free to
 use and modify. Please send modifications and/or suggestions + bug fixes to
 
         Klas Heggemann <klas@nada.kth.se>
 
-	$Id: callbootd.c,v 1.1.1.1 1995/02/26 23:40:53 wpaul Exp $
+	$Id: callbootd.c,v 1.2 1995/03/26 03:15:39 wpaul Exp $
 */
 
 
@@ -59,13 +59,13 @@ char **argv;
 {
   int stat;
   char *server;
-  
+
   bp_whoami_arg whoami_arg;
   bp_whoami_res *whoami_res, stat_whoami_res;
   bp_getfile_arg getfile_arg;
   bp_getfile_res *getfile_res, stat_getfile_res;
 
-  
+
   long the_inet_addr;
   CLIENT *clnt;
   enum clnt_stat clnt_stat;
@@ -75,20 +75,20 @@ char **argv;
 
   stat_getfile_res.server_name = cln;
   stat_getfile_res.server_path = path;
-  
+
   if (argc < 3) {
     fprintf(stderr,
 	    "Usage: %s server procnum (IP-addr | host fileid)\n", argv[0]);
     exit(1);
-  } 
+  }
+
 
-    
   server = argv[1];
   if ( ! strcmp(server , "all") ) broadcast = 1;
-    
+
   if ( ! broadcast ) {
     clnt = clnt_create(server,BOOTPARAMPROG, BOOTPARAMVERS, "udp");
-  } 
+  }
 
   if ( clnt == NULL ) {
      fprintf (stderr, "%s: could not contact bootparam server on host %s\n",
@@ -115,9 +115,9 @@ char **argv;
       } else
 	exit(0);
      } else {
-       clnt_stat=clnt_broadcast(BOOTPARAMPROG, BOOTPARAMVERS, 
+       clnt_stat=clnt_broadcast(BOOTPARAMPROG, BOOTPARAMVERS,
 			       BOOTPARAMPROC_WHOAMI,
-			       xdr_bp_whoami_arg, &whoami_arg, 
+			       xdr_bp_whoami_arg, &whoami_arg,
 			       xdr_bp_whoami_res, &stat_whoami_res, eachres_whoami);
        exit(0);
      }
@@ -126,7 +126,7 @@ char **argv;
 
     getfile_arg.client_name = argv[2];
     getfile_arg.file_id = argv[3];
-    
+
     if (! broadcast ) {
       getfile_res = bootparamproc_getfile_1(&getfile_arg,clnt);
       printf("getfile returning:\n");
@@ -134,26 +134,26 @@ char **argv;
 	fprintf(stderr, "Bad answer returned from server %s\n", server);
 	exit(1);
       } else
-	exit(0);	
+	exit(0);
     } else {
-      clnt_stat=clnt_broadcast(BOOTPARAMPROG, BOOTPARAMVERS, 
+      clnt_stat=clnt_broadcast(BOOTPARAMPROG, BOOTPARAMVERS,
 			       BOOTPARAMPROC_GETFILE,
-			       xdr_bp_getfile_arg, &getfile_arg, 
+			       xdr_bp_getfile_arg, &getfile_arg,
 			       xdr_bp_getfile_res, &stat_getfile_res,eachres_getfile);
       exit(0);
     }
-      
+
   default:
-    
+
     fprintf(stderr,
 	    "Usage: %s server procnum (IP-addr | host fileid)\n", argv[0]);
     exit(1);
   }
-  
+
 }
 
 
-  
+
 int printwhoami(res)
 bp_whoami_res *res;
 {
@@ -171,7 +171,7 @@ bp_whoami_res *res;
 	return(1);
       }
     }
-	
+
 
 
 
@@ -181,7 +181,7 @@ bp_getfile_res *res;
 {
       if (res) {
 	printf("server_name:\t%s\nserver_address:\t%s\npath:\t%s\n",
-	       res->server_name, 
+	       res->server_name,
 	       inet_ntoa(res->server_address.bp_address_u.ip_addr),
 	       res->server_path);
 	return(0);
diff --git a/usr.sbin/cdplay/cdplay.c b/usr.sbin/cdplay/cdplay.c
index c37fc3cd3071..361ec1293a43 100644
--- a/usr.sbin/cdplay/cdplay.c
+++ b/usr.sbin/cdplay/cdplay.c
@@ -29,7 +29,7 @@ main (int argc, char **argv)
     int rc;
 
     switch (argc) {
-      case 2:  cdname = argv[1]; 
+      case 2:  cdname = argv[1];
           break;
       case 1:  if(cdname = getenv("CDPLAY"))
 	  /* Break if CDPLAY is set */
@@ -173,7 +173,7 @@ int
 setvol (int l, int r)
 {
     struct ioc_vol v;
-    
+
     v.vol[0] = l;
     v.vol[1] = r;
     v.vol[2] = 0;
@@ -181,10 +181,10 @@ setvol (int l, int r)
     return ioctl (cd_fd, CDIOCSETVOL, &v);
 }
 int
-getvol (int  *l, int *r) 
+getvol (int  *l, int *r)
 {
     struct ioc_vol v;
-    if (ioctl (cd_fd, CDIOCGETVOL, &v) < 0) 
+    if (ioctl (cd_fd, CDIOCGETVOL, &v) < 0)
 	return -1;
     *l = v.vol[0];
     *r = v.vol[1];
@@ -207,7 +207,7 @@ read_toc_entrys (int len)
     return ioctl (cd_fd, CDIOREADTOCENTRYS, (char *) &t);
 }
 int
-play_msf (int start_m, int start_s, int start_f, 
+play_msf (int start_m, int start_s, int start_f,
 	  int end_m, int end_s, int end_f)
 {
     struct ioc_play_msf a;
@@ -231,7 +231,7 @@ status (int *trk, int *min, int *sec, int *frame)
     s.address_format = CD_MSF_FORMAT;
     s.data_format = CD_CURRENT_POSITION;
     open_cd ();
-    if (ioctl (cd_fd, CDIOCREADSUBCHANNEL, (char *) &s) < 0) 
+    if (ioctl (cd_fd, CDIOCREADSUBCHANNEL, (char *) &s) < 0)
 	    return -1;
     *trk = s.data->what.position.track_number;
     *min = s.data->what.position.reladdr.msf.minute;
@@ -239,7 +239,7 @@ status (int *trk, int *min, int *sec, int *frame)
     *frame = s.data->what.position.reladdr.msf.frame;
     return s.data->header.audio_status;
 }
-    
+
 int
 input ()
 {
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index 5dd08677f7ed..a5ff99edb8c1 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -76,10 +76,10 @@ main(argc, argv)
 	FTSENT *p;
 	int Hflag, Lflag, Pflag, ch, fts_options, hflag, rval;
 	char *cp;
-	
+
 	myname = (cp = rindex(*argv, '/')) ? cp + 1 : *argv;
 	ischown = myname[2] == 'o';
-	
+
 	Hflag = Lflag = Pflag = hflag = 0;
 	while ((ch = getopt(argc, argv, "HLPRfh")) != EOF)
 		switch (ch) {
@@ -145,9 +145,9 @@ main(argc, argv)
 		if ((cp = strchr(*argv, ':')) != NULL) {
 			*cp++ = '\0';
 			a_gid(cp);
-		} 
+		}
 		a_uid(*argv);
-	} else 
+	} else
 		a_gid(*argv);
 
 	if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL)
@@ -259,7 +259,7 @@ chownerr(file)
 		}
 	}
 
-	if (!fflag) 
+	if (!fflag)
 		warn("%s", file);
 }
 
diff --git a/usr.sbin/config.new/files.c b/usr.sbin/config.new/files.c
index 40cddf8c1d8a..b45e1f600839 100644
--- a/usr.sbin/config.new/files.c
+++ b/usr.sbin/config.new/files.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/main.c b/usr.sbin/config.new/main.c
index 50b930e2ff8a..e4f87975ce2c 100644
--- a/usr.sbin/config.new/main.c
+++ b/usr.sbin/config.new/main.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/mkheaders.c b/usr.sbin/config.new/mkheaders.c
index f62724328d9f..9bcef0e589aa 100644
--- a/usr.sbin/config.new/mkheaders.c
+++ b/usr.sbin/config.new/mkheaders.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/mkioconf.c b/usr.sbin/config.new/mkioconf.c
index 8b1ebe0f9aaf..455b8c89a3c2 100644
--- a/usr.sbin/config.new/mkioconf.c
+++ b/usr.sbin/config.new/mkioconf.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/mkmakefile.c b/usr.sbin/config.new/mkmakefile.c
index 06971a556359..7f74cae88fa4 100644
--- a/usr.sbin/config.new/mkmakefile.c
+++ b/usr.sbin/config.new/mkmakefile.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/mkswap.c b/usr.sbin/config.new/mkswap.c
index afea2107d05c..350c8d92ffbe 100644
--- a/usr.sbin/config.new/mkswap.c
+++ b/usr.sbin/config.new/mkswap.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/pack.c b/usr.sbin/config.new/pack.c
index 8b525ec65814..471079406ce9 100644
--- a/usr.sbin/config.new/pack.c
+++ b/usr.sbin/config.new/pack.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/sem.c b/usr.sbin/config.new/sem.c
index aa60169f6ed2..bab30756b0f5 100644
--- a/usr.sbin/config.new/sem.c
+++ b/usr.sbin/config.new/sem.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -416,7 +416,7 @@ exclude(nv, name, what)
 	return (0);
 }
 
-/* 
+/*
  * Map things like "ra0b" => makedev(major("ra"), 0*8 + 'b'-'a').
  * Handle the case where the device number is given but there is no
  * corresponding name, and map NULL to the default.
diff --git a/usr.sbin/config.new/sem.h b/usr.sbin/config.new/sem.h
index 14d6c2b5d684..4f1d26e6f022 100644
--- a/usr.sbin/config.new/sem.h
+++ b/usr.sbin/config.new/sem.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.sbin/config.new/util.c b/usr.sbin/config.new/util.c
index 6ef37db006b6..12f955c6c5db 100644
--- a/usr.sbin/config.new/util.c
+++ b/usr.sbin/config.new/util.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -55,7 +55,7 @@
 static void nomem __P((void));
 static void vxerror __P((const char *, int, const char *, va_list));
 
-/* 
+/*
  * Malloc, with abort on error.
  */
 void *
@@ -69,7 +69,7 @@ emalloc(size)
 	return (p);
 }
 
-/* 
+/*
  * Realloc, with abort on error.
  */
 void *
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index d6efbf79b885..190e1a20a1ad 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -43,7 +43,7 @@
 #define	NODEV	((dev_t)-1)
 
 struct file_list {
-	struct	file_list *f_next;	
+	struct	file_list *f_next;
 	char	*f_fn;			/* the name */
 	u_char	f_type;			/* see below */
 	u_char	f_flags;		/* see below */
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 2e8ef485b6bb..d2b15355ba08 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -102,7 +102,7 @@ vax_ioconf()
 				continue;
 			}
 			if (dp->d_slave != UNKNOWN) {
-				printf("can't specify slave number for %s%d\n", 
+				printf("can't specify slave number for %s%d\n",
 				    dp->d_name, dp->d_unit);
 				continue;
 			}
@@ -865,7 +865,7 @@ scbus_devtab(fp, dev_idp)
 			 "%s%s which is not fixed at a single adapter.\n",
 			 mp->d_name, wnum(mp->d_unit));
 		}
-		
+
 		fprintf(fp, "{ ");
 		fprintf(fp, "\"%s\", ", dp->d_name);
 		id_put(fp, dp->d_unit, ", ");
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index fce7082f64c5..14e06f54ae84 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -234,7 +234,7 @@ read_files()
 	register struct opt *op;
 	char *wd, *this, *needs, *special, *depends, *clean;
 	char fname[32];
-	int nreqs, first = 1, configdep, isdup, std, filetype, 
+	int nreqs, first = 1, configdep, isdup, std, filetype,
 	    imp_rule, no_obj, before_depend;
 
 	ftab = 0;
@@ -253,7 +253,7 @@ next:
 	/*
 	 * filename	[ standard | optional ] [ config-dependent ]
 	 *	[ dev* | profiling-routine ] [ device-driver] [ no-obj ]
-	 *	[ compile-with "compile rule" [no-implicit-rule] ] 
+	 *	[ compile-with "compile rule" [no-implicit-rule] ]
 	 *      [ dependency "dependency-list"] [ before-depend ]
 	 *	[ clean "file-list"]
 	 */
@@ -624,15 +624,15 @@ do_rules(f)
 		else {
 			*cp = '\0';
 			if (och == 'o') {
-				fprintf(f, "%so:\n\t-cp $S/%so .\n\n", 
+				fprintf(f, "%so:\n\t-cp $S/%so .\n\n",
 					tail(np), np);
 				continue;
 			}
 			if (ftp->f_depends)
-				fprintf(f, "%so: $S/%s%c %s\n", tail(np), 
+				fprintf(f, "%so: $S/%s%c %s\n", tail(np),
 					np, och, ftp->f_depends);
 			else
-				fprintf(f, "%so: $S/%s%c\n", tail(np), 
+				fprintf(f, "%so: $S/%s%c\n", tail(np),
 					np, och);
 		}
 		tp = tail(np);
diff --git a/usr.sbin/config/mkswapconf.c b/usr.sbin/config/mkswapconf.c
index 94b5dce4d698..9722d9c1d55c 100644
--- a/usr.sbin/config/mkswapconf.c
+++ b/usr.sbin/config/mkswapconf.c
@@ -195,7 +195,7 @@ char *
 devtoname(dev)
 	dev_t dev;
 {
-	char buf[80]; 
+	char buf[80];
 	register struct devdescription *dp;
 	int part;
 	char partname[2];
@@ -242,7 +242,7 @@ initdevtable()
 		* Allow a comment		*
 		\*******************************/
 		if(linebuf[0] == '#') continue;
-	
+
 		if (sscanf(linebuf, "%s\t%d\n", buf, &maj) == 2) {
 			*dp = (struct devdescription *)malloc(sizeof (**dp));
 			(*dp)->dev_name = ns(buf);
diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h
index ebe45c7fb538..66de64bcbe56 100644
--- a/usr.sbin/cron/cron/cron.h
+++ b/usr.sbin/cron/cron/cron.h
@@ -17,7 +17,7 @@
 
 /* cron.h - header for vixie's cron
  *
- * $Id: cron.h,v 2.10 1994/01/15 20:43:43 vixie Exp $
+ * $Id: cron.h,v 1.1.1.1 1994/08/27 13:43:04 jkh Exp $
  *
  * vix 14nov88 [rest of log is in RCS]
  * vix 14jan87 [0 or 7 can be sunday; thanks, mwm@berkeley]
@@ -147,7 +147,7 @@
 
 typedef	struct _entry {
 	struct _entry	*next;
-	uid_t		uid;	
+	uid_t		uid;
 	gid_t		gid;
 	char		**envp;
 	char		*cmd;
diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c
index 8439db921495..f924d3444870 100644
--- a/usr.sbin/cron/cron/do_command.c
+++ b/usr.sbin/cron/cron/do_command.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$Id: do_command.c,v 1.3 1995/04/13 20:58:13 ache Exp $";
+static char rcsid[] = "$Id: do_command.c,v 1.4 1995/04/14 21:54:18 ache Exp $";
 #endif
 
 
@@ -114,7 +114,7 @@ child_process(e, u)
 	 */
 	pipe(stdin_pipe);	/* child's stdin */
 	pipe(stdout_pipe);	/* child's stdout */
-	
+
 	/* since we are a forked process, we can diddle the command string
 	 * we were passed -- nobody else is going to use it again, right?
 	 *
@@ -354,7 +354,7 @@ child_process(e, u)
 				 */
 				mailto = usernm;
 			}
-		
+
 			/* if we are supposed to be mailing, MAILTO will
 			 * be non-NULL.  only in this case should we set
 			 * up the mail command and subjects and stuff...
diff --git a/usr.sbin/cron/cron/user.c b/usr.sbin/cron/cron/user.c
index 9672dd5d7817..5f7ab137761d 100644
--- a/usr.sbin/cron/cron/user.c
+++ b/usr.sbin/cron/cron/user.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$Id: user.c,v 2.8 1994/01/15 20:43:43 vixie Exp $";
+static char rcsid[] = "$Id: user.c,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $";
 #endif
 
 /* vix 26jan87 [log is in RCS file]
@@ -67,7 +67,7 @@ load_user(crontab_fd, pw, name)
 	u->name = strdup(name);
 	u->crontab = NULL;
 
-	/* 
+	/*
 	 * init environment.  this will be copied/augmented for each entry.
 	 */
 	envp = env_init();
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index 09b3d546ffc6..09a1fdc090bd 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -1,7 +1,7 @@
 BINDIR?=	/usr/bin
 
 PROG=	crontab
-SRCS=	crontab.c 
+SRCS=	crontab.c
 CFLAGS+= -I${.CURDIR}/../cron
 MAN1=	crontab.1
 MAN5=	crontab.5
diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c
index 2caf78ca355f..0af18c32c1ea 100644
--- a/usr.sbin/cron/crontab/crontab.c
+++ b/usr.sbin/cron/crontab/crontab.c
@@ -17,7 +17,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$Id: crontab.c,v 1.4 1994/04/13 21:57:55 wollman Exp $";
+static char rcsid[] = "$Id: crontab.c,v 1.2 1994/12/21 11:06:08 ache Exp $";
 #endif
 
 /* crontab - install and manage per-user crontab files
@@ -129,7 +129,7 @@ main(argc, argv)
 	exit(0);
 	/*NOTREACHED*/
 }
-	
+
 
 static void
 parse_args(argc, argv)
@@ -480,7 +480,7 @@ edit_cmd() {
  done:
 	log_it(RealUser, Pid, "END EDIT", User);
 }
-	
+
 
 /* returns	0	on success
  *		-1	on syntax error
diff --git a/usr.sbin/cron/doc/Makefile.vixie b/usr.sbin/cron/doc/Makefile.vixie
index 3dab5ad16372..2ce05b94c47c 100644
--- a/usr.sbin/cron/doc/Makefile.vixie
+++ b/usr.sbin/cron/doc/Makefile.vixie
@@ -17,7 +17,7 @@
 
 # Makefile for vixie's cron
 #
-# $Id: Makefile,v 2.9 1994/01/15 20:43:43 vixie Exp $
+# $Id: Makefile.vixie,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $
 #
 # vix 03mar88 [moved to RCS, rest of log is in there]
 # vix 30mar87 [goodbye, time.c; hello, getopt]
@@ -35,7 +35,7 @@
 #	SHELL is for the 'augumented make' systems where 'make' imports
 #	SHELL from the environment and then uses it to run its commands.
 #	if your environment SHELL variable is /bin/csh, make goes real
-#	slow and sometimes does the wrong thing.  
+#	slow and sometimes does the wrong thing.
 #
 #	this package needs the 'bitstring macros' library, which is
 #	available from me or from the comp.sources.unix archive.  if you
diff --git a/usr.sbin/cron/lib/compat.c b/usr.sbin/cron/lib/compat.c
index 205c73163d8d..87eeacce1936 100644
--- a/usr.sbin/cron/lib/compat.c
+++ b/usr.sbin/cron/lib/compat.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$Id: compat.c,v 1.6 1994/01/15 20:43:43 vixie Exp $";
+static char rcsid[] = "$Id: compat.c,v 1.1.1.1 1994/08/27 13:43:02 jkh Exp $";
 #endif
 
 /* vix 30dec93 [broke this out of misc.c - see RCS log for history]
@@ -143,7 +143,7 @@ getdtablesize() {
  * Snarfage done by Jarkko Hietaniemi <Jarkko.Hietaniemi@hut.fi>
  * *) well, almost, had to K&R the function entry, HPUX "cc"
  * does not grok ANSI function prototypes */
- 
+
 /*
  * flock (fd, operation)
  *
@@ -199,13 +199,13 @@ flock(fd, operation)
 	case LOCK_UN:		/* unlock */
 		i = lockf (fd, F_ULOCK, 0);
 		break;
- 
+
 	default:		/* can't decipher operation */
 		i = -1;
 		errno = EINVAL;
 		break;
 	}
- 
+
 	return (i);
 }
 #endif /*NEED_FLOCK*/
diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c
index d57e2f7a1fb6..13d1644c0ef0 100644
--- a/usr.sbin/cron/lib/entry.c
+++ b/usr.sbin/cron/lib/entry.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$Id: entry.c,v 1.1.1.1 1994/08/27 13:43:02 jkh Exp $";
+static char rcsid[] = "$Id: entry.c,v 1.2 1995/04/12 19:04:26 ache Exp $";
 #endif
 
 /* vix 26jan87 [RCS'd; rest of log is in RCS file]
@@ -271,7 +271,7 @@ load_entry(file, error_func, pw, envp)
 	 * too bad we don't know in advance how long it will be, since we
 	 * need to malloc a string for it... so, we limit it to MAX_COMMAND.
 	 * XXX - should use realloc().
-	 */ 
+	 */
 	ch = get_string(cmd, MAX_COMMAND, file, "\n");
 
 	/* a file without a \n before the EOF is rude, so we'll complain...
@@ -321,7 +321,7 @@ get_list(bits, low, high, names, ch, file)
 
 	/* list = range {"," range}
 	 */
-	
+
 	/* clear the bit string, since the default is 'off'.
 	 */
 	bit_nclear(bits, 0, (high-low+1));
diff --git a/usr.sbin/cron/lib/misc.c b/usr.sbin/cron/lib/misc.c
index 3d2469b6523a..b6313b8b52b4 100644
--- a/usr.sbin/cron/lib/misc.c
+++ b/usr.sbin/cron/lib/misc.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$Id: misc.c,v 1.1.1.1 1994/08/27 13:43:02 jkh Exp $";
+static char rcsid[] = "$Id: misc.c,v 1.2 1995/04/29 13:25:13 ache Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the rest of the log]
@@ -639,7 +639,7 @@ arpadate(clock)
 	time_t t = clock ?*clock :time(0L);
 	struct tm *tm = localtime(&t);
 	static char ret[30];	/* zone name might be >3 chars */
-	
+
 	(void) sprintf(ret, "%s, %2d %s %2d %02d:%02d:%02d %s",
 		       DowNames[tm->tm_wday],
 		       tm->tm_mday,
diff --git a/usr.sbin/crunch/crunchgen/crunched_main.c b/usr.sbin/crunch/crunchgen/crunched_main.c
index 662b87c9c45a..7cf1c99356fb 100644
--- a/usr.sbin/crunch/crunchgen/crunched_main.c
+++ b/usr.sbin/crunch/crunchgen/crunched_main.c
@@ -24,7 +24,7 @@
  *			   University of Maryland at College Park
  */
 /*
- * crunched_main.c - main program for crunched binaries, it branches to a 
+ * crunched_main.c - main program for crunched binaries, it branches to a
  * 	particular subprogram based on the value of argv[0].  Also included
  *	is a little program invoked when the crunched binary is called via
  *	its EXECNAME.  This one prints out the list of compiled-in binaries,
@@ -84,7 +84,7 @@ int crunched_main(int argc, char **argv)
     struct stub *ep;
     int columns, len;
 
-    if(argc <= 1) 
+    if(argc <= 1)
 	crunched_usage();
 
     return main(--argc, ++argv);
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index 2ed0e2b73c29..4ef40fa9e173 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -28,7 +28,7 @@
  * crunchgen.c
  *
  * Generates a Makefile and main C file for a crunched executable,
- * from specs given in a .conf file.  
+ * from specs given in a .conf file.
  */
 #include <stdlib.h>
 #include <unistd.h>
@@ -98,7 +98,7 @@ int is_nonempty_file(char *pathname);
 
 /* helper routines for main() */
 
-void usage(void);			
+void usage(void);
 void parse_conf_file(void);
 void gen_outputs(void);
 
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
     verbose = 1;
     readcache = 1;
     *outmkname = *outcfname = *execfname = '\0';
-    
+
     if(argc > 0) pname = argv[0];
 
     while((optc = getopt(argc, argv, "lm:c:e:fq")) != -1) {
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
 
     if(argc != 1) usage();
 
-    /* 
+    /*
      * generate filenames
      */
 
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
 
 void usage(void)
 {
-    fprintf(stderr, 
+    fprintf(stderr,
 	"%s [-fq] [-m <makefile>] [-c <c file>] [-e <exec file>] <conffile>\n",
 	    pname);
     exit(1);
@@ -187,7 +187,7 @@ void usage(void)
 /* helper routines for parse_conf_file */
 
 void parse_one_file(char *filename);
-void parse_line(char *line, int *fc, char **fv, int nf); 
+void parse_line(char *line, int *fc, char **fv, int nf);
 void add_srcdirs(int argc, char **argv);
 void add_progs(int argc, char **argv);
 void add_link(int argc, char **argv);
@@ -247,7 +247,7 @@ void parse_one_file(char *filename)
 	    continue;
 	}
 	if(fieldc < 2) {
-	    fprintf(stderr, 
+	    fprintf(stderr,
 		    "%s:%d: %s command needs at least 1 argument, skipping.\n",
 		    curfilename, linenum, fieldv[0]);
 	    goterror = 1;
@@ -291,7 +291,7 @@ void add_srcdirs(int argc, char **argv)
 	if(is_dir(argv[i]))
 	    add_string(&srcdirs, argv[i]);
 	else {
-	    fprintf(stderr, "%s:%d: `%s' is not a directory, skipping it.\n", 
+	    fprintf(stderr, "%s:%d: `%s' is not a directory, skipping it.\n",
 		    curfilename, linenum, argv[i]);
 	    goterror = 1;
 	}
@@ -319,7 +319,7 @@ void add_prog(char *progname)
 
     p2 = malloc(sizeof(prog_t));
     if(p2) p2->name = strdup(progname);
-    if(!p2 || !p2->name) 
+    if(!p2 || !p2->name)
 	out_of_memory();
 
     p2->next = NULL;
@@ -340,7 +340,7 @@ void add_link(int argc, char **argv)
     prog_t *p = find_prog(argv[1]);
 
     if(p == NULL) {
-	fprintf(stderr, 
+	fprintf(stderr,
 		"%s:%d: no prog %s previously declared, skipping link.\n",
 		curfilename, linenum, argv[1]);
 	goterror = 1;
@@ -370,7 +370,7 @@ void add_special(int argc, char **argv)
 
     if(p == NULL) {
 	if(reading_cache) return;
-	fprintf(stderr, 
+	fprintf(stderr,
 		"%s:%d: no prog %s previously declared, skipping special.\n",
 		curfilename, linenum, argv[1]);
 	goterror = 1;
@@ -411,7 +411,7 @@ void add_special(int argc, char **argv)
 
 
  argcount:
-    fprintf(stderr, 
+    fprintf(stderr,
 	    "%s:%d: too %s arguments, expected \"special %s %s <string>\".\n",
 	    curfilename, linenum, argc < 4? "few" : "many", argv[1], argv[2]);
     goterror = 1;
@@ -463,7 +463,7 @@ void gen_outputs(void)
     gen_output_cfile();
     gen_output_makefile();
     status("");
-    fprintf(stderr, 
+    fprintf(stderr,
 	    "Run \"make -f %s objs exe\" to build crunched binary.\n",
 	    outmkname);
 }
@@ -478,7 +478,7 @@ void fillin_program(prog_t *p)
     sprintf(line, "filling in parms for %s", p->name);
     status(line);
 
-    if(!p->ident) 
+    if(!p->ident)
 	p->ident = genident(p->name);
     if(!p->srcdir) {
 	srcparent = dir_search(p->name);
@@ -509,11 +509,11 @@ void fillin_program(prog_t *p)
 	fprintf(stderr, "%s: %s: warning: could not find source directory.\n",
 		infilename, p->name);
     if(!p->objs && verbose)
-	fprintf(stderr, "%s: %s: warning: could not find any .o files.\n", 
+	fprintf(stderr, "%s: %s: warning: could not find any .o files.\n",
 		infilename, p->name);
 
     if(!p->objpaths) {
-	fprintf(stderr, 
+	fprintf(stderr,
 		"%s: %s: error: no objpaths specified or calculated.\n",
 		infilename, p->name);
 	p->goterror = goterror = 1;
@@ -533,7 +533,7 @@ void fillin_program_objs(prog_t *p, char *path)
 	goterror = 1;
 	return;
     }
-	
+
     fprintf(f, ".include \"%s\"\n", path);
     fprintf(f, ".if defined(PROG) && !defined(OBJS)\n");
     fprintf(f, "OBJS=${PROG}.o\n");
@@ -551,7 +551,7 @@ void fillin_program_objs(prog_t *p, char *path)
     while(fgets(line, MAXLINELEN, f)) {
 	if(strncmp(line, "OBJS= ", 6)) {
 	    fprintf(stderr, "make error: %s", line);
-	    goterror = 1;	
+	    goterror = 1;
 	    continue;
 	}
 	cp = line + 6;
@@ -575,8 +575,8 @@ void remove_error_progs(void)
 {
     prog_t *p1, *p2;
 
-    p1 = NULL; p2 = progs; 
-    while(p2 != NULL) { 
+    p1 = NULL; p2 = progs;
+    while(p2 != NULL) {
 	if(!p2->goterror)
 	    p1 = p2, p2 = p2->next;
 	else {
@@ -644,7 +644,7 @@ void gen_output_makefile(void)
     top_makefile_rules(outmk);
 
     for(p = progs; p != NULL; p = p->next)
-	prog_makefile_rules(outmk, p); 
+	prog_makefile_rules(outmk, p);
 
     fprintf(outmk, "\n# ========\n");
     fclose(outmk);
@@ -668,7 +668,7 @@ void gen_output_cfile(void)
 	return;
     }
 
-    fprintf(outcf, 
+    fprintf(outcf,
 	  "/* %s - generated from %s by crunchgen %s */\n",
 	    outcfname, infilename, CRUNCH_VERSION);
 
@@ -687,7 +687,7 @@ void gen_output_cfile(void)
 	    fprintf(outcf, "\t{ \"%s\", _crunched_%s_stub },\n",
 		    s->str, p->ident);
     }
-    
+
     fprintf(outcf, "\t{ EXECNAME, crunched_main },\n");
     fprintf(outcf, "\t{ NULL, NULL }\n};\n");
     fclose(outcf);
@@ -745,7 +745,7 @@ void top_makefile_rules(FILE *outmk)
 	fprintf(outmk, " %s_make", p->ident);
     fprintf(outmk, "\n\n");
 
-    fprintf(outmk, "%s: %s.o $(CRUNCHED_OBJS)\n", 
+    fprintf(outmk, "%s: %s.o $(CRUNCHED_OBJS)\n",
 	    execfname, execfname);
     fprintf(outmk, "\t$(CC) -static -o %s %s.o $(CRUNCHED_OBJS) $(LIBS)\n",
 	    execfname, execfname);
@@ -766,11 +766,11 @@ void prog_makefile_rules(FILE *outmk, prog_t *p)
 	fprintf(outmk, "%s_OBJS=", p->ident);
 	output_strlst(outmk, p->objs);
 	fprintf(outmk, "%s_make:\n", p->ident);
-	fprintf(outmk, "\t(cd $(%s_SRCDIR); make $(%s_OBJS))\n\n", 
+	fprintf(outmk, "\t(cd $(%s_SRCDIR); make $(%s_OBJS))\n\n",
 		p->ident, p->ident);
     }
     else
-	fprintf(outmk, "%s_make:\n\t@echo \"** cannot make objs for %s\"\n\n", 
+	fprintf(outmk, "%s_make:\n\t@echo \"** cannot make objs for %s\"\n\n",
 		p->ident, p->name);
 
     fprintf(outmk,   "%s_OBJPATHS=", p->ident);
@@ -783,9 +783,9 @@ void prog_makefile_rules(FILE *outmk, prog_t *p)
 	    p->ident, p->name);
     fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)\n",
 	    p->name, p->name, p->ident);
-    fprintf(outmk, "\tld -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)\n", 
+    fprintf(outmk, "\tld -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)\n",
 	    p->name, p->name, p->ident);
-    fprintf(outmk, "\tcrunchide -k __crunched_%s_stub %s.lo\n", 
+    fprintf(outmk, "\tcrunchide -k __crunched_%s_stub %s.lo\n",
 	    p->ident, p->name);
 }
 
diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c
index ae54da08cf58..e35560a1bddb 100644
--- a/usr.sbin/crunch/crunchide/crunchide.c
+++ b/usr.sbin/crunch/crunchide/crunchide.c
@@ -55,7 +55,7 @@
  *      - arrange that all the BSS segments start at the same address, so
  *	  that the final crunched binary BSS size is the max of all the
  *	  component programs' BSS sizes, rather than their sum.
- */ 
+ */
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index c39d0bc6f623..05ab0ccefa9f 100644
--- a/usr.sbin/ctm/ctm/ctm.c
+++ b/usr.sbin/ctm/ctm/ctm.c
@@ -6,15 +6,15 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm.c,v 1.9 1995/03/19 13:42:54 joerg Exp $
+ * $Id: ctm.c,v 1.10 1995/03/26 20:09:50 phk Exp $
  *
- * This is the client program of 'CTM'.  It will apply a CTM-patch to a 
+ * This is the client program of 'CTM'.  It will apply a CTM-patch to a
  * collection of files.
  *
  * Options we'd like to see:
  *
  * -a 			Attempt best effort.
- * -b <dir>		Base-dir	
+ * -b <dir>		Base-dir
  * -B <file>		Backup to tar-file.
  * -d <int>		Debug TBD.
  * -m <mail-addr>	Email me instead.
@@ -40,7 +40,7 @@
 extern int Proc(char *, unsigned applied);
 
 int
-main(int argc, char **argv) 
+main(int argc, char **argv)
 {
     int stat=0;
     int c;
@@ -48,12 +48,12 @@ main(int argc, char **argv)
     extern char * optarg;
     FILE *statfile;
     unsigned applied = 0;
-    
+
     Verbose = 1;
     Paranoid = 1;
     setbuf(stderr,0);
     setbuf(stdout,0);
-    
+
     while((c=getopt(argc,argv,"ab:B:cd:Fm:pPqr:R:T:Vv")) != -1) {
 	switch (c) {
 	    case 'c': CheckIt++;	break; /* Only check it */
@@ -91,7 +91,7 @@ main(int argc, char **argv)
 	fscanf(statfile, "%*s %u", &applied);
 	fclose(statfile);
     }
-    
+
     if(!argc)
 	stat |= Proc("-", applied);
 
diff --git a/usr.sbin/ctm/ctm/ctm.h b/usr.sbin/ctm/ctm/ctm.h
index eb4b4ba128f6..a444f983ec31 100644
--- a/usr.sbin/ctm/ctm/ctm.h
+++ b/usr.sbin/ctm/ctm/ctm.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm.h,v 1.5 1994/10/24 20:09:21 phk Exp $
+ * $Id: ctm.h,v 1.6 1995/03/04 20:36:45 phk Exp $
  *
  */
 
@@ -66,7 +66,7 @@ EXTERN u_char *FileName;
 EXTERN u_char *BaseDir;
 EXTERN u_char *TmpDir;
 
-/* 
+/*
  * Paranoid -- Just in case they should be after us...
  *  0 not at all.
  *  1 normal.
@@ -75,7 +75,7 @@ EXTERN u_char *TmpDir;
  *
  * Verbose -- What to tell mom...
  *  0 Nothing which wouldn't surprise.
- *  1 Normal. 
+ *  1 Normal.
  *  2 Show progress '.'.
  *  3 Show progress names, and actions.
  *  4 even more...
@@ -89,7 +89,7 @@ EXTERN u_char *TmpDir;
  *  8 Destination-tree not correct.
  * 16 Destination-tree not correct, can force.
  * 32 Internal problems.
- * 
+ *
  */
 
 EXTERN int Paranoid;
diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c
index 4fdf3b9ba6aa..a78be73cd0a5 100644
--- a/usr.sbin/ctm/ctm/ctm_ed.c
+++ b/usr.sbin/ctm/ctm/ctm_ed.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_ed.c,v 1.4 1994/09/22 02:49:17 phk Exp $
+ * $Id: ctm_ed.c,v 1.5 1995/04/16 22:40:49 bde Exp $
  *
  */
 
@@ -20,9 +20,9 @@ ctm_edit(u_char *script, int length, char *filein, char *fileout)
     FILE *fi=0,*fo=0;
 
     fi = fopen(filein,"r");
-    if(!fi) { 
+    if(!fi) {
 	perror(filein);
-	return 8; 
+	return 8;
     }
 
     fo = fopen(fileout,"w");
@@ -84,7 +84,7 @@ ctm_edit(u_char *script, int length, char *filein, char *fileout)
 	    }
 	    continue;
 	}
-	ret = 1; 
+	ret = 1;
 	goto bye;
     }
     while(1) {
diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c
index e8bfcc433b9b..6b00fcc60fe4 100644
--- a/usr.sbin/ctm/ctm/ctm_pass1.c
+++ b/usr.sbin/ctm/ctm/ctm_pass1.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_pass1.c,v 1.8 1995/03/04 20:36:46 phk Exp $
+ * $Id: ctm_pass1.c,v 1.9 1995/03/26 20:09:52 phk Exp $
  *
  */
 
@@ -27,15 +27,15 @@ Pass1(FILE *fd, unsigned applied)
     struct CTM_Syntax *sp;
     int slashwarn=0;
     unsigned current;
-    
-    if(Verbose>3) 
+
+    if(Verbose>3)
 	printf("Pass1 -- Checking integrity of incoming CTM-patch\n");
     MD5Init (&ctx);
 
     GETFIELD(p,' ');				/* CTM_BEGIN */
     if(strcmp(p,"CTM_BEGIN")) {
 	Fatal("Probably not a CTM-patch at all.");
-	if(Verbose>3) 
+	if(Verbose>3)
 	    fprintf(stderr,"Expected \"CTM_BEGIN\" got \"%s\".\n",p);
 	return 1;
     }
@@ -43,7 +43,7 @@ Pass1(FILE *fd, unsigned applied)
     GETFIELDCOPY(Version,' ');				/* <Version> */
     if(strcmp(Version,VERSION)) {
 	Fatal("CTM-patch is wrong version.");
-	if(Verbose>3) 
+	if(Verbose>3)
 	    fprintf(stderr,"Expected \"%s\" got \"%s\".\n",VERSION,p);
 	return 1;
     }
@@ -60,7 +60,7 @@ Pass1(FILE *fd, unsigned applied)
 		    current);
 	return Exit_Version;
     }
-    
+
     for(;;) {
 	if(md5)		{Free(md5), md5 = 0;}
 	if(trash)	{Free(trash), trash = 0;}
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c
index 9ad407c29f80..7ce55e2a0bc0 100644
--- a/usr.sbin/ctm/ctm/ctm_pass2.c
+++ b/usr.sbin/ctm/ctm/ctm_pass2.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_pass2.c,v 1.6 1995/02/04 19:20:48 phk Exp $
+ * $Id: ctm_pass2.c,v 1.7 1995/03/19 12:01:23 roberto Exp $
  *
  */
 
@@ -28,7 +28,7 @@ Pass2(FILE *fd)
     struct stat st;
     int ret = 0;
 
-    if(Verbose>3) 
+    if(Verbose>3)
 	printf("Pass2 -- Checking if CTM-patch will apply\n");
     MD5Init (&ctx);
 
@@ -87,7 +87,7 @@ Pass2(FILE *fd)
 			else
 			    ret |= Exit_NotOK;
 			break;
-		    } 
+		    }
 		    if (j & CTM_Q_Name_Dir) {
 			if((st.st_mode & S_IFMT) != S_IFDIR) {
 			    fprintf(stderr,
@@ -96,7 +96,7 @@ Pass2(FILE *fd)
 			    ret |= Exit_NotOK;
 			}
 			break;
-		    } 
+		    }
 		    if (j & CTM_Q_Name_File) {
 			if((st.st_mode & S_IFMT) != S_IFREG) {
 			    fprintf(stderr,
@@ -162,7 +162,7 @@ Pass2(FILE *fd)
 			unlink(p);
 			free(p);
 		    }
-		    
+
 		    break;
 		default: WRONG
 	    }
diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c
index 8143816518e0..049648d1f3e5 100644
--- a/usr.sbin/ctm/ctm/ctm_pass3.c
+++ b/usr.sbin/ctm/ctm/ctm_pass3.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_pass3.c,v 1.8 1995/02/04 19:20:49 phk Exp $
+ * $Id: ctm_pass3.c,v 1.9 1995/03/25 20:46:51 joerg Exp $
  *
  */
 
@@ -28,7 +28,7 @@ Pass3(FILE *fd)
     FILE *ed=0;
     struct stat st;
 
-    if(Verbose>3) 
+    if(Verbose>3)
 	printf("Pass3 -- Applying the CTM-patch\n");
     MD5Init (&ctx);
 
@@ -74,9 +74,9 @@ Pass3(FILE *fd)
 		case CTM_F_Mode: GETFIELDCOPY(mode,sep); break;
 		case CTM_F_MD5:
 		    if(j & CTM_Q_MD5_Before)
-			GETFIELDCOPY(md5before,sep); 
+			GETFIELDCOPY(md5before,sep);
 		    else
-			GETFIELDCOPY(md5,sep); 
+			GETFIELDCOPY(md5,sep);
 		    break;
 		case CTM_F_Count: GETBYTECNT(cnt,sep); break;
 		case CTM_F_Bytes: GETDATA(trash,cnt); break;
@@ -105,7 +105,7 @@ Pass3(FILE *fd)
 		WRONG
 	    }
 	    continue;
-	} 
+	}
 	if(!strcmp(sp->Key,"FE")) {
 	    ed = popen("ed","w");
 	    if(!ed) {
@@ -156,7 +156,7 @@ Pass3(FILE *fd)
 		WRONG
 	    }
 	    continue;
-	} 
+	}
 	if(!strcmp(sp->Key,"FR")) {
 	    if (0 != unlink(name)) {
 		fprintf(stderr,"<%s> unlink failed\n",name);
@@ -164,8 +164,8 @@ Pass3(FILE *fd)
 		    WRONG
 	    }
 	    continue;
-	} 
-	if(!strcmp(sp->Key,"DR")) { 
+	}
+	if(!strcmp(sp->Key,"DR")) {
 	    /*
 	     * We cannot use rmdir() because we do not get the directories
 	     * in '-depth' order (cvs-cur.0018.gz for examples)
@@ -173,7 +173,7 @@ Pass3(FILE *fd)
 	    sprintf(buf,"rm -rf %s",name);
 	    system(buf);
 	    continue;
-	} 
+	}
 	WRONG
     }
     q = MD5End (&ctx);
diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c
index a2da70a03199..89ea54ff6115 100644
--- a/usr.sbin/ctm/ctm/ctm_syntax.c
+++ b/usr.sbin/ctm/ctm/ctm_syntax.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $Id: ctm_syntax.c,v 1.4 1994/09/22 02:49:21 phk Exp $
  *
  */
 
@@ -31,15 +31,15 @@
 #define Force	CTM_Q_MD5_Force
 
 static int ctmFM[] = /* File Make */
-    { Name|File|New, Uid, Gid, Mode, 
+    { Name|File|New, Uid, Gid, Mode,
 	MD5|After|Chunk, Count, Bytes,0 };
 
 static int ctmFS[] = /* File Substitute */
-    { Name|File, Uid, Gid, Mode, 
+    { Name|File, Uid, Gid, Mode,
 	MD5|Before|Force, MD5|After|Chunk, Count, Bytes,0 };
 
 static int ctmFE[] = /* File Edit */
-    { Name|File, Uid, Gid, Mode, 
+    { Name|File, Uid, Gid, Mode,
 	MD5|Before, MD5|After, Count, Bytes,0 };
 
 static int ctmFR[] = /* File Remove */
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
index cc42e3f79516..a47f8853d015 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
@@ -556,9 +556,9 @@ combine(char *delta, int npieces, char *dname, char *pname, char *tname)
  * MIME BASE64 decode table.
  */
 static unsigned char from_b64[0x80] =
-    { 
+    {
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
diff --git a/usr.sbin/ctm/ctm_rmail/options.h b/usr.sbin/ctm/ctm_rmail/options.h
index f0d96c88a35d..18b844cebf5d 100644
--- a/usr.sbin/ctm/ctm_rmail/options.h
+++ b/usr.sbin/ctm/ctm_rmail/options.h
@@ -15,7 +15,7 @@
  *
  * For example:
  *	zap -xz -f flame -q34 -- -x
- * 
+ *
  * where zap.c contains the following in main():
  *
  *	OPTIONS("[-xz] [-q queue-id] [-f dump-file] user")
diff --git a/usr.sbin/ctm/ctm_scan/ctm_scan.c b/usr.sbin/ctm/ctm_scan/ctm_scan.c
index 8650578f6f30..5a68e0f31c93 100644
--- a/usr.sbin/ctm/ctm_scan/ctm_scan.c
+++ b/usr.sbin/ctm/ctm_scan/ctm_scan.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_scan.c,v 1.9 1995/03/24 21:33:20 phk Exp $
+ * $Id: ctm_scan.c,v 1.10 1995/03/24 21:36:32 phk Exp $
  *
  */
 #include <stdio.h>
@@ -22,7 +22,7 @@
 int barf[256];
 int CheckMode = 0;
 
-int 
+int
 pstrcmp(const void *pp, const void *qq)
 {
     return strcmp(*(char **)pp,*(char **)qq);
@@ -41,7 +41,7 @@ Do(char *path)
     MD5_CTX ctx;
     int fd,i,j,k,l,npde,nde=0;
     char **pde;
- 
+
     npde = 1;
     pde = malloc(sizeof *pde * (npde+1));
     d = opendir(path);
@@ -82,9 +82,9 @@ Do(char *path)
 	switch(st.st_mode & S_IFMT) {
 	    case S_IFDIR:
 		if(!CheckMode) {
-		    i = printf("d %s %o %lu %lu - - -\n",	
+		    i = printf("d %s %o %lu %lu - - -\n",
 			buf,st.st_mode & (~S_IFMT),st.st_uid,st.st_gid);
-		    if(!i) 
+		    if(!i)
 			exit(-1);
 		}
 		ret |= Do(buf);
@@ -170,7 +170,7 @@ main(int argc, char **argv)
 	argv++;
     }
 
-    /* 
+    /*
      * Scan the directories recursively.
      */
     if (argc > 1) {
@@ -182,6 +182,6 @@ main(int argc, char **argv)
 			return i;
 	}
 	return i;
-    } else 
+    } else
 	    return Do(".");
 }
diff --git a/usr.sbin/ctm/ctm_smail/ctm_smail.c b/usr.sbin/ctm/ctm_smail/ctm_smail.c
index df0907042e7a..4782f4025069 100644
--- a/usr.sbin/ctm/ctm_smail/ctm_smail.c
+++ b/usr.sbin/ctm/ctm_smail/ctm_smail.c
@@ -1,14 +1,14 @@
 /*
- * Send a compressed CTM delta to a recipient mailing list by encoding it 
+ * Send a compressed CTM delta to a recipient mailing list by encoding it
  * in safe ASCII characters, in mailer-friendly chunks, and passing it
  * to sendmail.  The encoding is almost the same as MIME BASE64, and is
  * protected by a simple checksum.
  *
  * Author: Stephen McKay
  *
- * NOTICE: This is free software.  I hope you get some use from this program.  
- * In return you should think about all the nice people who give away software. 
- * Maybe you should write some free software too.  
+ * NOTICE: This is free software.  I hope you get some use from this program.
+ * In return you should think about all the nice people who give away software.
+ * Maybe you should write some free software too.
  */
 
 #include <stdio.h>
@@ -69,7 +69,7 @@ main(int argc, char **argv)
 	err("%s: %s", delta_file, strerror(errno));
 	exit(1);
 	}
-    
+
     if (max_ctm_size != 0 && sb.st_size > max_ctm_size)
 	apologise(delta_file, sb.st_size, max_ctm_size, mail_alias);
     else
diff --git a/usr.sbin/diskpart/diskpart.c b/usr.sbin/diskpart/diskpart.c
index c89d0f1d9cbd..46e7323c5385 100644
--- a/usr.sbin/diskpart/diskpart.c
+++ b/usr.sbin/diskpart/diskpart.c
@@ -181,7 +181,7 @@ main(argc, argv)
 		badsecttable = spc * dp->d_ncylinders - totsize;
 	}
 
-	/* 
+	/*
 	 * Figure out if disk is large enough for
 	 * expanded swap area and 'd', 'e', and 'f'
 	 * partitions.  Otherwise, use smaller defaults
diff --git a/usr.sbin/eeprom/eeprom.c b/usr.sbin/eeprom/eeprom.c
index 2015fed8f0ae..e2425aa79381 100644
--- a/usr.sbin/eeprom/eeprom.c
+++ b/usr.sbin/eeprom/eeprom.c
@@ -163,7 +163,7 @@ main(argc, argv)
 		}
 		exit(0);
 	}
-	
+
 	status = 0;
 	for (i = 0; i < argc; ++i) {
 		dp->op_name = name = argv[i];
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index a93aa450dcf2..d7d98464fe02 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -35,7 +35,7 @@ getnumber(void)
 {
   int i;
   char b[80];
-  
+
   fgets(b, 80, stdin);
   if(b[0] == '\n') return -1;
 
@@ -69,23 +69,23 @@ main(int argc, char **argv)
 	debug = atoi(optarg);
 	settype = 0;
 	break;
-	
+
       case 's':
 	debug = -1;
 	settype = 1;
 	break;
-	
+
       case '?':
       default:
 	usage();
       }
-  
+
   argc -= optind;
   argv += optind;
 
   if(argc != 1)
     usage();
-  
+
   if((fd = open(argv[0], 0)) < 0)
     {
       perror("open(floppy)");
@@ -101,7 +101,7 @@ main(int argc, char **argv)
 	}
       return 0;
     }
-  
+
   if(settype)
     {
       if(ioctl(fd, FD_GTYPE, &ft) < 0)
@@ -129,7 +129,7 @@ main(int argc, char **argv)
 	}
       return 0;
     }
-  
+
 }
 
 
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index b43af82c624c..7e9424d39e80 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -27,7 +27,7 @@
 /*
  * FreeBSD:
  * format a floppy disk
- * 
+ *
  * Added FD_GTYPE ioctl, verifying, proportional indicators.
  * Serge Vakulenko, vak@zebub.msk.su
  * Sat Dec 18 17:45:47 MSK 1993
@@ -98,7 +98,7 @@ verify_track(int fd, int track, int tracksize)
 		fdopts |= FDOPT_NORETRY;
 		(void)ioctl(fd, FD_SOPTS, &fdopts);
 	}
-	
+
 	if (bufsz < tracksize) {
 		if (buf)
 			free (buf);
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index 830faf54dbf0..d77040bc754e 100644
--- a/usr.sbin/fdwrite/fdwrite.c
+++ b/usr.sbin/fdwrite/fdwrite.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: fdwrite.c,v 1.1.1.1 1994/09/18 07:39:19 phk Exp $
+ * $Id: fdwrite.c,v 1.2 1994/10/14 16:03:33 joerg Exp $
  *
  */
 
@@ -142,7 +142,7 @@ main(int argc, char **argv)
 		printf("Format: %d cylinders, %d heads, %d sectors, %d bytes = %dkb\n",
 		fdt.tracks,fdt.heads,fdt.sectrac,(1<<fdt.secsize) * 128,
 		fdt.tracks*bpt*fdt.heads/1024);
-		    
+
 	    }
 	    memset(trackbuf,0,bpt);
 	    for(j=0;inputfd >= 0 && j<bpt;j+=i) {
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 70a41f462561..5f8fa492e1d0 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -39,8 +39,8 @@ static char copyright[] =
 
 #ifndef lint
 /* from: @(#)inetd.c	8.4 (Berkeley) 4/13/94"; */
-static char inetd_c_rcsid[] = 
-	"$Id$";
+static char inetd_c_rcsid[] =
+	"$Id: inetd.c,v 1.4 1994/12/21 19:08:45 wollman Exp $";
 #endif /* not lint */
 
 /*
@@ -58,7 +58,7 @@ static char inetd_c_rcsid[] =
  * to receive further messages on, or ``take over the socket'',
  * processing all arriving datagrams and, eventually, timing
  * out.	 The first type of server is said to be ``multi-threaded'';
- * the second type of server ``single-threaded''. 
+ * the second type of server ``single-threaded''.
  *
  * Inetd uses a configuration file which is read at startup
  * and, possibly, at some later time in response to a hangup signal.
@@ -460,7 +460,7 @@ main(argc, argv, envp)
 				if (pwd->pw_uid) {
 					if (setgid(pwd->pw_gid) < 0) {
 						syslog(LOG_ERR,
-						  "%s: can't set gid %d: %m", 
+						  "%s: can't set gid %d: %m",
 						  sep->se_service, pwd->pw_gid);
 						_exit(1);
 					}
@@ -468,7 +468,7 @@ main(argc, argv, envp)
 							pwd->pw_gid);
 					if (setuid(pwd->pw_uid) < 0) {
 						syslog(LOG_ERR,
-						  "%s: can't set uid %d: %m", 
+						  "%s: can't set uid %d: %m",
 						  sep->se_service, pwd->pw_uid);
 						_exit(1);
 					}
@@ -500,7 +500,7 @@ reapchild(signo)
 		if (pid <= 0)
 			break;
 		if (debug)
-			fprintf(stderr, "%d reaped, status %#x\n", 
+			fprintf(stderr, "%d reaped, status %#x\n",
 				pid, status);
 		for (sep = servtab; sep; sep = sep->se_next)
 			if (sep->se_wait == pid) {
@@ -550,10 +550,10 @@ config(signo)
 			/*
 			 * sep->se_wait may be holding the pid of a daemon
 			 * that we're waiting for.  If so, don't overwrite
-			 * it unless the config file explicitly says don't 
+			 * it unless the config file explicitly says don't
 			 * wait.
 			 */
-			if (cp->se_bi == 0 && 
+			if (cp->se_bi == 0 &&
 			    (sep->se_wait == 1 || cp->se_wait == 0))
 				sep->se_wait = cp->se_wait;
 #define SWAP(a, b) { char *c = a; a = b; b = c; }
@@ -685,7 +685,7 @@ setup(sep)
 
 	if ((sep->se_fd = socket(AF_INET, sep->se_socktype, 0)) < 0) {
 		if (debug)
-			fprintf(stderr, "socket failed on %s/%s: %s\n", 
+			fprintf(stderr, "socket failed on %s/%s: %s\n",
 				sep->se_service, sep->se_proto,
 				strerror(errno));
 		syslog(LOG_ERR, "%s/%s: socket: %m",
@@ -719,13 +719,13 @@ setsockopt(fd, SOL_SOCKET, opt, (char *)&on, sizeof (on))
         if (sep->se_rpc) {
                 int i, len = sizeof(struct sockaddr);
 
-                if (getsockname(sep->se_fd, 
+                if (getsockname(sep->se_fd,
 				(struct sockaddr*)&sep->se_ctrladdr, &len) < 0){
                         syslog(LOG_ERR, "%s/%s: getsockname: %m",
                                sep->se_service, sep->se_proto);
                         (void) close(sep->se_fd);
                         sep->se_fd = -1;
-                        return;       
+                        return;
                 }
                 if (debug)
                         print_service("REG ", sep);
@@ -736,7 +736,7 @@ setsockopt(fd, SOL_SOCKET, opt, (char *)&on, sizeof (on))
                                  ? IPPROTO_UDP : IPPROTO_TCP,
                                  ntohs(sep->se_ctrladdr.sin_port));
                 }
-                     
+
         }
 	if (sep->se_socktype == SOCK_STREAM)
 		listen(sep->se_fd, 10);
@@ -889,8 +889,8 @@ more:
                                         sep->se_rpc_lowvers;
                                 break;
                         default:
-                                syslog(LOG_ERR, 
-					"bad RPC version specifier; %s\n", 
+                                syslog(LOG_ERR,
+					"bad RPC version specifier; %s\n",
 					sep->se_service);
                                 freeconfig(sep);
                                 goto more;
@@ -911,13 +911,13 @@ more:
 		sep->se_wait = 0;
 
 		if (strcmp(sep->se_proto, "tcp")) {
-			syslog(LOG_ERR, 
+			syslog(LOG_ERR,
 				"%s: bad protocol for tcpmux service %s",
 				CONFIG, sep->se_service);
 			goto more;
 		}
 		if (sep->se_socktype != SOCK_STREAM) {
-			syslog(LOG_ERR, 
+			syslog(LOG_ERR,
 				"%s: bad socket type for tcpmux service %s",
 				CONFIG, sep->se_service);
 			goto more;
@@ -1055,9 +1055,9 @@ setproctitle(a, s)
 	cp = Argv[0];
 	size = sizeof(sin);
 	if (getpeername(s, (struct sockaddr *)&sin, &size) == 0)
-		(void) sprintf(buf, "-%s [%s]", a, inet_ntoa(sin.sin_addr)); 
+		(void) sprintf(buf, "-%s [%s]", a, inet_ntoa(sin.sin_addr));
 	else
-		(void) sprintf(buf, "-%s", a); 
+		(void) sprintf(buf, "-%s", a);
 	strncpy(cp, buf, LastArg - cp);
 	cp += strlen(cp);
 	while (cp < LastArg)
@@ -1098,7 +1098,7 @@ int check_loop(sin, sep)
 		if (sin->sin_port == se2->se_ctrladdr.sin_port) {
 			syslog(LOG_WARNING,
 			       "%s/%s:%s/%s loop request REFUSED from %s",
-			       sep->se_service, sep->se_proto, 
+			       sep->se_service, sep->se_proto,
 			       se2->se_service, se2->se_proto,
 			       inet_ntoa(sin->sin_addr));
 			return 1;
@@ -1118,7 +1118,7 @@ echo_dg(s, sep)			/* Echo service -- echo data back */
 	struct sockaddr_in sin;
 
 	size = sizeof(sin);
-	if ((i = recvfrom(s, buffer, sizeof(buffer), 0, 
+	if ((i = recvfrom(s, buffer, sizeof(buffer), 0,
 			  (struct sockaddr *)&sin, &size)) < 0)
 		return;
 
@@ -1226,7 +1226,7 @@ chargen_dg(s, sep)		/* Character generator */
 	}
 
 	size = sizeof(sin);
-	if (recvfrom(s, text, sizeof(text), 0, 
+	if (recvfrom(s, text, sizeof(text), 0,
 		     (struct sockaddr *)&sin, &size) < 0)
 		return;
 
@@ -1243,7 +1243,7 @@ chargen_dg(s, sep)		/* Character generator */
 		rs = ring;
 	text[LINESIZ] = '\r';
 	text[LINESIZ + 1] = '\n';
-	(void) sendto(s, text, sizeof(text), 0, 
+	(void) sendto(s, text, sizeof(text), 0,
 		      (struct sockaddr *)&sin, sizeof(sin));
 }
 
@@ -1293,7 +1293,7 @@ machtime_dg(s, sep)
 	int size;
 
 	size = sizeof(sin);
-	if (recvfrom(s, (char *)&result, sizeof(result), 0, 
+	if (recvfrom(s, (char *)&result, sizeof(result), 0,
 		     (struct sockaddr *)&sin, &size) < 0)
 		return;
 
@@ -1301,7 +1301,7 @@ machtime_dg(s, sep)
 		return;
 
 	result = machtime();
-	(void) sendto(s, (char *) &result, sizeof(result), 0, 
+	(void) sendto(s, (char *) &result, sizeof(result), 0,
 		      (struct sockaddr *)&sin, sizeof(sin));
 }
 
@@ -1334,7 +1334,7 @@ daytime_dg(s, sep)		/* Return human-readable time of day */
 	clock = time((time_t *) 0);
 
 	size = sizeof(sin);
-	if (recvfrom(s, buffer, sizeof(buffer), 0, 
+	if (recvfrom(s, buffer, sizeof(buffer), 0,
 		     (struct sockaddr *)&sin, &size) < 0)
 		return;
 
@@ -1342,7 +1342,7 @@ daytime_dg(s, sep)		/* Return human-readable time of day */
 		return;
 
 	(void) sprintf(buffer, "%.24s\r\n", ctime(&clock));
-	(void) sendto(s, buffer, strlen(buffer), 0, 
+	(void) sendto(s, buffer, strlen(buffer), 0,
 		      (struct sockaddr *)&sin, sizeof(sin));
 }
 
@@ -1359,10 +1359,10 @@ print_service(action, sep)
 		fprintf(stderr,
 	    		"%s: %s proto=%s, wait=%d, user=%s builtin=%x server=%s\n",
 	    		action, sep->se_service, sep->se_proto,
-	    		sep->se_wait, sep->se_user, (int)sep->se_bi, 
+	    		sep->se_wait, sep->se_user, (int)sep->se_bi,
 			sep->se_server);
 	else
-		fprintf(stderr, 
+		fprintf(stderr,
 			"%s: %s proto=%s, wait=%d, user=%s builtin=%x server=%s\n",
 			action, sep->se_service, sep->se_proto,
 			sep->se_wait, sep->se_user, (int)sep->se_bi,
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 1d646e2ed08a..0cdf8a2b0e15 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -364,7 +364,7 @@ dkstats()
 			itime = atime - xtime;		/* time not xfer'ing */
 			if (itime < 0)
 				msps = 0;
-			else 
+			else
 				msps = itime * 1000 / cur.dk_xfer[dn];
 		} else
 			msps = 0;
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 47d8f90fd497..7e1d6b756b62 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdcontrol.c,v 1.4 1995/01/28 22:17:19 sos Exp $
+ *	$Id: kbdcontrol.c,v 1.5 1995/01/30 21:41:10 sos Exp $
  */
 
 #include <ctype.h>
@@ -36,7 +36,7 @@
 #include "lex.h"
 
 char ctrl_names[32][4] = {
-	"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", 
+	"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
 	"bs ", "ht ", "nl ", "vt ", "ff ", "cr ", "so ", "si ",
 	"dle", "dc1", "dc2", "dc3", "dc4", "nak", "syn", "etb",
 	"can", "em ", "sub", "esc", "fs ", "gs ", "rs ", "ns "
@@ -177,7 +177,7 @@ get_entry()
 		return -1;
 	}
 }
-			 
+
 
 int
 get_key_definition_line(FILE* fd, keymap_t *map)
@@ -187,7 +187,7 @@ get_key_definition_line(FILE* fd, keymap_t *map)
 	yyin = fd;
 
 	/* get scancode number */
-	if (yylex() != TNUM) 
+	if (yylex() != TNUM)
 		return -1;
 	if (number < 0 || number >= NUM_KEYS)
 		return -1;
@@ -210,14 +210,14 @@ get_key_definition_line(FILE* fd, keymap_t *map)
 }
 
 
-int 
+int
 print_entry(FILE *fp, int value)
 {
 	int val = value & 0xFF;
 
 	switch (value) {
 	case NOP | 0x100:
-		fprintf(fp, " nop   "); 
+		fprintf(fp, " nop   ");
 		break;
 	case LSH | 0x100:
 		fprintf(fp, " lshift");
@@ -269,26 +269,26 @@ print_entry(FILE *fp, int value)
 		break;
 	default:
 		if (value & 0x100) {
-		 	if (val >= F_FN && val <= L_FN) 
+		 	if (val >= F_FN && val <= L_FN)
 				fprintf(fp, " fkey%02d", val - F_FN + 1);
-		 	else if (val >= F_SCR && val <= L_SCR) 
+		 	else if (val >= F_SCR && val <= L_SCR)
 				fprintf(fp, " scr%02d ", val - F_SCR + 1);
 			else if (hex)
-				fprintf(fp, " 0x%02x  ", val); 
+				fprintf(fp, " 0x%02x  ", val);
 			else
-				fprintf(fp, "  %3d  ", val); 
+				fprintf(fp, "  %3d  ", val);
 		}
 		else {
 			if (val < ' ')
-				fprintf(fp, " %s   ", ctrl_names[val]);  
+				fprintf(fp, " %s   ", ctrl_names[val]);
 			else if (val == 127)
-				fprintf(fp, " del   ");  
+				fprintf(fp, " del   ");
 			else if (isprint(val))
-				fprintf(fp, " '%c'   ", val);  
+				fprintf(fp, " '%c'   ", val);
 			else if (hex)
-				fprintf(fp, " 0x%02x  ", val); 
+				fprintf(fp, " 0x%02x  ", val);
 			else
-				fprintf(fp, " %3d   ", val); 
+				fprintf(fp, " %3d   ", val);
 		}
 	}
 }
@@ -310,7 +310,7 @@ print_key_definition_line(FILE *fp, int scancode, struct key_t *key)
 		if (key->spcl & (0x80 >> i))
 			print_entry(fp, key->map[i] | 0x100);
 		else
-			print_entry(fp, key->map[i]); 
+			print_entry(fp, key->map[i]);
 	}
 
 	/* print lock state key def */
@@ -327,7 +327,7 @@ print_key_definition_line(FILE *fp, int scancode, struct key_t *key)
 	case 3:
 		fprintf(fp, "  B\n");
 		break;
-	}			
+	}
 }
 
 
@@ -412,7 +412,7 @@ set_functionkey(char *keynumstr, char *string)
 	}
 	fkey.keynum = atoi(keynumstr);
 	if (fkey.keynum < 1 || fkey.keynum > NUM_FKEYS) {
-		fprintf(stderr, 
+		fprintf(stderr,
 			"function key number must be between 1 and %d\n",
 			NUM_FKEYS);
 		return;
@@ -434,14 +434,14 @@ set_bell_values(char *opt)
 {
 	int bell, duration, pitch;
 
-	if (!strcmp(opt, "visual")) 
+	if (!strcmp(opt, "visual"))
 		bell = 1, duration = 1, pitch = 800;
 	else if (!strcmp(opt, "normal"))
 		bell = 0, duration = 1, pitch = 800;
 	else {
 		int		n;
 		char		*v1;
-		
+
 		bell = 0;
 		duration = strtol(opt, &v1, 0);
 		if ((duration < 0) || (*v1 != '.'))
@@ -450,7 +450,7 @@ set_bell_values(char *opt)
 		pitch = strtol(opt, &v1, 0);
 		if ((pitch < 0) || (*opt == '\0') || (*v1 != '\0')) {
 badopt:
-			fprintf(stderr, 
+			fprintf(stderr,
 				"argument to -b must be DURATION.PITCH\n");
 			return;
 		}
@@ -489,7 +489,7 @@ struct	{
 		repeat = strtol(opt, &v1, 0);
 		if ((repeat < 0) || (*opt == '\0') || (*v1 != '\0')) {
 badopt:
-			fprintf(stderr, 
+			fprintf(stderr,
 				"argument to -r must be delay.repeat\n");
 			return;
 		}
@@ -560,7 +560,7 @@ main(int argc, char **argv)
 				load_keymap(optarg);
 				break;
 			case 'f':
-				set_functionkey(optarg, 
+				set_functionkey(optarg,
 					nextarg(argc, argv, &optind, 'f'));
 				break;
 			case 'F':
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index cf75723d9c60..adef0b80be3c 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -284,7 +284,7 @@ setprof(kvp, state)
 			return;
 		}
 		(void)seteuid(getuid());
-	} else if (kvm_write(kvp->kd, (u_long)&p->state, (void *)&state, sz) 
+	} else if (kvm_write(kvp->kd, (u_long)&p->state, (void *)&state, sz)
 	    == sz)
 		return;
 bad:
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index a606731b2201..adf4a421fba4 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -83,7 +83,7 @@ create_knlist(name, db)
 	kfile = name;
 	if ((fd = open(name, O_RDONLY, 0)) < 0)
 		err(1, "%s", name);
-	
+
 	fstat(fd,&sst);
 
 	filep = (u_char*)mmap(0, sst.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -101,7 +101,7 @@ create_knlist(name, db)
 
 	/* Seek to symbol table. */
 	cur_off = N_SYMOFF(*ebuf);
-	
+
 	/* Read each symbol and enter it into the database. */
 	nsyms = ebuf->a_syms / sizeof(struct nlist);
 	while (nsyms--) {
@@ -125,7 +125,7 @@ create_knlist(name, db)
  * XXX
  * The FreeBSD bootloader loads the kernel at the a_entry address, meaning
  * that this is where the kernel starts.  (not at KERNBASE)
- * 
+ *
  * This may be introducing an i386 dependency.
  */
 #if defined(__FreeBSD__)
@@ -147,7 +147,7 @@ create_knlist(name, db)
 				voff += N_DATOFF(*ebuf) - N_DATADDR(*ebuf);
 
 			vp = filep + voff;
-			
+
 			key.data = (u_char *)VRS_KEY;
 			key.size = sizeof(VRS_KEY) - 1;
 			data.data = vp;
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 49f79390e6e6..65714b4d87b4 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -221,7 +221,7 @@ getq(namelist)
 
 	/*
 	 * Estimate the array size by taking the size of the directory file
-	 * and dividing it by a multiple of the minimum size entry. 
+	 * and dividing it by a multiple of the minimum size entry.
 	 */
 	arraysz = (stbuf.st_size / 24);
 	queue = (struct queue **)malloc(arraysz * sizeof(struct queue *));
diff --git a/usr.sbin/lpr/common_source/recvjob.c b/usr.sbin/lpr/common_source/recvjob.c
index 67a61830ff29..e199af1acb18 100644
--- a/usr.sbin/lpr/common_source/recvjob.c
+++ b/usr.sbin/lpr/common_source/recvjob.c
@@ -94,7 +94,7 @@ recvjob()
 		frecverr("unknown printer %s", printer);
 	else if (status == -3)
 		fatal("potential reference loop detected in printcap file");
-	
+
 	if (cgetstr(bp, "lf", &LF) == -1)
 		LF = _PATH_CONSOLE;
 	if (cgetstr(bp, "sd", &SD) == -1)
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 5335f316c564..3bec84d61de0 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -71,7 +71,7 @@ char	*host;		/* user's machine name */
 char	*acctfile;	/* accounting information file */
 
 int
-main(argc, argv) 
+main(argc, argv)
 	int argc;
 	char *argv[];
 {
@@ -117,7 +117,7 @@ main(argc, argv)
 
 	for (cp = buf[0], limit = buf[MAXREP]; cp < limit; *cp++ = ' ');
 	done = 0;
-	
+
 	while (!done) {
 		col = indent;
 		maxrep = -1;
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 7c2b6fe632be..193eac55d799 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -342,7 +342,7 @@ cleanpr()
 		}
      	} while (++i < nitems);
 }
- 
+
 static void
 unlinkf(name)
 	char	*name;
@@ -976,7 +976,7 @@ topq(argc, argv)
 	 */
 	if (changed && stat(LO, &stbuf) >= 0)
 		(void) chmod(LO, (stbuf.st_mode & 0777) | 01);
-} 
+}
 
 /*
  * Reposition the job by changing the modification time of
@@ -1008,8 +1008,8 @@ doarg(job)
 	FILE *fp;
 
 	/*
-	 * Look for a job item consisting of system name, colon, number 
-	 * (example: ucbarpa:114)  
+	 * Look for a job item consisting of system name, colon, number
+	 * (example: ucbarpa:114)
 	 */
 	if ((cp = index(job, ':')) != NULL) {
 		machine = job;
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 4a4f5da1ccbe..c5e11d4aca93 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -163,7 +163,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c_1___1_,
  	  c1___1_1,
  	  c_____1_ },			/* % */
- 
+
  	{ c_11____,
  	  c1__1___,
  	  c1___1__,
@@ -173,7 +173,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c1___11_,
  	  c1___11_,
  	  c_111__1 },			/* & */
- 
+
  	{ c___11__,
  	  c___11__,
  	  c___1___,
@@ -183,7 +183,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c_______,
  	  c_______,
  	  c_______ },			/* ' */
- 
+
  	{ c____1__,
  	  c___1___,
  	  c__1____,
@@ -193,7 +193,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c__1____,
  	  c___1___,
  	  c____1__ },			/* ( */
- 
+
  	{ c__1____,
  	  c___1___,
  	  c____1__,
@@ -203,7 +203,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c____1__,
  	  c___1___,
  	  c__1____ },			/* ) */
- 
+
  	{ c_______,
  	  c___1___,
  	  c1__1__1,
@@ -213,7 +213,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c1__1__1,
  	  c___1___,
  	  c_______ },			/* * */
- 
+
  	{ c_______,
  	  c___1___,
  	  c___1___,
@@ -223,7 +223,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c___1___,
  	  c___1___,
  	  c_______ },			/* + */
- 
+
  	{ c_______,
  	  c_______,
  	  c_______,
@@ -233,7 +233,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c__1____,
  	  c_1_____,
  	  c_______ },			/* , */
- 
+
  	{ c_______,
  	  c_______,
  	  c_______,
@@ -243,7 +243,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c_______,
  	  c_______,
  	  c_______ },			/* - */
- 
+
  	{ c_______,
 	  c_______,
 	  c_______,
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 41f737255e9c..9341c7dedd3c 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -102,7 +102,7 @@ static int	 tof;		/* true if at top of form */
 static char	class[32];		/* classification field */
 static char	fromhost[32];		/* user's host machine */
 				/* indentation size in static characters */
-static char	indent[10] = "-i0"; 
+static char	indent[10] = "-i0";
 static char	jobname[100];		/* job or file name */
 static char	length[10] = "-l";	/* page length in lines */
 static char	logname[32];		/* user's login name */
@@ -967,7 +967,7 @@ scan_out(scfd, scsp, dlm)
 		while (*--strp == BACKGND && strp >= outbuf)
 			;
 		strp++;
-		*strp++ = '\n';	
+		*strp++ = '\n';
 		(void) write(scfd, outbuf, strp-outbuf);
 	}
 }
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index 67a61830ff29..e199af1acb18 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -94,7 +94,7 @@ recvjob()
 		frecverr("unknown printer %s", printer);
 	else if (status == -3)
 		fatal("potential reference loop detected in printcap file");
-	
+
 	if (cgetstr(bp, "lf", &LF) == -1)
 		LF = _PATH_CONSOLE;
 	if (cgetstr(bp, "sd", &SD) == -1)
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 8e9c45f955e4..43c36568663d 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -88,7 +88,7 @@ static int	 nact;		/* number of jobs to act on */
 static int	 ncopies = 1;	/* # of copies to make */
 static char	*person;	/* user name */
 static int	 qflag;		/* q job, but don't exec daemon */
-static int	 rflag;		/* remove files upon completion */	
+static int	 rflag;		/* remove files upon completion */
 static int	 sflag;		/* symbolic link flag */
 static int	 tfd;		/* control file descriptor */
 static char	*tfname;	/* tmp copy of cf before linking */
@@ -260,7 +260,7 @@ main(argc, argv)
 		fatal2("only %d copies are allowed", MC);
 	/*
 	 * Get the identity of the person doing the lpr using the same
-	 * algorithm as lprm. 
+	 * algorithm as lprm.
 	 */
 	userid = getuid();
 	if (userid != DU || person == 0) {
@@ -425,7 +425,7 @@ copy(f, n)
 		}
 	}
 	(void) close(fd);
-	if (nc==0 && nr==0) 
+	if (nc==0 && nr==0)
 		printf("%s: %s: empty input file\n", name, f ? n : "stdin");
 	else
 		nact++;
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index af0c8ccb12b9..65d3e86064c2 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -267,7 +267,7 @@ dumpit()
 	}
 	if (allflag) {
 		printf("\n");
-		printf("%-24s %7.2f %4d   $%6.2f\n", "total", feet, 
+		printf("%-24s %7.2f %4d   $%6.2f\n", "total", feet,
 		    runs, feet * price);
 	}
 }
diff --git a/usr.sbin/lpr/runqueue/lpdchar.c b/usr.sbin/lpr/runqueue/lpdchar.c
index 4a4f5da1ccbe..c5e11d4aca93 100644
--- a/usr.sbin/lpr/runqueue/lpdchar.c
+++ b/usr.sbin/lpr/runqueue/lpdchar.c
@@ -163,7 +163,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c_1___1_,
  	  c1___1_1,
  	  c_____1_ },			/* % */
- 
+
  	{ c_11____,
  	  c1__1___,
  	  c1___1__,
@@ -173,7 +173,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c1___11_,
  	  c1___11_,
  	  c_111__1 },			/* & */
- 
+
  	{ c___11__,
  	  c___11__,
  	  c___1___,
@@ -183,7 +183,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c_______,
  	  c_______,
  	  c_______ },			/* ' */
- 
+
  	{ c____1__,
  	  c___1___,
  	  c__1____,
@@ -193,7 +193,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c__1____,
  	  c___1___,
  	  c____1__ },			/* ( */
- 
+
  	{ c__1____,
  	  c___1___,
  	  c____1__,
@@ -203,7 +203,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c____1__,
  	  c___1___,
  	  c__1____ },			/* ) */
- 
+
  	{ c_______,
  	  c___1___,
  	  c1__1__1,
@@ -213,7 +213,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c1__1__1,
  	  c___1___,
  	  c_______ },			/* * */
- 
+
  	{ c_______,
  	  c___1___,
  	  c___1___,
@@ -223,7 +223,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c___1___,
  	  c___1___,
  	  c_______ },			/* + */
- 
+
  	{ c_______,
  	  c_______,
  	  c_______,
@@ -233,7 +233,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c__1____,
  	  c_1_____,
  	  c_______ },			/* , */
- 
+
  	{ c_______,
  	  c_______,
  	  c_______,
@@ -243,7 +243,7 @@ char scnkey[][HEIGHT] =	/* this is relatively easy to modify */
  	  c_______,
  	  c_______,
  	  c_______ },			/* - */
- 
+
  	{ c_______,
 	  c_______,
 	  c_______,
diff --git a/usr.sbin/lpr/runqueue/printjob.c b/usr.sbin/lpr/runqueue/printjob.c
index 41f737255e9c..9341c7dedd3c 100644
--- a/usr.sbin/lpr/runqueue/printjob.c
+++ b/usr.sbin/lpr/runqueue/printjob.c
@@ -102,7 +102,7 @@ static int	 tof;		/* true if at top of form */
 static char	class[32];		/* classification field */
 static char	fromhost[32];		/* user's host machine */
 				/* indentation size in static characters */
-static char	indent[10] = "-i0"; 
+static char	indent[10] = "-i0";
 static char	jobname[100];		/* job or file name */
 static char	length[10] = "-l";	/* page length in lines */
 static char	logname[32];		/* user's login name */
@@ -967,7 +967,7 @@ scan_out(scfd, scsp, dlm)
 		while (*--strp == BACKGND && strp >= outbuf)
 			;
 		strp++;
-		*strp++ = '\n';	
+		*strp++ = '\n';
 		(void) write(scfd, outbuf, strp-outbuf);
 	}
 }
diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile
index 110066db369d..76c40e75b0e8 100644
--- a/usr.sbin/lptcontrol/Makefile
+++ b/usr.sbin/lptcontrol/Makefile
@@ -1,5 +1,5 @@
 PROG=		lptcontrol
-CFLAGS+=	-Wall 
+CFLAGS+=	-Wall
 MAN8=		lptcontrol.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index cbe0410a0520..f297b330d5ec 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: lptcontrol.c,v 1.1.1.1 1994/09/03 13:10:09 csgr Exp $
+ * $Id: lptcontrol.c,v 1.2 1994/09/03 22:46:50 csgr Exp $
  */
 
 #include <ctype.h>
@@ -91,18 +91,18 @@ int main (int argc, char * argv[])
 	int		opt;
 	int		irq_status = IRQ_INVALID;
 	char		* unit = DEFAULT_UNIT;
-	
+
 	while((opt = getopt(argc, argv, "ipu:")) != -1)
 		switch(opt) {
 		case 'i': irq_status = USE_IRQ; break;
 		case 'p': irq_status = DO_POLL; break;
-		case 'u': unit = optarg; 
+		case 'u': unit = optarg;
 			  if(!isdigit(*unit))
 				usage(argv[0]);
 			  break;
-		default : usage(argv[0]); 
+		default : usage(argv[0]);
 		}
-	if(irq_status == IRQ_INVALID) 
+	if(irq_status == IRQ_INVALID)
 		usage(argv[0]);
 
 	set_interrupt_status(irq_status, dev_file(*unit));
diff --git a/usr.sbin/lsdev/i386.c b/usr.sbin/lsdev/i386.c
index edc1cd8d6d40..e916005defac 100644
--- a/usr.sbin/lsdev/i386.c
+++ b/usr.sbin/lsdev/i386.c
@@ -66,7 +66,7 @@ printit:
 			goto printit;
 		}
 		break;
-		
+
 	default:
 		if(dc->dc_devtype >= NDEVTYPES) {
 			printf("%s%d (#%d) at %s%d",
@@ -74,7 +74,7 @@ printit:
 			       dc->dc_pname, dc->dc_punit);
 		} else {
 			printf("%s%d (%s) at %s%d",
-			       dc->dc_name, dc->dc_unit, 
+			       dc->dc_name, dc->dc_unit,
 			       devtypes[dc->dc_devtype], dc->dc_pname,
 			       dc->dc_punit);
 		}
@@ -83,7 +83,7 @@ printit:
 	fputc('\n', stdout);
 }
 
-static void 
+static void
 print_isa(struct devconf *dc)
 {
 	struct isa_device *id = (struct isa_device *)dc->dc_data;
@@ -124,7 +124,7 @@ print_isa(struct devconf *dc)
 		if((unsigned long)id->id_maddr == ~0UL) {
 			printf(" iomem ?");
 		} else {
-			printf(" iomem 0x%lx", 
+			printf(" iomem 0x%lx",
 			       (unsigned long)id->id_maddr & ~KERNBASE);
 		}
 	}
diff --git a/usr.sbin/lsdev/lsdev.c b/usr.sbin/lsdev/lsdev.c
index 0e337d73300d..8d0385d89110 100644
--- a/usr.sbin/lsdev/lsdev.c
+++ b/usr.sbin/lsdev/lsdev.c
@@ -16,7 +16,7 @@ static void badname(const char *);
 static void print_pretty(struct devconf *);
 static void hprint_pretty(void);
 
-int 
+int
 main(int argc, char **argv)
 {
 	struct devconf *dc = 0;
@@ -80,13 +80,13 @@ main(int argc, char **argv)
 	mib[0] = CTL_HW;
 	mib[1] = HW_DEVCONF;
 	mib[2] = DEVCONF_NUMBER;
-	
+
 	size = sizeof ndevs;
 	if(sysctl(mib, 3, &ndevs, &size, 0, 0) < 0) {
 		err(1, "sysctl(hw.devconf.number)");
 	}
 	osize = 0;
-	
+
 	hprtfcn();
 
 	for(i = 1; i <= ndevs; i++) {
@@ -111,7 +111,7 @@ main(int argc, char **argv)
 			prtfcn(dc);
 		} else if(showonlydev) {
 			if(!strcmp(showonlydevclass, dc->dc_name)
-			   && (showonlydevunit < 0 || 
+			   && (showonlydevunit < 0 ||
 			       showonlydevunit == dc->dc_unit))
 				prtfcn(dc);
 		} else if(showonlytype == dc->dc_devtype) {
@@ -201,7 +201,7 @@ print_pretty(struct devconf *dc)
 
 	if(vflag) {
 		printf("%-10.10s %2.2s ", buf, states[dc->dc_state]);
-	
+
 		if(dc->dc_punit >= 0) {
 			snprintf(buf, sizeof buf, "%s%d", dc->dc_pname,
 				 dc->dc_punit);
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index a8dbb7079744..2ce07a0fb10b 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -2,7 +2,7 @@
  *	This is an example of a mixer program for Linux
  *
  *	updated 1/1/93 to add stereo, level query, broken
- *      	devmask kludge - cmetz@thor.tjhsst.edu 
+ *      	devmask kludge - cmetz@thor.tjhsst.edu
  *
  * (C) Craig Metz and Hannu Savolainen 1993.
  *
@@ -27,13 +27,13 @@ void usage(void)
 	int i, n = 0;
 	printf("Usage: mixer { ");
 
-	for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) 
+	for (i = 0; i < SOUND_MIXER_NRDEVICES; i++)
 		if ((1 << i) & devmask)  {
 			if (n)
 				putchar('|');
 			printf(names[i]);
 			n = 1;
-		} 
+		}
 	printf(" } <value>\n  or   mixer { +rec|-rec } <devicename>\n");
 	exit(1);
 }
@@ -53,7 +53,7 @@ void print_recsrc(void)
 	fprintf(stderr, "\n");
 }
 
-int 
+int
 main(int argc, char *argv[])
 {
 	int foo, bar, baz, dev;
@@ -125,9 +125,9 @@ main(int argc, char *argv[])
 			if (strchr(argv[2], ':') == NULL) {
 				sscanf(argv[2], "%d", &bar);
 				dev = bar;
-			} else 
+			} else
 				sscanf(argv[2], "%d:%d", &bar, &dev);
-	
+
 			if (bar < 0)
 				bar = 0;
 			if (dev < 0)
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 51437e49ad2e..04b1521b1d40 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: callout.c,v 1.2 1994/09/08 02:51:11 wollman Exp $
+ * $Id: callout.c,v 1.3 1995/05/16 00:28:42 jkh Exp $
  */
 
 #include "defs.h"
@@ -22,7 +22,7 @@ typedef void (* cfunc_t)();
 
 struct timeout_q {
 	struct timeout_q *next;		/* next event */
-	int        	 id;  
+	int        	 id;
 	cfunc_t          func ;    	/* function to call */
 	char	   	 *data;		/* func's data */
 	int            	 time;		/* time offset to next event*/
@@ -31,7 +31,7 @@ struct timeout_q {
 
 static void print_Q();
 
-void callout_init() 
+void callout_init()
 {
     Q = (struct timeout_q *) 0;
 }
@@ -43,20 +43,20 @@ void callout_init()
 void age_callout_queue()
 {
     struct timeout_q *ptr;
-    
+
     if (in_callout)
 	return;
 
     in_callout = 1;
     ptr = Q;
-    
+
     while (ptr){
 	if (!ptr->time ) {
 	    /* timeout has happened */
 	    if(ptr->func)
 		ptr->func(ptr->data);
 	    Q = Q->next;
-	    
+
 	    free(ptr);
 	    ptr = Q;
 	}
@@ -73,7 +73,7 @@ void age_callout_queue()
 }
 
 
-/* 
+/*
  * sets the timer
  */
 int timer_setTimer(delay, action, data)
@@ -82,39 +82,39 @@ int timer_setTimer(delay, action, data)
     char  	*data;  	/* what to call the timeout function with */
 {
     struct     timeout_q  *ptr, *node, *prev;
-    
+
     if (in_callout)
 	return -1;
 
     in_callout = 1;
-    
-    /* create a node */	
+
+    /* create a node */
     node   = (struct timeout_q *)malloc(sizeof(struct timeout_q));
     if ((int) node <= 0) {
 	log(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n");
 	in_callout = 0;
 	return -1;
     }
-    node->func = action; 
+    node->func = action;
     node->data = data;
-    node->time = delay; 
-    node->next = 0;	
+    node->time = delay;
+    node->next = 0;
     node->id   = ++id;
-    
+
     prev = ptr = Q;
-    
+
     /* insert node in the queue */
-    
+
     /* if the queue is empty, insert the node and return */
     if (!Q)
 	Q = node;
     else {
 	/* chase the pointer looking for the right place */
 	while (ptr){
-	    
+
 	    if (delay < ptr->time){
 		/* right place */
-		
+
 		node->next = ptr;
 		if (ptr == Q)
 		    Q = node;
@@ -127,7 +127,7 @@ int timer_setTimer(delay, action, data)
 	    }
 	    else  {
 		/* keep moving */
-		
+
 		delay -= ptr->time; node->time = delay;
 		prev = ptr;
 		ptr = ptr->next;
@@ -146,35 +146,35 @@ void timer_clearTimer( id)
     int  id;
 {
     struct timeout_q  *ptr, *prev;
-    
+
     if (in_callout)  return;
     in_callout = 1;
-    
-    
+
+
     if ( !id ) {in_callout = 0; return;}
-    
+
     prev = ptr = Q;
-    
+
     /*
      * find the right node, delete it. the subsequent node's time
      * gets bumped up
      */
-    
+
     print_Q();
     while (ptr){
 	if (ptr->id == id){
 	    /* got the right node */
-	    
+
 	    /* unlink it from the queue */
 	    if ( ptr == Q)
 		Q = Q->next;
 	    else
 		prev->next = ptr->next;
-	    
+
 	    /* increment next node if any */
 	    if (ptr->next != 0)
 		(ptr->next)->time += ptr->time;
-	    
+
 	    free(ptr->data);
 	    free(ptr);
 	    print_Q();
@@ -195,7 +195,7 @@ static void print_Q()
 {
 #ifdef IGMP_DEBUG
     struct timeout_q  *ptr;
-    
+
     for(ptr = Q; ptr; ptr = ptr->next)
 	log(LOG_DEBUG,0,"(%d,%d) ", ptr->id, ptr->time);
 #endif IGMP_DEBUG
diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c
index 75e4b6a3a392..8f232ff58c41 100644
--- a/usr.sbin/mrouted/config.c
+++ b/usr.sbin/mrouted/config.c
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: config.c,v 1.2 1994/09/08 02:51:12 wollman Exp $
+ * $Id: config.c,v 1.3 1995/04/10 18:42:10 wollman Exp $
  */
 
 
@@ -254,7 +254,7 @@ void config_vifs_from_file()
 		break;
 	    }
 	    prev_vif = NO_VIF;
- 	    cache_lifetime = n;	
+ 	    cache_lifetime = n;
  	    max_prune_lifetime = cache_lifetime * 2;
  	}
 
@@ -277,7 +277,7 @@ void config_vifs_from_file()
  	else if (EQUAL(w, "boundary") && prev_vif != NO_VIF) {
 	    register struct vif_acl *v_acl;
 	    register u_long baddr;
-	    
+
 	    v = &uvifs[prev_vif];
 
 	    if (EQUAL((w = next_word(&s)), "")) {
@@ -287,7 +287,7 @@ void config_vifs_from_file()
 		w = "garbage";
 		break;
 	    }
-	    
+
 	    if ((sscanf(w, "%[0-9.]/%d", s1, &n) != 2) ||
 		n < 0 || n> 32) {
 		log(LOG_ERR, 0,
@@ -296,7 +296,7 @@ void config_vifs_from_file()
 		w = "garbage";
 		break;
 	    }
-	    
+
 	    if ((baddr = inet_parse(s1)) == 0xffffffff ||
 		(ntohl(baddr) & 0xff000000) != 0xef000000) {
 		log(LOG_ERR, 0,
@@ -304,14 +304,14 @@ void config_vifs_from_file()
 		    s1, configfilename);
 		continue;
 	    }
-	    
+
 	    v_acl = (struct vif_acl *)malloc(sizeof(struct vif_acl));
 	    if (v_acl == NULL)
 		log(LOG_ERR, 0,
 		    "out of memory");
 	    VAL_TO_MASK(v_acl->acl_mask, n);
 	    v_acl->acl_addr   = baddr & v_acl->acl_mask;
-	    
+
 	    /*
 	     * link into data structure
 	     */
@@ -329,7 +329,7 @@ void config_vifs_from_file()
 	     * Check if phyint was the first line - scream if not
 	     */
 	    if (order) {
-		log(LOG_ERR, 0, 
+		log(LOG_ERR, 0,
 		    "phyint stmnts should occur before tunnel stmnts in %s",
 		    configfilename);
 		continue;
@@ -619,7 +619,7 @@ void config_vifs_from_file()
 	    v->uv_acl         = NULL;
 
 	    /*
-	     * set variable to define which interface 
+	     * set variable to define which interface
 	     */
 	    prev_vif = numvifs;
 
@@ -761,7 +761,7 @@ void config_vifs_from_file()
  * lower-cased and null terminated, and advance '*s' to point beyond the word.
  * Words are separated by blanks and/or tabs, and the input string is
  * considered to terminate at a newline, '#' (comment), or null character.
- * If no words remain, a pointer to a null string ("") is returned.  
+ * If no words remain, a pointer to a null string ("") is returned.
  * Warning: This function clobbers the input string.
  */
 static char *next_word(s)
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index f7a04dfe88e7..f814e67347a0 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -32,7 +32,7 @@ void init_igmp()
 {
     struct ip *ip;
 
-    if ((igmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_IGMP)) < 0) 
+    if ((igmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_IGMP)) < 0)
 	log(LOG_ERR, errno, "IGMP socket");
 
     k_hdr_include(TRUE);	/* include IP header when sending */
@@ -124,9 +124,9 @@ void accept_igmp(recvlen)
     src       = ip->ip_src.s_addr;
     dst       = ip->ip_dst.s_addr;
 
-    /* 
+    /*
      * this is most likely a message from the kernel indicating that
-     * a new src grp pair message has arrived and so, it would be 
+     * a new src grp pair message has arrived and so, it would be
      * necessary to install a route into the kernel for this.
      */
     if (ip->ip_p == 0) {
@@ -170,7 +170,7 @@ void accept_igmp(recvlen)
 	case IGMP_HOST_NEW_MEMBERSHIP_REPORT:
 	    accept_group_report(src, dst, group,igmp->igmp_type);
 	    return;
-	    
+
 	case IGMP_HOST_LEAVE_MESSAGE:
 	    leave_group_message(src, dst, group);
 	    return;
@@ -226,7 +226,7 @@ void accept_igmp(recvlen)
 		    return;
 	    }
 
- 
+
  	case IGMP_PIM:		/* %%% hack for PIM  %%% */
  	    return;
 
diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c
index a44a15f9812b..8ef357192196 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/usr.sbin/mrouted/kern.c
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: kern.c,v 1.6 1994/08/24 23:53:37 thyagara Exp $
+ * $Id: kern.c,v 1.2 1994/09/08 02:51:17 wollman Exp $
  */
 
 
@@ -180,4 +180,4 @@ void k_del_rg(kt)
     if (setsockopt(igmp_socket, IPPROTO_IP, DVMRP_DEL_MFC,
 		   (char *)&mc, sizeof(mc)) < 0)
 	log(LOG_WARNING, errno, "setsockopt DVMRP_DEL_MFC");
-}	
+}
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index d11f807e2d3b..d7292c79abf2 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: main.c,v 1.2 1994/09/08 02:51:18 wollman Exp $
+ * $Id: main.c,v 1.3 1995/03/31 21:16:43 wollman Exp $
  */
 
 /*
@@ -89,7 +89,7 @@ main(argc, argv)
     }
 
     if (argc > 0) {
-usage:	fprintf(stderr, 
+usage:	fprintf(stderr,
 		"usage: mrouted [-p] [-c configfile] [-d [debug_level]]\n");
 	exit(1);
     }
@@ -128,7 +128,7 @@ usage:	fprintf(stderr,
     srandom(gethostid());
 
     /*
-     * Get generation id 
+     * Get generation id
      */
     gettimeofday(&tv, &tzp);
     dvmrp_genid = tv.tv_sec;
@@ -157,7 +157,7 @@ usage:	fprintf(stderr,
     if (debug)
 	fprintf(stderr, "pruning %s\n", pruning ? "on" : "off");
 
-    fp = fopen(pidfilename, "w");		
+    fp = fopen(pidfilename, "w");
     if (fp != NULL) {
 	fprintf(fp, "%d\n", getpid());
 	(void) fclose(fp);
@@ -184,7 +184,7 @@ usage:	fprintf(stderr,
     for(;;) {
 	recvlen = recvfrom(igmp_socket, recv_buf, sizeof(recv_buf),
 			   0, NULL, &dummy);
-	if (recvlen < 0) {	
+	if (recvlen < 0) {
 	    if (errno != EINTR) log(LOG_ERR, errno, "recvfrom");
 	    continue;
 	}
@@ -235,7 +235,7 @@ static void fasttimer()
 	timer();
 
     age_callout_queue();/* Advance the timer for the callout queue
-				for groups */	
+				for groups */
     alarm(1);
 }
 
@@ -355,7 +355,7 @@ static void cdump()
 
     fp = fopen(cachefilename, "w");
     if (fp != NULL) {
-	dump_cache(fp); 
+	dump_cache(fp);
 	(void) fclose(fp);
     }
 }
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c
index 5dba17c149af..bd1dfaa78c09 100644
--- a/usr.sbin/mrouted/mapper.c
+++ b/usr.sbin/mrouted/mapper.c
@@ -1,23 +1,23 @@
 /* Mapper for connections between MRouteD multicast routers.
  * Written by Pavel Curtis <Pavel@PARC.Xerox.Com>
  *
- * $Id: mapper.c,v 1.8 1994/08/24 23:53:54 thyagara Exp $
+ * $Id: mapper.c,v 1.2 1994/09/08 02:51:19 wollman Exp $
  */
 
 /*
  * Copyright (c) Xerox Corporation 1992. All rights reserved.
- *  
+ *
  * License is granted to copy, to use, and to make and to use derivative
  * works for research and evaluation purposes, provided that Xerox is
  * acknowledged in all documentation pertaining to any such copy or derivative
  * work. Xerox grants no other licenses expressed or implied. The Xerox trade
  * name should not be used in any advertising without its written permission.
- *  
+ *
  * XEROX CORPORATION MAKES NO REPRESENTATIONS CONCERNING EITHER THE
  * MERCHANTABILITY OF THIS SOFTWARE OR THE SUITABILITY OF THIS SOFTWARE
  * FOR ANY PARTICULAR PURPOSE.  The software is provided "as is" without
  * express or implied warranty of any kind.
- *  
+ *
  * These notices must be retained in any copies of any part of this software.
  */
 
@@ -354,10 +354,10 @@ void accept_neighbors(src, dst, p, datalen, level)
 	    ifc_node->tries = -1;
 	    ifc_node->u.alias = node;
 	}
-	
+
 	ifc = find_interface(ifc_addr, node);
 	old_neighbors = ifc->neighbors;
-	
+
 	/* Add the neighbors for this interface */
 	while (ncount--) {
 	    u_long 	neighbor;
@@ -490,10 +490,10 @@ void accept_neighbors2(src, dst, p, datalen)
 	    ifc_node->tries = -1;
 	    ifc_node->u.alias = node;
 	}
-	
+
 	ifc = find_interface(ifc_addr, node);
 	old_neighbors = ifc->neighbors;
-	
+
 	/* Add the neighbors for this interface */
 	while (ncount--) {
 	    u_long 	neighbor;
@@ -586,7 +586,7 @@ void print_map(node)
 {
     if (node) {
 	char *name, *addr;
-	
+
 	print_map(node->left);
 
 	addr = inet_fmt(node->addr, s1);
@@ -794,7 +794,7 @@ main(argc, argv)
     char *argv[];
 {
     int flood = FALSE, graph = FALSE;
-    
+
 #ifdef SYSV
     setvbuf(stderr, NULL, _IOLBF, 0);
 #else
@@ -837,7 +837,7 @@ main(argc, argv)
     }
 
     if (argc > 1) {
-      usage:	
+      usage:
 	fprintf(stderr,
 		"Usage: map-mbone [-f] [-g] [-n] [-t timeout] %s\n\n",
 		"[-r retries] [-d [debug-level]] [router]");
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index f82b671063a4..d0d9e6b0cb80 100644
--- a/usr.sbin/mrouted/mrinfo.c
+++ b/usr.sbin/mrouted/mrinfo.c
@@ -44,24 +44,24 @@
  * SUCH DAMAGE.
  * ---------------------------------
  * Copyright (c) Xerox Corporation 1992. All rights reserved.
- * 
+ *
  * License is granted to copy, to use, and to make and to use derivative works
  * for research and evaluation purposes, provided that Xerox is acknowledged
  * in all documentation pertaining to any such copy or derivative work. Xerox
  * grants no other licenses expressed or implied. The Xerox trade name should
  * not be used in any advertising without its written permission.
- * 
+ *
  * XEROX CORPORATION MAKES NO REPRESENTATIONS CONCERNING EITHER THE
  * MERCHANTABILITY OF THIS SOFTWARE OR THE SUITABILITY OF THIS SOFTWARE FOR
  * ANY PARTICULAR PURPOSE.  The software is provided "as is" without express
  * or implied warranty of any kind.
- * 
+ *
  * These notices must be retained in any copies of any part of this software.
  */
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Id: mrinfo.c,v 1.2 1994/09/08 02:51:20 wollman Exp $";
+    "@(#) $Id: mrinfo.c,v 1.3 1995/05/16 00:28:46 jkh Exp $";
 /*  original rcsid:
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 */
@@ -98,7 +98,7 @@ inet_name(addr)
  * message and the current debug level.  For errors of severity LOG_ERR or
  * worse, terminate the program.
  */
-void 
+void
 log(severity, syserr, format, a, b, c, d, e)
 	int     severity, syserr;
 	char   *format;
@@ -137,7 +137,7 @@ log(severity, syserr, format, a, b, c, d, e)
 /*
  * Send a neighbors-list request.
  */
-void 
+void
 ask(dst)
 	u_long  dst;
 {
@@ -145,7 +145,7 @@ ask(dst)
 			htonl(MROUTED_LEVEL), 0);
 }
 
-void 
+void
 ask2(dst)
 	u_long  dst;
 {
@@ -156,7 +156,7 @@ ask2(dst)
 /*
  * Process an incoming neighbor-list message.
  */
-void 
+void
 accept_neighbors(src, dst, p, datalen)
 	u_long  src, dst;
 	u_char *p;
@@ -189,7 +189,7 @@ accept_neighbors(src, dst, p, datalen)
 	}
 }
 
-void 
+void
 accept_neighbors2(src, dst, p, datalen)
 	u_long  src, dst;
 	u_char *p;
@@ -232,7 +232,7 @@ accept_neighbors2(src, dst, p, datalen)
 	}
 }
 
-int 
+int
 get_number(var, deflt, pargv, pargc)
 	int    *var, *pargc, deflt;
 	char ***pargv;
@@ -258,7 +258,7 @@ get_number(var, deflt, pargv, pargc)
 	}
 }
 
-u_long 
+u_long
 host_addr(name)
 	char   *name;
 {
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index 590fe948bfab..d3e7f5f0f6e5 100644
--- a/usr.sbin/mrouted/mtrace.c
+++ b/usr.sbin/mrouted/mtrace.c
@@ -22,7 +22,7 @@ inet_name(addr)
 	return e ? e->h_name : "?";
 }
 
-u_long 
+u_long
 host_addr(name)
 	char   *name;
 {
@@ -75,7 +75,7 @@ flag_type(type)
       default:
 	return ("INVALID ERR");
     }
-}    
+}
 
 int
 t_diff(a, b)
@@ -245,7 +245,7 @@ usage:	printf("usage: mtrace -s <src> -g <grp> -d <dst> -n <# reports> \n");
 
     if (dst == NULL)
 	dst = qgrp;
-	
+
     /*
      * set timer to calculate delays & send query
      */
@@ -256,7 +256,7 @@ usage:	printf("usage: mtrace -s <src> -g <grp> -d <dst> -n <# reports> \n");
 	      qgrp, datalen);
 
     /*
-     * If the response is to be a multicast address, make sure we 
+     * If the response is to be a multicast address, make sure we
      * are listening on that multicast address.
      */
     if (IN_MULTICAST(ntohl(raddr)))
@@ -278,13 +278,13 @@ usage:	printf("usage: mtrace -s <src> -g <grp> -d <dst> -n <# reports> \n");
 
 	FD_ZERO(&fds);
 	FD_SET(igmp_socket, &fds);
-	
+
 	/* need to input timeout as optional argument */
 	tv.tv_sec = timeout;
 	tv.tv_usec = 0;
-	
+
 	count = select(igmp_socket + 1, &fds, 0, 0, &tv);
-	
+
 	if (count < 0) {
 	    if (errno != EINTR)
 		perror("select");
@@ -305,7 +305,7 @@ usage:	printf("usage: mtrace -s <src> -g <grp> -d <dst> -n <# reports> \n");
 		perror("recvfrom");
 	    continue;
 	}
-	
+
 	if (recvlen < sizeof(struct ip)) {
 	    log(LOG_WARNING, 0,
 		"packet too short (%u bytes) for IP header",
@@ -331,7 +331,7 @@ usage:	printf("usage: mtrace -s <src> -g <grp> -d <dst> -n <# reports> \n");
 	    continue;
 	}
 
-	if (igmp->igmp_type != IGMP_MTRACE && 
+	if (igmp->igmp_type != IGMP_MTRACE &&
 	    igmp->igmp_type != IGMP_MTRACE_RESP)
 	    continue;
 
@@ -348,13 +348,13 @@ usage:	printf("usage: mtrace -s <src> -g <grp> -d <dst> -n <# reports> \n");
 	/* If this is query with a different id, ignore! */
 	if (query->tr_qid != qid)
 	    continue;
-	
+
 	/*
 	 * Most of the sanity checking done at this point.
 	 * This is the packet we have been waiting for all this time
 	 */
 	resp = (struct tr_resp *)(query + 1);
-	
+
 	rno = (igmpdatalen - QLEN)/RLEN;
 
 	/*
@@ -381,7 +381,7 @@ usage:	printf("usage: mtrace -s <src> -g <grp> -d <dst> -n <# reports> \n");
 	    printf("hop: %d ms ", t_diff(resptime, r->tr_qarr));
 	    printf("%s ", proto_type(r->tr_rproto));
 	    printf("%s\n", flag_type(r->tr_rflags));
-	    
+
 	    printf("  %-15s  ", inet_fmt(r->tr_outaddr, s1));
 	    printf("v_in: %ld ", r->tr_vifin);
 	    printf("v_out: %ld ", r->tr_vifout);
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index b18530af55c4..3269288cd80a 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: prune.c,v 1.3 1995/03/16 16:25:55 wollman Exp $
+ * $Id: prune.c,v 1.4 1995/05/16 00:28:48 jkh Exp $
  */
 
 
@@ -37,7 +37,7 @@ extern int max_prune_lifetime;
 			default:  y = 0; \
 		} \
 	}
-			    
+
 static struct ktable *kernel_rtable;    /* ptr to list of kernel rt entries */
 unsigned int kroutes;			/* current number of cache entries  */
 
@@ -51,7 +51,7 @@ void init_ktable()
     kroutes		= 0;
 }
 
-/* 
+/*
  * Determine if mcastgrp has a listener on vifi
  */
 int grplst_mem(vifi, mcastgrp)
@@ -60,17 +60,17 @@ int grplst_mem(vifi, mcastgrp)
 {
     register struct listaddr *g;
     register struct uvif *v;
-    
+
     v = &uvifs[vifi];
-    
+
     for (g = v->uv_groups; g != NULL; g = g->al_next)
-	if (mcastgrp == g->al_addr) 
+	if (mcastgrp == g->al_addr)
 	    return 1;
-    
+
     return 0;
 }
 
-/* 
+/*
  * Updates the ttl values for each vif.
  */
 void prun_add_ttls(kt)
@@ -78,11 +78,11 @@ void prun_add_ttls(kt)
 {
     struct uvif *v;
     vifi_t vifi;
-    
+
     for (vifi = 0, v = uvifs; vifi < numvifs; ++vifi, ++v) {
 	if (VIFM_ISSET(vifi, kt->kt_grpmems))
 	    kt->kt_ttls[vifi] = v->uv_threshold;
-	else 
+	else
 	    kt->kt_ttls[vifi] = 0;
     }
 }
@@ -111,7 +111,7 @@ int scoped_addr(vifi, addr)
     return 0;
 }
 
-/* 
+/*
  * Add a new table entry for (origin, mcastgrp)
  */
 void add_table_entry(origin, mcastgrp)
@@ -121,22 +121,22 @@ void add_table_entry(origin, mcastgrp)
     struct rtentry *r;
     struct ktable *kt;
     int i;
-    
+
     if ((kt = find_src_grp(origin, mcastgrp)) != NULL) {
 	log(LOG_DEBUG, 0, "kernel entry exists for (%s %s)",
 	    inet_fmt(origin, s1), inet_fmt(mcastgrp, s2));
 	return;
     }
-    
+
     r = determine_route(origin);
-    
+
     /* allocate space for the new entry */
     kt = (struct ktable *)malloc(sizeof(struct ktable));
     if (kt == NULL)
 	log(LOG_ERR, 0, "ran out of memory");   /* fatal */
-    
+
     kroutes++;
-    
+
     /* add the new values in */
     if (r == NULL) {
 	kt->kt_origin 		= origin;
@@ -173,10 +173,10 @@ void add_table_entry(origin, mcastgrp)
 
 	/* obtain the multicast group membership list */
 	for (i = 0; i < numvifs; i++) {
-	    if (VIFM_ISSET(i, kt->kt_children) && 
+	    if (VIFM_ISSET(i, kt->kt_children) &&
 		!(VIFM_ISSET(i, kt->kt_leaves)))
 		VIFM_SET(i, kt->kt_grpmems);
-	    
+
 	    if (VIFM_ISSET(i, kt->kt_leaves) && grplst_mem(i, mcastgrp))
 		VIFM_SET(i, kt->kt_grpmems);
 	}
@@ -188,23 +188,23 @@ void add_table_entry(origin, mcastgrp)
 	else
 	    kt->kt_grpmems &= ~kt->kt_scope;
     }
-    
+
     /* update the kernel_rtable pointer */
     kt->kt_next 	= kernel_rtable;
     kernel_rtable 	= kt;
-    
+
     /* update ttls and add entry into kernel */
     prun_add_ttls(kt);
     k_add_rg(kt);
-    
+
     log(LOG_DEBUG, 0, "add entry (%s %s) vif-list:%x",
-	inet_fmt(kt->kt_origin, s1), 
+	inet_fmt(kt->kt_origin, s1),
 	inet_fmt(kt->kt_mcastgrp, s2),
 	kt->kt_grpmems);
-    
+
     /* If there are no leaf vifs
      * which have this group, then
-     * mark this src-grp as a prune candidate. 
+     * mark this src-grp as a prune candidate.
      * One thing to do is to check if parent vif is the source
      * and not send a prune to that.
      */
@@ -222,13 +222,13 @@ void reset_neighbor_state(vifi, addr)
 {
     struct ktable *prev_kt, *kt;
     struct prunlst *prev_krl, *krl;
-    
+
     /* Check each src-grp entry to see if it was pruned on that interface
        If so, forward on that interface */
     for (prev_kt = (struct ktable *)&kernel_rtable,
 	 kt = kernel_rtable; kt;
 	 prev_kt = kt, kt = kt->kt_next) {
-	for (prev_krl = (struct prunlst *)&kt->kt_rlist, 
+	for (prev_krl = (struct prunlst *)&kt->kt_rlist,
 	     krl = prev_krl->rl_next;
 	     krl;
 	     prev_krl = krl, krl = krl->rl_next) {
@@ -267,14 +267,14 @@ void reset_neighbor_state(vifi, addr)
 	}
 
 	if (!VIFM_ISSET(vifi, kt->kt_grpmems)) {
-	    if (VIFM_ISSET(vifi, kt->kt_children) && 
+	    if (VIFM_ISSET(vifi, kt->kt_children) &&
 		!(VIFM_ISSET(vifi, kt->kt_leaves)))
 		VIFM_SET(vifi, kt->kt_grpmems);
-	    
-	    if (VIFM_ISSET(vifi, kt->kt_leaves) && 
+
+	    if (VIFM_ISSET(vifi, kt->kt_leaves) &&
 		grplst_mem(vifi, kt->kt_mcastgrp))
 		VIFM_SET(vifi, kt->kt_grpmems);
-	    
+
 	    kt->kt_grpmems &= ~kt->kt_scope;
 	    prun_add_ttls(kt);
 	    k_add_rg(kt);
@@ -293,7 +293,7 @@ void del_table_entry(r, mcastgrp, del_flag)
 {
     struct ktable *kt, *prev_kt;
     struct prunlst *krl;
-    
+
     if (del_flag == DEL_ALL_ROUTES) {
 	for (prev_kt = (struct ktable *)&kernel_rtable;
 	     kt = prev_kt->kt_next;
@@ -301,16 +301,16 @@ void del_table_entry(r, mcastgrp, del_flag)
 	    if ((kt->kt_origin & r->rt_originmask) == r->rt_origin) {
 		log(LOG_DEBUG, 0, "delete all rtes %s",
 		    inet_fmt(kt->kt_origin, s1));
-		
+
 		k_del_rg(kt);
-		
+
 		/* free prun list entries */
 		while (kt->kt_rlist) {
 		    krl = kt->kt_rlist;
 		    kt->kt_rlist = krl->rl_next;
 		    free((char *)krl);
 		}
-		
+
 		/* free the source mcastgrp entry */
 		prev_kt->kt_next = kt->kt_next;
 		free((char *)kt);
@@ -319,25 +319,25 @@ void del_table_entry(r, mcastgrp, del_flag)
 	    }
 	}
     }
-    
+
     if (del_flag == DEL_RTE_GROUP) {
 	for (prev_kt = (struct ktable *)&kernel_rtable;
 	     (prev_kt) && (kt = prev_kt->kt_next);
 	     prev_kt = kt) {
 	    if ((kt->kt_origin & r->rt_originmask) == r->rt_origin &&
 		kt->kt_mcastgrp == mcastgrp) {
-		log(LOG_DEBUG, 0, "delete (%s, %s)", 
+		log(LOG_DEBUG, 0, "delete (%s, %s)",
 		    inet_fmt(kt->kt_origin, s1), inet_fmt(mcastgrp, s2));
-		
+
 		k_del_rg(kt);
-		
+
 		/* free prun list entries */
 		while (kt->kt_rlist) {
 		    krl = kt->kt_rlist;
 		    kt->kt_rlist = krl->rl_next;
 		    free((char *)krl);
 		}
-		
+
 		/* free the source mcastgrp entry */
 		prev_kt->kt_next = kt->kt_next;
 		free((char *)kt);
@@ -358,45 +358,45 @@ void update_table_entry(r)
     struct prunlst 	*krl;
     int i;
     int changed;
-    
+
     for (kt = kernel_rtable; kt; kt = kt->kt_next)
 	if ((kt->kt_origin & r->rt_originmask)== r->rt_origin) {
 	    changed = 0;
-	    
+
 	    if (kt->kt_leaves != r->rt_leaves)
 		changed |= 0x1;
 	    if (kt->kt_children != r->rt_children)
 		changed |= 0x2;
 	    if (kt->kt_parent != r->rt_parent)
 		changed |= 0x4;
-	    
+
 	    if (!changed)
 		continue;
-	    
+
 	    log(LOG_DEBUG, 0, "updating entry: (%s %s) code:%x",
 		inet_fmt(kt->kt_origin, s1),
 		inet_fmt(kt->kt_mcastgrp, s2), changed);
-	    
+
 	    /* free prun list entries */
 	    while (kt->kt_rlist) {
 		krl = kt->kt_rlist;
 		kt->kt_rlist = krl->rl_next;
 		free((char *)krl);
 	    }
-	    
+
 	    kt->kt_parent	= r->rt_parent;
 	    kt->kt_gateway	= r->rt_gateway;
 	    kt->kt_grpmems 	= 0;
 	    kt->kt_prun_count	= 0;
 	    VIFM_COPY(r->rt_children, kt->kt_children);
 	    VIFM_COPY(r->rt_leaves,   kt->kt_leaves);
-	    
+
 	    /* obtain the multicast group membership list */
 	    for (i = 0; i < numvifs; i++) {
-		if (VIFM_ISSET(i, kt->kt_children) && 
+		if (VIFM_ISSET(i, kt->kt_children) &&
 		    !(VIFM_ISSET(i, kt->kt_leaves)))
 		    VIFM_SET(i, kt->kt_grpmems);
-		
+
 		if (VIFM_ISSET(i, kt->kt_leaves) && grplst_mem(i, kt->kt_mcastgrp))
 		    VIFM_SET(i, kt->kt_grpmems);
 	    }
@@ -406,21 +406,21 @@ void update_table_entry(r)
 	    }
 	    else
 		kt->kt_grpmems &= ~kt->kt_scope;
-	    
+
 	    if (kt->kt_grpmems && kt->kt_prsent_timer) {
 		kt->kt_grftsnt = 1;
 		send_graft(kt);
 		kt->kt_prsent_timer = 0;
 	    }
-	    
+
 	    /* update ttls and add entry into kernel */
 	    prun_add_ttls(kt);
 	    k_add_rg(kt);
-	    
+
 	    if (!kt->kt_grpmems && kt->kt_gateway) {
 		kt->kt_timer = CACHE_LIFETIME(cache_lifetime);
 		send_prune(kt);
-	    }	    
+	    }
 	}
 }
 
@@ -434,10 +434,10 @@ void update_lclgrp(vifi, mcastgrp)
     u_long mcastgrp;
 {
     struct ktable *kt;
-    
+
     log(LOG_DEBUG, 0, "group %s joined at vif %d",
 	inet_fmt(mcastgrp, s1), vifi);
-    
+
     for (kt = kernel_rtable; kt; kt = kt->kt_next)
 	if (kt->kt_mcastgrp == mcastgrp && VIFM_ISSET(vifi, kt->kt_children)) {
 	    VIFM_SET(vifi, kt->kt_grpmems);
@@ -446,7 +446,7 @@ void update_lclgrp(vifi, mcastgrp)
 		continue;
 	    prun_add_ttls(kt);
 	    k_add_rg(kt);
-	}	
+	}
 }
 
 /*
@@ -457,10 +457,10 @@ void delete_lclgrp(vifi, mcastgrp)
     u_long mcastgrp;
 {
     struct ktable *kt;
-    
+
     log(LOG_DEBUG, 0, "group %s left at vif %d",
 	inet_fmt(mcastgrp, s1), vifi);
-    
+
     for (kt = kernel_rtable; kt; kt = kt->kt_next)
 	if (kt->kt_mcastgrp == mcastgrp)  {
 	    struct listaddr *vr;
@@ -476,7 +476,7 @@ void delete_lclgrp(vifi, mcastgrp)
 		VIFM_CLR(vifi, kt->kt_grpmems);
 		prun_add_ttls(kt);
 		k_add_rg(kt);
-		
+
 		/*
 		 * If there are no more members of this particular group,
 		 *  send prune upstream
@@ -484,7 +484,7 @@ void delete_lclgrp(vifi, mcastgrp)
 		if (kt->kt_grpmems == NULL && kt->kt_gateway)
 		    send_prune(kt);
 	    }
-	}	
+	}
 }
 
 /*
@@ -495,7 +495,7 @@ int pruning_neighbor(vifi, addr)
     u_long addr;
 {
     struct listaddr *u;
-    
+
     for (u = uvifs[vifi].uv_neighbors; u; u = u->al_next)
 	if ((u->al_addr == addr) && (u->al_pv > 2))
 	    return 1;
@@ -505,8 +505,8 @@ int pruning_neighbor(vifi, addr)
 
 /*
  * Send a prune message to the upstream router
- * given by the kt->kt_gateway argument. The origin and 
- * multicast group can be determined from the kt 
+ * given by the kt->kt_gateway argument. The origin and
+ * multicast group can be determined from the kt
  * structure.
  *
  * Also, record an entry that a prune was sent for this group
@@ -520,24 +520,24 @@ void send_prune(kt)
     int datalen;
     u_long src;
     u_long dst;
-    
+
     /* Don't process any prunes if router is not pruning */
     if (pruning == 0)
 	return;
-    
+
     /* Don't send a prune to a non-pruning router */
     if (!pruning_neighbor(kt->kt_parent, kt->kt_gateway))
 	return;
-    
-    /* 
+
+    /*
      * sends a prune message to the router upstream.
      */
     src = uvifs[kt->kt_parent].uv_lcl_addr;
     dst = kt->kt_gateway;
-    
+
     p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN;
     datalen = 0;
-    
+
     /*
      * determine prune lifetime
      */
@@ -545,7 +545,7 @@ void send_prune(kt)
     for (krl = kt->kt_rlist; krl; krl = krl->rl_next)
 	if (krl->rl_timer < kt->kt_prsent_timer)
 	    kt->kt_prsent_timer = krl->rl_timer;
-    
+
     for (i = 0; i < 4; i++)
 	*p++ = ((char *)&(kt->kt_origin))[i];
     for (i = 0; i < 4; i++)
@@ -558,10 +558,10 @@ void send_prune(kt)
 #endif
 	*p++ = ((char *)&(kt->kt_prsent_timer))[i];
     datalen += 12;
-    
+
     send_igmp(src, dst, IGMP_DVMRP, DVMRP_PRUNE,
 	      htonl(MROUTED_LEVEL), datalen);
-    
+
     /*	log(LOG_DEBUG, 0, "send prune for src:%x, grp:%x up to %x",
 	kt->kt_origin, kt->kt_mcastgrp, kt->kt_gateway);*/
 }
@@ -587,22 +587,22 @@ void accept_prune(src, dst, p, datalen)
     u_long prun_tmr;
     vifi_t vifi;
     int i;
-    int stop_sending; 
+    int stop_sending;
     struct ktable *kt;
     struct prunlst *pr_recv;
     struct listaddr *vr;
-    
+
     /* Don't process any prunes if router is not pruning */
     if (pruning == 0)
 	return;
-    
+
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
 	log(LOG_INFO, 0,
     	    "ignoring prune report from non-neighbor %s",
 	    inet_fmt(src, s1));
 	return;
     }
-    
+
     /* Check if enough data is present */
     if (datalen < 12) {
 	log(LOG_WARNING, 0,
@@ -610,7 +610,7 @@ void accept_prune(src, dst, p, datalen)
 	    inet_fmt(src, s1));
 	return;
     }
-    
+
     for (i = 0; i< 4; i++)
 	((char *)&prun_src)[i] = *p++;
     for (i = 0; i< 4; i++)
@@ -622,15 +622,15 @@ void accept_prune(src, dst, p, datalen)
     for (i = 3; i >= 0; i--)
 #endif
 	((char *)&prun_tmr)[i] = *p++;
-    
+
     kt = find_src_grp(prun_src, prun_dst);
-    
-    if (kt == NULL) 
+
+    if (kt == NULL)
 	{
 	    log(LOG_WARNING, 0, "prune message received incorrectly");
 	    return;
 	}
-    
+
     if (!VIFM_ISSET(vifi, kt->kt_children))
 	{
 	    log(LOG_INFO, 0,
@@ -649,35 +649,35 @@ void accept_prune(src, dst, p, datalen)
 	    log(LOG_INFO, 0, "duplicate prune from %s", inet_fmt(src, s1));
 	    return;
 	}
-    
+
     log(LOG_DEBUG, 0, "%s on vif %d prunes (%s %s) tmr %d",
 	inet_fmt(src, s1), vifi,
 	inet_fmt(prun_src, s2), inet_fmt(prun_dst, s3), prun_tmr);
-    
+
     /* allocate space for the prune structure */
     pr_recv = (struct prunlst *)(malloc(sizeof(struct prunlst)));
-    
+
     if (pr_recv == NULL)
 	log(LOG_ERR, 0, "pr_recv: ran out of memory");
-    
+
     pr_recv->rl_vifi	= vifi;
     pr_recv->rl_router	= src;
     pr_recv->rl_timer	= prun_tmr;
-    
-    /* 
-     * add this prune message to the list of prunes received 
-     * for this src group pair 
+
+    /*
+     * add this prune message to the list of prunes received
+     * for this src group pair
      */
     pr_recv->rl_next = kt->kt_rlist;
     kt->kt_rlist = pr_recv;
-    
+
     kt->kt_prun_count++;
     kt->kt_timer = CACHE_LIFETIME(cache_lifetime);
     if (kt->kt_timer < prun_tmr)
 	kt->kt_timer = prun_tmr;
-    
+
     /*
-     * check if any more packets need to be sent on the 
+     * check if any more packets need to be sent on the
      * vif which sent this message
      */
     for (vr = uvifs[vifi].uv_neighbors, stop_sending = 1;
@@ -686,16 +686,16 @@ void accept_prune(src, dst, p, datalen)
 	    stop_sending = 0;
 	    break;
 	}
-    
+
     if (stop_sending && !grplst_mem(vifi, prun_dst)) {
 	VIFM_CLR(vifi, kt->kt_grpmems);
 	prun_add_ttls(kt);
 	k_add_rg(kt);
     }
-    
+
     /*
      * check if all the child routers have expressed no interest
-     * in this group and if this group does not exist in the 
+     * in this group and if this group does not exist in the
      * interface
      * Send a prune message then upstream
      */
@@ -713,11 +713,11 @@ int no_entry_exists(vr, kt)
     struct ktable *kt;
 {
     struct prunlst *krl;
-    
+
     for (krl = kt->kt_rlist; krl; krl = krl->rl_next)
 	if (krl->rl_router == vr)
 	    return 0;
-    
+
     return 1;
 }
 
@@ -729,16 +729,16 @@ struct ktable *find_src_grp(src, grp)
     u_long grp;
 {
     struct ktable *kt;
-    
+
     for (kt = kernel_rtable; kt; kt = kt->kt_next)
-	if ((kt->kt_origin == (src & kt->kt_originmask)) && 
+	if ((kt->kt_origin == (src & kt->kt_originmask)) &&
 	    (kt->kt_mcastgrp == grp))
 	    return kt;
-    
+
     return NULL;
 }
 
-/* 
+/*
  * scans through the neighbor list of this router and then
  * determines the total no. of child routers present
  */
@@ -748,12 +748,12 @@ int rtr_cnt(kt)
     int ri;
     int rcount = 0;
     struct listaddr *u;
-    
+
     for (ri = 0; ri < numvifs; ri++)
 	if (VIFM_ISSET(ri, kt->kt_children))
 	    for(u = uvifs[ri].uv_neighbors; u; u = u->al_next)
 		rcount++;
-    
+
     return rcount;
 }
 
@@ -766,7 +766,7 @@ void chkgrp_graft(vifi, mcastgrp)
     u_long	mcastgrp;
 {
     struct ktable *kt;
-    
+
     for (kt = kernel_rtable; kt; kt = kt->kt_next)
 	if (kt->kt_mcastgrp == mcastgrp && VIFM_ISSET(vifi, kt->kt_children))
 	    if (kt->kt_prsent_timer) {
@@ -781,33 +781,33 @@ void chkgrp_graft(vifi, mcastgrp)
 
 		/* set the flag for graft retransmission */
 		kt->kt_grftsnt = 1;
-		
+
 		/* send graft upwards */
 		send_graft(kt);
-		
+
 		/* reset the prune timer and update cache timer*/
 		kt->kt_prsent_timer = 0;
 		kt->kt_timer = max_prune_lifetime;
-		
+
 		prun_add_ttls(kt);
 		k_add_rg(kt);
 	    }
 }
 
 /* determine the multicast group and src
- * 
- * if it does, then determine if a prune was sent 
+ *
+ * if it does, then determine if a prune was sent
  * upstream.
  * if prune sent upstream, send graft upstream and send
  * ack downstream.
- * 
+ *
  * if no prune sent upstream, change the forwarding bit
  * for this interface and send ack downstream.
  *
  * if no entry exists for this group just ignore the message
- * [this may not be the right thing to do. but lets see what 
+ * [this may not be the right thing to do. but lets see what
  * happens for the time being and then we might decide to do
- * a modification to the code depending on the type of behaviour 
+ * a modification to the code depending on the type of behaviour
  * that we see in this]
  */
 void accept_graft(src, dst, p, datalen)
@@ -823,64 +823,64 @@ void accept_graft(src, dst, p, datalen)
     int 	i;
     struct 	prunlst *krl;
     struct	prunlst *prev_krl;
-    
+
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
 	log(LOG_INFO, 0,
     	    "ignoring graft from non-neighbor %s",
 	    inet_fmt(src, s1));
 	return;
     }
-    
+
     if (datalen < 8) {
 	log(LOG_WARNING, 0,
 	    "received non-decipherable graft from %s",
 	    inet_fmt(src, s1));
 	return;
     }
-    
+
     for (i = 0; i< 4; i++)
 	((char *)&prun_src)[i] = *p++;
     for (i = 0; i< 4; i++)
 	((char *)&prun_dst)[i] = *p++;
-    
+
     log(LOG_DEBUG, 0, "%s on vif %d grafts (%s %s)",
 	inet_fmt(src, s1), vifi,
 	inet_fmt(prun_src, s2), inet_fmt(prun_dst, s3));
-    
+
     kt = find_src_grp(prun_src, prun_dst);
     if (kt == NULL) {
 	log(LOG_DEBUG, 0, "incorrect graft received from %s", inet_fmt(src, s1));
 	return;
     }
-    
+
     if (VIFM_ISSET(vifi, kt->kt_scope)) {
 	log(LOG_INFO, 0,
 	    "incorrect graft received from %s on scoped vif %d",
 	    inet_fmt(src, s1), vifi);
 	return;
     }
-    /* remove prune entry from the list 
+    /* remove prune entry from the list
      * allow forwarding on that vif, make change in the kernel
      */
     for (prev_krl = (struct prunlst *)&kt->kt_rlist;
-	 krl = prev_krl->rl_next; 
+	 krl = prev_krl->rl_next;
 	 prev_krl = krl)
 	if ((krl->rl_vifi) == vifi && (krl->rl_router == src)) {
 	    prev_krl->rl_next = krl->rl_next;
 	    free((char *)krl);
 	    krl = prev_krl;
-	    
+
 	    kt->kt_prun_count--;
 	    VIFM_SET(vifi, kt->kt_grpmems);
 	    prun_add_ttls(kt);
 	    k_add_rg(kt);
-	    break;				
+	    break;
 	}
-    
+
     /* send ack downstream */
     send_graft_ack(kt, src);
     kt->kt_timer = max_prune_lifetime;
-    
+
     if (kt->kt_prsent_timer) {
 	/* set the flag for graft retransmission */
 	kt->kt_grftsnt = 1;
@@ -905,22 +905,22 @@ void send_graft_ack(kt, to)
     int datalen;
     u_long src;
     u_long dst;
-    
+
     src = uvifs[kt->kt_parent].uv_lcl_addr;
     dst = to;
-    
+
     p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN;
     datalen = 0;
-    
+
     for (i = 0; i < 4; i++)
 	*p++ = ((char *)&(kt->kt_origin))[i];
     for (i = 0; i < 4; i++)
 	*p++ = ((char *)&(kt->kt_mcastgrp))[i];
     datalen += 8;
-    
+
     send_igmp(src, dst, IGMP_DVMRP, DVMRP_GRAFT_ACK,
 	      htonl(MROUTED_LEVEL), datalen);
-    
+
     log(LOG_DEBUG, 0, "sent graft ack (%s, %s) to %s",
 	inet_fmt(kt->kt_origin, s1), inet_fmt(kt->kt_mcastgrp, s2),
 	inet_fmt(dst, s3));
@@ -930,7 +930,7 @@ void send_graft_ack(kt, to)
 /*
  * a prune was sent upstream
  * so, a graft has to be sent to annul the prune
- * set up a graft timer so that if an ack is not 
+ * set up a graft timer so that if an ack is not
  * heard within that time, another graft request
  * is sent out.
  */
@@ -942,19 +942,19 @@ void send_graft(kt)
     int datalen;
     u_long src;
     u_long dst;
-    
+
     src = uvifs[kt->kt_parent].uv_lcl_addr;
     dst = kt->kt_gateway;
-    
+
     p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN;
     datalen = 0;
-    
+
     for (i = 0; i < 4; i++)
 	*p++ = ((char *)&(kt->kt_origin))[i];
     for (i = 0; i < 4; i++)
 	*p++ = ((char *)&(kt->kt_mcastgrp))[i];
     datalen += 8;
-    
+
     if (datalen != 0) {
 	send_igmp(src, dst, IGMP_DVMRP, DVMRP_GRAFT,
 		  htonl(MROUTED_LEVEL), datalen);
@@ -965,11 +965,11 @@ void send_graft(kt)
 }
 
 /*
- * find out which group is involved first of all 
+ * find out which group is involved first of all
  * then determine if a graft was sent.
  * if no graft sent, ignore the message
- * if graft was sent and the ack is from the right 
- * source, remove the graft timer so that we don't 
+ * if graft was sent and the ack is from the right
+ * source, remove the graft timer so that we don't
  * have send a graft again
  */
 void accept_g_ack(src, dst, p, datalen)
@@ -983,37 +983,37 @@ void accept_g_ack(src, dst, p, datalen)
     u_long	grft_dst;
     struct ktable *kt;
     int 	i;
-    
+
     if ((vifi = find_vif(src, dst)) == NO_VIF) {
 	log(LOG_INFO, 0,
     	    "ignoring graft ack report from non-neighbor %s",
 	    inet_fmt(src, s1));
 	return;
     }
-    
+
     if (datalen < 8) {
 	log(LOG_WARNING, 0,
 	    "received non-decipherable graft ack report from %s",
 	    inet_fmt(src, s1));
 	return;
     }
-    
+
     for (i = 0; i< 4; i++)
 	((char *)&grft_src)[i] = *p++;
     for (i = 0; i< 4; i++)
 	((char *)&grft_dst)[i] = *p++;
-    
+
     log(LOG_DEBUG, 0, "%s on vif %d acks graft (%s %s)",
 	inet_fmt(src, s1), vifi,
 	inet_fmt(grft_src, s2), inet_fmt(grft_dst, s3));
-    
+
     kt = find_src_grp(grft_src, grft_dst);
-    
+
     if (kt == NULL) {
 	log(LOG_WARNING, 0, "received wrong graft ack from %s", inet_fmt(src, s1));
 	return;
     }
-    
+
     if (kt->kt_grftsnt)
 	kt->kt_grftsnt = 0;
 }
@@ -1026,7 +1026,7 @@ void free_all_prunes()
 {
     register struct ktable *kt;
     register struct prunlst *krl;
-    
+
     while (kernel_rtable != NULL) {
 	kt = kernel_rtable;
 	kernel_rtable = kt->kt_next;
@@ -1054,10 +1054,10 @@ void age_table_entry()
     struct ktable *prev_kt;
     struct prunlst *krl;
     struct prunlst *prev_krl;
-    
+
     log(LOG_DEBUG, 0, "kr:%x pr:%x",
 	kernel_rtable, (struct ktable *)&kernel_rtable);
-    
+
     for (prev_kt = (struct ktable *)&kernel_rtable;
 	 kt = prev_kt->kt_next;
 	 prev_kt = kt) {
@@ -1072,10 +1072,10 @@ void age_table_entry()
 		send_graft(kt);
 	}
 
-	/* delete the entry only if there are no subordinate 
+	/* delete the entry only if there are no subordinate
 	   routers
-	   
-	   Now, if there are subordinate routers, then, what we 
+
+	   Now, if there are subordinate routers, then, what we
 	   have to do is to decrement each and every router's prune
 	   time entry too and decide if we want to forward on
 	   that link basically
@@ -1090,8 +1090,8 @@ void age_table_entry()
 		    inet_fmt(kt->kt_origin, s1),
 		    inet_fmt(kt->kt_mcastgrp, s2),
 		    krl->rl_vifi);
-		
-		/* 
+
+		/*
 		 * forwarding now, so entry is not pruned anymore
 		 * reset the cache timer to a largish value also
 		 */
@@ -1103,13 +1103,13 @@ void age_table_entry()
 		    prun_add_ttls(kt);
 		    k_add_rg(kt);
 		}
-		
+
 		/* remove the router's prune entry and await new one */
 		kt->kt_prun_count--;
 		prev_krl->rl_next = krl->rl_next;
 		free((char *)krl);
 		krl = prev_krl;
-		
+
 		if (krl == NULL)
 		    break;
 	    }
@@ -1117,7 +1117,7 @@ void age_table_entry()
 
 	if (kt->kt_timer <= 0) {
 	    /*
-	     * If there are prune entries still outstanding, 
+	     * If there are prune entries still outstanding,
 	     * update the cache timer otherwise expire entry.
 	     */
 	    if (kt->kt_rlist) {
@@ -1127,10 +1127,10 @@ void age_table_entry()
 		log(LOG_DEBUG, 0, "aging entry (%s, %s)",
 		    inet_fmt(kt->kt_origin, s1),
 		    inet_fmt(kt->kt_mcastgrp, s2));
-		
+
 		k_del_rg(kt);
 		prev_kt->kt_next = kt->kt_next;
-		
+
 		/* free all the prune list entries */
 		krl = kt->kt_rlist;
 		while(krl) {
@@ -1138,7 +1138,7 @@ void age_table_entry()
 		    krl = krl->rl_next;
 		    free((char *)prev_krl);
 		}
-		
+
 		free((char *)kt);
 		kroutes--;
 		kt = prev_kt;
@@ -1161,7 +1161,7 @@ void dump_cache(fp2)
     fprintf(fp2,
 	    "Multicast Routing Cache Table (%d entries)\n%s", kroutes,
 	    " Origin-Subnet   Mcast-group      CTmr IVif Prcv# Psnt Forwvifs\n");
-    
+
     for (kt = kernel_rtable, count = 0; kt != NULL; kt = kt->kt_next) {
 
 	fprintf(fp2, " %-15s %-15s",
@@ -1205,12 +1205,12 @@ int can_forward(vifi)
     vifi_t vifi;
 {
     struct listaddr *u;
-    
+
     for (u = uvifs[vifi].uv_neighbors; u; u = u->al_next)
 	if (((u->al_pv > 2) && (u->al_mv > 2)) ||
 	    (u->al_pv > 3))
 	    return 1;
-    
+
     return 0;
 }
 
@@ -1279,7 +1279,7 @@ void mtrace(src, dst, group, data, no, datalen)
     rt = determine_route(qry->tr_src);
 
     /*
-     * Query type packet - check if rte exists 
+     * Query type packet - check if rte exists
      * Check if the query destination is a vif connected to me.
      * and if so, whether I should start response back
      */
@@ -1294,7 +1294,7 @@ void mtrace(src, dst, group, data, no, datalen)
 	    if (!(v->uv_flags & VIFF_TUNNEL) &&
 		((qry->tr_dst & v->uv_subnetmask) == v->uv_subnet))
 		break;
-	
+
 	if (vifi == numvifs) {
 	    printf("Destination %s not an interface\n",
 		   inet_fmt(qry->tr_dst, s1));
@@ -1314,22 +1314,22 @@ void mtrace(src, dst, group, data, no, datalen)
 	    printf("Wrong interface for packet\n");
 	    return;
 	}
-    }   
-    
+    }
+
     printf("Sending traceroute response\n");
-    
+
     /* copy the packet to the sending buffer */
     p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN;
-    
+
     bcopy(data, p, datalen);
-    
+
     p += datalen;
-    
+
     /*
      * fill in initial response fields
      */
     resp = (struct tr_resp *)p;
-    resp->tr_qarr    = ((tp.tv_sec + JAN_1970) << 16) + 
+    resp->tr_qarr    = ((tp.tv_sec + JAN_1970) << 16) +
 				((tp.tv_usec << 10) / 15625);
 
     resp->tr_vifin   = 0;	/* default values */
diff --git a/usr.sbin/mrouted/prune.h b/usr.sbin/mrouted/prune.h
index 3cce25e38eba..fd1fd2344fc2 100644
--- a/usr.sbin/mrouted/prune.h
+++ b/usr.sbin/mrouted/prune.h
@@ -7,12 +7,12 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: prune.h,v 1.3 1994/08/24 23:54:40 thyagara Exp $
+ * $Id: prune.h,v 1.2 1994/09/08 02:51:24 wollman Exp $
  */
 
-/* 
+/*
  * Macro for copying the user-level cache table to the kernel
- * level table variable passed on by the setsock option 
+ * level table variable passed on by the setsock option
  */
 
 #define COPY_TABLES(from, to) { \
@@ -34,7 +34,7 @@
  * an extra field in the user level table.
  *
  */
-struct ktable 
+struct ktable
 {
     struct ktable  *kt_next;       	/* pointer to the next entry        */
     u_long	    kt_origin;		/* subnet origin of multicasts      */
@@ -57,7 +57,7 @@ struct ktable
 /*
  * structure to store incoming prunes
  */
-struct prunlst 
+struct prunlst
 {
     struct prunlst *rl_next;
     u_long	    rl_router;
@@ -120,4 +120,4 @@ struct tr_resp {
 
 #define VAL_TO_MASK(x, i) { \
 			x = ~((1 << (32 - (i))) - 1); \
-			}				
+			}
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index 2debcc7ad0b6..70ee5a5fb8ed 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: route.c,v 1.8 1994/08/24 23:54:42 thyagara Exp $
+ * $Id: route.c,v 1.2 1994/09/08 02:51:25 wollman Exp $
  */
 
 
@@ -703,7 +703,7 @@ struct newrt {
 	u_long origin;
 	int metric;
 	int pad;
-}; 
+};
 
 int compare_rts(r1, r2)
     register struct newrt *r1;
@@ -763,7 +763,7 @@ void accept_report(src, dst, p, datalen, level)
 
 	if (datalen < 3) {
 	    log(LOG_WARNING, 0,
-		"received truncated route report from %s", 
+		"received truncated route report from %s",
 		inet_fmt(src, s1));
 	    return;
 	}
@@ -776,7 +776,7 @@ void accept_report(src, dst, p, datalen, level)
 	do {			/* Loop through (origin, metric) pairs */
 	    if (datalen < width + 1) {
 		log(LOG_WARNING, 0,
-		    "received truncated route report from %s", 
+		    "received truncated route report from %s",
 		    inet_fmt(src, s1));
 		return;
 	    }
@@ -794,7 +794,7 @@ void accept_report(src, dst, p, datalen, level)
     qsort((char*)rt, nrt, sizeof(rt[0]), compare_rts);
     start_route_updates();
     for (i = 0; i < nrt; ++i)
-	update_route(rt[i].origin, rt[i].mask, (rt[i].metric & 0x7f), 
+	update_route(rt[i].origin, rt[i].mask, (rt[i].metric & 0x7f),
 		     src, vifi);
 
     if (routes_changed && !delay_change_reports)
@@ -1068,7 +1068,7 @@ struct rtentry *determine_route(src)
     struct rtentry *rt;
 
     for (rt = routing_table; rt != NULL; rt = rt->rt_next) {
-	if (rt->rt_origin == (src & rt->rt_originmask)) 
+	if (rt->rt_origin == (src & rt->rt_originmask))
 	    break;
     }
     return rt;
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 75115ad7c80b..56aae3f82dd1 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: vif.c,v 1.2 1994/09/08 02:51:27 wollman Exp $
+ * $Id: vif.c,v 1.3 1995/05/16 00:28:50 jkh Exp $
  */
 
 
@@ -187,7 +187,7 @@ static void start_vif(vifi)
 	 * query.
 	 */
 	v->uv_flags |= VIFF_QUERIER;
-	send_igmp(src, allhosts_group, IGMP_HOST_MEMBERSHIP_QUERY, 
+	send_igmp(src, allhosts_group, IGMP_HOST_MEMBERSHIP_QUERY,
 		  IGMP_MAX_HOST_REPORT_DELAY * IGMP_TIMER_SCALE, 0, 0);
 	age_old_hosts();
     }
@@ -206,7 +206,7 @@ static void start_vif(vifi)
      * add the neighbor list on the interface to the message
      */
     nbr = v->uv_neighbors;
-    
+
     while (nbr) {
 	for (i = 0; i < 4; i++)
 	    *p++ = ((char *)&nbr->al_addr)[i];
@@ -214,7 +214,7 @@ static void start_vif(vifi)
 	nbr = nbr->al_next;
     }
 
-    send_igmp(src, dst, IGMP_DVMRP, DVMRP_PROBE, 
+    send_igmp(src, dst, IGMP_DVMRP, DVMRP_PROBE,
 	      htonl(MROUTED_LEVEL), datalen);
 }
 
@@ -366,7 +366,7 @@ void query_groups()
     for (vifi = 0, v = uvifs; vifi < numvifs; vifi++, v++) {
 	if (v->uv_flags & VIFF_QUERIER) {
 	    send_igmp(v->uv_lcl_addr, allhosts_group,
-		      IGMP_HOST_MEMBERSHIP_QUERY, 
+		      IGMP_HOST_MEMBERSHIP_QUERY,
 		      IGMP_MAX_HOST_REPORT_DELAY * IGMP_TIMER_SCALE, 0, 0);
 	}
     }
@@ -415,7 +415,7 @@ void accept_group_report(src, dst, group, r_type)
 		g->al_query = DeleteTimer(g->al_query);
 	    if (g->al_timerid)
 		g->al_timerid = DeleteTimer(g->al_timerid);
-	    g->al_timerid = SetTimer(vifi, g);	
+	    g->al_timerid = SetTimer(vifi, g);
 	    break;
 	}
     }
@@ -448,7 +448,7 @@ void accept_group_report(src, dst, group, r_type)
 	update_lclgrp(vifi, group);
     }
 
-    /* 
+    /*
      * Check if a graft is necessary for this group
      */
     chkgrp_graft(vifi, group);
@@ -493,12 +493,12 @@ void leave_group_message( src, dst, group)
 	    /** send a group specific querry **/
 	    g->al_timer = GROUP_EXPIRE_TIME / 10;
 	    send_igmp(v->uv_lcl_addr, g->al_addr,
-		      IGMP_HOST_MEMBERSHIP_QUERY, 
+		      IGMP_HOST_MEMBERSHIP_QUERY,
 		      GROUP_EXPIRE_TIME / 30 * IGMP_TIMER_SCALE,
 		      g->al_addr, 0);
 	    g->al_query = SetQueryTimer(g, vifi, g->al_timer / 3 ,
 			 	GROUP_EXPIRE_TIME / 30 * IGMP_TIMER_SCALE);
-	    g->al_timerid = SetTimer(vifi, g);	
+	    g->al_timerid = SetTimer(vifi, g);
 	    break;
 	}
     }
@@ -584,7 +584,7 @@ void accept_neighbor_request(src, dst)
 	close(udp);
 	us = addr.sin_addr.s_addr;
     } else			/* query sent to us alone */
-	us = dst;	
+	us = dst;
 
 #define PUT_ADDR(a)	temp_addr = ntohl(a); \
     *p++ = temp_addr >> 24; \
@@ -668,7 +668,7 @@ void accept_neighbor_request2(src, dst)
 	close(udp);
 	us = addr.sin_addr.s_addr;
     } else			/* query sent to us alone */
-	us = dst;	
+	us = dst;
 
     p = (u_char *) (send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN);
     datalen = 0;
@@ -843,13 +843,13 @@ int update_neighbor(vifi, addr, msgtype, p, datalen, level)
 	    for (i = 0; i < 4; i++)
 	      ((char *)&genid)[i] = *p++;
 	    datalen -=4;
-	    
-	    /* 
+
+	    /*
 	     * loop through router list and check for one-way ifs.
 	     */
-	    
+
 	    he_hears_me = FALSE;
-	    
+
 	    while (datalen > 0) {
 		if (datalen < 4) {
 		    log(LOG_WARNING, 0,
@@ -876,7 +876,7 @@ int update_neighbor(vifi, addr, msgtype, p, datalen, level)
 	    n->al_timer = 0;
 
 	    /* If probe message and version no >= 3.3 check genid */
-	    if (msgtype == DVMRP_PROBE && 
+	    if (msgtype == DVMRP_PROBE &&
 		((n->al_pv >= 3 && n->al_mv > 2) || n->al_pv > 3)) {
 		if (he_hears_me == TRUE && v->uv_flags & VIFF_ONEWAY)
 		    v->uv_flags &= ~VIFF_ONEWAY;
@@ -886,7 +886,7 @@ int update_neighbor(vifi, addr, msgtype, p, datalen, level)
 
 		if ((n->al_genid != 0) && (n->al_genid != genid)) {
 		    log(LOG_DEBUG, 0,
-			"old:%d new:%dreset neighbor %s", 
+			"old:%d new:%dreset neighbor %s",
 			n->al_genid, genid, inet_fmt(addr, s1));
 
 		    reset_neighbor_state(vifi, addr);
@@ -904,7 +904,7 @@ int update_neighbor(vifi, addr, msgtype, p, datalen, level)
 
 	    /*
 	     * update the neighbors version and protocol number
-	     * if changed => router went down and came up, 
+	     * if changed => router went down and came up,
 	     * so take action immediately.
 	     */
 	    if ((n->al_pv != (level & 0xff)) ||
@@ -913,7 +913,7 @@ int update_neighbor(vifi, addr, msgtype, p, datalen, level)
 		    "resetting neighbor %s [old:%d.%d, new:%d.%d]",
 		    inet_fmt(addr, s1),
 		    n->al_pv, n->al_mv, level&0xff, (level>>8)&0xff);
-		
+
 		n->al_pv = level & 0xff;
 		n->al_mv = (level >> 8) & 0xff;
 
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 1a38739ea86f..8d4094fa9944 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -196,14 +196,14 @@ typeerr:		LABEL;
 			(void)close(fd);
 			if (s->cksum != val) {
 				LABEL;
-				(void)printf("%scksum (%lu, %lu)\n", 
+				(void)printf("%scksum (%lu, %lu)\n",
 				    tab, s->cksum, val);
 			}
 			tab = "\t";
 		}
 	if (s->flags & F_MD5) {
 		char *new_digest;
-		
+
 		new_digest = MD5File(p->fts_accpath);
 		if (!new_digest) {
 			LABEL;
@@ -212,7 +212,7 @@ typeerr:		LABEL;
 			tab = "\t";
 		} else if (strcmp(new_digest, s->md5digest)) {
 			LABEL;
-			printf("%sMD5 (%s, %s)\n", tab, s->md5digest, 
+			printf("%sMD5 (%s, %s)\n", tab, s->md5digest,
 			       new_digest);
 			tab = "\t";
 			free(new_digest);
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index af8d468e3974..9230a15eb893 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -116,7 +116,7 @@ cwalk()
 			if (!dflag)
 				statf(indent, p);
 			break;
-			
+
 		}
 	}
 	(void)fts_close(t);
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 7602063c0fde..443b3772ab9f 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -97,7 +97,7 @@ spec()
 			set(p, centry);
 			continue;
 		}
-			
+
 		/* Grab file name, "$", "set", or "unset". */
 		if ((p = strtok(p, "\n\t ")) == NULL)
 			err("missing field");
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 4abf0fb191f7..3e7c08f18960 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -86,13 +86,13 @@ vwalk()
 	while ((p = fts_read(t))) {
 		switch(p->fts_info) {
 		case FTS_D:
-			++ftsdepth; 
+			++ftsdepth;
 			break;
 		case FTS_DP:
-			--ftsdepth; 
+			--ftsdepth;
 			if (specdepth > ftsdepth) {
 				for (level = level->parent; level->prev;
-				      level = level->prev);  
+				      level = level->prev);
 				--specdepth;
 			}
 			continue;
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index c337c365aa52..d5693752224b 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -6,7 +6,7 @@
 ## -
 ## Copyright (c) 1985, 1989
 ##    The Regents of the University of California.  All rights reserved.
-## 
+##
 ## Redistribution and use in source and binary forms, with or without
 ## modification, are permitted provided that the following conditions
 ## are met:
@@ -22,7 +22,7 @@
 ## 4. Neither the name of the University nor the names of its contributors
 ##    may be used to endorse or promote products derived from this software
 ##    without specific prior written permission.
-## 
+##
 ## THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 ## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 ## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,14 +36,14 @@
 ## SUCH DAMAGE.
 ## -
 ## Portions Copyright (c) 1993 by Digital Equipment Corporation.
-## 
+##
 ## Permission to use, copy, modify, and distribute this software for any
 ## purpose with or without fee is hereby granted, provided that the above
 ## copyright notice and this permission notice appear in all copies, and that
 ## the name of Digital Equipment Corporation not be used in advertising or
 ## publicity pertaining to distribution of the document or software without
 ## specific, written prior permission.
-## 
+##
 ## THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 ## WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 ## OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/db_defs.h b/usr.sbin/named/db_defs.h
index db9b32c2e256..25842760c39b 100644
--- a/usr.sbin/named/db_defs.h
+++ b/usr.sbin/named/db_defs.h
@@ -1,6 +1,6 @@
 /*
  *	from db.h	4.16 (Berkeley) 6/1/90
- *	$Id: db_defs.h,v 1.11 1994/07/22 08:42:39 vixie Exp $
+ *	$Id: db_defs.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $
  */
 
 /*
@@ -8,7 +8,7 @@
  * -
  * Copyright (c) 1985, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/db_dump.c b/usr.sbin/named/db_dump.c
index 3c9b5a4b0c45..2501f2d25cbd 100644
--- a/usr.sbin/named/db_dump.c
+++ b/usr.sbin/named/db_dump.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_dump.c	4.33 (Berkeley) 3/3/91";
-static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $";
+static char rcsid[] = "$Id: db_dump.c,v 1.2 1994/09/22 20:45:00 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $";
  * -
  * Copyright (c) 1986, 1988, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $";
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $";
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -259,7 +259,7 @@ doadump()
 }
 
 #ifdef ALLOW_UPDATES
-/* Create a disk database to back up zones 
+/* Create a disk database to back up zones
  */
 void
 zonedump(zp)
@@ -554,12 +554,12 @@ db_dump(htp, fp, zone, origin)
 				break;
 
 			case T_WKS:
-				GETLONG(addr, cp);	
-				addr = htonl(addr);	
+				GETLONG(addr, cp);
+				addr = htonl(addr);
 				fprintf(fp, "%s ",
 					inet_ntoa(*(struct in_addr *)&addr));
 				proto = protocolname(*cp);
-				cp += sizeof(char); 
+				cp += sizeof(char);
 				fprintf(fp, "%s ", proto);
 				i = 0;
 				while(cp < (u_char *)dp->d_data + dp->d_size) {
@@ -570,7 +570,7 @@ db_dump(htp, fp, zone, origin)
 							servicename(i, proto));
 					    j <<= 1;
 					} while (++i & 07);
-				} 
+				}
 				break;
 
 			case T_MINFO:
@@ -702,8 +702,8 @@ static int32_t Ceor, Csum, Crot, word, bcount;
 #define AddToBuf(bufp, c) **bufp = c; (*bufp)++;
 #define times85(x)	((((((x<<2)+x)<<2)+x)<<2)+x)
 
-/* Decode ASCII-encoded byte c into binary representation and 
- * place into *bufp, advancing bufp 
+/* Decode ASCII-encoded byte c into binary representation and
+ * place into *bufp, advancing bufp
  */
 static int
 byte_atob(c, bufp)
@@ -831,8 +831,8 @@ byte_btoa(c, bufp)
 		} else {
 		    register int tmp = 0;
 		    register int32_t tmpword = word;
-			
-		    if (tmpword < 0) {	
+
+		    if (tmpword < 0) {
 			   /* Because some don't support unsigned long */
 		    	tmp = 32;
 		    	tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
diff --git a/usr.sbin/named/db_func.h b/usr.sbin/named/db_func.h
index 1c7275cb46e0..4237f166ca8f 100644
--- a/usr.sbin/named/db_func.h
+++ b/usr.sbin/named/db_func.h
@@ -1,6 +1,6 @@
 /* db_proc.h - prototypes for functions in db_*.c
  *
- * $Id: db_func.h,v 1.8 1994/07/23 23:23:56 vixie Exp $
+ * $Id: db_func.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $
  */
 
 /* ++from db_update.c++ */
@@ -79,7 +79,7 @@ extern int		getdtablesize __P((void));
 extern struct databuf	*rm_datum __P((struct databuf *,
 				       struct namebuf *,
 				       struct databuf *));
-extern struct namebuf	*rm_name __P((struct namebuf *, 
+extern struct namebuf	*rm_name __P((struct namebuf *,
 				      struct namebuf **,
 				      struct namebuf *));
 #ifdef INVQ
diff --git a/usr.sbin/named/db_glob.h b/usr.sbin/named/db_glob.h
index 74ae45d45763..157e51344a6b 100644
--- a/usr.sbin/named/db_glob.h
+++ b/usr.sbin/named/db_glob.h
@@ -1,6 +1,6 @@
 /*
  *	from db.h	4.16 (Berkeley) 6/1/90
- *	$Id: db_glob.h,v 1.2 1994/04/12 08:57:50 vixie Exp $
+ *	$Id: db_glob.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $
  */
 
 /*
@@ -8,7 +8,7 @@
  * -
  * Copyright (c) 1985, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/db_glue.c b/usr.sbin/named/db_glue.c
index f3f306941ba4..f061acd3ba11 100644
--- a/usr.sbin/named/db_glue.c
+++ b/usr.sbin/named/db_glue.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_glue.c	4.4 (Berkeley) 6/1/90";
-static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $";
+static char rcsid[] = "$Id: db_glue.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $
  * -
  * Copyright (c) 1986, 1988
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -314,7 +314,7 @@ getdtablesize()
 {
 #if defined(USE_POSIX)
 	int j = (int) sysconf(_SC_OPEN_MAX);
- 
+
 	if (j >= 0)
 		return (j);
 #endif /* POSIX */
diff --git a/usr.sbin/named/db_load.c b/usr.sbin/named/db_load.c
index ef6d0b4cb664..acf6ec786d12 100644
--- a/usr.sbin/named/db_load.c
+++ b/usr.sbin/named/db_load.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_load.c	4.38 (Berkeley) 3/2/91";
-static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: db_load.c,v 1.2 1994/09/22 20:45:03 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $
  * -
  * Copyright (c) 1986, 1988, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -271,7 +271,7 @@ db_load(filename, in_origin, zp, doinginclude)
 				n = 0;
 				do {
 				    if (n > (INT_MAX - (*cp - '0')) / 10) {
-					syslog(LOG_ERR, 
+					syslog(LOG_ERR,
 					   "%s: line %d: number > %lu\n",
 					   filename, lineno, INT_MAX);
 					dprintf(1, (ddt,
@@ -415,7 +415,7 @@ db_load(filename, in_origin, zp, doinginclude)
 				n = (u_int32_t) zp->z_refresh;
 				PUTLONG(n, cp);
 				if (zp->z_type == Z_SECONDARY
-#if defined(STUBS) 
+#if defined(STUBS)
 				    || zp->z_type == Z_STUB
 #endif
 				    ) {
@@ -639,7 +639,7 @@ db_load(filename, in_origin, zp, doinginclude)
 			    != OK) {
 #ifdef DEBUG
 				if (debug && (c != DATAEXISTS))
-					fprintf(ddt, "update failed %s %d\n", 
+					fprintf(ddt, "update failed %s %d\n",
 						domain, type);
 #endif
 				free((char*) dp);
@@ -711,9 +711,9 @@ gettoken(fp, src)
 					return (ORIGIN);
 			}
 			dprintf(1, (ddt,
-				    "%s: line %d: Unknown $ option: $%s\n", 
+				    "%s: line %d: Unknown $ option: $%s\n",
 				    src, lineno, op));
-			syslog(LOG_ERR,"%s: line %d: Unknown $ option: $%s\n", 
+			syslog(LOG_ERR,"%s: line %d: Unknown $ option: $%s\n",
 			       src, lineno, op);
 			return (ERROR);
 
@@ -915,11 +915,11 @@ getnum(fp, src, is_serial)
 		seendigit = 1;
 	}
 	if (m > 9999) {
-		syslog(LOG_ERR, 
-		       "%s:%d: number after the decimal point exceeds 9999", 
+		syslog(LOG_ERR,
+		       "%s:%d: number after the decimal point exceeds 9999",
 		       src, lineno);
 		dprintf(1, (ddt,
-			"%s:%d: number after the decimal point exceeds 9999", 
+			"%s:%d: number after the decimal point exceeds 9999",
 			    src, lineno));
 		exit(1);	/* XXX why exit here?? */
 	}
@@ -1022,7 +1022,7 @@ getprotocol(fp, src)
 	char b[MAXLEN];
 
 	(void) getword(b, sizeof(b), fp);
-		
+
 	k = protocolnumber(b);
 	if(k == -1)
 		syslog(LOG_ERR, "%s: line %d: unknown protocol: %s.",
@@ -1123,7 +1123,7 @@ get_netlist(fp, netlistp, allow, print_tag)
 		if (!inet_aton(buf, &ntp->my_addr)) {
 			syslog(LOG_ERR, "%s contains bogus element (%s)",
 			       print_tag, buf);
-			continue;	
+			continue;
 		}
 		if (maskp) {
 			if (!inet_aton(maskp, &ina)) {
@@ -1159,7 +1159,7 @@ get_netlist(fp, netlistp, allow, print_tag)
 	}
 	if (ntp)
 		free((char *)ntp);
-	
+
 	dprintf(1, (ddt, "\n"));
 #ifdef DEBUG
 	if (debug > 2)
diff --git a/usr.sbin/named/db_lookup.c b/usr.sbin/named/db_lookup.c
index 9084491c9137..875e0ede6050 100644
--- a/usr.sbin/named/db_lookup.c
+++ b/usr.sbin/named/db_lookup.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_lookup.c	4.18 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp $";
+static char rcsid[] = "$Id: db_lookup.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -72,7 +72,7 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp
 
 #include "named.h"
 
-/* 
+/*
  * Lookup 'name' and return a pointer to the namebuf;
  * NULL otherwise. If 'insert', insert name into tables.
  * Wildcard lookups are handled.
@@ -103,7 +103,7 @@ nlookup(name, htpp, fname, insert)
 				return (np);
 			if ((htp = np->n_hash) == NULL) {
 				if (!insert) {
-					if (np->n_dname[0] == '*' && 
+					if (np->n_dname[0] == '*' &&
 					    np->n_dname[1] == '\0')
 						*fname = name;
 					return (np);
diff --git a/usr.sbin/named/db_reload.c b/usr.sbin/named/db_reload.c
index 1b962a63fdc2..1145e4aa4921 100644
--- a/usr.sbin/named/db_reload.c
+++ b/usr.sbin/named/db_reload.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_reload.c	4.22 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp $";
+static char rcsid[] = "$Id: db_reload.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp
  * -
  * Copyright (c) 1986, 1988
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/db_save.c b/usr.sbin/named/db_save.c
index cd1639d6ec76..abe1896b7824 100644
--- a/usr.sbin/named/db_save.c
+++ b/usr.sbin/named/db_save.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_save.c	4.16 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $";
+static char rcsid[] = "$Id: db_save.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $"
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $"
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $"
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -111,7 +111,7 @@ savedata(class, type, ttl, data, size)
 	register struct databuf *dp;
 
 	if (type == T_NS)
-		dp = (struct databuf *) 
+		dp = (struct databuf *)
 #ifdef DMALLOC
 		    dmalloc(file, line,
 #else
diff --git a/usr.sbin/named/db_secure.c b/usr.sbin/named/db_secure.c
index b3eb73148560..d6c7bedb5b81 100644
--- a/usr.sbin/named/db_secure.c
+++ b/usr.sbin/named/db_secure.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static char rcsid[] = "$Id: db_secure.c,v 1.6 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: db_secure.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $";
 #endif
 
 /* this file was contributed by Gregory Neil Shapiro of WPI in August 1993 */
@@ -91,10 +91,10 @@ build_secure_netlist(zp)
 				"build_secure_netlist (%s): Bad address: %s\n",
 				    zp->z_origin, buf));
 			syslog(LOG_ERR,
-			       "build_secure_netlist (%s): Bad address: %s", 
+			       "build_secure_netlist (%s): Bad address: %s",
 			       zp->z_origin, buf);
 			errs++;
-			continue;	
+			continue;
 		}
 		if (maskptr && *maskptr) {
 			if (*maskptr == 'h' || *maskptr == 'H') {
@@ -110,18 +110,18 @@ build_secure_netlist(zp)
 					       zp->z_origin, maskptr);
 					errs++;
 					continue;
-				}	
-			}    
+				}
+			}
 		} else {
 			ntp->mask = net_mask(ntp->my_addr);
 		}
 		if (ntp->my_addr.s_addr & ~(ntp->mask)) {
-			dprintf(1, (ddt, 
+			dprintf(1, (ddt,
 		 "build_secure_netlist (%s): addr (%s) is not in mask (x%x)\n",
 				    zp->z_origin,
 				    inet_ntoa(ntp->my_addr),
 				    ntp->mask));
-			syslog(LOG_WARNING, 
+			syslog(LOG_WARNING,
 		   "build_secure_netlist (%s): addr (%s) is not in mask (x%x)",
 			       zp->z_origin,
 			       inet_ntoa(ntp->my_addr),
@@ -133,10 +133,10 @@ build_secure_netlist(zp)
 
 		/* Check for duplicates */
 		if (addr_on_netlist(ntp->my_addr, *netlistp)) {
-			dprintf(1, (ddt, 
+			dprintf(1, (ddt,
 			   "build_secure_netlist (%s): duplicate address %s\n",
 				    zp->z_origin, inet_ntoa(ntp->my_addr)));
-			syslog(LOG_WARNING, 
+			syslog(LOG_WARNING,
 			   "build_secure_netlist (%s): duplicate address %s\n",
 			       zp->z_origin, inet_ntoa(ntp->my_addr));
 			errs++;
diff --git a/usr.sbin/named/db_update.c b/usr.sbin/named/db_update.c
index 93244930d561..b322609630a7 100644
--- a/usr.sbin/named/db_update.c
+++ b/usr.sbin/named/db_update.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_update.c	4.28 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: db_update.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp
  * -
  * Copyright (c) 1986, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -217,7 +217,7 @@ db_update(name, odp, newdp, flags, htp)
 		return (NONAME);
 
 	/* don't let nonauthoritative updates write in authority zones */
-	if (newdp && (flags & DB_NOTAUTH) && 
+	if (newdp && (flags & DB_NOTAUTH) &&
 	    (zn = findMyZone(np, newdp->d_class)) != DB_Z_CACHE) {
 		int foundRR = 0;
 
@@ -339,11 +339,11 @@ db_update(name, odp, newdp, flags, htp)
 				 * correctly with glue records. mpa.
 				 */
 
-				/* if the new data is authorative 
+				/* if the new data is authorative
 				 * remove any data for this domain with
 				 * the same class that isn't as credable
 				 */
-				if (newdp->d_cred == DB_C_ZONE && 
+				if (newdp->d_cred == DB_C_ZONE &&
 				    newdp->d_cred > dp->d_cred)
 					/* better credibility and the old datum
 					 * was not from a zone file.  remove
@@ -361,7 +361,7 @@ db_update(name, odp, newdp, flags, htp)
 				/* if the new data is authoritative but
 				 * but isn't as credible, reject it.
 				 */
-				if (newdp->d_cred == DB_C_ZONE && 
+				if (newdp->d_cred == DB_C_ZONE &&
 				    newdp->d_cred == dp->d_cred &&
 				    newdp->d_clev < dp->d_clev)
 					return (AUTH);
@@ -400,8 +400,8 @@ db_update(name, odp, newdp, flags, htp)
 					    ntohs(from_addr.sin_port),
 					    dp->d_cred,
 					    dp->d_clev));
-				if (newdp->d_cred > dp->d_cred || 
-				    (newdp->d_cred == DB_C_ZONE && 
+				if (newdp->d_cred > dp->d_cred ||
+				    (newdp->d_cred == DB_C_ZONE &&
 				     newdp->d_clev > dp->d_clev)) {
 					/* better credibility and the old datum
 					 * was not from a zone file.  remove
@@ -616,7 +616,7 @@ db_cmp(dp1, dp2)
 		cp1 += strlen((char *)cp1) + 1;
 		cp2 += strlen((char *)cp2) + 1;
 		return (bcmp(cp1, cp2, INT32SZ * 5));
-	
+
 	case T_MX:
 	case T_AFSDB:
 	case T_RT:
diff --git a/usr.sbin/named/dmalloc.c b/usr.sbin/named/dmalloc.c
index f30dec490df4..6f27adfffc73 100644
--- a/usr.sbin/named/dmalloc.c
+++ b/usr.sbin/named/dmalloc.c
@@ -3,7 +3,7 @@
  * vix 24mar92 [added size calcs, improved printout]
  * vix 22mar92 [original work]
  *
- * $Id: dmalloc.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $
+ * $Id: dmalloc.c,v 1.2 1994/09/22 20:45:04 pst Exp $
  */
 
 /*
@@ -11,7 +11,7 @@
  * -
  * Copyright (c) 1993
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -27,7 +27,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,14 +41,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/dmalloc.h b/usr.sbin/named/dmalloc.h
index 54e68f9887a2..6d89ab825cbd 100644
--- a/usr.sbin/named/dmalloc.h
+++ b/usr.sbin/named/dmalloc.h
@@ -1,15 +1,15 @@
 /* dmalloc - debugging layer on top of malloc
  * vix 22mar92 [written]
  *
- * $Id: dmalloc.h,v 4.9.1.2 1993/09/08 00:01:17 vixie Exp $
+ * $Id: dmalloc.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $
  */
 
 /*
  * ++Copyright++
  * -
- * Copyright (c) 
+ * Copyright (c)
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -25,7 +25,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,14 +39,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/ns_defs.h b/usr.sbin/named/ns_defs.h
index bb9f18fbacb1..d9a208bc1ca1 100644
--- a/usr.sbin/named/ns_defs.h
+++ b/usr.sbin/named/ns_defs.h
@@ -1,6 +1,6 @@
 /*
  *	from ns.h	4.33 (Berkeley) 8/23/90
- *	$Id: ns_defs.h,v 1.12 1994/07/23 23:23:56 vixie Exp $
+ *	$Id: ns_defs.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $
  */
 
 /*
@@ -8,7 +8,7 @@
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -67,7 +67,7 @@
  * larger land on 32-bit boundaries; smaller structure members have been
  * deliberately shuffled and smaller integer sizes chosen where possible
  * to make sure this happens.  This is all meant to avoid structure member
- * padding which can cost a _lot_ of memory when you have hundreds of 
+ * padding which can cost a _lot_ of memory when you have hundreds of
  * thousands of entries in your cache.
  */
 
@@ -127,7 +127,7 @@ struct zoneinfo {
 	int		z_class;	/* class of zone */
 #ifdef SECURE_ZONES
 	struct netinfo *secure_nets;	/* list of secure networks for zone */
-#endif	
+#endif
 };
 
 	/* zone types (z_type) */
@@ -304,11 +304,11 @@ struct nameser {
 #endif
 	u_int8_t	xfers;		/* #/xfers running right now */
 };
-		
+
 
 #ifdef NCACHE
 #define NOERROR_NODATA   6 /* only used internally by the server, used for
-                            * -ve $ing non-existence of records. 6 is not 
+                            * -ve $ing non-existence of records. 6 is not
                             * a code used as yet anyway. anant@isi.edu
                             */
 #define NTTL		600 /* ttl for negative data: 10 minutes? */
diff --git a/usr.sbin/named/ns_forw.c b/usr.sbin/named/ns_forw.c
index 574596460ada..19a1cd57f7e0 100644
--- a/usr.sbin/named/ns_forw.c
+++ b/usr.sbin/named/ns_forw.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)ns_forw.c	4.32 (Berkeley) 3/3/91";
-static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: ns_forw.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -74,7 +74,7 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $
 /*
  * Forward the query to get the answer since its not in the database.
  * Returns FW_OK if a request struct is allocated and the query sent.
- * Returns FW_DUP if this is a duplicate of a pending request. 
+ * Returns FW_DUP if this is a duplicate of a pending request.
  * Returns FW_NOSERVER if there were no addresses for the nameservers.
  * Returns FW_SERVFAIL on malloc error or if asked to do something
  * dangerous, such as fwd to ourselves or fwd to the host that asked us.
diff --git a/usr.sbin/named/ns_glob.h b/usr.sbin/named/ns_glob.h
index 993d14d01385..4e72a48c16c0 100644
--- a/usr.sbin/named/ns_glob.h
+++ b/usr.sbin/named/ns_glob.h
@@ -1,6 +1,6 @@
 /*
  *	from ns.h	4.33 (Berkeley) 8/23/90
- *	$Id: ns_glob.h,v 1.7 1994/06/11 22:04:46 vixie Exp $
+ *	$Id: ns_glob.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $
  */
 
 /*
@@ -8,7 +8,7 @@
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/ns_init.c b/usr.sbin/named/ns_init.c
index 82c2071ed2d6..af5ad93ab0eb 100644
--- a/usr.sbin/named/ns_init.c
+++ b/usr.sbin/named/ns_init.c
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id:";
  * -
  * Copyright (c) 1986, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id:";
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id:";
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -315,7 +315,7 @@ boot_read(bootfile)
 		 */
 		if (!getword(buf, sizeof(buf), fp)) {
 			syslog(LOG_ERR, "%s: line %d: missing %s\n",
-				bootfile, lineno, 
+				bootfile, lineno,
 #ifdef STUBS
 			   (type == Z_SECONDARY || type == Z_STUB)
 #else
@@ -404,7 +404,7 @@ boot_read(bootfile)
 			 */
 			if (zp->z_source &&
 			    !strcmp(source, zp->z_source) &&
-			    !(zp->z_flags & Z_INCLUDE) && 
+			    !(zp->z_flags & Z_INCLUDE) &&
 			    stat(zp->z_source, &f_time) != -1 &&
 			    zp->z_ftime == f_time.st_mtime) {
 				dprintf(1, (ddt, "cache is up to date\n"));
@@ -461,7 +461,7 @@ boot_read(bootfile)
 			 */
 			if (zp->z_source &&
 			    !strcmp(source, zp->z_source) &&
-			    !(zp->z_flags & Z_INCLUDE) && 
+			    !(zp->z_flags & Z_INCLUDE) &&
 			    stat(zp->z_source, &f_time) != -1 &&
 			    zp->z_ftime == f_time.st_mtime) {
 				dprintf(1, (ddt, "zone is up to date\n"));
@@ -552,8 +552,8 @@ boot_read(bootfile)
 				zoneinit(zp);
 #ifdef FORCED_RELOAD
 			else {
-				/* 
-				** Force secondary to try transfer right away 
+				/*
+				** Force secondary to try transfer right away
 				** after SIGHUP.
 				*/
 				if (reloading) {
@@ -713,7 +713,7 @@ get_forwarders(fp)
 			syslog(LOG_ERR, "'%s' (ignored, NOT dotted quad)",
 			       buf);
 			dprintf(1, (ddt, " (ignored, NOT dotted quad)"));
-			continue;	
+			continue;
 		}
 #ifdef FWD_LOOP
 		if (aIsUs(ftp->fwdaddr.sin_addr)) {
@@ -737,7 +737,7 @@ get_forwarders(fp)
 	}
 	if (ftp)
 		free((char *)ftp);
-	
+
 #ifdef SLAVE_FORWARD
 	/*
 	** Set the slave retry time to 60 seconds total divided
@@ -776,7 +776,7 @@ free_forwarders()
 }
 
 static struct zoneinfo *
-find_zone(name, type, class) 
+find_zone(name, type, class)
 	char *name;
 	int type, class;
 {
@@ -796,7 +796,7 @@ find_zone(name, type, class)
 #ifdef DEBUG
 /* prints out the content of zones */
 static void
-content_zone(end) 
+content_zone(end)
 	int end;
 {
 	int i;
diff --git a/usr.sbin/named/ns_main.c b/usr.sbin/named/ns_main.c
index 8b04a49caa79..10c294e4d3a4 100644
--- a/usr.sbin/named/ns_main.c
+++ b/usr.sbin/named/ns_main.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)ns_main.c	4.55 (Berkeley) 7/1/91";
-static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: ns_main.c,v 1.1.1.1 1994/09/22 19:46:12 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $
  * -
  * Copyright (c) 1986, 1989, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -277,7 +277,7 @@ main(argc, argv, envp)
 		fprintf(ddt, "Debug turned ON, Level %d\n",debug);
 		fprintf(ddt, "Version = %s\n", Version);
 		fprintf(ddt, "bootfile = %s\n", bootfile);
-	}		
+	}
 #endif
 
 	n = 0;
@@ -325,7 +325,7 @@ main(argc, argv, envp)
 		if ((vs = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 			syslog(LOG_ERR, "socket(SOCK_STREAM): %m");
 			exit(1);
-		}	
+		}
 		if (setsockopt(vs, SOL_SOCKET, SO_REUSEADDR, (char *)&on,
 			sizeof(on)) != 0)
 		{
@@ -593,7 +593,7 @@ main(argc, argv, envp)
 		if (retryqp != NULL) {
 			gettime(&tt);
 			/*
-			** The tv_sec field might be unsigned 
+			** The tv_sec field might be unsigned
 			** and thus cannot be negative.
 			*/
 			if ((int32_t) retryqp->q_time <= tt.tv_sec) {
@@ -805,7 +805,7 @@ main(argc, argv, envp)
 						sp->s_bufsize = sp->s_size;
 					    }
 					}
-					sp->s_bufp = sp->s_buf;	
+					sp->s_bufp = sp->s_buf;
 				}
 			}
 			gettime(&tt);
@@ -920,10 +920,10 @@ getnetconf()
 			    inet_ntoa(((struct sockaddr_in *)
 				       &ifreq.ifr_addr)->sin_addr)));
 		/* build datagram queue */
-		/* 
+		/*
 		 * look for an already existing source interface address.
 		 * This happens mostly when reinitializing.  Also, if
-		 * the machine has multiple point to point interfaces, then 
+		 * the machine has multiple point to point interfaces, then
 		 * the local address may appear more than once.
 		 */
 		if (dqp = aIsUs(((struct sockaddr_in *)&ifreq.ifr_addr)
@@ -1127,7 +1127,7 @@ opensocket(dqp)
 	if ((dqp->dq_dfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
 		syslog(LOG_ERR, "socket(SOCK_DGRAM): %m - exiting");
 		exit(1);
-	}	
+	}
 	dprintf(1, (ddt, "dqp->dq_addr %s d_dfd %d\n",
 		    inet_ntoa(dqp->dq_addr), dqp->dq_dfd));
 	if (setsockopt(dqp->dq_dfd, SOL_SOCKET, SO_REUSEADDR,
diff --git a/usr.sbin/named/ns_maint.c b/usr.sbin/named/ns_maint.c
index 927fde3fde58..12904e3f1017 100644
--- a/usr.sbin/named/ns_maint.c
+++ b/usr.sbin/named/ns_maint.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)ns_maint.c	4.39 (Berkeley) 3/2/91";
-static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp $";
+static char rcsid[] = "$Id: ns_maint.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp
  * -
  * Copyright (c) 1986, 1988
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -380,7 +380,7 @@ startxfer(zp)
 		}
 	}
 #endif
-	
+
 	if (zp->z_xaddr.s_addr != 0) {
 		/* address was specified by the qserial logic, use it */
 		argv[argc++] = strcpy(argv_ns[argc_ns++],
@@ -413,7 +413,7 @@ startxfer(zp)
 #ifdef ECHOARGS
 	if (debug) {
 		int i;
-		for (i = 0; i < argc; i++) 
+		for (i = 0; i < argc; i++)
 			fprintf(ddt, "Arg %d=%s\n", i, argv[i]);
         }
 #endif /* ECHOARGS */
@@ -570,7 +570,7 @@ remove_zone(htp, zone)
 		}
 	    }
 }
-   
+
 /*
  * Handle XFER limit for a nameserver.
  */
@@ -623,7 +623,7 @@ abortxfer(zp)
 SIG_FN
 endxfer()
 {
-    	register struct zoneinfo *zp;   
+    	register struct zoneinfo *zp;
 	int exitstatus, pid, xfers, save_errno;
 #if defined(sequent)
 	union wait status;
@@ -651,7 +651,7 @@ endxfer()
 			zp->z_xferpid = 0;
 			zp->z_flags &= ~Z_XFER_RUNNING;
 			dprintf(1, (ddt,
-		"\nendxfer: child %d zone %s returned status=%d termsig=%d\n", 
+		"\nendxfer: child %d zone %s returned status=%d termsig=%d\n",
 				    pid, zp->z_origin, exitstatus,
 				    WIFSIGNALED(status) ?WTERMSIG(status) :-1
 				    )
@@ -724,7 +724,7 @@ tryxfer() {
 
 		if (!xfers_deferred || xfers_running >= max_xfers_running)
 			break;
-		
+
 		if ((xfers = nxfers(zp, 0)) != -1 &&
 		    xfers < MAX_XFERS_PERNS &&
 		    (zp->z_flags & Z_NEED_XFER)) {
@@ -743,7 +743,7 @@ tryxfer() {
 void
 loadxfer()
 {
-    	register struct zoneinfo *zp;   
+    	register struct zoneinfo *zp;
 
 	gettime(&tt);
 	for (zp = zones; zp < &zones[nzones]; zp++) {
diff --git a/usr.sbin/named/ns_ncache.c b/usr.sbin/named/ns_ncache.c
index 54083428f979..f6d1ea3d247c 100644
--- a/usr.sbin/named/ns_ncache.c
+++ b/usr.sbin/named/ns_ncache.c
@@ -38,7 +38,7 @@ cache_n_resp(msg, msglen)
 
 	hp = (HEADER *)msg;
 	cp = msg+HFIXEDSZ;
-  
+
 	n = dn_expand(msg, msg + msglen, cp, dname, sizeof dname);
 	if (n < 0) {
 		dprintf(1, (ddt, "Query expand name failed:cache_n_resp\n"));
diff --git a/usr.sbin/named/ns_req.c b/usr.sbin/named/ns_req.c
index afc3fc5af271..81b2e7f7e7fe 100644
--- a/usr.sbin/named/ns_req.c
+++ b/usr.sbin/named/ns_req.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)ns_req.c	4.47 (Berkeley) 7/1/91";
-static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: ns_req.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $"
  * -
  * Copyright (c) 1986, 1988, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $"
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $"
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -259,9 +259,9 @@ ns_req(msg, msglen, buflen, qsp, from, dfd)
 	}
 
 	dprintf(1, (ddt, "ns_req: answer -> [%s].%d fd=%d id=%d %s\n",
-		    inet_ntoa(from->sin_addr), 
+		    inet_ntoa(from->sin_addr),
 		    ntohs(from->sin_port),
-		    (qsp == QSTREAM_NULL) ?dfd :qsp->s_rfd, 
+		    (qsp == QSTREAM_NULL) ?dfd :qsp->s_rfd,
 		    ntohs(hp->id), local(from) == NULL ? "Remote" : "Local"));
 #ifdef DEBUG
 	if (debug >= 10)
@@ -409,8 +409,8 @@ req_query(hp, cpp, eom, qsp, buflenp, msglenp, msg, dfd, from)
 #ifdef QRYLOG
 	if (qrylog) {
 		syslog(LOG_INFO, "XX /%s/%s/%s",
-		       inet_ntoa(from->sin_addr), 
-		       (dname[0] == '\0') ?"." :dname, 
+		       inet_ntoa(from->sin_addr),
+		       (dname[0] == '\0') ?"." :dname,
 		       p_type(type));
 	}
 #endif /*QRYLOG*/
@@ -442,10 +442,10 @@ try_again:
 #endif /*LOCALDOM*/
 
 #ifdef YPKLUDGE
-	/* Some braindamaged resolver software will not 
-	   recognize internet addresses in dot notation and 
-	   send out address  queries for "names" such as 
-	   128.93.8.1.  This kludge will prevent those 
+	/* Some braindamaged resolver software will not
+	   recognize internet addresses in dot notation and
+	   send out address  queries for "names" such as
+	   128.93.8.1.  This kludge will prevent those
 	   from flooding higher level servers.
 	   We simply claim to be authoritative and that
 	   the domain doesn't exist.
@@ -477,7 +477,7 @@ try_again:
 		if (zp->secure_nets
 		    && !addr_on_netlist(from->sin_addr, zp->secure_nets)) {
 			dprintf(1, (ddt,
-				    "REFUSED Unauthorized request from %s\n", 
+				    "REFUSED Unauthorized request from %s\n",
 				    inet_ntoa(from->sin_addr)));
 			syslog(LOG_INFO, "Unauthorized request %s from %s",
 			       dname, inet_ntoa(from->sin_addr));
@@ -510,7 +510,7 @@ try_again:
 			    *msglenp += n;
 			    hp->rcode = NXDOMAIN;
 			    hp->nscount = htons((u_int16_t)count);
-			    hp->aa = 1;	
+			    hp->aa = 1;
 			    return (Finish);
 			}
 			else
@@ -567,7 +567,7 @@ try_again:
 		    "req: foundname=%d, count=%d, founddata=%d, cname=%d\n",
 		    foundname, count, founddata, cname));
 
-	if ((lp = local(from)) != NULL) 
+	if ((lp = local(from)) != NULL)
 		sort_response(answers, count, lp, *cpp);
 	if (type == T_AXFR) {
 		hp->ancount = htons(hp->ancount);
@@ -634,7 +634,7 @@ fetchns:
 						}
 						*cpp += n;
 						*buflenp -= n;
-						hp->nscount = 
+						hp->nscount =
 							htons((u_int16_t)
 							      count);
 					}
@@ -719,8 +719,8 @@ fetchns:
 	case FW_DUP:
 		break;		/* Duplicate request dropped */
 	case FW_NOSERVER:
-		/* 
-		** Don't go into an infinite loop if 
+		/*
+		** Don't go into an infinite loop if
 		** the admin gave root NS records in the cache
 		** file without giving address records
 		** for the root servers.
@@ -730,7 +730,7 @@ fetchns:
 				dprintf(1, (ddt,
 					    "ns_req: no address for root NS\n"
 					    ));
-				syslog(LOG_ERR, 
+				syslog(LOG_ERR,
 				       "ns_req: no address for root server");
 				hp->rcode = SERVFAIL;
 #ifdef DATUMREFCNT
@@ -1124,7 +1124,7 @@ addname(name, class)
 	for (ap = addinfo, n = addcount; --n >= 0; ap++)
 		if (strcasecmp(ap->a_dname, name) == 0)
 			return;
-	
+
 
 	/* add domain name to additional section */
 	if (addcount < NADDRECS) {
@@ -1338,7 +1338,7 @@ doaxfr(np, rfp, top, class)
 #ifdef NO_GLUE
 		if ((np != top) || (top->n_dname[0] == '\0')) {
 #endif /*NO_GLUE*/
-		    /*  Glue the sub domains together by sending 
+		    /*  Glue the sub domains together by sending
 		     *  the address records for the sub domain
 		     *  name servers along if necessary.
 		     *  Glue is necessary if the server is in any zone
diff --git a/usr.sbin/named/ns_resp.c b/usr.sbin/named/ns_resp.c
index f8086e316dbb..004721b57b57 100644
--- a/usr.sbin/named/ns_resp.c
+++ b/usr.sbin/named/ns_resp.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)ns_resp.c	4.65 (Berkeley) 3/3/91";
-static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: ns_resp.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $
  * -
  * Copyright (c) 1986, 1988, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -317,7 +317,7 @@ ns_resp(msg, msglen)
 				       inet_ntoa(from_addr.sin_addr),
 				       ntohs(from_addr.sin_port));
 			}
-			/* 
+			/*
 			 * We don't know who this response came from so it
 			 * gets dropped on the floor.
 			 */
@@ -355,7 +355,7 @@ ns_resp(msg, msglen)
 		    rtrip = ((tt.tv_sec - stp->tv_sec) * 1000 +
 			(tt.tv_usec - stp->tv_usec) / 1000);
 		}
-		
+
 		dprintf(3, (ddt, "stime %d/%d  now %d/%d rtt %d\n",
 			    stp->tv_sec, stp->tv_usec,
 			    tt.tv_sec, tt.tv_usec, rtrip));
@@ -374,7 +374,7 @@ ns_resp(msg, msglen)
 				ns->d_nstime = (u_int32_t)rtrip;
 			else
 				ns->d_nstime = (u_int32_t)
-						(ns->d_nstime * ALPHA 
+						(ns->d_nstime * ALPHA
 						 +
 						 (1-ALPHA) * (u_int32_t)rtrip);
 			/* prevent floating point overflow,
@@ -404,7 +404,7 @@ ns_resp(msg, msglen)
 		 * Watch out for records that may have timed out
 		 * and are no longer the correct type.			XXX
 		 */
-		
+
 		for (n = 0, qs = qp->q_addr; n < qp->q_naddr; n++, qs++) {
 			ns2 = qs->nsdata;
 			if ((!ns2) || (ns2 == ns))
@@ -714,7 +714,7 @@ ns_resp(msg, msglen)
 	 *  If there are addresses and this is a local query,
 	 *  sort them appropriately for the local context.
 	 */
-	if (ancount > 1 && (lp = local(&qp->q_from)) != NULL) 
+	if (ancount > 1 && (lp = local(&qp->q_from)) != NULL)
 		sort_response(tp, ancount, lp, msg + msglen);
 
 	/*
@@ -1231,7 +1231,7 @@ doupdate(msg, msglen, rrp, zone, savens, flags, cred)
 		if ( (hp->opcode == UPDATED) || (hp->opcode == UPDATEDA) ) {
 			if (cp != (u_char *)(msg + msglen)) {
 			    dprintf(1,
-				    (ddt, 
+				    (ddt,
 				     "FORMERR UPDATE message length off\n"
 				     )
 				    );
@@ -1239,7 +1239,7 @@ doupdate(msg, msglen, rrp, zone, savens, flags, cred)
 			    return (-1);
 			}
 		}
-		if ((zonenum = findzone(dname, class)) == 0) { 
+		if ((zonenum = findzone(dname, class)) == 0) {
 			hp->rcode = NXDOMAIN;
 			return (-1);
 		}
@@ -1319,7 +1319,7 @@ doupdate(msg, msglen, rrp, zone, savens, flags, cred)
 			hp->rcode = FORMERR;
 			return (-1);
 		}
-		if ((zonenum = findzone(dname, class)) == 0) { 
+		if ((zonenum = findzone(dname, class)) == 0) {
 			hp->rcode = NXDOMAIN;
 			return (-1);
 		}
@@ -1426,7 +1426,7 @@ send_msg(msg, msglen, qp)
 #ifdef DEBUG
 	if (debug) {
 		fprintf(ddt,"send_msg -> [%s] (%s %d %d) id=%d\n",
-			inet_ntoa(qp->q_from.sin_addr), 
+			inet_ntoa(qp->q_from.sin_addr),
 			qp->q_stream == QSTREAM_NULL ? "UDP" : "TCP",
 			qp->q_stream == QSTREAM_NULL ? qp->q_dfd
 						     : qp->q_stream->s_rfd,
@@ -1640,7 +1640,7 @@ sysquery(dname, class, type, nss, nsc)
 	dprintf(1, (ddt,
 		  "sysquery: send -> [%s].%d dfd=%d nsid=%d id=%d retry=%ld\n",
 		    inet_ntoa(nsa->sin_addr),
-		    ntohs(nsa->sin_port), qp->q_dfd, 
+		    ntohs(nsa->sin_port), qp->q_dfd,
 		    ntohs(qp->q_nsid), ntohs(qp->q_id),
 		    qp->q_time));
 #ifdef DEBUG
@@ -1708,7 +1708,7 @@ check_root()
 	check_ns();
 }
 
-/* 
+/*
  * Check the root to make sure that for each NS record we have a A RR
  */
 static void
@@ -1792,7 +1792,7 @@ findns(npp, class, nsp, countp, flag)
 	register struct databuf *dp;
 	register struct	databuf **nspp;
 	struct hashbuf *htp;
-	
+
 #ifdef DATUMREFCNT
 	nsp[0] = NULL;
 #endif
@@ -1916,7 +1916,7 @@ finddata(np, class, type, hp, dnamep, lenp, countp)
 		/* cycle order of RRs, for a load balancing effect... */
 
 		register struct databuf **dpp;
- 
+
 		for (dpp = &np->n_data;  dp = *dpp;  dpp = &dp->d_next) {
 			if (dp->d_next && wanted(dp, class, type)) {
 				register struct databuf *lp;
@@ -1934,7 +1934,7 @@ finddata(np, class, type, hp, dnamep, lenp, countp)
 		}
 	}
 #endif /*ROUND_ROBIN*/
-  
+
 	buflen = *lenp;
 	cp = ((char *)hp) + *countp;
 	for (dp = np->n_data; dp != NULL; dp = dp->d_next) {
diff --git a/usr.sbin/named/ns_sort.c b/usr.sbin/named/ns_sort.c
index c35b58f16ae4..6e77de695536 100644
--- a/usr.sbin/named/ns_sort.c
+++ b/usr.sbin/named/ns_sort.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)ns_sort.c	4.10 (Berkeley) 3/3/91";
-static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $";
+static char rcsid[] = "$Id: ns_sort.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $"
  * -
  * Copyright (c) 1986, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $"
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $"
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/ns_stats.c b/usr.sbin/named/ns_stats.c
index d6d6225b6210..4a1182074b9c 100644
--- a/usr.sbin/named/ns_stats.c
+++ b/usr.sbin/named/ns_stats.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)ns_stats.c	4.10 (Berkeley) 6/27/90";
-static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $";
+static char rcsid[] = "$Id: ns_stats.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -101,7 +101,7 @@ static const char *typenames[T_ANY+1] = {
 	/* 240 */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	/* 250 */
-	0, 0, "AXFR", "MAILB", "MAILA", "ANY" 
+	0, 0, "AXFR", "MAILB", "MAILA", "ANY"
 };
 
 static void		nameserStats __P((FILE *));
@@ -204,7 +204,7 @@ nameserCompar(t1, t2)
 	else
 		return (0);
 }
-	
+
 struct nameser *
 nameserFind(addr, flags)
 	struct in_addr addr;
diff --git a/usr.sbin/named/ns_validate.c b/usr.sbin/named/ns_validate.c
index f1236c542e10..46095180f6f4 100644
--- a/usr.sbin/named/ns_validate.c
+++ b/usr.sbin/named/ns_validate.c
@@ -40,7 +40,7 @@ static TO_Validate	*validateQ, *currentVQ;
 static int		VQcount;
 
 /*****************************************************************
- * validate() is called from dovalidate(). it takes as parameters, 
+ * validate() is called from dovalidate(). it takes as parameters,
  * the domain name sought, the class, type etc. of record, the server
  * that gave us the answer and the data it gave us
  *
@@ -63,8 +63,8 @@ static int		VQcount;
  *              if(data agrees with what we have)
  *                return VALID_NO_CACHE;
  *              else return INVALID;
- *    
- *          if(we are not authoritative) /findns() returned OK;/       
+ *
+ *          if(we are not authoritative) /findns() returned OK;/
  *          if (address records for NS's found in cache){
  *                       if("server" = one of the addresses){
  *                               return VALID_CACHE;
@@ -129,7 +129,7 @@ validate(dname, server, type, class, data, dlen
 		np = NULL;
 	else
 		np = nlookup(dname, &htp, &fname, 0);
-    
+
 	/* we were able to locate namebufs for this domain, or a parent domain,
 	 * or ??? */
 
@@ -150,7 +150,7 @@ validate(dname, server, type, class, data, dlen
 	}
 	switch (findns(&np, class, nsp, &count, 0)) {
 	case NXDOMAIN:
-		/** we are authoritative for this domain, lookup name 
+		/** we are authoritative for this domain, lookup name
 		 * in our zone data, if it matches, return valid.
 		 * in either case, do not cache
 		 **/
@@ -164,7 +164,7 @@ validate(dname, server, type, class, data, dlen
 #ifdef NCACHE
 		if(rcode == NXDOMAIN) {
 			/* If we had an exactmatch on the name, we found the
-			 * name in our authority database, so this couldn't 
+			 * name in our authority database, so this couldn't
 			 * have been a bad name. INVALID data, say so
 			 */
 			if (exactmatch)
@@ -178,7 +178,7 @@ validate(dname, server, type, class, data, dlen
 		}
 #endif
 		if (!strcasecmp(dname, np->n_dname)) {
-      
+
 			/* if the name we seek is the same as that we have ns
 			 * records for, compare the data we have to see if it
 			 * matches. if it does, return valid_no_cache, if it
@@ -189,7 +189,7 @@ validate(dname, server, type, class, data, dlen
 			else
 				return INVALID;
 		}
-    
+
 		/* we found ns records in a higher level, if we were unable to
 		 * locate the exact name earlier, it means we are
 		 * authoritative for this domain but do not have records for
@@ -197,7 +197,7 @@ validate(dname, server, type, class, data, dlen
 		 */
 		if (!exactmatch)
 			return INVALID;
-    
+
 		/* we found the exact name earlier and we are obviously
 		 * authoritative so check for data records and see if any
 		 * match.
@@ -206,7 +206,7 @@ validate(dname, server, type, class, data, dlen
 			return VALID_NO_CACHE;
 		else
 			return INVALID;
-  
+
 	case SERVFAIL:/* could not find name server records*/
 		/* stick_in_queue(dname, type, class, data); */
 		if (needs_prime_cache)
@@ -215,7 +215,7 @@ validate(dname, server, type, class, data, dlen
 		free_nsp(nsp);
 #endif
 		return INVALID;
-    
+
 	case OK: /*proceed */
 		dprintf(5,
 			(ddt,
@@ -244,7 +244,7 @@ validate(dname, server, type, class, data, dlen
 } /*validate*/
 
 /***********************************************************************
- * validate rr returned by somebody against your own database, if you are 
+ * validate rr returned by somebody against your own database, if you are
  * authoritative for the information. if you have a record that matches,
  * return 1, else return 0. validate() above will use this and determine
  * if the record should be returned/discarded.
@@ -257,10 +257,10 @@ isvalid(np, type, class, data, dlen)
 	int dlen;
 {
 	register struct databuf *dp;
-  
+
 	for (dp = np->n_data; dp != NULL; dp = dp->d_next) {
 		if (!wanted(dp, class, type)) {
-			if ((type == T_CNAME) && (class == dp->d_class)) { 
+			if ((type == T_CNAME) && (class == dp->d_class)) {
 				/* if a cname exists, any other will not */
 				return(0);
 				/* we come here only for zone info,
@@ -269,9 +269,9 @@ isvalid(np, type, class, data, dlen)
 			}
 			continue;
 		}
-		/* type and class match, if i get here 
+		/* type and class match, if i get here
 		 * let's now compare the data section, per RR type
-		 */  
+		 */
 
 		/* unless, of course, the data was negative, in which case
 		 * we should return FAILURE since we should not have found
@@ -279,8 +279,8 @@ isvalid(np, type, class, data, dlen)
 		 */
 		if ((data == NULL) || (dlen == 0)) {
 			return 0;
-		} 
-		
+		}
+
 		/* XXX:	why aren't we just calling db_cmp() ?
 		 */
 
@@ -321,7 +321,7 @@ isvalid(np, type, class, data, dlen)
 			       if (x == 0)
 				       return (1);
 			       else
-				      break; 
+				      break;
 
 			case T_MINFO:
 			case T_SOA:
@@ -329,16 +329,16 @@ isvalid(np, type, class, data, dlen)
 				/* compare first string */
 				x = strncasecmp((char *)dp->d_data, data,
 						strlen(data) + 1);
-				if (x != 0) 
+				if (x != 0)
 					break;
 
 				/* move to second string */
 				td = data + (strlen(data) + 1);
-				tdp = dp->d_data + 
+				tdp = dp->d_data +
 					(strlen((char *)dp->d_data)+1);
 
 				/* compare second string */
-				x = strncasecmp(td, (char *)tdp, 
+				x = strncasecmp(td, (char *)tdp,
 						strlen((char *)td+1));
 				if (x != 0)
 					break;
@@ -357,7 +357,7 @@ isvalid(np, type, class, data, dlen)
 					if (x != 0)
 						break;
 				}
-				
+
 				/* everything was equal, wow!
 				 * so return a success
 				 */
@@ -372,7 +372,7 @@ isvalid(np, type, class, data, dlen)
 					break;
 				td = data + INT16SZ;
 				tdp = dp->d_data + INT16SZ;
-				x = strncasecmp(td, (char *)tdp, 
+				x = strncasecmp(td, (char *)tdp,
 						strlen((char *)td) + 1);
 				if (x != 0)
 					break;
@@ -390,8 +390,8 @@ isvalid(np, type, class, data, dlen)
 	 */
 	if ((data == NULL) || (dlen == 0)) {
 		/* negative data, report success */
-		return 1; 
-	} 
+		return 1;
+	}
 	/* positive data, no such RR, validation failed */
 	return (0);
 }
@@ -399,8 +399,8 @@ isvalid(np, type, class, data, dlen)
 /******************************************************************
   * get a list of databufs that have ns addresses for the closest domain
   * you know about, get their addresses and confirm that server indeed
-  * is one of them. if yes return 1 else 0. 
-  * first checks the cache that we build in nslookup() earlier 
+  * is one of them. if yes return 1 else 0.
+  * first checks the cache that we build in nslookup() earlier
   * when we ns_forw(). if unableto find it there, it checks the entire
   * hash table to do address translations.
   *******************************************************************/
@@ -416,7 +416,7 @@ check_addr_ns(nsp, server, dname)
 	struct databuf **nsdp;
 
 	dprintf(5, (ddt,
-		    "check_addr_ns: s:[%s], db:0x%x, d:\"%s\"\n", 
+		    "check_addr_ns: s:[%s], db:0x%x, d:\"%s\"\n",
 		    inet_ntoa(*saddr), nsp, dname));
 
 	for(i = lastNA; i != firstNA; i = (i+1) % MAXNAMECACHE) {
@@ -450,7 +450,7 @@ check_addr_ns(nsp, server, dname)
 }
 
 /*************************************************************************
- * checks in hash tables for the address of servers whose name is in the 
+ * checks in hash tables for the address of servers whose name is in the
  * data section of nsp records. borrows code from nslookup()/ns_forw.c
  * largely.
  *************************************************************************/
@@ -466,10 +466,10 @@ check_in_tables(nsp, server, syslogdname)
 	char *dname, *fname;
 	int class;
 	int qcomp();
-  
+
 	dprintf(3, (ddt, "check_in_tables(nsp=x%x,qp=x%x,'%s')\n",
 		    nsp, server, syslogdname));
-  
+
 	while ((nsdp = *nsp++) != NULL) {
 		class = nsdp->d_class;
 		dname = (char *)nsdp->d_data;
@@ -563,7 +563,7 @@ store_name_addr(servername, serveraddr, syslogdname, sysloginfo)
 				(char *)malloc((unsigned)strlen(servername)+1);
 			strcpy(nameaddrlist[i].nsname, servername);
 			return;
-		} 
+		}
 	}
 	/* we have to add this one to our cache */
 
@@ -591,9 +591,9 @@ store_name_addr(servername, serveraddr, syslogdname, sysloginfo)
  * Decode the resource record 'rrp' and validate the RR.
  * Borrows code almost entirely from doupdate(). is a rather
  * non-invasive routine since it just goes thru the same motions
- * as doupdate but just marks the array validatelist entry as 
+ * as doupdate but just marks the array validatelist entry as
  * the return code from validate(). This is later used in doupdate
- * to cache/not cache the entry. also used in update_msg() to 
+ * to cache/not cache the entry. also used in update_msg() to
  * delete/keep the record from the outgoing message.
  */
 int
@@ -875,7 +875,7 @@ update_msg(msg, msglen, Vlist, c)
 	}
 #endif
 	/* just making sure we do not do all the work for nothing */
-	for (i=0;  i<c;  i++) { 
+	for (i=0;  i<c;  i++) {
 		if (Vlist[i] == INVALID) {
 			inv = 1;
 			break;
@@ -961,7 +961,7 @@ update_msg(msg, msglen, Vlist, c)
 	newlen += (n_new+2*INT16SZ);
 	rembuflen -= (n_new+2*INT16SZ);
 	/* have to decode and copy every Valid RR from here */
-  
+
 	cp = msg +HFIXEDSZ +qlen;	/*skip header and query section*/
 	for (i = 0;  i < c;  i++) {
 		if (Vlist[i] == INVALID) {
@@ -975,7 +975,7 @@ update_msg(msg, msglen, Vlist, c)
 			hp->rcode = FORMERR;
 			goto badend;
 		}
-		n_new = dn_comp(dname, newcp, rembuflen, dnptrs, edp); 
+		n_new = dn_comp(dname, newcp, rembuflen, dnptrs, edp);
 		if (n_new < 0)
 			goto badend;
 		cp += n;
@@ -1110,7 +1110,7 @@ update_msg(msg, msglen, Vlist, c)
 			bcopy(cp,newcp,INT16SZ);
 			cp += INT16SZ;
 			newcp += INT16SZ;
-		
+
 			/* get name */
 			n = dn_expand(msg, eom, cp, (char *)data, sizeof data);
 			if (n < 0) {
@@ -1145,7 +1145,7 @@ update_msg(msg, msglen, Vlist, c)
 	}
 	*msglen = newlen;
 	free((char *)newmsg);
-  
+
 #ifdef DEBUG
 	if (debug >= 10)
 		fp_query(msg, ddt);
diff --git a/usr.sbin/named/options.h b/usr.sbin/named/options.h
index e33589b5101a..7c3440717fe0 100644
--- a/usr.sbin/named/options.h
+++ b/usr.sbin/named/options.h
@@ -1,15 +1,15 @@
 /* options.h - specify the conditionally-compiled features
  * vix 28mar92 [moved out of the Makefile because they were getting too big]
  *
- * $Id: options.h,v 1.1 1994/09/22 20:45:07 pst Exp $
+ * $Id: options.h,v 1.2 1995/05/09 12:48:17 rgrimes Exp $
  */
 
 /*
  * ++Copyright++
  * -
- * Copyright (c) 
+ * Copyright (c)
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -25,7 +25,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,14 +39,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/pathnames.h b/usr.sbin/named/pathnames.h
index bcbe642cb4a3..5adf1a2ac4f5 100644
--- a/usr.sbin/named/pathnames.h
+++ b/usr.sbin/named/pathnames.h
@@ -1,6 +1,6 @@
 /*
  *	@(#)pathnames.h	5.4 (Berkeley) 6/1/90
- *	$Id: pathnames.h,v 4.9.1.5 1994/04/09 03:43:17 vixie Exp $
+ *	$Id: pathnames.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $
  */
 
 /*
@@ -8,7 +8,7 @@
  * -
  * Copyright (c) 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +24,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,14 +38,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/portability.h b/usr.sbin/named/portability.h
index 1aeb233c387a..fa257cd31af3 100644
--- a/usr.sbin/named/portability.h
+++ b/usr.sbin/named/portability.h
@@ -1,15 +1,15 @@
 /* defs.h - include or define things that aren't present on all systems
  * vixie@decwrl 26dec92 [new]
  *
- * $Id: portability.h,v 4.9.1.24 1994/07/22 08:42:30 vixie Exp $
+ * $Id: portability.h,v 1.1 1994/09/22 20:45:08 pst Exp $
  */
 
 /*
  * ++Copyright++
  * -
- * Copyright (c) 
+ * Copyright (c)
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -25,7 +25,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,14 +39,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/storage.c b/usr.sbin/named/storage.c
index 5f995cce37da..294c80ab3025 100644
--- a/usr.sbin/named/storage.c
+++ b/usr.sbin/named/storage.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -70,18 +70,18 @@
  *
  *  Author -
  *	Michael John Muuss
- *  
+ *
  *  Source -
  *	SECAD/VLD Computing Consortium, Bldg 394
  *	The U. S. Army Ballistic Research Laboratory
  *	Aberdeen Proving Ground, Maryland  21005-5066
- *  
+ *
  *  Copyright Notice -
  *	This software is Copyright (C) 1987 by the United States Army.
  *	All rights reserved.
  */
 #ifndef lint
-static char RCSid[] = "$Id: storage.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $";
+static char RCSid[] = "$Id: storage.c,v 1.2 1994/09/22 20:45:09 pst Exp $";
 #endif
 
 #undef malloc
@@ -160,7 +160,7 @@ ok:	;
 
 /*
  *			R T _ P R M E M
- * 
+ *
  *  Print map of memory currently in use.
  */
 void
diff --git a/usr.sbin/named/tools/nsquery/nsquery.c b/usr.sbin/named/tools/nsquery/nsquery.c
index 2a00de08bc96..c1ac28ea88f6 100644
--- a/usr.sbin/named/tools/nsquery/nsquery.c
+++ b/usr.sbin/named/tools/nsquery/nsquery.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -62,7 +62,7 @@ char copyright[] =
 
 #ifndef lint
 static char sccsid[] = "@(#)nsquery.c	4.8 (Berkeley) 6/1/90";
-static char rcsid[] = "$Id: nsquery.c,v 4.9.1.4 1994/06/11 22:05:07 vixie Exp $";
+static char rcsid[] = "$Id: nsquery.c,v 1.2 1994/09/22 20:45:28 pst Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/named/tools/nstest/nstest.c b/usr.sbin/named/tools/nstest/nstest.c
index 9104a8e4fa0a..d40e748fa1e3 100644
--- a/usr.sbin/named/tools/nstest/nstest.c
+++ b/usr.sbin/named/tools/nstest/nstest.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1986
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -62,7 +62,7 @@ char copyright[] =
 
 #ifndef lint
 static char sccsid[] = "@(#)nstest.c	4.15 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: nstest.c,v 4.9.1.6 1994/06/01 21:10:11 vixie Exp $";
+static char rcsid[] = "$Id: nstest.c,v 1.2 1994/09/22 20:45:31 pst Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/named/tree.c b/usr.sbin/named/tree.c
index 58607ea0bd48..98988e7ac6ca 100644
--- a/usr.sbin/named/tree.c
+++ b/usr.sbin/named/tree.c
@@ -93,7 +93,7 @@ tree_init(ppr_tree)
 	*ppr_tree = NULL;
 	RETV
 }
-	
+
 
 tree_t
 tree_srch(ppr_tree, pfi_compare, p_user)
diff --git a/usr.sbin/named/xfer/named-xfer.c b/usr.sbin/named/xfer/named-xfer.c
index b2546d003089..74f65ea1f5fd 100644
--- a/usr.sbin/named/xfer/named-xfer.c
+++ b/usr.sbin/named/xfer/named-xfer.c
@@ -11,7 +11,7 @@
  * -
  * Copyright (c) 1988, 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -27,7 +27,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,14 +41,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -70,7 +70,7 @@ char copyright[] =
 
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)named-xfer.c	4.18 (Berkeley) 3/7/91";
-static char rcsid[] = "$Id: named-xfer.c,v 4.9.1.23 1994/07/22 08:42:39 vixie Exp $";
+static char rcsid[] = "$Id: named-xfer.c,v 1.2 1994/09/22 20:45:34 pst Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -202,7 +202,7 @@ main(argc, argv)
 		case 'z':		/* zone == domain */
 			domain = optarg;
 			domain_len = strlen(domain);
-			while ((domain_len > 0) && 
+			while ((domain_len > 0) &&
 					(domain[domain_len-1] == '.'))
 				domain[--domain_len] = '\0';
 			break;
@@ -339,7 +339,7 @@ main(argc, argv)
 	buildprotolist();
 
 	/* init zone data */
- 
+
 	zp = &zone;
 #ifdef STUBS
 	if (stub_only)
@@ -427,7 +427,7 @@ main(argc, argv)
 	}
 	/*NOTREACHED*/
 }
- 
+
 static char *UsageText[] = {
 	"\t-z zone_to_transfer\n",
 	"\t-f db_file\n",
@@ -549,7 +549,7 @@ getzone(zp, serial_no, port)
 			syslog(LOG_ERR, "socket: %m");
 			error++;
 			break;
-		}	
+		}
 		dprintf(2, (ddt, "connecting to server #%d [%s].%d\n",
 			    cnt+1, inet_ntoa(sin.sin_addr),
 			    ntohs(sin.sin_port)));
@@ -559,7 +559,7 @@ getzone(zp, serial_no, port)
 			error++;
 			(void) my_close(s);
 			continue;
-		}	
+		}
 tryagain:
 		n = res_mkquery(QUERY, zp->z_origin, Class,
 				T_SOA, NULL, 0, NULL, buf, bufsize);
@@ -583,7 +583,7 @@ tryagain:
 			syslog(LOG_ERR, "writemsg: %m");
 			error++;
 			(void) my_close(s);
-			continue;	
+			continue;
 		}
 		/*
 		 * Get out your butterfly net and catch the SOA
@@ -630,7 +630,7 @@ tryagain:
 		 *  2) not an authority response
 		 *  3) both the number of answers and authority count < 1)
 		 */
-		if (hp->rcode != NOERROR || !(hp->aa) || 
+		if (hp->rcode != NOERROR || !(hp->aa) ||
 		    (ancount < 1 && aucount < 1)) {
 #ifndef GEN_AXFR
 			if (Class == C_IN) {
@@ -689,7 +689,7 @@ tryagain:
 							type = T_SOA;
 						else if (!nscnt)
 							type = T_NS;
-						else 
+						else
 							type = T_SOA;
 					} else
 #endif
@@ -729,7 +729,7 @@ tryagain:
 						syslog(LOG_ERR,"writemsg: %m");
 						error++;
 						(void) my_close(s);
-						break;	
+						break;
 					}
 				}
 				/*
@@ -805,7 +805,7 @@ tryagain:
 					error++;
 					break;
 				}
-		
+
 			} else {
 #endif /*STUBS*/
 				n = print_output(buf, bufsize, cp);
@@ -941,7 +941,7 @@ read_alarm()
 {
 	read_interrupted = 1;
 }
- 
+
 static int
 netread(fd, buf, len, timeout)
 	int fd;
@@ -1217,7 +1217,7 @@ print_output(msg, msglen, rrp)
 	 * that might have been altered by ignored records.
 	 * (This means that we sometimes output unnecessary $ORIGIN
 	 * lines, but that is harmless.)
-	 * 
+	 *
 	 * Also update prev_comment now.
 	 */
 	if (prev_comment && ignore[0] == '\0') {
diff --git a/usr.sbin/ncrcontrol/ncrcontrol.c b/usr.sbin/ncrcontrol/ncrcontrol.c
index 296fb889d9c7..ec1f8ffdcee0 100644
--- a/usr.sbin/ncrcontrol/ncrcontrol.c
+++ b/usr.sbin/ncrcontrol/ncrcontrol.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncrcontrol.c,v 1.6 1995/03/14 21:12:26 se Exp $
+**  $Id: ncrcontrol.c,v 1.7 1995/03/16 15:10:11 se Exp $
 **
 **  Utility for NCR 53C810 device driver.
 **
@@ -357,7 +357,7 @@ do_info(void)
 		set_lun_mask(tip);
 		if (!lun_mask) lun_mask=1;
 		fl=1;
-		
+
 		for (l=0; l<MAX_LUN; l++) {
 			if (!((lun_mask>>l)&1)) continue;
 
@@ -423,7 +423,7 @@ do_info(void)
 			printf (" --- no target.\n");
 			continue;
 		};
-		
+
 		if (verbose<1) continue;
 
 		for (i=0; i<8; i++) {
@@ -467,7 +467,7 @@ do_info(void)
 				if (d&0x80) printf (" AEN");
 				if (d&0x40) printf (" TERMINATE-I/O");
 				break;
-	
+
 			case 7:
 				if (d&0xfb) printf ("capabilities:");
 				if (d&0x80) printf (" relative");
@@ -504,7 +504,7 @@ do_profile(void)
 	int tra,line,t;
 
 	open_kvm(O_RDONLY);
-	
+
 	set_target_mask();
 
 	if (interval<1) interval=1;
@@ -537,9 +537,9 @@ do_profile(void)
 			printf (" t/s kb/s");
 		};
 
-		printf (" length   exp une fly brk"); 
+		printf (" length   exp une fly brk");
 
-		if (verbose>=1) printf ("  total  pre post  disc"); 
+		if (verbose>=1) printf ("  total  pre post  disc");
 
 		printf ("\n");
 
@@ -560,7 +560,7 @@ do_profile(void)
 			diff.ms_post	= new.ms_post - old.ms_post;
 			diff.num_disc	= new.num_disc - old.num_disc;
 			diff.num_break	= new.num_break - old.num_break;
-		
+
 			tra = diff.num_trans;
 			if (!tra) tra=1;
 
@@ -595,7 +595,7 @@ do_profile(void)
 				printf ("%7.1f",
 					(diff.ms_disc+diff.ms_data+diff.ms_setup+diff.ms_post)
 					* 1.0  / tra);
-	
+
 					printf ("%5.1f%5.1f%6.1f",
 					1.0 * diff.ms_setup / tra,
 					1.0 * diff.ms_post  / tra,
@@ -1061,7 +1061,7 @@ static void dump_reg(struct ncr_reg * rp)
 	printf ("        DSP  %08x %-20s  CMD %08x DSPS %08x %s\n",
 		l(0x2c),sn(l(0x2c)),l(0x24),l(0x30), sn(l(0x30)));
 	printf ("        TEMP %08x %-20s  DSA %08x\n",
-		l(0x1c),sn(l(0x1c)),l(0x10)); 
+		l(0x1c),sn(l(0x1c)),l(0x10));
 	printf ("\n");
 	printf ("        Busstatus: ");
 	if ((reg[0x0b]>>7)&1) printf (" Req");
@@ -1320,7 +1320,7 @@ static void dump_ncr (void)
 			fprintf (stderr, "%s: bad kvm read.\n", prog);
 			exit (1);
 		};
-		
+
 		printf ("\n");
 		dump_reg (&reg);
 	};
@@ -1357,7 +1357,7 @@ static void dump_ncr (void)
 			fprintf (stderr, "%s: bad kvm read.\n", prog);
 			exit (1);
 		};
-		
+
 		printf ("    startpos: %x\n", startpos);
 		printf ("        slot: %d\n", (startpos-
 			(ncr.p_script+offsetof(struct script, tryloop)))/20);
diff --git a/usr.sbin/nslookup/debug.c b/usr.sbin/nslookup/debug.c
index 1d5383e60050..9f63873c1ece 100644
--- a/usr.sbin/nslookup/debug.c
+++ b/usr.sbin/nslookup/debug.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)debug.c	5.26 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: debug.c,v 1.1.1.1 1994/09/22 21:36:01 pst Exp $";
+static char rcsid[] = "$Id: debug.c,v 1.2 1994/09/22 21:50:31 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -284,7 +284,7 @@ Print_rr(cp, msg, eom, file)
 		fprintf(file,"\n\tttl = %lu (%s)", rrttl, p_time(rrttl));
 	    }
 	    (void) putc('\n', file);
-	} 
+	}
 
 	cp1 = cp;
 
diff --git a/usr.sbin/nslookup/getinfo.c b/usr.sbin/nslookup/getinfo.c
index 7d86c2c78b1e..83efe4fcc72a 100644
--- a/usr.sbin/nslookup/getinfo.c
+++ b/usr.sbin/nslookup/getinfo.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)getinfo.c	5.26 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: getinfo.c,v 1.1.1.1 1994/09/22 21:36:01 pst Exp $";
+static char rcsid[] = "$Id: getinfo.c,v 1.2 1994/09/22 21:50:33 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -485,7 +485,7 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 		    if (strcmp((char *)bp, server[j].name) == 0) {
 			server[j].numAddresses++;
 			if (server[j].numAddresses <= MAXADDRS) {
-			    server[j].address[server[j].numAddresses-1] = 
+			    server[j].address[server[j].numAddresses-1] =
 				    				Calloc(1,dlen);
 			    bcopy(cp,
 			      server[j].address[server[j].numAddresses-1],dlen);
diff --git a/usr.sbin/nslookup/list.c b/usr.sbin/nslookup/list.c
index 6bafe1969054..bc187fad8ddc 100644
--- a/usr.sbin/nslookup/list.c
+++ b/usr.sbin/nslookup/list.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)list.c	5.23 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: list.c,v 1.1.1.1 1994/09/22 21:36:01 pst Exp $";
+static char rcsid[] = "$Id: list.c,v 1.2 1994/09/22 21:50:34 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -175,7 +175,7 @@ ListHostsByType(string, putToFile)
 	}
 	result = ListSubr(qtype, namePtr, putToFile ? string : NULL);
 	if (result != SUCCESS)
-	    fprintf(stderr, "*** Can't list domain %s: %s\n", 
+	    fprintf(stderr, "*** Can't list domain %s: %s\n",
 			namePtr, DecodeError(result));
 }
 
@@ -221,7 +221,7 @@ ListHosts(string, putToFile)
 	}
 	result = ListSubr(qtype, namePtr, putToFile ? string : NULL);
 	if (result != SUCCESS)
-	    fprintf(stderr, "*** Can't list domain %s: %s\n", 
+	    fprintf(stderr, "*** Can't list domain %s: %s\n",
 			namePtr, DecodeError(result));
 }
 
diff --git a/usr.sbin/nslookup/main.c b/usr.sbin/nslookup/main.c
index 5daeadf8d0ec..083acecb39cc 100644
--- a/usr.sbin/nslookup/main.c
+++ b/usr.sbin/nslookup/main.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -61,21 +61,21 @@ char copyright[] =
 
 #ifndef lint
 static char sccsid[] = "@(#)main.c	5.42 (Berkeley) 3/3/91";
-static char rcsid[] = "$Id: main.c,v 1.1.1.1 1994/09/22 21:36:01 pst Exp $";
+static char rcsid[] = "$Id: main.c,v 1.2 1994/09/22 21:50:36 pst Exp $";
 #endif /* not lint */
 
 /*
  ******************************************************************************
- *  
+ *
  *   main.c --
- *  
+ *
  *	Main routine and some action routines for the name server
  *	lookup program.
  *
  *	Andrew Cherenson
  *	U.C. Berkeley Computer Science Div.
  *	CS298-26, Fall 1985
- *  
+ *
  ******************************************************************************
  */
 
@@ -98,7 +98,7 @@ static char rcsid[] = "$Id: main.c,v 1.1.1.1 1994/09/22 21:36:01 pst Exp $";
 #include "pathnames.h"
 
 /*
- * Name of a top-level name server. Can be changed with 
+ * Name of a top-level name server. Can be changed with
  * the "set root" command.
  */
 
@@ -193,7 +193,7 @@ main(argc, argv)
      *  find the server's address and name. If the resolver library
      *  already has some addresses for a potential name server,
      *  then use them. Otherwise, see if the current host has a server.
-     *  Command line arguments may override the choice of initial server. 
+     *  Command line arguments may override the choice of initial server.
      */
 
     defaultPtr = (HostInfo *) Calloc(1, sizeof(HostInfo));
@@ -203,11 +203,11 @@ main(argc, argv)
      *  no args =  go into interactive mode, use default host as server
      *	1 arg	=  use as host name to be looked up, default host will be server
      *		   non-interactive mode
-     *  2 args	=  1st arg: 
-     *		     if it is '-', then 
+     *  2 args	=  1st arg:
+     *		     if it is '-', then
      *		        ignore but go into interactive mode
-     *		     else 
-     *		         use as host name to be looked up, 
+     *		     else
+     *		         use as host name to be looked up,
      *			 go into non-interactive mode
      *		2nd arg: name or inet address of server
      *
@@ -226,7 +226,7 @@ main(argc, argv)
     }
     if (argc > 2) {
 	Usage();
-    } 
+    }
     if (argc && *argv[0] != '-') {
 	wantedHost = *argv;	/* name of host to be looked up */
     }
@@ -238,7 +238,7 @@ main(argc, argv)
 	/*
 	 * Use an explicit name server. If the hostname lookup fails,
 	 * default to the server(s) in resolv.conf.
-	 */ 
+	 */
 
 	if (inet_aton(*++argv, &addr)) {
 	    _res.nscount = 1;
@@ -246,18 +246,18 @@ main(argc, argv)
 	} else {
 	    hp = gethostbyname(*argv);
 	    if (hp == NULL) {
-		fprintf(stderr, "*** Can't find server address for '%s': ", 
+		fprintf(stderr, "*** Can't find server address for '%s': ",
 			*argv);
 		herror((char *)NULL);
 		fputc('\n', stderr);
 	    } else {
 		for (i = 0; i < MAXNS && hp->h_addr_list[i] != NULL; i++) {
-		    bcopy(hp->h_addr_list[i], 
-			    (char *)&_res.nsaddr_list[i].sin_addr, 
+		    bcopy(hp->h_addr_list[i],
+			    (char *)&_res.nsaddr_list[i].sin_addr,
 			    hp->h_length);
 		}
 		_res.nscount = i;
-	    } 
+	    }
 	}
     }
 
@@ -270,13 +270,13 @@ main(argc, argv)
 	        LocalServer(defaultPtr);
 		break;
 	    } else {
-		result = GetHostInfoByAddr(&(_res.nsaddr_list[i].sin_addr), 
-				    &(_res.nsaddr_list[i].sin_addr), 
+		result = GetHostInfoByAddr(&(_res.nsaddr_list[i].sin_addr),
+				    &(_res.nsaddr_list[i].sin_addr),
 				    defaultPtr);
 		if (result != SUCCESS) {
 		    fprintf(stderr,
-		    "*** Can't find server name for address %s: %s\n", 
-		       inet_ntoa(_res.nsaddr_list[i].sin_addr), 
+		    "*** Can't find server name for address %s: %s\n",
+		       inet_ntoa(_res.nsaddr_list[i].sin_addr),
 		       DecodeError(result));
 		} else {
 		    defaultAddr = _res.nsaddr_list[i].sin_addr;
@@ -329,7 +329,7 @@ main(argc, argv)
 
 	(void) setjmp(env);
 
-	/* 
+	/*
 	 * Return here after a longjmp.
 	 */
 
@@ -338,7 +338,7 @@ main(argc, argv)
 
 	/*
 	 * Read and evaluate commands. The commands are described in commands.l
-	 * Yylex returns 0 when ^D or 'exit' is typed. 
+	 * Yylex returns 0 when ^D or 'exit' is typed.
 	 */
 
 	printf("> ");
@@ -414,11 +414,11 @@ IsAddr(host, addrPtr)
     if (isdigit(host[0])) {
 	    /* Make sure it has only digits and dots. */
 	    for (cp = host; *cp; ++cp) {
-		if (!isdigit(*cp) && *cp != '.') 
+		if (!isdigit(*cp) && *cp != '.')
 		    return FALSE;
 	    }
 	    /* If it has a trailing dot, don't treat it as an address. */
-	    if (*--cp != '.') { 
+	    if (*--cp != '.') {
 		return inet_aton(host, addrPtr);
 	    }
     }
@@ -432,7 +432,7 @@ IsAddr(host, addrPtr)
  *  SetDefaultServer --
  *
  *	Changes the default name server to the one specified by
- *	the first argument. The command "server name" uses the current 
+ *	the first argument. The command "server name" uses the current
  *	default server to lookup the info for "name". The command
  *	"lserver name" uses the original server to lookup "name".
  *
@@ -510,9 +510,9 @@ SetDefaultServer(string, local)
     if (IsAddr(newServer, &addr)) {
 	result = GetHostInfoByAddr(servAddrPtr, &addr, newDefPtr);
 	/* If we can't get the name, fall through... */
-    } 
+    }
     if (result != SUCCESS && result != NONAUTH) {
-	result = GetHostInfoByName(servAddrPtr, C_IN, T_A, 
+	result = GetHostInfoByName(servAddrPtr, C_IN, T_A,
 			newServer, newDefPtr, 1);
     }
 
@@ -559,14 +559,14 @@ DoLookup(host, servPtr, serverName)
 {
     int result;
     struct in_addr *servAddrPtr;
-    struct in_addr addr; 
+    struct in_addr addr;
 
     /* Skip escape character */
     if (host[0] == '\\')
 	host++;
 
     /*
-     *  If the user gives us an address for an address query, 
+     *  If the user gives us an address for an address query,
      *  silently treat it as a PTR query. If the query type is already
      *  PTR, then convert the address into the in-addr.arpa format.
      *
@@ -581,8 +581,8 @@ DoLookup(host, servPtr, serverName)
 	servAddrPtr = (struct in_addr *) servPtr->servers[0]->addrList[0];
     }
 
-    /* 
-     * RFC1123 says we "SHOULD check the string syntactically for a 
+    /*
+     * RFC1123 says we "SHOULD check the string syntactically for a
      * dotted-decimal number before looking it up [...]" (p. 13).
      */
     if (queryType == T_A && IsAddr(host, &addr)) {
@@ -590,8 +590,8 @@ DoLookup(host, servPtr, serverName)
     } else {
 	if (queryType == T_PTR) {
 	    CvtAddrToPtr(host);
-	} 
-	result = GetHostInfoByName(servAddrPtr, queryClass, queryType, host, 
+	}
+	result = GetHostInfoByName(servAddrPtr, queryClass, queryType, host,
 			&curHostInfo, 0);
     }
 
@@ -618,7 +618,7 @@ DoLookup(host, servPtr, serverName)
 	    break;
 
 	case NO_INFO:
-	    fprintf(stderr, "*** No %s (%s) records available for %s\n", 
+	    fprintf(stderr, "*** No %s (%s) records available for %s\n",
 			DecodeType(queryType), p_type(queryType), host);
 	    break;
 
@@ -659,7 +659,7 @@ LookupHost(string, putToFile)
     int		result;
 
     /*
-     *  Invalidate the current host information to prevent Finger 
+     *  Invalidate the current host information to prevent Finger
      *  from using bogus info.
      */
 
@@ -699,13 +699,13 @@ LookupHost(string, putToFile)
  *
  *  LookupHostWithServer --
  *
- *	Asks the name server specified in the second argument for 
+ *	Asks the name server specified in the second argument for
  *	information about the host or domain specified in the first
  *	argument. The information is printed if the lookup was successful.
  *
  *	Address info about the requested name server is obtained
  *	from the default name server. This routine will return an
- *	error if the default server doesn't have info about the 
+ *	error if the default server doesn't have info about the
  *	requested server. Thus an error return status might not
  *	mean the requested name server doesn't have info about the
  *	requested host.
@@ -743,11 +743,11 @@ LookupHostWithServer(string, putToFile)
 	}
 	fprintf(filePtr,"> %s\n", string);
     }
-    
+
     result = GetHostInfoByName(
 		defaultPtr->addrList ?
 		    (struct in_addr *) defaultPtr->addrList[0] :
-		    (struct in_addr *) defaultPtr->servers[0]->addrList[0], 
+		    (struct in_addr *) defaultPtr->servers[0]->addrList[0],
 		C_IN, T_A, server, &serverInfo, 1);
 
     if (result != SUCCESS) {
@@ -768,7 +768,7 @@ LookupHostWithServer(string, putToFile)
 /*
  ******************************************************************************
  *
- *  SetOption -- 
+ *  SetOption --
  *
  *	This routine is used to change the state information
  *	that affect the lookups. The command format is
@@ -1017,7 +1017,7 @@ ShowOptions()
     printf("  retry=%d\n", _res.retry);
     printf("  root=%s\n", rootServerName);
     printf("  domain=%s\n", _res.defdname);
-    
+
     if (cp = _res.dnsrch) {
 	printf("  srchlist=%s", *cp);
 	for (cp++; *cp; cp++) {
@@ -1072,7 +1072,7 @@ CvtAddrToPtr(name)
     if (IsAddr(name, &addr)) {
 	p = inet_ntoa(addr);
 	if (sscanf(p, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3]) == 4) {
-	    sprintf(name, "%d.%d.%d.%d.in-addr.arpa.", 
+	    sprintf(name, "%d.%d.%d.%d.in-addr.arpa.",
 		ip[3], ip[2], ip[1], ip[0]);
 	}
     }
diff --git a/usr.sbin/nslookup/pathnames.h b/usr.sbin/nslookup/pathnames.h
index f2693b5420ce..84a2e33cbca0 100644
--- a/usr.sbin/nslookup/pathnames.h
+++ b/usr.sbin/nslookup/pathnames.h
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1990
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 /*
  *	@(#)pathnames.h	5.1 (Berkeley) 5/28/90
- *	$Id: pathnames.h,v 4.9.1.3 1993/09/16 09:02:07 vixie Exp $
+ *	$Id: pathnames.h,v 1.2 1994/09/22 21:50:37 pst Exp $
  */
 
 #define	_PATH_NSLOOKUPRC	"/.nslookuprc"
diff --git a/usr.sbin/nslookup/res.h b/usr.sbin/nslookup/res.h
index e86bc2f301da..fcad610ad980 100644
--- a/usr.sbin/nslookup/res.h
+++ b/usr.sbin/nslookup/res.h
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 /*
  *	@(#)res.h	5.10 (Berkeley) 6/1/90
- *	$Id: res.h,v 4.9.1.3 1994/06/01 21:10:16 vixie Exp $
+ *	$Id: res.h,v 1.1.1.1 1994/09/22 21:36:02 pst Exp $
  */
 
 /*
@@ -69,7 +69,7 @@
  *	Andrew Cherenson
  *	U.C. Berkeley
  *	CS298-26  Fall 1985
- * 
+ *
  *******************************************************************************
  */
 
diff --git a/usr.sbin/nslookup/send.c b/usr.sbin/nslookup/send.c
index 6e793a5aebdd..8f34de38ba74 100644
--- a/usr.sbin/nslookup/send.c
+++ b/usr.sbin/nslookup/send.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)send.c	5.18 (Berkeley) 3/2/91";
-static char rcsid[] = "$Id: send.c,v 1.1.1.1 1994/09/22 21:36:02 pst Exp $";
+static char rcsid[] = "$Id: send.c,v 1.2 1994/09/22 21:50:38 pst Exp $";
 #endif /* not lint */
 
 /*
@@ -331,7 +331,7 @@ wait:
 				 * timeout
 				 */
 				if (_res.options & RES_DEBUG)
-					printf("timeout (%d secs)\n", 
+					printf("timeout (%d secs)\n",
 						timeout.tv_sec);
 #if BSD >= 43
 				gotsomewhere = 1;
diff --git a/usr.sbin/nslookup/skip.c b/usr.sbin/nslookup/skip.c
index 7b5f889a0e52..068f8179dbb0 100644
--- a/usr.sbin/nslookup/skip.c
+++ b/usr.sbin/nslookup/skip.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)skip.c	5.12 (Berkeley) 3/21/91";
-static char rcsid[] = "$Id: skip.c,v 1.1.1.1 1994/09/22 21:36:02 pst Exp $";
+static char rcsid[] = "$Id: skip.c,v 1.2 1994/09/22 21:50:39 pst Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/nslookup/subr.c b/usr.sbin/nslookup/subr.c
index 0ad71f76fb39..9f86d1502e9d 100644
--- a/usr.sbin/nslookup/subr.c
+++ b/usr.sbin/nslookup/subr.c
@@ -3,7 +3,7 @@
  * -
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -19,7 +19,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
  * SUCH DAMAGE.
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)subr.c	5.24 (Berkeley) 3/2/91";
-static char rcsid[] = "$Id: subr.c,v 1.1.1.1 1994/09/22 21:36:02 pst Exp $";
+static char rcsid[] = "$Id: subr.c,v 1.2 1994/09/22 21:50:41 pst Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pcvt/cursor/cursor.c b/usr.sbin/pcvt/cursor/cursor.c
index 58fb5c77b6f9..94ce1d7fb844 100644
--- a/usr.sbin/pcvt/cursor/cursor.c
+++ b/usr.sbin/pcvt/cursor/cursor.c
@@ -43,7 +43,7 @@ static char *id =
  *	-hm	adding option -d <device>
  *
  *---------------------------------------------------------------------------*/
-	
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -67,7 +67,7 @@ char *argv[];
 	int end = -1;
 	int dflag = -1;
 	char *device;
-	
+
 	while( (c = getopt(argc, argv, "d:n:s:e:")) != EOF)
 	{
 		switch(c)
@@ -76,15 +76,15 @@ char *argv[];
 				device = optarg;
 				dflag = 1;
 				break;
-				
+
 			case 'n':
 				screen = atoi(optarg);
 				break;
-				
+
 			case 's':
 				start = atoi(optarg);
 				break;
-				
+
 			case 'e':
 				end = atoi(optarg);
 				break;
@@ -96,7 +96,7 @@ char *argv[];
 		}
 	}
 
-	if(start == -1 || end == -1)	
+	if(start == -1 || end == -1)
 		usage();
 
 	if(dflag == -1)
@@ -118,7 +118,7 @@ char *argv[];
 	if(screen == -1)
 	{
 		struct stat stat;
-		
+
 		if((fstat(fd, &stat)) == -1)
 		{
 			char buffer[80];
@@ -130,7 +130,7 @@ char *argv[];
 
 		screen = minor(stat.st_rdev);
 	}
-	
+
 	cursorshape.start = start;
 	cursorshape.end = end;
 	cursorshape.screen_no = screen;
diff --git a/usr.sbin/pcvt/demo/playvt.c b/usr.sbin/pcvt/demo/playvt.c
index d0a391ff6b4e..a3ac9fb09e8c 100644
--- a/usr.sbin/pcvt/demo/playvt.c
+++ b/usr.sbin/pcvt/demo/playvt.c
@@ -40,7 +40,7 @@ static char *id =
  *	-hm	want to see my xmas greeting ... :-)
  *
  *---------------------------------------------------------------------------*/
-	
+
 #include <stdio.h>
 #include <unistd.h>
 
@@ -58,7 +58,7 @@ char *argv[];
 	int delay = 0;
 	int fflag = -1;
 	char *filename;
-	
+
 	while( (c = getopt(argc, argv, "d:f:")) != EOF)
 	{
 		switch(c)
@@ -66,7 +66,7 @@ char *argv[];
 			case 'd':
 				delay = atoi(optarg);
 				break;
-				
+
 			case 'f':
 				filename = optarg;
 				fflag = 1;
@@ -90,7 +90,7 @@ char *argv[];
 			exit(1);
 		}
 	}
-			
+
 	while((c = getc(fp)) != EOF)
 	{
 		putchar(c);
diff --git a/usr.sbin/pcvt/fed/edit.c b/usr.sbin/pcvt/fed/edit.c
index c15a90ceb6d9..67d616bba732 100644
--- a/usr.sbin/pcvt/fed/edit.c
+++ b/usr.sbin/pcvt/fed/edit.c
@@ -14,7 +14,7 @@
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *    This product includes software developed by Hellmuth Michaelis.
- * 4. The name of the developer may not be used to endorse or promote 
+ * 4. The name of the developer may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * 	edit.c, 3.00, last edit-date: [Sun Jan  2 20:08:27 1994]   
+ * 	edit.c, 3.00, last edit-date: [Sun Jan  2 20:08:27 1994]
  */
 
 /*---------------------------------------------------------------------------
@@ -57,13 +57,13 @@ static int pen;
 void edit_mode(void)
 {
 	mvwprintw(cmd_win,1,1,"(W)hite     ");
-	mvwprintw(cmd_win,2,1,"(Black      ");	
+	mvwprintw(cmd_win,2,1,"(Black      ");
 	mvwprintw(cmd_win,3,1,"(I)nvert    ");
 	mvwprintw(cmd_win,4,1,"(R)ow BLACK ");
 	mvwprintw(cmd_win,5,1,"(r)ow WHITE ");
 	mvwprintw(cmd_win,6,1,"(C)ol BLACK ");
-	mvwprintw(cmd_win,7,1,"(c)ol WHITE ");	
-	mvwprintw(cmd_win,8,1,"(Q)uit/Save ");	
+	mvwprintw(cmd_win,7,1,"(c)ol WHITE ");
+	mvwprintw(cmd_win,8,1,"(Q)uit/Save ");
 
 	mvwprintw(cmd_win,9 ,1,"e(X)it/undo ");
 	mvwprintw(cmd_win,10,1,"Pen (U)p    ");
@@ -73,7 +73,7 @@ void edit_mode(void)
 	mvwprintw(cmd_win,14,1,"(^N)ext Line");
 	mvwprintw(cmd_win,15,1,"(^F)orwd Col");
 	mvwprintw(cmd_win,16,1,"(^B)ack  Col");
-	wrefresh(cmd_win);	
+	wrefresh(cmd_win);
 }
 
 /*---------------------------------------------------------------------------*
@@ -88,23 +88,23 @@ int edit(void)
 	c = r = 0;
 
 	pen = UP;
-	
+
 	for(;;)
 	{
 		if(pen == DOWN)
 			dis_cmd("   Edit Mode, the Pen is DOWN");
 		else
-			dis_cmd("   Edit Mode, the Pen is UP");		
-		
+			dis_cmd("   Edit Mode, the Pen is UP");
+
 		l = ((mvwinch(ch_win,(r+1),(c+1))) & A_CHARTEXT);
 		wattron(ch_win,A_REVERSE);
 		mvwprintw(ch_win,(r+1),(c+1),"%c",l);
-		wattroff(ch_win,A_REVERSE);		
+		wattroff(ch_win,A_REVERSE);
 		wmove(ch_win,(r+1),(c+1));
 		wrefresh(ch_win);
 
 		k_ch = wgetch(ch_win);
-		
+
 		switch(k_ch)
 		{
 			case K_LEFT:
@@ -182,33 +182,33 @@ int edit(void)
 			case 'W':
 				setchr(WHITE);
 				break;
-				
+
 			case 'b':
 			case 'B':
 				setchr(BLACK);
 				break;
-				
+
 			case 'i':
 			case 'I':
 				invert();
 				break;
-				
+
 			case 'r':
 				setrow(WHITE);
 				break;
-				
+
 			case 'R':
 				setrow(BLACK);
 				break;
-				
+
 			case 'c':
 				setcol(WHITE);
 				break;
-				
+
 			case 'C':
 				setcol(BLACK);
 				break;
-						
+
 			case 'u':
 			case 'U':
 				pen = UP;
@@ -218,11 +218,11 @@ int edit(void)
 			case 'D':
 				pen = DOWN;
 				break;
-				
+
 			default:
 				beep();
 				break;
-				
+
 		}
 	}
 }
@@ -237,12 +237,12 @@ void normal_ch(int r, int c)
 	if(pen == DOWN)
 		mvwprintw(ch_win,(r+1),(c+1),"*");
 	else
-		mvwprintw(ch_win,(r+1),(c+1),"%c",l);	
+		mvwprintw(ch_win,(r+1),(c+1),"%c",l);
 	wmove(ch_win,(r+1),(c+1));
 }
 
 /*---------------------------------------------------------------------------*
- *	
+ *
  *---------------------------------------------------------------------------*/
 void chg_pt(int r, int c)
 {
@@ -262,7 +262,7 @@ void chg_pt(int r, int c)
 void invert(void)
 {
 	int r,c;
-	
+
 	r = 1;
 
 	while(r <= ch_height)
@@ -273,7 +273,7 @@ void invert(void)
 			if(WHITE == mvwinch(ch_win, r, c))
 				mvwaddch(ch_win, r, c, BLACK);
 			else
-				mvwaddch(ch_win, r, c, WHITE);			
+				mvwaddch(ch_win, r, c, WHITE);
 			c++;
 		}
 		r++;
@@ -286,15 +286,15 @@ void invert(void)
 void setchr(char type)
 {
 	int r,c;
-	
+
 	r = 1;
-	
+
 	while(r <= ch_height)
 	{
 		c = 1;
 		while(c <= ch_width)
 		{
-			mvwaddch(ch_win, r, c, type);			
+			mvwaddch(ch_win, r, c, type);
 			c++;
 		}
 		r++;
@@ -308,13 +308,13 @@ void setrow(char type)
 {
 	int r,c;
 
-	getyx(ch_win,r,c);	
+	getyx(ch_win,r,c);
 
 	c = 1;
-	
+
 	while(c <= ch_width)
 	{
-		mvwaddch(ch_win, r, c, type);			
+		mvwaddch(ch_win, r, c, type);
 		c++;
 	}
 }
@@ -326,13 +326,13 @@ void setcol(char type)
 {
 	int r,c;
 
-	getyx(ch_win,r,c);	
+	getyx(ch_win,r,c);
 
 	r = 1;
-	
+
 	while(r <= ch_height)
 	{
-		mvwaddch(ch_win, r, c, type);			
+		mvwaddch(ch_win, r, c, type);
 		r++;
 	}
 }
diff --git a/usr.sbin/pcvt/fed/fed.c b/usr.sbin/pcvt/fed/fed.c
index aa577ab9897b..d2fa4f39bd7c 100644
--- a/usr.sbin/pcvt/fed/fed.c
+++ b/usr.sbin/pcvt/fed/fed.c
@@ -14,7 +14,7 @@
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *    This product includes software developed by Hellmuth Michaelis.
- * 4. The name of the developer may not be used to endorse or promote 
+ * 4. The name of the developer may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * 	fed.c, 3.00, last edit-date: [Sun Jan  2 20:08:45 1994]   
+ * 	fed.c, 3.00, last edit-date: [Sun Jan  2 20:08:45 1994]
  */
 
 /*---------------------------------------------------------------------------
@@ -53,7 +53,7 @@ void main(int argc, char *argv[])
 	int i;
 	int row, col;
 	int ret;
-	
+
 	if(argc != 2)
 	{
 		fprintf(stderr,"EGA/VGA Fonteditor, Rel 1.00\n");
@@ -81,10 +81,10 @@ void main(int argc, char *argv[])
 	if(ch_width == WIDTH16)
 		addstr("1234567890123456");
 	else
-		addstr("12345678");	
+		addstr("12345678");
 
 /* charcater vertical ruler */
-	
+
 	for(i=1; i < ch_height+1; i++)
 		mvprintw((WINROW+i), (CHCOL + ((WIDTH16 - ch_width)/2) - 2), "%2d", i);
 
@@ -112,19 +112,19 @@ void main(int argc, char *argv[])
 
 	cmd_win = newwin(((WSIZE)+(2*WBORDER)),(CMDSIZE+(2*WBORDER)),
 				WINROW,CMDCOL);
-	keypad(cmd_win,TRUE);				
+	keypad(cmd_win,TRUE);
 	idlok(cmd_win, TRUE);
 	box(cmd_win,'|','-');
 
 	sel_mode();
-	
+
 /* character font window */
 
 	ch_win = newwin((ch_height+(2*WBORDER)),(ch_width+(2*WBORDER)),
 				WINROW, CHCOL+((WIDTH16 - ch_width)/2));
 	keypad(ch_win,TRUE);
 	idlok(ch_win, TRUE);
-	
+
 	box(ch_win,'|','-');
 	wrefresh(ch_win);
 
@@ -132,7 +132,7 @@ void main(int argc, char *argv[])
 
 	set_win = newwin((WSIZE+(2*WBORDER)),((WSIZE*2)+(2*WBORDER)),
 				WINROW,SETCOL); /* whole character set */
-	keypad(set_win,TRUE);				
+	keypad(set_win,TRUE);
 	idlok(set_win, TRUE);
 
 	box(set_win,'|','-');
@@ -152,10 +152,10 @@ void main(int argc, char *argv[])
 	wmove(set_win,1,1);
 	wrefresh(set_win);
 
-/* start */	
+/* start */
 
 	clr_cmd();
-	
+
 	curchar = 0;
 
 	if((ret = selectc()) == 1)
diff --git a/usr.sbin/pcvt/fed/fed.h b/usr.sbin/pcvt/fed/fed.h
index 27a32c355260..0911d37f067e 100644
--- a/usr.sbin/pcvt/fed/fed.h
+++ b/usr.sbin/pcvt/fed/fed.h
@@ -14,7 +14,7 @@
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *    This product includes software developed by Hellmuth Michaelis.
- * 4. The name of the developer may not be used to endorse or promote 
+ * 4. The name of the developer may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
diff --git a/usr.sbin/pcvt/fed/misc.c b/usr.sbin/pcvt/fed/misc.c
index a0dff32703ac..c6707ba81251 100644
--- a/usr.sbin/pcvt/fed/misc.c
+++ b/usr.sbin/pcvt/fed/misc.c
@@ -14,7 +14,7 @@
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *    This product includes software developed by Hellmuth Michaelis.
- * 4. The name of the developer may not be used to endorse or promote 
+ * 4. The name of the developer may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * 	misc.c, 3.00, last edit-date: [Sun Jan  2 20:09:21 1994] 
+ * 	misc.c, 3.00, last edit-date: [Sun Jan  2 20:09:21 1994]
  */
 
 /*---------------------------------------------------------------------------
@@ -84,9 +84,9 @@ void readfont(char *filename)
 	struct stat sbuf, *sbp;
 	int ret;
 	char buffer[1024];
-	
+
 	sbp = &sbuf;
-	
+
 	if((in = fopen(filename, "r")) == NULL)
 	{
 		sprintf(buffer, "cannot open file %s for reading", filename);
@@ -107,31 +107,31 @@ void readfont(char *filename)
 			ch_height = HEIGHT8X8;
 			ch_width = WIDTH8;
 			break;
-			
+
 		case FONT8X10:
 			ch_height = HEIGHT8X10;
 			ch_width = WIDTH8;
 			break;
-			
+
 		case FONT8X14:
 			ch_height = HEIGHT8X14;
 			ch_width = WIDTH8;
 			break;
-			
+
 		case FONT8X16:
 			ch_height = HEIGHT8X16;
 			ch_width = WIDTH8;
 			break;
-			
+
 		case FONT16X16:
 			ch_height = HEIGHT16X16;
 			ch_width = WIDTH16;
 			break;
-			
+
 		default:
 			fprintf(stderr,"error, file %s is no valid font file, size=%d\n",filename,sbp->st_size);
 			exit(1);
-	}			
+	}
 
 	if((fonttab = (unsigned char *)malloc((size_t)sbp->st_size)) == NULL)
 	{
@@ -147,7 +147,7 @@ void readfont(char *filename)
 		sprintf(buffer,"error reading file %s, size = %d, ret = %d\n",filename,sbp->st_size, ret);
 		perror(buffer);
 		exit(1);
-	}		
+	}
 }
 
 /*---------------------------------------------------------------------------*
@@ -158,12 +158,12 @@ void writefont()
 	FILE *in, *out;
 	int ret;
 	char buffer[1024];
-	
+
 	if((in = fopen(lfilename, "r")) != NULL)
 	{
 		int c;
 		char wfn[1024];
-		
+
 		strcpy(wfn, lfilename);
 		strcat(wfn, ".BAK");
 		if((out = fopen(wfn, "w")) == NULL)
@@ -179,7 +179,7 @@ void writefont()
 		fclose(out);
 		fclose(in);
 	}
-			
+
 	if((out = fopen(lfilename, "w")) == NULL)
 	{
 		sprintf(buffer, "cannot open file %s for writing", lfilename);
@@ -192,7 +192,7 @@ void writefont()
 		sprintf(buffer,"error writing file %s, size=%d, ret=%d\n",lfilename,lfilesize, ret);
 		perror(buffer);
 		exit(1);
-	}		
+	}
 }
 
 /*---------------------------------------------------------------------------*
@@ -223,7 +223,7 @@ void move_ch(int src, int dst)
 {
 	unsigned char *s, *d;
 	int offset = 0;
-	
+
 	if(ch_width == WIDTH16)
 		offset = 2;
 	else
@@ -231,7 +231,7 @@ void move_ch(int src, int dst)
 
 	s = &(fonttab[ch_height * offset * src]);
 	d = &(fonttab[ch_height * offset * dst]);
-		
+
 	bcopy(s, d, (ch_height*offset));	/* src -> dst */
 }
 
@@ -243,7 +243,7 @@ void xchg_ch(int src, int dst)
 	unsigned char *s, *d;
 	unsigned char buf[32];
 	int offset = 0;
-	
+
 	if(ch_width == WIDTH16)
 		offset = 2;
 	else
@@ -251,7 +251,7 @@ void xchg_ch(int src, int dst)
 
 	s = &(fonttab[ch_height * offset * src]);
 	d = &(fonttab[ch_height * offset * dst]);
-		
+
 	bcopy(s, buf, (ch_height*offset));	/* src -> tmp */
 	bcopy(d, s, (ch_height*offset));	/* dst -> src */
 	bcopy(buf, d, (ch_height*offset));	/* tmp -> dst */
@@ -266,19 +266,19 @@ void display(int no)
 	char line[32];
 	int ln_no;
 	unsigned char hibyte;
-	unsigned char lobyte;	
+	unsigned char lobyte;
 	int offset;
 	int r;
 
 	offset = 0;
 	r = 1;
 	lobyte = 0;
-	
+
 	if(ch_width == WIDTH16)
 		fontchar = &(fonttab[ch_height * 2 * no]);
 	else
 		fontchar = &(fonttab[ch_height * no]);
-		
+
 	for (ln_no = 0; ln_no < ch_height; ln_no++)
 	{
 		hibyte = *(fontchar + (offset++));
@@ -287,7 +287,7 @@ void display(int no)
 		{
 			lobyte = *(fontchar + offset++);
 		}
-			
+
 		strcpy(line,bitmask[(int)((hibyte >> 4) & 0x0f)]);
 		strcat(line,bitmask[(int)(hibyte & 0x0f)]);
 
@@ -317,7 +317,7 @@ void save_ch(void)
 	int r, c;
 	unsigned short byte;
 	unsigned short shift;
-	
+
 	if(ch_width == WIDTH16)
 		offset = 2;
 	else
@@ -326,7 +326,7 @@ void save_ch(void)
 	s = &(fonttab[ch_height * offset * curchar]);
 
 	r = 1;
-	
+
 	while(r <= ch_height)
 	{
 		c = 1;
diff --git a/usr.sbin/pcvt/fed/select.c b/usr.sbin/pcvt/fed/select.c
index 6b9d3858cf7c..b6993bb1f52a 100644
--- a/usr.sbin/pcvt/fed/select.c
+++ b/usr.sbin/pcvt/fed/select.c
@@ -14,7 +14,7 @@
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *    This product includes software developed by Hellmuth Michaelis.
- * 4. The name of the developer may not be used to endorse or promote 
+ * 4. The name of the developer may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * 	select.c, 3.00, last edit-date: [Sun Jan  2 20:09:36 1994]  
+ * 	select.c, 3.00, last edit-date: [Sun Jan  2 20:09:36 1994]
  */
 
 /*---------------------------------------------------------------------------
@@ -78,14 +78,14 @@ int selectc()
 	int ret;
 	char h, l;
 	unsigned int k_ch;
-	
+
 	c = (curchar / 16);
 	r = (curchar % 16);
 
 	for(;;)
 	{
 		dis_cmd("   Select Character");
-		
+
 		sel_mode();
 
 		curchar = r + (c*16);
@@ -96,12 +96,12 @@ int selectc()
 		l = ((mvwinch(set_win,(r+1),((c*2)+2))) & A_CHARTEXT);
 		wattron(set_win,A_REVERSE);
 		mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);
-		wattroff(set_win,A_REVERSE);		
+		wattroff(set_win,A_REVERSE);
 		wmove(set_win,(r+1),((c*2)+1));
 		wrefresh(set_win);
-		
+
 		k_ch = wgetch(set_win);
-		
+
 		switch(k_ch)
 		{
 			case K_LEFT:
@@ -141,7 +141,7 @@ int selectc()
 				break;
 
 			case 'e':
-			case 'E':			
+			case 'E':
 				edit_mode();
 				dis_cmd("   Edit Character");
 				display(curchar);
@@ -195,25 +195,25 @@ int selectc()
 			case 'q':
 			case 'Q':
 				normal_set(r,c);
-				wrefresh(set_win);			
+				wrefresh(set_win);
 				return(1);
 				break;
-			
+
 			case 'x':
 			case 'X':
 				normal_set(r,c);
-				wrefresh(set_win);			
+				wrefresh(set_win);
 				return(0);
 				break;
 
 			case 0x0c:
 				wrefresh(curscr);
 				break;
-			
+
 			default:
 				beep();
 				break;
-				
+
 		}
 	}
 }
@@ -221,7 +221,7 @@ int selectc()
 void normal_set(int r, int c)
 {
 	char h, l;
-	
+
 	h = ((mvwinch(set_win,(r+1),((c*2)+1))) & A_CHARTEXT);
 	l = ((mvwinch(set_win,(r+1),((c*2)+2))) & A_CHARTEXT);
 	wattroff(set_win,A_REVERSE);
@@ -234,7 +234,7 @@ int sel_dest(void)
 	int c, r;
 	char h, l;
 	unsigned int k_ch;
-	
+
 	c = (curchar / 16);
 	r = (curchar % 16);
 
@@ -242,19 +242,19 @@ int sel_dest(void)
 	{
 
 		curchar = r + (c*16);
-		
+
 		display(curchar);
-		
+
 		h = ((mvwinch(set_win,(r+1),((c*2)+1))) & A_CHARTEXT);
 		l = ((mvwinch(set_win,(r+1),((c*2)+2))) & A_CHARTEXT);
 		wattron(set_win,A_UNDERLINE);
 		mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);
-		wattroff(set_win,A_UNDERLINE);		
+		wattroff(set_win,A_UNDERLINE);
 		wmove(set_win,(r+1),((c*2)+1));
 		wrefresh(set_win);
 
 		k_ch = wgetch(set_win);
-		
+
 		switch(k_ch)
 		{
 			case K_LEFT:
@@ -292,7 +292,7 @@ int sel_dest(void)
 					c++;
 				}
 				break;
-				
+
 			case '\r':
 			case '\n':
 				normal_uset(r,c);
@@ -301,9 +301,9 @@ int sel_dest(void)
 			case 0x0c:
 				wrefresh(curscr);
 				break;
-			
+
 			default:
-				normal_uset(r,c);			
+				normal_uset(r,c);
 				return(-1);
 		}
 	}
@@ -315,7 +315,7 @@ void normal_uset(int r, int c)
 
 	h = ((mvwinch(set_win,(r+1),((c*2)+1))) & A_CHARTEXT);
 	l = ((mvwinch(set_win,(r+1),((c*2)+2))) & A_CHARTEXT);
-	
+
 	wattroff(set_win,A_UNDERLINE);
 	mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);
 	wmove(set_win,(r+1),((c*2)+1));
@@ -324,9 +324,9 @@ void normal_uset(int r, int c)
 	{
 		wattron(set_win,A_REVERSE);
 		mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);
-		wattroff(set_win,A_REVERSE);		
+		wattroff(set_win,A_REVERSE);
 		wmove(set_win,(r+1),((c*2)+1));
-	}	
+	}
 }
 
 
diff --git a/usr.sbin/pcvt/fontedit/fontedit.c b/usr.sbin/pcvt/fontedit/fontedit.c
index 36a3232f097e..d9ed357c6e85 100644
--- a/usr.sbin/pcvt/fontedit/fontedit.c
+++ b/usr.sbin/pcvt/fontedit/fontedit.c
@@ -17,7 +17,7 @@
  *
  *      REVISION HISTORY:
  *
- *      Nov 21, 1987 - Fixed man page to say "Fontedit" instead of "Top" 
+ *      Nov 21, 1987 - Fixed man page to say "Fontedit" instead of "Top"
  *      Nov 22, 1987 - Added BSD Compatible ioctl, turned cursor on/off
  *                     - eap@bucsf.bu.edu
  */
@@ -79,7 +79,7 @@ typedef enum { false, true } bool;
 #define	ROW_OFFSET	3
 #define COL_OFFSET	10
 
-/* 
+/*
  * Position of the DRCS table.
  */
 
@@ -122,8 +122,8 @@ interrupt()
 {
 	void clear_screen();
 #ifdef CURFIX
-        printf("%s\n",CURSORON);   
-#endif CURFIX   
+        printf("%s\n",CURSORON);
+#endif CURFIX
 #ifdef SYSV
 	ioctl( 0, TCSETA, &old_stty );
 #endif SYSV
@@ -142,7 +142,7 @@ interrupt()
  * Main
  *	Grab input/output file and call main command processor.
  */
-	
+
 main( argc, argv )
 int argc;
 char *argv[];
@@ -168,7 +168,7 @@ char *argv[];
 		}
 	}
 	fclose( font_file );
-	
+
 	if ( ( font_file = fopen( argv[1], "r" ) ) != (FILE *)0 ) {
 		get_table( font_file );
 		fclose( font_file );
@@ -204,7 +204,7 @@ char *argv[];
 	ioctl( 0, TIOCSETA, &new_stty );
 #endif /* __NetBSD__ || __FreeBSD__ */
 #ifdef BSD
-	new_stty.sg_flags |= CBREAK;               
+	new_stty.sg_flags |= CBREAK;
         new_stty.sg_flags &= ~ECHO;
 	ioctl( 0, TIOCSETP, &new_stty );
 #endif BSD
@@ -237,7 +237,7 @@ char *argv[];
 
 /*
  * Command
- *	Process a function key. 
+ *	Process a function key.
  *
  *	The user cannot fill in slots 0 or 95 (space and del respecitively).
  */
@@ -317,7 +317,7 @@ command()
 			}
 			draw_current();
 			break;
-	
+
 		case KEY_REMOVE:	/* Remove a row	*/
 			change = true;
 			for ( j = 0; j < MAX_COLS; ++j ) {
@@ -349,7 +349,7 @@ command()
 				warning( "Changes not saved" );
 				error = true;
 				override = true;
-			} else { 
+			} else {
 				extract_entry( current_entry );
 				draw_current();
 			}
@@ -363,7 +363,7 @@ command()
 			} else {
 				print_entry( current_entry, false );
 				current_entry = current_entry - 1;
-				if ( current_entry == 0 ) 
+				if ( current_entry == 0 )
 					current_entry = TOTAL_ENTRIES - 2;
 				print_entry( current_entry, true );
 			}
@@ -398,7 +398,7 @@ command()
 			break;
 
 		case KEY_LEFT:
-			if ( col == 0 ) 
+			if ( col == 0 )
 				col = MAX_COLS;
 			col = col - 1;
 			break;
@@ -522,7 +522,7 @@ init_restore()
 {
 	register int row, col;
 	register int i;
-	
+
 	void  draw_current(), clear_screen(), print_entry();
 
 	clear_screen();
@@ -572,7 +572,7 @@ init_restore()
 		printf( "|" );
 		move ( TABLE_ROW + i * 2 + 1, TABLE_COL +12 * 2 - 1);
 		printf( "+" );
-	}	
+	}
 	for ( i = 0; i < TOTAL_ENTRIES; ++i )
 		print_entry( i, (i == current_entry) ? true : false );
 }
@@ -618,7 +618,7 @@ draw_current()
  * highlight
  *	Draw the cursor in the main display area.
  */
- 
+
 void
 highlight( row, col, on )
 unsigned int row, col;
@@ -654,7 +654,7 @@ bool on;
 /*
  * Clear_screen
  */
- 
+
 void
 clear_screen()
 {
@@ -681,7 +681,7 @@ int y, x;
  *	Convert the bit pattern used in the main display area into something
  *	that the vt220 can digest - namely sixels...
  */
- 
+
 void
 build_entry( entry_no )
 unsigned int entry_no;
@@ -711,7 +711,7 @@ unsigned int entry_no;
 		}
 		font_table[entry_no][col+8] = mask + 077;
 	}
-		
+
 }
 
 
@@ -733,7 +733,7 @@ unsigned int entry_no;
 		/* Top set of sixels	*/
 
 		mask = font_table[entry_no][col];
-		if ( mask >= 077 ) 
+		if ( mask >= 077 )
 			mask -= 077;
 		else
 			mask = 0;		/* Bogus entry	*/
@@ -756,7 +756,7 @@ unsigned int entry_no;
 			mask = mask >> 1;
 		}
 	}
-		
+
 }
 
 
@@ -773,7 +773,7 @@ int entry_no;
 {
 	register char *fp	= font_table[entry_no];
 
-	printf( "\033P1;%d;1;0;0;0{ @%c%c%c%c%c%c%c%c/%c%c%c%c%c%c%c%c\033\\", 
+	printf( "\033P1;%d;1;0;0;0{ @%c%c%c%c%c%c%c%c/%c%c%c%c%c%c%c%c\033\\",
 		entry_no,
 		fp[ 0], fp[ 1], fp[ 2], fp[ 3], fp[ 4], fp[ 5], fp[ 6], fp[ 7],
 		fp[ 8], fp[ 9], fp[10], fp[11], fp[12], fp[13], fp[14], fp[15] );
@@ -830,8 +830,8 @@ FILE *font_file;
 
 	for ( i = 0; i < TOTAL_ENTRIES; ++i ) {
 		fp = font_table[i];
-		fprintf( font_file, "\033P1;%d;1;0;0;0{ @%c%c%c%c%c%c%c%c/%c%c%c%c%c%c%c%c\033\\\n", 
-			i, 
+		fprintf( font_file, "\033P1;%d;1;0;0;0{ @%c%c%c%c%c%c%c%c/%c%c%c%c%c%c%c%c\033\\\n",
+			i,
 			fp[ 0], fp[ 1], fp[ 2], fp[ 3], fp[ 4], fp[ 5], fp[ 6], fp[ 7],
 			fp[ 8], fp[ 9], fp[10], fp[11], fp[12], fp[13], fp[14], fp[15] );
 	}
@@ -855,10 +855,10 @@ FILE *font_file;
 	register int j;
 
 	while( fgets( s, 255, font_file ) ) {
-		if ( strncmp( s, "\033P1;", 4 ) !=  0 ) 
+		if ( strncmp( s, "\033P1;", 4 ) !=  0 )
 			continue;	/* Bogus line	*/
 		p = &s[4];
-		if ( sscanf( p, "%d", &i ) != 1 ) 
+		if ( sscanf( p, "%d", &i ) != 1 )
 			continue;	/* Illegal entry number	*/
 
 		if ( i <= 0 || TOTAL_ENTRIES <= i )
@@ -868,12 +868,12 @@ FILE *font_file;
 
 		while ( *p && *p != '@' )
 			++p;		/* Skip to font definition */
-		if ( ! *p++ ) 
+		if ( ! *p++ )
 			continue;	/* Skip @	*/
 
 		for ( j = 0; *p && *p != '\033' && j < 16; ++j, ++p ) {
 			if ( *p == '/' ) {
-				j = 8; 
+				j = 8;
 				++p;
 			}
 			fp[j] = *p;
@@ -888,7 +888,7 @@ FILE *font_file;
  * Help
  *	Print out help information.
  */
- 
+
 void
 help()
 {
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.c b/usr.sbin/pcvt/ispcvt/ispcvt.c
index fe6a1a910862..3e86b90a3e10 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.c
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.c
@@ -67,11 +67,11 @@ char *argv[];
 	extern char *optarg;
 
 	struct pcvtid pcvtid;
-	struct pcvtinfo pcvtinfo;	
+	struct pcvtinfo pcvtinfo;
 	int c;
 	char *p;
 	int verbose = 0;
-	int config = 0;	
+	int config = 0;
 	int dflag = 0;
 	int fd;
 	char *device;
@@ -83,16 +83,16 @@ char *argv[];
 			case 'v':
 				verbose = 1;
 				break;
-				
+
 			case 'c':
 				config = 1;
 				break;
-				
+
 			case 'd':
 				device = optarg;
 				dflag = 1;
 				break;
-				
+
 			case '?':
 			default:
 				usage();
@@ -173,17 +173,17 @@ char *argv[];
 			case CONF_NETBSD:
 				p = "PCVT_NETBSD";
 				break;
-				
+
 			case CONF_FREEBSD:
 				p = "PCVT_FREEBSD";
 				break;
-	
+
 			default:
 			case CONF_UNKNOWNOPSYS:
 				p = "UNKNOWN";
 				break;
-				
-		}			
+
+		}
 		fprintf(stderr,"Operating System     = %s\t", p);
 		fprintf(stderr,"OS Release Id        = %u\n", pcvtinfo.opsysrel);
 		fprintf(stderr,"PCVT_NSCREENS        = %u\t\t", pcvtinfo.nscreens);
@@ -192,7 +192,7 @@ char *argv[];
 		fprintf(stderr,"PCVT_SYSBEEPF        = %u\n", pcvtinfo.sysbeepf);
 		fprintf(stderr,"PCVT_PCBURST         = %u\t\t", pcvtinfo.pcburst);
 		fprintf(stderr,"PCVT_KBD_FIFO_SZ     = %u\n\n", pcvtinfo.kbd_fifo_sz);
-	
+
 	/* config booleans */
 
 		fprintf(stderr,"PCVT_132GENERIC      = %s",
diff --git a/usr.sbin/pcvt/kcon/kcon.c b/usr.sbin/pcvt/kcon/kcon.c
index 8393e86e0acf..259af90b088a 100644
--- a/usr.sbin/pcvt/kcon/kcon.c
+++ b/usr.sbin/pcvt/kcon/kcon.c
@@ -54,7 +54,7 @@ static char *id =
  *	-hm	remapping debugging
  *	-hm	garbage output for remapped keys bugfix
  *	-hm	patch from Lon Willet, adding -R
- *	
+ *
  *---------------------------------------------------------------------------*/
 
 #include <stdio.h>
@@ -89,12 +89,12 @@ char *argv[];
 	int c = 0;
 
 	int errf = 0;
-	
+
 	int rate = -1;
 	int delay = -1;
 	char *map;
 	int kbfd;
-	
+
 	while((c = getopt(argc, argv, "Rd:lm:opr:st:x")) != EOF)
 	{
 		switch(c)
@@ -123,11 +123,11 @@ char *argv[];
 				else
 					of = 1;
 				break;
-				
+
 			case 'p':
 				pf = 1;
 				break;
-				
+
 			case 'r':
 				rf = 1;
 				rate = atoi(optarg);
@@ -136,7 +136,7 @@ char *argv[];
 			case 's':
 				sf = 1;
 				break;
-				
+
 			case 't':
 				if(*optarg == '+')
 					tf = 1;
@@ -152,7 +152,7 @@ char *argv[];
 				else
 					xf = 1;
 				break;
-				
+
 			default:
 				usage();
 		}
@@ -175,7 +175,7 @@ char *argv[];
 		showtypeamatic(kbfd);
 		exit(0);
 	}
-	
+
 	if(lf)
 	{
 		listcurrent(kbfd);
@@ -194,7 +194,7 @@ char *argv[];
 	{
 		setrepeat(kbfd, tf);
 	}
-		
+
 	if(df || rf)
 	{
 		if(delay > 3)
@@ -217,12 +217,12 @@ char *argv[];
 
 	close(kbfd);
 	exit(0);
-}				
+}
 
 /*---------------------------------------------------------------------------*
  *	display usage info & exit
  *---------------------------------------------------------------------------*/
-usage() 
+usage()
 {
 	fprintf(stderr, "\nkcon: keyboard control and remapping utility for pcvt video driver\n");
 	fprintf(stderr, "usage: [-R] [-d delay] [-l] [-m map] [-o] [-p] [-r rate] [-t +/-] [-x]\n");
@@ -231,10 +231,10 @@ usage()
 	fprintf(stderr, "       -l   produce listing of current keyboard mapping\n");
 	fprintf(stderr, "       -m   set keyboard remapping from a keycap entry\n");
 	fprintf(stderr, "       -o   set octal output for listing\n");
-	fprintf(stderr, "       -p   pure, don't display escape as 'ESC' for listing\n");	
+	fprintf(stderr, "       -p   pure, don't display escape as 'ESC' for listing\n");
 	fprintf(stderr, "       -r   chars/second repeat value (range: 0...31 => 30...2 chars/sec)\n");
 	fprintf(stderr, "       -s   show, display the current keyboard typematic values\n");
-	fprintf(stderr, "       -t   switch repeat on(+) or off(-)\n");	
+	fprintf(stderr, "       -t   switch repeat on(+) or off(-)\n");
 	fprintf(stderr, "       -x   set hexadecimal output for listing\n\n");
 	exit(1);
 }
@@ -248,7 +248,7 @@ u_char *s;
 	static char res_str[80];
 	static char conv_buf[80];
 	int i;
-	
+
 	res_str[0] = '\0';
 
 	for(i = 0; s[i]; i++)
@@ -302,14 +302,14 @@ int kbfd;
 	struct kbd_ovlkey keyboardmap[KBDMAXKEYS];
 	struct kbd_ovlkey *kbmapp;
 	int keytype;
-	int altgr_defined;	
+	int altgr_defined;
 	int i;
 
 	altgr_defined = 0;
 	kbmapp = keyboardmap;
 
 	for (i = 0; i < KBDMAXKEYS; i++)
-	{		
+	{
 		kbmapp->keynum = i;
 
 		if(ioctl(kbfd, KBDGCKEY, kbmapp) < 0)
@@ -336,11 +336,11 @@ int kbfd;
 	}
 
 	kbmapp = &keyboardmap[1];
-	
+
 	for(i = 1; i < KBDMAXKEYS; i++)
 	{
 		keytype = kbmapp->type;
-		
+
 		if(keytype)
 		{
 			if(keytype & KBD_OVERLOAD)
@@ -357,22 +357,22 @@ int kbfd;
 				case KBD_KP:
 				case KBD_CURSOR:
 				case KBD_RETURN: /* ??? */
-				
+
 					if(kbmapp->subu == KBD_SUBT_STR)
 						printf("%-15s ",showcntrl(kbmapp->unshift));
 					else
 						printf("Function()      ");
-		
+
 					if(kbmapp->subs == KBD_SUBT_STR)
 						printf("%-15s ",showcntrl(kbmapp->shift));
 					else
 						printf("Function()      ");
-					
+
 					if(kbmapp->subc == KBD_SUBT_STR)
 						printf("%-15s ",showcntrl(kbmapp->ctrl));
 					else
 						printf("Function()      ");
-					
+
 					if(altgr_defined)
 					{
 						if(kbmapp->suba == KBD_SUBT_STR)
@@ -381,13 +381,13 @@ int kbfd;
 							printf("Function()      ");
 					}
 					break;
-			}			
+			}
 			putchar('\n');
 		}
 		kbmapp++;
 	}
-}	
-	
+}
+
 /*---------------------------------------------------------------------------*
  *	show delay and rate values for keyboard
  *---------------------------------------------------------------------------*/
@@ -438,7 +438,7 @@ int kbfd;
 
 	int cur_typemat_val;
 	int delay, rate;
-	
+
 	if((ioctl(kbfd, KBDGTPMAT, &cur_typemat_val)) < 0)
 	{
 		perror("kcon: ioctl KBDGTPMAT failed");
@@ -461,7 +461,7 @@ int kbfd;
 int tf;
 {
 	int	srepsw_val;
-	
+
 	if(tf == 1)
 		srepsw_val = KBD_REPEATON;
 	else
@@ -473,7 +473,7 @@ int tf;
 		exit(1);
 	}
 }
-	
+
 /*---------------------------------------------------------------------------*
  *	set delay and rate values for keyboard
  *---------------------------------------------------------------------------*/
@@ -495,7 +495,7 @@ int rate;
 		delay = (cur_typemat_val & 0x60);
 	else
 		delay = ((delay << 5) & 0x60);
-		
+
 	if(rate == -1)
 		rate = (cur_typemat_val & 0x1f);
 	else
@@ -521,7 +521,7 @@ char *map;
 	int ret;
 	char keyflag[128];
 	int i;
-	
+
 	/* try to find the entry */
 
 	ret = kgetent(cap_entry, map);
@@ -544,7 +544,7 @@ char *map;
 		perror("kcon: ioctl KBDDEFAULT failed");
 		exit(1);
 	}
-	
+
 	/* DE flag present? */
 
 	if(kgetflag("de"))
@@ -582,15 +582,15 @@ int kbfd;
 		"sc",	KBD_SCROLL
 	};
 
-	
+
 	for(i = 0; i < 4; i++)
 	{
 		int n;
-		
+
 		sprintf(cap, "%s", lock[i].ch);
-		
+
 		n = kgetnum(cap);
-		
+
 		if(n > 0)
 		{
 			if (keyflag[n])
@@ -622,7 +622,7 @@ int kbfd;
 	int i, j;
 	char cap[16];
 	struct kbd_ovlkey entry;
-	
+
 	struct {
 		char	ch;
 		u_short	typ;
@@ -639,7 +639,7 @@ int kbfd;
 		for(j = 1; j < 10; j++)
 		{
 			int n;
-			
+
 			sprintf(cap, "%c%d", shift[i].ch,j);
 
 			n = kgetnum(cap);
@@ -655,7 +655,7 @@ int kbfd;
 
 				entry.keynum = n;
 				entry.type = shift[i].typ;
-				if((ioctl(kbfd, KBDSCKEY, &entry)) < 0) 
+				if((ioctl(kbfd, KBDSCKEY, &entry)) < 0)
 				{
 					perror("kcon: ioctl KBDSCKEY failed");
 					exit(1);
@@ -678,7 +678,7 @@ int kbfd;
 	char *addr_str;
 	char *new_str;
 	struct kbd_ovlkey entry;
-	
+
 	struct {
 		char	*addr;
 		char	ch;
@@ -688,8 +688,8 @@ int kbfd;
 		&entry.shift[0],	'S',
 		&entry.ctrl[0],		'C',
 		&entry.altgr[0],	'A'
-	};				
-	
+	};
+
 	for(i = 1; i < KBDMAXKEYS; i++)
 	{
 		setflag = 0;
@@ -707,10 +707,10 @@ int kbfd;
 		for(j = 0; j < 5; j++)
 		{
 			sprintf(cap, "%c%d", standard[j].ch,i);
-			
+
 			if((j == 0) && (kgetflag(cap)))
 			{
-				/* delete a key */	
+				/* delete a key */
 
 				entry.type = KBD_NONE;
 				setflag = 1;
@@ -718,7 +718,7 @@ int kbfd;
 
 			}
 			else
-			{	
+			{
 				addr_str = standard[j].addr;
 				if(new_str = kgetstr(cap, &addr_str))
 				{
@@ -731,7 +731,7 @@ int kbfd;
 				}
 			}
 		}
-			
+
 setit:		if (setflag)
 		{
 			if (keyflag[i])
diff --git a/usr.sbin/pcvt/keycap/keycap.c b/usr.sbin/pcvt/keycap/keycap.c
index f70e987b0f6e..9bbb7e584702 100644
--- a/usr.sbin/pcvt/keycap/keycap.c
+++ b/usr.sbin/pcvt/keycap/keycap.c
@@ -91,7 +91,7 @@ char *id,*cstr;
 	register char *c = cstr+n;
 
 	if (strncmp(id,cstr,n)==0 &&
-	    (*c==':' || *c=='|' || *c=='=' || *c=='#') || *c=='@') 
+	    (*c==':' || *c=='|' || *c=='=' || *c=='#') || *c=='@')
 	    	return c;
 	return 0;
 }
@@ -258,7 +258,7 @@ char *id;
 		bp = kskip(bp);
 		if (*bp == 0)
 			return (-1);
-		if ((xp=nmatch(id,bp)) == 0) 
+		if ((xp=nmatch(id,bp)) == 0)
 			continue;
 		bp = xp;	/* we have an entry */
 		if (*bp == '@')
diff --git a/usr.sbin/pcvt/loadfont/loadfont.c b/usr.sbin/pcvt/loadfont/loadfont.c
index db251859fc22..bbf293fd3082 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.c
+++ b/usr.sbin/pcvt/loadfont/loadfont.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis
  *
- * Copyright (c) 1992, 1994 Brian Dunford-Shore 
+ * Copyright (c) 1992, 1994 Brian Dunford-Shore
  *
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ static char *id =
  *	-hm	add -d option
  *
  *---------------------------------------------------------------------------*/
- 
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -96,7 +96,7 @@ char *argv[];
 	int info = -1;
 	int dflag = 0;
 	char *device;
-	
+
 	while( (c = getopt(argc, argv, "c:d:f:i")) != EOF)
 	{
 		switch(c)
@@ -104,7 +104,7 @@ char *argv[];
 			case 'c':
 				chr_set = atoi(optarg);
 				break;
-				
+
 			case 'd':
 				device = optarg;
 				dflag = 1;
@@ -114,18 +114,18 @@ char *argv[];
 				filename = optarg;
 				fflag = 1;
 				break;
-				
+
 			case 'i':
 				info = 1;
 				break;
-				
+
 			case '?':
 			default:
 				usage();
 				break;
 		}
 	}
-	
+
 	if(chr_set == -1 || fflag == -1)
 		info = 1;
 
@@ -148,7 +148,7 @@ char *argv[];
 	if(info == 1)
 	{
 		int i;
-	
+
 		if(ioctl(fd, VGAGETSCREEN, &screeninfo) == -1)
 		{
 		    perror("ioctl VGAGETSCREEN failed");
@@ -170,7 +170,7 @@ char *argv[];
 		    }
 		    break;
 		  case VGA_ADAPTOR:
-		    printheader();		  
+		    printheader();
 		    for(i = 0;i < 8;i++)
 		    {
 			printvgafontattr(i);
@@ -184,7 +184,7 @@ char *argv[];
 		usage();
 
 	sbp = &sbuf;
-	
+
 	if((in = fopen(filename, "r")) == NULL)
 	{
 		char buffer[80];
@@ -200,7 +200,7 @@ char *argv[];
 		perror(buffer);
 		exit(1);
 	}
-		
+
 	switch(sbp->st_size)
 	{
 		case FONT8X8:
@@ -208,29 +208,29 @@ char *argv[];
 			scr_scan = SSCAN8X8;
 			scr_rows = SIZ_50ROWS;
 			break;
-			
+
 		case FONT8X10:
 			chr_height = HEIGHT8X10;
 			scr_scan = SSCAN8X10;
 			scr_rows = SIZ_40ROWS;
 			break;
-			
+
 		case FONT8X14:
 			chr_height = HEIGHT8X14;
 			scr_scan = SSCAN8X14;
 			scr_rows = SIZ_28ROWS;
 			break;
-			
+
 		case FONT8X16:
 			chr_height = HEIGHT8X16;
 			scr_scan = SSCAN8X16;
 			scr_rows = SIZ_25ROWS;
 			break;
-			
+
 		default:
 			fprintf(stderr,"error, file %s is no valid font file, size=%d\n",argv[1],sbp->st_size);
 			exit(1);
-	}			
+	}
 
 	if((fonttab = (unsigned char *)malloc((size_t)sbp->st_size)) == NULL)
 	{
@@ -242,7 +242,7 @@ char *argv[];
 	{
 		fprintf(stderr,"error reading file %s, size = %d, read =  is no valid font file, size=%d\n",argv[1],sbp->st_size, ret);
 		exit(1);
-	}		
+	}
 
 	loadfont(chr_set, chr_height, fonttab);
 	setfont(chr_set, 1, chr_height - 1, scr_scan, scr_rows);
@@ -300,7 +300,7 @@ int charset;
 {
 	struct vgafontattr vfattr;
 	static int sizetab[] = { 25, 28, 35, 40, 43, 50 };
-	
+
 	vfattr.character_set = charset;
 
 	if(ioctl(fd, VGAGETFONTATTR, &vfattr) == -1)
@@ -338,7 +338,7 @@ usage()
 	fprintf(stderr,"\nloadfont - load font into ega/vga font ram for pcvt video driver\n");
 	fprintf(stderr,"usage: loadfont -c <cset> -d <dev> -f <name> -i\n");
 	fprintf(stderr,"       -c <cset> characterset to load (ega 0..3, vga 0..7)\n");
-	fprintf(stderr,"       -d <dev>  specify device\n");	
+	fprintf(stderr,"       -d <dev>  specify device\n");
 	fprintf(stderr,"       -f <name> filename containing binary font data\n");
 	fprintf(stderr,"       -i        print status and types of loaded fonts (default)\n");
 	exit(1);
diff --git a/usr.sbin/pcvt/mcon/mcon.c b/usr.sbin/pcvt/mcon/mcon.c
index 89989d9ccc37..dac70d7bf4cb 100644
--- a/usr.sbin/pcvt/mcon/mcon.c
+++ b/usr.sbin/pcvt/mcon/mcon.c
@@ -95,19 +95,19 @@ int main(int argc, char **argv) {
 			do_set = 1;
 			if(left == -1) goto keynameerr;
 			break;
-			
+
 		case 'm':
 			mid = nametoscan(optarg);
 			do_set = 1;
 			if(mid == -1) goto keynameerr;
 			break;
-			
+
 		case 'r':
 			right = nametoscan(optarg);
 			do_set = 1;
 			if(right == -1) goto keynameerr;
 			break;
-			
+
 		keynameerr:
 		{
 			fprintf(stderr, "unknown key name: %s\n",
@@ -115,12 +115,12 @@ int main(int argc, char **argv) {
 			errs++;
 		}
 			break;
-			
+
 		case 'a':
 			accel = 1000 * strtol(optarg, 0, 10);
 			do_set = 1;
 			break;
-			
+
 		case 's':
 			if(strcmp(optarg, "0") == 0
 			   || strcmp(optarg, "false") == 0
@@ -137,21 +137,21 @@ int main(int argc, char **argv) {
 			}
 			do_set = 1;
 			break;
-			
+
 		default:
 			errs++;
 		}
-	
+
 	argc -= optind;
 	argv += optind;
-	
+
 	if(errs || argc != 1) {
 		fprintf(stderr, "usage: "
 			"mouse [-l key][-m key][-r key][-a acctime][-s 0|1] "
 			"mousedev\n");
 		return 2;
 	}
-	
+
 	if((fd = open(argv[0], O_RDONLY)) < 0) {
 		perror("open(mousedev)");
 		return 2;
@@ -182,7 +182,7 @@ int main(int argc, char **argv) {
 
 	if(accel) mdef.acceltime = accel;
 	if(sticky != -1) mdef.stickybuttons = sticky;
-	
+
 	if(ioctl(fd, KBDMOUSESET, &mdef) < 0) {
 		perror("ioctl(KBDMOUSESET)");
 		return 1;
diff --git a/usr.sbin/pcvt/scon/scon.c b/usr.sbin/pcvt/scon/scon.c
index 5237d0738a96..0cb053b69760 100644
--- a/usr.sbin/pcvt/scon/scon.c
+++ b/usr.sbin/pcvt/scon/scon.c
@@ -192,10 +192,10 @@ char *argv[];
 	extern int optind;
 	extern int opterr;
 	extern char *optarg;
-	
+
 	int c;
 	int fd;
-	
+
 	while( (c = getopt(argc, argv, "ac:d:f:HVlms:t:vp:18")) != EOF)
 	{
 		switch(c)
@@ -203,7 +203,7 @@ char *argv[];
 			case 'a':
 				aflag = 1;
 				break;
-				
+
 			case 'l':
 				lflag = 1;
 				break;
@@ -215,17 +215,17 @@ char *argv[];
 			case 'c':
 				current = atoi(optarg);
 				break;
-				
+
 			case 'd':
 				device = optarg;
 				dflag = 1;
 				break;
-				
+
 			case 'f':
 				onoff = optarg;
 				fflag = 1;
 				break;
-				
+
 			case 'V':
 				pflag = 1;
 				break;
@@ -309,7 +309,7 @@ char *argv[];
 			case '1':
 				colms = 132;
 				break;
-			
+
 			case '8':
 				colms = 80;
 				break;
@@ -348,7 +348,7 @@ char *argv[];
 			exit(1);
 		}
 		if(vflag)
-			printf("using device %s\n",device);		
+			printf("using device %s\n",device);
 	}
 
 	if(aflag == 1)	/* return adaptor type */
@@ -404,7 +404,7 @@ char *argv[];
 		}
 		goto success;
 	}
-	
+
 	if(Pflag == 3)
 	{
 		/* listing VGA palette */
@@ -445,14 +445,14 @@ char *argv[];
 	screeninfo.screen_no = -1; /* We are using fd */
 	screeninfo.current_screen = current;
 	screeninfo.pure_vt_mode = -1;
-	screeninfo.screen_size = res;	
+	screeninfo.screen_size = res;
 	screeninfo.force_24lines = -1;
-	
+
 	if(current != -1)	/* set current screen */
 	{
 		if(vflag)
 			printf("processing option -c, setting current screen to %d\n",current);
-		
+
 		if(ioctl(1, VGASETSCREEN, &screeninfo) == -1)
 		{
 			perror("ioctl VGASETSCREEN failed");
@@ -523,8 +523,8 @@ char *argv[];
 success:
 	if(vflag)
 		printf("successful execution of ioctl VGASETSCREEN!\n");
-	exit(0);	
-}			
+	exit(0);
+}
 
 usage()
 {
@@ -566,19 +566,19 @@ int fd;
 		case UNKNOWN_ADAPTOR:
 			printf("UNKNOWN\n");
 			break;
-			
+
 		case MDA_ADAPTOR:
 			printf("MDA\n");
 			break;
-			
+
 		case CGA_ADAPTOR:
 			printf("CGA\n");
 			break;
-			
+
 		case EGA_ADAPTOR:
 			printf("EGA\n");
 			break;
-			
+
 		case VGA_ADAPTOR:
 			printf("VGA\n");
 			break;
@@ -598,11 +598,11 @@ int fd;
 		default:
 			printf("UNKNOWN\n");
 			break;
-			
+
 		case MONITOR_MONO:
 			printf("MONO\n");
 			break;
-			
+
 		case MONITOR_COLOR:
 			printf("COLOR\n");
 			break;
@@ -675,26 +675,26 @@ int fd;
 	}
 
 	printf( "\nVideo Adaptor Type           = ");
-	
+
 	switch(screeninfo.adaptor_type)
 	{
 		default:
 		case UNKNOWN_ADAPTOR:
 			printf("UNKNOWN Video Adaptor\n");
 			break;
-			
+
 		case MDA_ADAPTOR:
 			printf("MDA - Monochrome Display Adaptor\n");
 			break;
-			
+
 		case CGA_ADAPTOR:
 			printf("CGA - Color Graphics Adaptor\n");
 			break;
-			
+
 		case EGA_ADAPTOR:
 			printf("EGA - Enhanced Graphics Adaptor\n");
 			break;
-			
+
 		case VGA_ADAPTOR:
 			printf("VGA - Video Graphics Adaptor/Array\n");
 			printf(" VGA Chipset Manufacturer    = %s\n",
@@ -706,61 +706,61 @@ int fd;
 			break;
 	}
 
-	printf( "Display Monitor Type         = ");	
+	printf( "Display Monitor Type         = ");
 
 	switch(screeninfo.monitor_type)
 	{
 		default:
 			printf("UNKNOWN Monitor Type\n");
 			break;
-			
+
 		case MONITOR_MONO:
 			printf("Monochrome Monitor\n");
 			break;
-			
+
 		case MONITOR_COLOR:
 			printf("Color Monitor\n");
 			break;
 	}
-	
+
 	printf( "Number of Downloadable Fonts = %d\n",screeninfo.totalfonts);
 	printf( "Number of Virtual Screens    = %d\n",screeninfo.totalscreens);
 	printf( "Info Request Screen Number   = %d\n",screeninfo.screen_no);
 	printf( "Current Displayed Screen     = %d\n",screeninfo.current_screen);
-	
-	if(screeninfo.pure_vt_mode == M_PUREVT)				
+
+	if(screeninfo.pure_vt_mode == M_PUREVT)
 		printf( "Terminal Emulation Mode      = VT220\n");
 	else
 		printf( "Terminal Emulation Mode      = VT220 with HP Features\n");
 
-	printf( "Lines                        = ");	
+	printf( "Lines                        = ");
 
 	switch(screeninfo.screen_size)
 	{
 		case SIZ_25ROWS:
 			printf( "25\n");
 			break;
-	
+
 		case SIZ_28ROWS:
 			printf( "28\n");
 			break;
-	
+
 		case SIZ_35ROWS:
 			printf( "35\n");
 			break;
-	
+
 		case SIZ_40ROWS:
 			printf( "40\n");
 			break;
-	
+
 		case SIZ_43ROWS:
 			printf( "43\n");
 			break;
-	
+
 		case SIZ_50ROWS:
 			printf( "50\n");
 			break;
-	
+
 		default:
 			printf( "UNKNOWN\n");
 			break;
diff --git a/usr.sbin/pcvt/set2061/ICD2061Aalt.c b/usr.sbin/pcvt/set2061/ICD2061Aalt.c
index 248476ad7284..a74ec4e09d2d 100644
--- a/usr.sbin/pcvt/set2061/ICD2061Aalt.c
+++ b/usr.sbin/pcvt/set2061/ICD2061Aalt.c
@@ -24,7 +24,7 @@ unsigned short card;
 unsigned short crtcaddr;
 unsigned short clockreg;
 
-static double range[15] = {50.0, 51.0, 53.2, 58.5, 60.7, 64.4, 66.8, 73.5, 
+static double range[15] = {50.0, 51.0, 53.2, 58.5, 60.7, 64.4, 66.8, 73.5,
 			   75.6, 80.9, 83.2, 91.5, 100.0, 120.0, 120.0};
 
 #ifdef __STDC__
@@ -216,7 +216,7 @@ static void init_clock(setup, crtcport)
    int i;
    unsigned char c;
 
-#ifndef PCVT_STANDALONE   
+#ifndef PCVT_STANDALONE
    (void)xf86DisableInterrupts();
 #endif
 
diff --git a/usr.sbin/pcvt/set2061/Makefile b/usr.sbin/pcvt/set2061/Makefile
index db718300da7c..0cbeff7342dd 100644
--- a/usr.sbin/pcvt/set2061/Makefile
+++ b/usr.sbin/pcvt/set2061/Makefile
@@ -10,4 +10,4 @@ install: ${DEMOS}
 
 .include <bsd.prog.mk>
 
-$(PROG):	compiler.h 
+$(PROG):	compiler.h
diff --git a/usr.sbin/pcvt/set2061/compiler.h b/usr.sbin/pcvt/set2061/compiler.h
index 3a0e99ad2516..9fbdb56c9159 100644
--- a/usr.sbin/pcvt/set2061/compiler.h
+++ b/usr.sbin/pcvt/set2061/compiler.h
@@ -20,7 +20,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * $Header: /proj/X11/mit/server/ddx/x386/RCS/compiler.h,v 1.2 1991/06/27 00:01:11 root Exp $
+ * $Header: /home/ncvs/src/usr.sbin/pcvt/set2061/compiler.h,v 1.1.1.1 1995/02/05 13:49:25 jkh Exp $
  */
 
 
@@ -221,7 +221,7 @@ inw(port)
 /*
  * rdinx - read the indexed byte port 'port', index 'ind', and return its value
  */
-static __inline__ unsigned char 
+static __inline__ unsigned char
 #ifdef __STDC__
 rdinx(unsigned short port, unsigned char ind)
 #else
@@ -239,7 +239,7 @@ unsigned char ind;
 /*
  * wrinx - write 'val' to port 'port', index 'ind'
  */
-static __inline__ void 
+static __inline__ void
 #ifdef __STDC__
 wrinx(unsigned short port, unsigned char ind, unsigned char val)
 #else
@@ -258,7 +258,7 @@ unsigned char ind, val;
  */
 static __inline__ void
 #ifdef __STDC__
-modinx(unsigned short port, unsigned char ind, 
+modinx(unsigned short port, unsigned char ind,
        unsigned char mask, unsigned char new)
 #else
 modinx(port, ind, mask, new)
@@ -322,7 +322,7 @@ unsigned char ind, mask;
 }
 
 /*
- * testinx - returns true iff all bits of register 'port', index 'ind' are 
+ * testinx - returns true iff all bits of register 'port', index 'ind' are
  *     	     readable & writable.
  */
 static __inline__ int
diff --git a/usr.sbin/pcvt/set2061/main.c b/usr.sbin/pcvt/set2061/main.c
index 03a482d3e3fa..e16b1df3fc60 100644
--- a/usr.sbin/pcvt/set2061/main.c
+++ b/usr.sbin/pcvt/set2061/main.c
@@ -41,7 +41,7 @@ static char *id =
  *	-hm	start using 132 columns on my Elsa Winner
  *
  *---------------------------------------------------------------------------*/
-	
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <machine/pcvt_ioctl.h>
@@ -62,7 +62,7 @@ char *argv[];
 	int c;
 	long freq = -1;
 	int no = -1;
-	
+
 	while( (c = getopt(argc, argv, "f:n:")) != EOF)
 	{
 		switch(c)
@@ -70,11 +70,11 @@ char *argv[];
 			case 'f':
 				freq = atoi(optarg);
 				break;
-				
+
 			case 'n':
 				no = atoi(optarg);
 				break;
-				
+
 			case '?':
 			default:
 				usage();
@@ -82,7 +82,7 @@ char *argv[];
 		}
 	}
 
-	if(freq == -1 || no == -1)	
+	if(freq == -1 || no == -1)
 		usage();
 
 	if((fd = open("/dev/console", O_RDONLY)) < 0)
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.c b/usr.sbin/pcvt/userkeys/vt220keys.c
index dfde51a2691b..e5a54b5c637b 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.c
+++ b/usr.sbin/pcvt/userkeys/vt220keys.c
@@ -7,23 +7,23 @@
  *      strings.
  *
  *      Author, Author: Barry Shein, Boston University
- * 
+ *
  * HISTORY
   {1}   30-Oct-85  Kenneth J. Lester (ken) at ektools
 
         Added the necessary code to read an initialization file.  This
         should make it easier to used this program.  Also added code
         that will set-up the terminal in vt200 (this saves the user the
-        trouble of checking if the set-up is in vt200). 
-        
+        trouble of checking if the set-up is in vt200).
+
         Restructed  the  main  function  to  use   getopt,  for  argument
-        processing.  
-        
+        processing.
+
         Alterated usage function  to include  new "i"  option (init file)
- 
+
 
  	-hm	minor modifications for pcvt 2.0 release
- 	
+
 */
 
 #include <stdio.h>
@@ -69,8 +69,8 @@ struct keynames {
 
 char prog[BUFSIZ];
 
-main(argc,argv) 
-        int argc; 
+main(argc,argv)
+        int argc;
         char *argv[];
 {
         /* these are defined in the getopt routine                       */
@@ -89,7 +89,7 @@ main(argc,argv)
 
         /* get options */
         while ((option = getopt(argc, argv, "cli")) != EOF)
-        switch(option) 
+        switch(option)
         {
                 case 'c' :
                         clearf++;
@@ -110,14 +110,14 @@ main(argc,argv)
                 printf("\033[62;2\"p");    /* vt200 8 bits */
 
         if(clearf) clearkeys();
-        
+
         if (initf) getinit();
 
         /* process {key, key string} pairs.  Note optind is index to argv
            for first pair.  By adding 1 to optind insures that a pair exists
            i.e. the last key has a key string.                             */
 
-        while(optind + 1 < argc) 
+        while(optind + 1 < argc)
         {
                 dokey(argv[optind], argv[optind+1]);
                 optind += 2;
@@ -205,8 +205,8 @@ usage()
                 <ws> keyname ws string
 
    Where ws is white space (spaces or tabs) and <ws> is optional white space.
-   The string may include spaces or tabs and need not be quoted.  If the 
-   string has the sequence of "\n" then a newline character is included in 
+   The string may include spaces or tabs and need not be quoted.  If the
+   string has the sequence of "\n" then a newline character is included in
    the string.
 
    examples:
@@ -289,7 +289,7 @@ getinit()
                 dokey(key, keystr);   /* load key with string */
             }
         }
-        else 
+        else
         {
             fprintf(stderr, "init file %s not found\n\n", path);
             usage();
diff --git a/usr.sbin/pcvt/vttest/esc.c b/usr.sbin/pcvt/vttest/esc.c
index 520946b5054b..b2bce92397c6 100644
--- a/usr.sbin/pcvt/vttest/esc.c
+++ b/usr.sbin/pcvt/vttest/esc.c
@@ -256,7 +256,7 @@ ttybin(bin) int bin; {
   static int arglst[] = {
     _IOPIM,
     `TTY`,
-    0    
+    0
   };
   arglst[0] = bin ? _IOPIM : _IOASC;
   v = uuo(OPEN, 1, &arglst[0]);
diff --git a/usr.sbin/pcvt/vttest/main.c b/usr.sbin/pcvt/vttest/main.c
index cb67f745abc0..02cbc62bce2f 100644
--- a/usr.sbin/pcvt/vttest/main.c
+++ b/usr.sbin/pcvt/vttest/main.c
@@ -558,7 +558,7 @@ tst_keyboard() {
      - DECKPNM (Keypad Numeric Mode)
 
 The standard VT100 keayboard layout:
- 
+
                                                         UP   DN   LE  RI
 
 ESC   1!   2@   3#   4$   5%   6^   7&   8*   9(   0)   -_   =+   `~  BS
@@ -1321,7 +1321,7 @@ tst_vt52() {
   for (i = 2; i <= 23; i++) {
     vt52cup(i,70); printf("%s", "**Foobar");
   }
-  vt52cup(23,10); 
+  vt52cup(23,10);
   for (i = 23; i >= 2; i--) {
     printf("%s", "*");
     printf("%c", 8);	/* BS */
diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c
index 3bda0b449480..7cf18e66ca1f 100644
--- a/usr.sbin/pkg_install/add/futil.c
+++ b/usr.sbin/pkg_install/add/futil.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: futil.c,v 1.2 1993/09/03 23:00:34 jkh Exp $";
+static const char *rcsid = "$Id: futil.c,v 1.3 1994/12/06 00:51:32 jkh Exp $";
 #endif
 
 /*
@@ -34,7 +34,7 @@ int
 make_hierarchy(char *dir)
 {
     char *cp1, *cp2;
-    
+
     if (dir[0] == '/')
 	cp1 = cp2 = dir + 1;
     else
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index e8b053b4baae..47d81a5922e4 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *rcsid = "$Id: main.c,v 1.5 1994/12/06 00:51:33 jkh Exp $";
+static char *rcsid = "$Id: main.c,v 1.6 1995/04/09 15:04:50 jkh Exp $";
 #endif
 
 /*
@@ -96,7 +96,7 @@ main(int argc, char **argv)
 	    break;
 	}
 
-    argc -= optind;	
+    argc -= optind;
     argv += optind;
 
     /* Get all the remaining package names, if any */
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index 8679e9503e02..2266129a67ef 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.23 1995/04/27 11:33:08 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.24 1995/04/28 04:16:30 jkh Exp $";
 #endif
 
 /*
@@ -90,7 +90,7 @@ pkg_do(char *pkg)
     /* Nope - do it now */
     else {
 	if (!getcwd(home, FILENAME_MAX))
-	    upchuck("getcwd"); 
+	    upchuck("getcwd");
 
 	if (isURL(pkg)) {
 	    char *newname = fileGetURL(pkg);
@@ -405,7 +405,7 @@ pkg_do(char *pkg)
 	if (Verbose)
 	    printf("Package %s registered in %s\n", PkgName, LogDir);
     }
-    
+
     if (p = find_plist(&Plist, PLIST_DISPLAY)) {
 	FILE *fp;
 	char buf[BUFSIZ];
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index 4ab6b7483d71..f2531b32a40e 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: main.c,v 1.9 1995/04/09 15:04:58 jkh Exp $";
+static const char *rcsid = "$Id: main.c,v 1.10 1995/04/22 00:03:07 jkh Exp $";
 #endif
 
 /*
@@ -117,7 +117,7 @@ main(int argc, char **argv)
 	    break;
 	}
 
-    argc -= optind;	
+    argc -= optind;
     argv += optind;
 
     /* Get all the remaining package names, if any */
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index f50bd8fb0926..9eb98a38458e 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: pl.c,v 1.5 1994/11/17 10:35:04 jkh Exp $";
+static const char *rcsid = "$Id: pl.c,v 1.6 1994/12/06 00:51:38 jkh Exp $";
 #endif
 
 /*
@@ -58,7 +58,7 @@ check_list(char *home, Package *pkg)
 	}
 	p = p->next;
     }
-}   
+}
 
 static int
 trylink(const char *from, const char *to)
@@ -163,7 +163,7 @@ copy_plist(char *home, Package *plist)
 		} else {
 		    add_count = snprintf(&where_args[where_count],
 					 maxargs - where_count,
-					 " %s%s %s", 
+					 " %s%s %s",
 					 last_chdir == home ? "" : "-C ",
 					 last_chdir == home ? "" : home,
 					 p->name);
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index c59f94bfc30b..66a4f8eb94eb 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *rcsid = "$Id: main.c,v 1.2 1993/09/03 23:01:00 jkh Exp $";
+static char *rcsid = "$Id: main.c,v 1.3 1994/12/06 00:51:40 jkh Exp $";
 #endif
 
 /*
@@ -75,7 +75,7 @@ main(int argc, char **argv)
 	    break;
 	}
 
-    argc -= optind;	
+    argc -= optind;
     argv += optind;
 
     /* Get all the remaining package names, if any */
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index ce8449e32943..d63ff13a5789 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *rcsid = "$Id: main.c,v 1.7 1994/06/01 05:15:00 asami Exp $";
+static char *rcsid = "$Id: main.c,v 1.8 1994/12/06 00:51:44 jkh Exp $";
 #endif
 
 /*
@@ -127,7 +127,7 @@ main(int argc, char **argv)
 	    break;
 	}
 
-    argc -= optind;	
+    argc -= optind;
     argv += optind;
 
     /* Set some reasonable defaults */
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index f03941635295..9a93253a841a 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.14 1995/04/28 18:24:31 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.15 1995/05/10 23:00:06 jkh Exp $";
 #endif
 
 /*
@@ -54,7 +54,7 @@ pkg_perform(char **pkgs)
 			    if (!strcmp(dp->d_name, CheckPkg))
 				return 0;
 			}
-			else 
+			else
 			    err_cnt += pkg_do(dp->d_name);
 		    }
 		}
@@ -66,7 +66,7 @@ pkg_perform(char **pkgs)
 		++err_cnt;
 	} else if (CheckPkg)
 	    return 1;			/* no dir -> not installed! */
-	    
+
     }
     for (i = 0; pkgs[i]; i++)
 	err_cnt += pkg_do(pkgs[i]);
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
index e9a6cc8e114a..b1c29b3d1ca5 100644
--- a/usr.sbin/pkg_install/info/show.c
+++ b/usr.sbin/pkg_install/info/show.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: show.c,v 1.4 1994/12/06 00:51:46 jkh Exp $";
+static const char *rcsid = "$Id: show.c,v 1.5 1995/01/05 01:10:13 swallace Exp $";
 #endif
 
 /*
@@ -51,14 +51,14 @@ show_index(char *title, char *fname)
     FILE *fp;
     char line[MAXINDEXSIZE+2];
     int i,n;
-    
+
     if (!Quiet)
         printf("%s%s", InfoPrefix, title);
     fp = fopen(fname, "r");
     if (!fp) {
         whinge("show_file: Can't open '%s' for reading.", fname);
         return;
-    }   
+    }
     if(fgets(line, MAXINDEXSIZE+1, fp)) {
 	if(line[MAXINDEXSIZE-1] != '\n')
           line[MAXINDEXSIZE] = '\n';
@@ -66,7 +66,7 @@ show_index(char *title, char *fname)
 	fputs(line, stdout);
     }
     fclose(fp);
-}   
+}
 
 /* Show a packing list item type.  If type is -1, show all */
 void
@@ -92,7 +92,7 @@ show_plist(char *title, Package *plist, plist_t type)
 	    else
 		printf(Quiet ? "%s\n" : "File: %s\n", p->name);
 	    break;
-	    
+
 	case PLIST_CWD:
 	    printf(Quiet ? "@cwd %s\n" : "\tCWD to %s\n", p->name);
 	    break;
@@ -180,7 +180,7 @@ show_files(char *title, Package *plist)
 		printf("%s/%s\n", dir, p->name);
 	    ign = FALSE;
 	    break;
-	    
+
 	case PLIST_CWD:
 	    dir = p->name;
 	    break;
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index e4c413bce59c..29d969c59de1 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: file.c,v 1.8 1995/04/26 15:08:20 jkh Exp $";
+static const char *rcsid = "$Id: file.c,v 1.9 1995/05/10 23:00:16 jkh Exp $";
 #endif
 
 /*
@@ -161,7 +161,7 @@ Boolean connectionAborted = FALSE;
 
 static int
 _fileGetIO(FTP *ftp, int n, char *s )
-{ 
+{
     printf("In IO: %s\n", s);
     return 0;
 }
@@ -262,7 +262,7 @@ fileFindByPath(char *fname)
     cp = getenv("PKG_PATH");
     while (cp) {
 	char *cp2 = strsep(&cp, ":");
-	
+
 	snprintf(tmp, FILENAME_MAX, "%s/%s.tgz", cp2 ? cp2 : cp, fname);
 	if (fexists(tmp))
 	    return tmp;
@@ -389,7 +389,7 @@ unpack(char *pkg, char *flist)
 }
 
 /* Using fmt, replace all instances of:
- * 
+ *
  * %F	With the parameter "name"
  * %D	With the parameter "dir"
  * %B	Return the directory part ("base") of %D/%F
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
index 9e3e8ef61570..460183e8a86e 100644
--- a/usr.sbin/pkg_install/lib/msg.c
+++ b/usr.sbin/pkg_install/lib/msg.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: msg.c,v 1.3 1994/04/05 14:08:47 jkh Exp $";
+static const char *rcsid = "$Id: msg.c,v 1.4 1994/06/01 05:14:19 asami Exp $";
 #endif
 
 /*
@@ -100,4 +100,4 @@ y_or_n(Boolean def, const char *msg, ...)
     return (ch == 'Y') ? TRUE : FALSE;
 }
 
-    
+
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index bb2dd5d882ac..cb6e4b7f50e4 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: plist.c,v 1.11 1995/04/22 00:14:20 jkh Exp $";
+static const char *rcsid = "$Id: plist.c,v 1.12 1995/04/22 07:41:02 jkh Exp $";
 #endif
 
 /*
@@ -93,7 +93,7 @@ find_plist(Package *pkg, plist_t type)
     }
     return NULL;
 }
- 
+
 /* Look for a specific boolean option argument in the list */
 char *
 find_plist_option(Package *pkg, char *name)
@@ -139,7 +139,7 @@ delete_plist(Package *pkg, Boolean all, plist_t type, char *name)
 	    p = p->next;
     }
 }
-    
+
 /* Allocate a new packing list entry */
 PackingList
 new_plist_entry(void)
@@ -253,7 +253,7 @@ read_plist(Package *pkg, FILE *fp)
 		cp = NULL;
 	}
 	else
-	    cmd = PLIST_FILE; 
+	    cmd = PLIST_FILE;
 	add_plist(pkg, cmd, cp);
     }
 }
@@ -381,7 +381,7 @@ delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg)
 	    if (Verbose)
 		printf("Delete%s %s\n",
 		       p->type == PLIST_FILE ? "" : " directory", full_name);
-	    
+
 	    if (!Fake && delete_hierarchy(full_name, ign_err,
 					  p->type == PLIST_DIR_RM ? FALSE : nukedirs)) {
 		whinge("Unable to completely remove file '%s'", full_name);
@@ -407,7 +407,7 @@ int
 delete_hierarchy(char *dir, Boolean ign_err, Boolean nukedirs)
 {
     char *cp1, *cp2;
-    
+
     cp1 = cp2 = dir;
     if (!fexists(dir)) {
 	if (!ign_err)
diff --git a/usr.sbin/pkg_manage/Makefile b/usr.sbin/pkg_manage/Makefile
index 41ce93d0b9da..6367244de924 100644
--- a/usr.sbin/pkg_manage/Makefile
+++ b/usr.sbin/pkg_manage/Makefile
@@ -1,9 +1,9 @@
-# $Id: Makefile,v 1.4 1995/04/24 13:00:49 jkh Exp $
+# $Id: Makefile,v 1.5 1995/05/27 20:05:35 jkh Exp $
 
 PROG=   pkg_manage
 SRCS=   pkg_main.c pkg_manage.c pkg_ui.c version.c
 LDADD+= -ldialog -lncurses -lmytinfo
-DPADD+= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} 
+DPADD+= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO}
 CFLAGS+= -Wall -Wstrict-prototypes -DHELP_PATH=\"${HELPDIR}/\" \
 	 -I${.CURDIR}/../../gnu/lib/libdialog \
 	 -I${.CURDIR}/../../lib/libncurses
diff --git a/usr.sbin/pkg_manage/pkg_main.c b/usr.sbin/pkg_manage/pkg_main.c
index 862bb27f5a86..3d8043b47fa2 100644
--- a/usr.sbin/pkg_manage/pkg_main.c
+++ b/usr.sbin/pkg_manage/pkg_main.c
@@ -1,5 +1,5 @@
 /***************************************************************
- * 
+ *
  * Program:	pkg_main.c
  * Author:	Marc van Kempen
  * Desc:	main routine for pkg_manage
@@ -15,7 +15,7 @@
  * responsible for the proper functioning of this software, nor does
  * the author assume any responsibility for damages incurred with
  * its use.
- * 
+ *
  ***************************************************************/
 
 #include "pkg_manage.h"
@@ -45,7 +45,7 @@ main(int argc, char **argv)
     if (p_inf.Nitems > 0) {
 	FreeInfo();
     }
- 
+
     clear();
     dialog_update();
     end_dialog();
diff --git a/usr.sbin/pkg_manage/pkg_manage.c b/usr.sbin/pkg_manage/pkg_manage.c
index f191a6e1c2a3..cc9c0b55620a 100644
--- a/usr.sbin/pkg_manage/pkg_manage.c
+++ b/usr.sbin/pkg_manage/pkg_manage.c
@@ -1,5 +1,5 @@
 /***************************************************************
- * 
+ *
  * Program:	pkg_manage.c
  * Author:	Marc van Kempen
  * Desc:	Add, delete packages with the pkg_* binaries
@@ -22,7 +22,7 @@
  * responsible for the proper functioning of this software, nor does
  * the author assume any responsibility for damages incurred with
  * its use.
- * 
+ *
  ***************************************************************/
 
 #include <stdlib.h>
@@ -46,7 +46,7 @@ PKG_info	p_inf = { 0, 0, NULL, NULL, NULL, NULL, NULL };
  *
  *******************************************************************/
 
-void 
+void
 FreeInfo(void)
 /*
  * Desc: free the space allocated to p_inf
@@ -69,12 +69,12 @@ FreeInfo(void)
 
 int
 file_exists(char *fname)
-/* 
+/*
  * Desc: check if the file <fname> exists (and is readable)
  */
 {
     FILE *f;
-    
+
     if (strlen(fname) == 0) return(FALSE); /* apparently opening an empty */
 					   /* file for reading succeeds always */
     f = fopen(fname, "r");
@@ -91,7 +91,7 @@ int
 exec_catch_errors(char *prog, char *arg, char *fout)
 /*
  * Desc: run the program <prog> with arguments <arg> and catch its output
- * 	 in <fout> and display it in case of an error. specify NULL, 
+ * 	 in <fout> and display it in case of an error. specify NULL,
  *	 if you don't want output.
  */
 {
@@ -119,7 +119,7 @@ exec_catch_errors(char *prog, char *arg, char *fout)
 
     sprintf(execstr, "%s %s > %s 2>&1", prog, arg, fout);
     ret = system(execstr);
-    if (ret) {	
+    if (ret) {
 
 	yesno = dialog_yesno("Error", "An error occured, view output?", 8, 40);
 	if (yesno == 0) {
@@ -137,7 +137,7 @@ exec_catch_errors(char *prog, char *arg, char *fout)
 	free(fout);
     }
     free(execstr);
-    
+
     return(ret);
 } /* exec_catch_errors() */
 
@@ -165,7 +165,7 @@ get_pkginfo(void)
 
     dialog_msgbox("PKG INFO", "Reading info, please wait ...", 4, 35, FALSE);
 
-    tmp_file = tempnam(NULL, "pkg.");  
+    tmp_file = tempnam(NULL, "pkg.");
     ret = exec_catch_errors(PKG_INFO, "-a", tmp_file);
     if (ret) {
 	dialog_notify("Could not get package info\nexiting!");
@@ -182,7 +182,7 @@ get_pkginfo(void)
 	free(tmp_file);
 	return;
     }
-    
+
     if (stat(tmp_file, &sb)) {	/* stat file to get filesize */
 	dialog_notify("Could not stat temporary file");
 	fclose(f);
@@ -190,7 +190,7 @@ get_pkginfo(void)
 	free(tmp_file);
 	return;
     }
-    
+
     if (sb.st_size == 0) {
 	dialog_notify("No packages installed or no info available");
 	fclose(f);
@@ -220,7 +220,7 @@ get_pkginfo(void)
     i = p_inf.N - strlen("Information for") - 1;
     p = p_inf.buf;
     if (strncmp(p_inf.buf, "Information for", 15) == 0) {
-	n = 1; 
+	n = 1;
     } else {
 	n = 0;
     }
@@ -232,7 +232,7 @@ get_pkginfo(void)
 	}
 	p++;
     }
-    
+
     /* malloc space for PKG_info */
     p_inf.name = (char **) malloc( n * sizeof(char *) );
     p_inf.comment = (char **) malloc( n * sizeof(char *) );
@@ -297,13 +297,13 @@ get_pkginfo(void)
     for (i=0; i<p_inf.Nitems; i++) {
 	/* tag */
 	p_inf.mnu[j] = (char *) malloc( lsize );
-	strncpy(p_inf.mnu[j], p_inf.name[i], lsize-1); 
+	strncpy(p_inf.mnu[j], p_inf.name[i], lsize-1);
 	p_inf.mnu[j++][lsize-1] = 0;
 
 	/* description */
 	p_inf.mnu[j] = (char *) malloc( lsize );
-	strncpy(p_inf.mnu[j], p_inf.comment[i], lsize-1); 
-	p_inf.mnu[j++][lsize-1] = 0; 
+	strncpy(p_inf.mnu[j], p_inf.comment[i], lsize-1);
+	p_inf.mnu[j++][lsize-1] = 0;
     }
 
     return;
@@ -323,13 +323,13 @@ get_pkg_index(char *selection)
 	    index = i;
 	}
     }
-    
+
     return(index);
 } /* get_pkg_index() */
 
 void
 install_package(char *fname)
-/* 
+/*
  * Desc: install the package <fname>
  */
 {
@@ -351,12 +351,12 @@ install_package(char *fname)
 
 
 int
-get_desc(char *fname, char **name, char **comment, 
+get_desc(char *fname, char **name, char **comment,
 	 char **desc, long *size, char *tmp_dir)
 /*
  * Desc: get the description and comment from the files
  *	 DESC, CONTENT and COMMENT from fname
- * Pre:  the current working directory is a temporary, 
+ * Pre:  the current working directory is a temporary,
  *	 empty directory.
  * Post: name = the name of the package
  * 	 comment = the comment for the package
@@ -372,7 +372,7 @@ get_desc(char *fname, char **name, char **comment,
     *desc = NULL;
     *name = NULL;
 
-    sprintf(args, "--fast-read -zxvf %s -C %s %s %s %s", fname, 
+    sprintf(args, "--fast-read -zxvf %s -C %s %s %s %s", fname,
 	    tmp_dir, CONTENTS, DESC, COMMENT);
     ret = exec_catch_errors(TAR, args, NULL);
     if (ret) {
@@ -416,7 +416,7 @@ get_desc(char *fname, char **name, char **comment,
     found = FALSE;
     while (*p && !found) {
 	if (strncmp(p, "@name ", 6) == 0) {
-	    i=0; 
+	    i=0;
 	    p += 6;
 	    while (*p && p[i] != '\n' && p[i] != '\r') i++;
 	    *name = (char *) malloc( i+1 );
@@ -506,7 +506,7 @@ get_desc(char *fname, char **name, char **comment,
 	sscanf(tmp, "%*s %ld", size);
 	pclose(pf);
     }
-	
+
     if (found) {
 	return(TRUE);
     } else {
@@ -517,7 +517,7 @@ get_desc(char *fname, char **name, char **comment,
 
 int
 already_installed(char *name)
-/* 
+/*
  * Desc: check if <name> is already installed as a package
  */
 {
@@ -532,5 +532,5 @@ already_installed(char *name)
 
     return(found);
 } /* already_installed() */
-    
- 
+
+
diff --git a/usr.sbin/pkg_manage/pkg_manage.h b/usr.sbin/pkg_manage/pkg_manage.h
index d25e55f83926..d2b66a9a2810 100644
--- a/usr.sbin/pkg_manage/pkg_manage.h
+++ b/usr.sbin/pkg_manage/pkg_manage.h
@@ -1,5 +1,5 @@
-/* 
- * include file for pkg_manage 
+/*
+ * include file for pkg_manage
  *
  *
  * Copyright (c) 1995, Marc van Kempen
@@ -13,7 +13,7 @@
  * responsible for the proper functioning of this software, nor does
  * the author assume any responsibility for damages incurred with
  * its use.
- * 
+ *
  */
 
 #include <sys/types.h>
@@ -48,7 +48,7 @@ typedef struct {
 #define PKG_DELETE 	"/usr/sbin/pkg_delete"
 #define PKG_INFO 	"/usr/sbin/pkg_info"
 #define PKG_ADD 	"/usr/sbin/pkg_add"
-#define TAR 		"/usr/bin/tar" 
+#define TAR 		"/usr/bin/tar"
 #define GUNZIP		"/usr/bin/gunzip"
 
 /* HELP_PATH must have a trailing '/' */
@@ -73,7 +73,7 @@ void    FreeInfo(void);
 void	install_package(char *fname);
 int	get_pkg_index(char *selection);
 void	install_batch(void);
-int	get_desc(char *fname, char **name, char **comment, 
+int	get_desc(char *fname, char **name, char **comment,
 		 char **desc, long *size, char *tmp_file);
 int	exec_catch_errors(char *prog, char *arg, char *fout);
 int	already_installed(char *name);
diff --git a/usr.sbin/pkg_manage/pkg_ui.c b/usr.sbin/pkg_manage/pkg_ui.c
index d06fb73ee401..e5dec9f56bdc 100644
--- a/usr.sbin/pkg_manage/pkg_ui.c
+++ b/usr.sbin/pkg_manage/pkg_ui.c
@@ -1,5 +1,5 @@
 /***************************************************************
- * 
+ *
  * Program:	pkg_ui.c
  * Author:	Marc van Kempen
  * Desc:	user interface parts of pkg_manage
@@ -15,7 +15,7 @@
  * responsible for the proper functioning of this software, nor does
  * the author assume any responsibility for damages incurred with
  * its use.
- * 
+ *
  ***************************************************************/
 
 #include <stdlib.h>
@@ -61,9 +61,9 @@ view_installed(void)
     quit_view = FALSE;
     while (!quit_view) {
 	use_helpline("F1=help, use arrow-keys or character to select option and press enter");
-	if (dialog_menu("View installed packages", 
+	if (dialog_menu("View installed packages",
 			"Press enter to see the package descriptions",
-			LINES, COLS, LINES-5, p_inf.Nitems, 
+			LINES, COLS, LINES-5, p_inf.Nitems,
 			p_inf.mnu, selection, &ch, &sc )) {
 	    quit_view = TRUE;
 	} else {
@@ -106,7 +106,7 @@ delete_installed(void)
 	use_helpfile(DEL_INST_HLP);
 	if (dialog_menu("DELETE an installed package",
 			"Press enter to select a package",
-			LINES, COLS, LINES-5, p_inf.Nitems, 
+			LINES, COLS, LINES-5, p_inf.Nitems,
 			p_inf.mnu, selection, &ch, &sc)) {
 	    quit_view = TRUE;
 	} else {
@@ -115,7 +115,7 @@ delete_installed(void)
 	    while (!quit_del) {
 		sprintf(tmp, "Delete <%s>", p_inf.name[i]);
 		use_helpline("F1=help, use arrow-keys or digit to select option and press enter");
-		if (dialog_menu("Delete a package", tmp, 10, COLS-6, 
+		if (dialog_menu("Delete a package", tmp, 10, COLS-6,
 				3, 3, mnu, selection, &ch0, &sc0)) {
 		    quit_del = TRUE;
 		} else {
@@ -161,7 +161,7 @@ delete_installed(void)
 
 void
 preview_pkg(void)
-/* 
+/*
  * Desc: View the package description and comment before installation
  */
 {
@@ -223,12 +223,12 @@ install_batch(void)
     }
     return;
 } /* install_batch() */
-	
+
 
 void
 install_pkgs_indir(void)
 /*
- * Desc: install several packages. 
+ * Desc: install several packages.
  */
 {
     WINDOW		*pkg_win, *w, *tmpwin;
@@ -254,12 +254,12 @@ install_pkgs_indir(void)
 	fprintf(stderr, "\ninstall_pkgs_indir: dupwin(newscr) failed\n");
 	exit(1);
     }
-    
+
     use_helpline(NULL);
     pkg_win = newwin(LINES-4, COLS-12, 2, 5);
     if (pkg_win == NULL) {
 	endwin();
-	fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n", 
+	fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n",
 		LINES-4, COLS-10, 2, 5);
 	exit(1);
     }
@@ -273,7 +273,7 @@ install_pkgs_indir(void)
 
     /* now build a list of the packages in the chosen directory */
     /* and display them in a list */
-    
+
     get_dir(StartDir ? StartDir : ".", "*.tgz", &d, &n);
     get_filenames(d, n, &fnames, &nf);
     FreeDir(d, n); 	/* free the space allocated to d */
@@ -296,7 +296,7 @@ install_pkgs_indir(void)
     if (!comment) {
 	fprintf(stderr, "install_batch(): Error malloc'ing space for comment\n");
 	exit(-1);
-    }    
+    }
     desc = (char **) malloc( sizeof(char *) * nf );
     if (!desc) {
 	fprintf(stderr, "install_batch(): Error malloc'ing space for desc\n");
@@ -348,9 +348,9 @@ install_pkgs_indir(void)
     a = (int *) malloc( nf * sizeof(int) );
     j = 0;
     for (i=0; i<nf; i++) {
-	dialog_gauge("Scanning directory:", fnames[i], LINES/2-3, COLS/2-30, 
+	dialog_gauge("Scanning directory:", fnames[i], LINES/2-3, COLS/2-30,
 		     7, 60, (int) ((float) (i+1)/nf*100));
-	if (get_desc(fnames[i], &(names[i]), &(comment[i]), 
+	if (get_desc(fnames[i], &(names[i]), &(comment[i]),
 		     &(desc[i]), &(sizes[i]), tmp_dir) == FALSE) {
 	    a[j] = i;
 	    j++;
@@ -375,7 +375,7 @@ install_pkgs_indir(void)
 	free(sizes);
 	delwin(pkg_win);
     }
-    
+
     /* Now we should have an array with indices of filenames that are not */
     /* packages, say a[0..k), 0<=k<=n, and the filenames itself           */
     /* remove the non-packages from the array 				  */
@@ -383,7 +383,7 @@ install_pkgs_indir(void)
     i=0;
     p=0;
     while (i+p < nf) {
-	if ((i+p == a[p]) && (p<j)) {	    
+	if ((i+p == a[p]) && (p<j)) {
 	    free(fnames[i+p]);
 	    free(names[i+p]);
 	    free(comment[i+p]);
@@ -402,12 +402,12 @@ install_pkgs_indir(void)
     free(a);
 
     o_pkg[0] = '0';
-    pkg_obj = NewListObj(pkg_win, "To be installed", names, o_pkg, 
+    pkg_obj = NewListObj(pkg_win, "To be installed", names, o_pkg,
 			 1, 2, LINES-11, COLS-50, nf);
     AddObj(&obj, LISTOBJ, (void *) pkg_obj);
-    
+
     o_pkgi[0] = '0';
-    pkgi_obj = NewListObj(pkg_win, "Already Installed", p_inf.name, o_pkgi, 
+    pkgi_obj = NewListObj(pkg_win, "Already Installed", p_inf.name, o_pkgi,
 			  1, COLS-45, LINES-11, COLS-50, p_inf.Nitems);
     AddObj(&obj, LISTOBJ, (void *) pkgi_obj);
 
@@ -554,7 +554,7 @@ install_pkgs_indir(void)
     touchwin(tmpwin);
     wrefresh(tmpwin);
     delwin(tmpwin);
-	    
+
     return;
 } /* install_batch() */
 
@@ -584,7 +584,7 @@ run_menu(void)
 	} else {
 	    sel = atoi(selection);
 	    switch(sel) {
-	    case 1: /* View installed packages */		
+	    case 1: /* View installed packages */
 		view_installed();
 		break;
 	    case 2: /* Delete installed package */
diff --git a/usr.sbin/pkg_manage/version.c b/usr.sbin/pkg_manage/version.c
index b738e81dd3a4..532e974e91f0 100644
--- a/usr.sbin/pkg_manage/version.c
+++ b/usr.sbin/pkg_manage/version.c
@@ -1 +1 @@
-char version[] = "pkg_manage version 1.0"; 
+char version[] = "pkg_manage version 1.0";
diff --git a/usr.sbin/portmap/from_local.c b/usr.sbin/portmap/from_local.c
index dc5583aafea5..9daacba04d27 100644
--- a/usr.sbin/portmap/from_local.c
+++ b/usr.sbin/portmap/from_local.c
@@ -1,6 +1,6 @@
  /*
   * Check if an address belongs to the local system. Adapted from:
-  * 
+  *
   * @(#)pmap_svc.c 1.32 91/03/11 Copyright 1984,1990 Sun Microsystems, Inc.
   * @(#)get_myaddress.c  2.1 88/07/29 4.0 RPCSRC.
   */
diff --git a/usr.sbin/portmap/pmap_check.c b/usr.sbin/portmap/pmap_check.c
index 1d1ed61d113e..eb0653b7d5ad 100644
--- a/usr.sbin/portmap/pmap_check.c
+++ b/usr.sbin/portmap/pmap_check.c
@@ -1,24 +1,24 @@
  /*
   * pmap_check - additional portmap security.
-  * 
+  *
   * Always reject non-local requests to update the portmapper tables.
-  * 
+  *
   * Refuse to forward mount requests to the nfs mount daemon. Otherwise, the
   * requests would appear to come from the local system, and nfs export
   * restrictions could be bypassed.
-  * 
+  *
   * Refuse to forward requests to the nfsd process.
-  * 
+  *
   * Refuse to forward requests to NIS (YP) daemons; The only exception is the
   * YPPROC_DOMAIN_NONACK broadcast rpc call that is used to establish initial
   * contact with the NIS server.
-  * 
+  *
   * Always allocate an unprivileged port when forwarding a request.
-  * 
+  *
   * If compiled with -DCHECK_PORT, require that requests to register or
   * unregister a privileged port come from a privileged port. This makes it
   * more difficult to replace a critical service by a trojan.
-  * 
+  *
   * If compiled with -DHOSTS_ACCESS, reject requests from hosts that are not
   * authorized by the /etc/hosts.{allow,deny} files. The local system is
   * always treated as an authorized host. The access control tables are never
@@ -26,7 +26,7 @@
   * for requests from other hosts. Access control is based on IP addresses
   * only; attempts to map an address to a host name might cause the
   * portmapper to hang.
-  * 
+  *
   * Author: Wietse Venema (wietse@wzv.win.tue.nl), dept. of Mathematics and
   * Computing Science, Eindhoven University of Technology, The Netherlands.
   */
diff --git a/usr.sbin/portmap/pmap_dump/pmap_dump.c b/usr.sbin/portmap/pmap_dump/pmap_dump.c
index 2bddcbbee069..9d57d65aea22 100644
--- a/usr.sbin/portmap/pmap_dump/pmap_dump.c
+++ b/usr.sbin/portmap/pmap_dump/pmap_dump.c
@@ -1,6 +1,6 @@
  /*
   * pmap_dump - dump portmapper table in format readable by pmap_set
-  * 
+  *
   * Author: Wietse Venema (wietse@wzv.win.tue.nl), dept. of Mathematics and
   * Computing Science, Eindhoven University of Technology, The Netherlands.
   */
diff --git a/usr.sbin/portmap/pmap_set/pmap_set.c b/usr.sbin/portmap/pmap_set/pmap_set.c
index ab82fd5334d5..92e79942bda4 100644
--- a/usr.sbin/portmap/pmap_set/pmap_set.c
+++ b/usr.sbin/portmap/pmap_set/pmap_set.c
@@ -1,6 +1,6 @@
  /*
   * pmap_set - set portmapper table from data produced by pmap_dump
-  * 
+  *
   * Author: Wietse Venema (wietse@wzv.win.tue.nl), dept. of Mathematics and
   * Computing Science, Eindhoven University of Technology, The Netherlands.
   */
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index 6c40795e7d99..5ef8b2d3b57e 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -58,23 +58,23 @@ static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro";
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -227,7 +227,7 @@ find_service(prog, vers, prot)
 	return (hit);
 }
 
-/* 
+/*
  * 1 OK, 0 not
  */
 void
@@ -239,7 +239,7 @@ reg_service(rqstp, xprt)
 	struct pmaplist *pml, *prevpml, *fnd;
 	int ans, port;
 	caddr_t t;
-	
+
 	/*
 	 * Later wrappers change the logging severity on the fly. Reset to
 	 * defaults before handling the next request.
@@ -270,11 +270,11 @@ reg_service(rqstp, xprt)
 			svcerr_decode(xprt);
 		else {
 			/* reject non-local requests, protect priv. ports */
-			if (!check_setunset(svc_getcaller(xprt), 
+			if (!check_setunset(svc_getcaller(xprt),
 			    rqstp->rq_proc, reg.pm_prog, reg.pm_port)) {
 				ans = 0;
 				goto done;
-			} 
+			}
 			/*
 			 * check to see if already used
 			 * find_service returns a hit even if
@@ -291,7 +291,7 @@ reg_service(rqstp, xprt)
 					goto done;
 				}
 			} else {
-				/* 
+				/*
 				 * add to END of list
 				 */
 				pml = (struct pmaplist *)
@@ -325,7 +325,7 @@ reg_service(rqstp, xprt)
 		else {
 			ans = 0;
 			/* reject non-local requests */
-			if (!check_setunset(svc_getcaller(xprt), 
+			if (!check_setunset(svc_getcaller(xprt),
 			    rqstp->rq_proc, reg.pm_prog, (u_long) 0))
 				goto done;
 			for (prevpml = NULL, pml = pmaplist; pml != NULL; ) {
@@ -338,9 +338,9 @@ reg_service(rqstp, xprt)
 				}
 				/* found it; pml moves forward, prevpml stays */
 				/* privileged port check */
-				if (!check_privileged_port(svc_getcaller(xprt), 
-				    rqstp->rq_proc, 
-				    reg.pm_prog, 
+				if (!check_privileged_port(svc_getcaller(xprt),
+				    rqstp->rq_proc,
+				    reg.pm_prog,
 				    pml->pml_map.pm_port)) {
 					ans = 0;
 					break;
@@ -370,8 +370,8 @@ reg_service(rqstp, xprt)
 			svcerr_decode(xprt);
 		else {
 			/* remote host authorization check */
-			if (!check_default(svc_getcaller(xprt), 
-			    rqstp->rq_proc, 
+			if (!check_default(svc_getcaller(xprt),
+			    rqstp->rq_proc,
 			    reg.pm_prog)) {
 				ans = 0;
 				goto done;
@@ -398,7 +398,7 @@ reg_service(rqstp, xprt)
 		else {
 			/* remote host authorization check */
 			struct pmaplist *p;
-			if (!check_default(svc_getcaller(xprt), 
+			if (!check_default(svc_getcaller(xprt),
 			    rqstp->rq_proc, (u_long) 0)) {
 				p = 0;	/* send empty list */
 			} else {
@@ -417,7 +417,7 @@ reg_service(rqstp, xprt)
 		 * Calls a procedure on the local machine.  If the requested
 		 * procedure is not registered this procedure does not return
 		 * error information!!
-		 * This procedure is only supported on rpc/udp and calls via 
+		 * This procedure is only supported on rpc/udp and calls via
 		 * rpc/udp.  It passes null authentication parameters.
 		 */
 		callit(rqstp, xprt);
@@ -531,7 +531,7 @@ xdr_len_opaque_parms(xdrs, cap)
  * a machine should shut-up instead of complain, less the requestor be
  * overrun with complaints at the expense of not hearing a valid reply ...
  *
- * This now forks so that the program & process that it calls can call 
+ * This now forks so that the program & process that it calls can call
  * back to the portmapper.
  */
 static void
@@ -555,7 +555,7 @@ callit(rqstp, xprt)
 	if (!svc_getargs(xprt, xdr_rmtcall_args, &a))
 		return;
 	/* host and service access control */
-	if (!check_callit(svc_getcaller(xprt), 
+	if (!check_callit(svc_getcaller(xprt),
 	    rqstp->rq_proc, a.rmt_prog, a.rmt_proc))
 		return;
 	if ((pml = find_service(a.rmt_prog, a.rmt_vers,
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index 6208383de1ae..4969f2d6fa81 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: arp.c,v 1.1 1995/02/26 12:17:09 amurai Exp $
+ *
  */
 
 /*
@@ -321,15 +321,15 @@ struct nlist nl[] = {
 
 kvm_t *kvmd;
 
-/*              
+/*
  * Read kernel memory, return 0 on success.
- */     
+ */
 int
-kread(addr, buf, size)  
+kread(addr, buf, size)
   u_long addr;
   char *buf;
   int size;
-{        
+{
 
 	if (kvm_read(kvmd, addr, buf, size) != size) {
 		/* XXX this duplicates kvm_read's error printout */
@@ -351,10 +351,10 @@ struct sockaddr_dl *dlo;
   struct sockaddr *sa;
   char *cp;
   struct sockaddr_dl *sdl;
-  union {          
+  union {
 	  struct ifaddr ifa;
 	  struct in_ifaddr in;
-  } ifaddr; 
+  } ifaddr;
   struct arpcom ac;
 
   kvmd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index 472d723f937b..70c1a483df28 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: async.c,v 1.2 1995/02/26 12:17:11 amurai Exp $
- * 
+ * $Id: async.c,v 1.3 1995/04/16 12:06:39 amurai Exp $
+ *
  */
 #include "fsm.h"
 #include "hdlc.h"
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index a125abcb3143..c2efa7bf5044 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: auth.c,v 1.2 1995/02/26 12:17:12 amurai Exp $
- * 
+ *
+ * $Id: auth.c,v 1.3 1995/02/27 10:57:38 amurai Exp $
+ *
  *	TODO:
  *		o Imprement check against with registerd IP addresses.
  */
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index cab86950f554..952ff2e98b27 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
+ * $Id: auth.h,v 1.1 1995/02/27 03:17:51 amurai Exp $
  *
  *	TODO:
  */
@@ -24,7 +24,7 @@
 #define	_AUTH_H_
 
 typedef enum { VALID, INVALID, NOT_FOUND } LOCAL_AUTH_VALID;
-LOCAL_AUTH_VALID	LocalAuthValidate( char *, char *, char *); 
+LOCAL_AUTH_VALID	LocalAuthValidate( char *, char *, char *);
 
 struct authinfo {
   void (*ChallengeFunc)();
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index ca3a8e8db770..eb7287bb212b 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: ccp.c,v 1.2 1995/02/26 12:17:14 amurai Exp $
+ *
  *	TODO:
  *		o Support other compression protocols
  */
@@ -29,7 +29,7 @@
 #include "phase.h"
 #include "vars.h"
 #include "cdefs.h"
- 
+
 extern void PutConfValue __P((void));
 
 struct ccpstate CcpInfo;
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 18ded48ab650..adc43afb0b4c 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: chap.c,v 1.2 1995/02/26 12:17:17 amurai Exp $
+ *
  *	TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 0fba4cfa08b8..ebfefe855a35 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -17,9 +17,9 @@
  *		1760 Zollinger Road
  *		Columbus, OH  43221
  *		(614)451-1883
- * 
- * $Id: chat.c,v 1.2 1995/02/26 12:17:20 amurai Exp $
- * 
+ *
+ * $Id: chat.c,v 1.3 1995/03/11 15:18:37 amurai Exp $
+ *
  *  TODO:
  *	o Support more UUCP compatible control sequences.
  *	o Dialing shoud not block monitor process.
@@ -453,7 +453,7 @@ char *script;
 #ifdef DEBUG
   int i;
 #endif
-  
+
   timeout_next = abort_next = 0;
   for (n = 0; AbortStrings[n]; n++) {
     free(AbortStrings[n]);
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index b926879c232b..dbe42474b86b 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: command.c,v 1.3 1995/02/27 10:57:45 amurai Exp $
- * 
+ *
+ * $Id: command.c,v 1.4 1995/04/16 13:38:38 amurai Exp $
+ *
  */
 #include <ctype.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index e803ef2be624..60a5cfbd5900 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: filter.c,v 1.3 1995/02/26 12:17:25 amurai Exp $
+ *
  *	TODO: Shoud send ICMP error message when we discard packets.
  */
 
@@ -80,7 +80,7 @@ int *pwidth;
     /* if width is not given, assume whole 32 bits are meaningfull */
     bits = 32;
   }
-  
+
   *pwidth = bits;
   pmask->s_addr = htonl(netmasks[bits]);
 
@@ -246,7 +246,7 @@ checkestab:
       printf("estab is expected.\n");
       return(0);
     }
-    
+
     return(1);
   } else if (argc == 1)
     goto checkestab;
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index e1e8d99701e7..3df063a3973c 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: fsm.c,v 1.2 1995/02/26 12:17:27 amurai Exp $
+ *
  *  TODO:
  *		o Refer loglevel for log output
  *		o Better option log display
@@ -323,7 +323,7 @@ struct mbuf *bp;
 {
   int plen, flen;
   int ackaction = 0;
- 
+
   plen = plength(bp);
   flen = ntohs(lhp->length) - sizeof(*lhp);
   if (plen < flen) {
@@ -446,7 +446,7 @@ struct fsmheader *lhp;
 struct mbuf *bp;
 {
   int plen, flen;
- 
+
   plen = plength(bp);
   flen = ntohs(lhp->length) - sizeof(*lhp);
   if (plen < flen) {
@@ -563,7 +563,7 @@ struct fsmheader *lhp;
 struct mbuf *bp;
 {
   int plen, flen;
- 
+
   plen = plength(bp);
   flen = ntohs(lhp->length) - sizeof(*lhp);
   if (plen < flen) {
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 6431e38a4dd1..f1de57e853c9 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: hdlc.c,v 1.2 1995/02/26 12:17:30 amurai Exp $
+ *
  *	TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index c0dd7e81f4a5..c25b56cc5d6d 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: ip.c,v 1.2 1995/02/26 12:17:33 amurai Exp $
- * 
+ *
+ * $Id: ip.c,v 1.3 1995/03/11 15:18:42 amurai Exp $
+ *
  *	TODO:
  *		o Return ICMP message for filterd packet
  *		  and optionaly record it into log.
@@ -240,7 +240,7 @@ int direction;
   logit = (loglevel & (1 << LOG_TCPIP));
 
   pip = (struct ip *)cp;
-  
+
   if (logit) logprintf("%s  ", Direction[direction]);
 
   ptop = (cp + (pip->ip_hl << 2));
@@ -379,7 +379,7 @@ int count;
   Enqueue(&IpOutputQueues[pri], bp);
 }
 
-int 
+int
 IsIpEnqueued()
 {
   struct mqueue *queue;
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index c8cb6aee38b8..240c0c609e62 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.c,v 1.2 1995/02/26 12:17:33 amurai Exp $
- * 
+ * $Id: ipcp.c,v 1.3 1995/03/11 15:18:44 amurai Exp $
+ *
  *	TODO:
  *		o More RFC1772 backwoard compatibility
  */
@@ -331,7 +331,7 @@ int mode;
           bcopy(&IpcpInfo.his_ipaddr.s_addr, nakp+2, length);
           nakp += length;
           break;
-	  
+
 	}
 	IpcpInfo.his_ipaddr = ipaddr;
 	bcopy(cp, ackp, length);
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index 0f7d9b102256..ade676ec3f43 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: lcp.c,v 1.2 1995/02/26 12:17:35 amurai Exp $
- * 
+ *
+ * $Id: lcp.c,v 1.3 1995/03/11 15:18:45 amurai Exp $
+ *
  * TODO:
  *      o Validate magic number received from peer.
  *	o Limit data field length by MRU
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index 235321f343f3..74430220cf8b 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: log.c,v 1.2 1995/02/26 12:17:38 amurai Exp $
+ *
  */
 #include "defs.h"
 #include <time.h>
@@ -248,7 +248,7 @@ LogTimeStamp()
     mypid = getpid();
   ltime = time(0);
   ptm = localtime(&ltime);
-  sprintf(logptr, "%02d-%02d %02d:%02d:%02d [%d] ", 
+  sprintf(logptr, "%02d-%02d %02d:%02d:%02d [%d] ",
     ptm->tm_mon + 1, ptm->tm_mday,
 	ptm->tm_hour, ptm->tm_min, ptm->tm_sec, mypid);
   logptr += strlen(logptr);
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index ed375ce220bf..eaa677cf9fc7 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lqr.c,v 1.2 1995/02/26 12:17:39 amurai Exp $
- * 
+ * $Id: lqr.c,v 1.3 1995/04/17 04:21:35 amurai Exp $
+ *
  *	o LQR based on RFC1333
  *
  * TODO:
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 3f8126f9a9a4..a698a04dbec1 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: main.c,v 1.3 1995/02/27 10:57:50 amurai Exp $
- * 
+ * $Id: main.c,v 1.4 1995/03/11 15:18:47 amurai Exp $
+ *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
  *		o Add signal handler for misc controls.
@@ -573,7 +573,7 @@ DoLoop()
 
   dial_up = FALSE;			/* XXXX */
   for (;;) {
-    if ( modem ) 
+    if ( modem )
 	IpStartOutput();
     FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&efds);
 
@@ -638,10 +638,10 @@ DoLoop()
     tp = (RedialTimer.state == TIMER_RUNNING)? &timeout : NULL;
     i = select(tun_in+10, &rfds, &wfds, &efds, tp);
 #else
-    /* 
+    /*
      * When SIGALRM timer is running, a select function will be
-     * return -1 and EINTR after a Time Service signal hundler 
-     * is done. 
+     * return -1 and EINTR after a Time Service signal hundler
+     * is done.
      */
     i = select(tun_in+10, &rfds, &wfds, &efds, NULL);
 #endif
@@ -655,7 +655,7 @@ DoLoop()
        }
        perror("select");
        break;
-    } 
+    }
 
     if ((netfd > 0 && FD_ISSET(netfd, &efds)) || FD_ISSET(modem, &efds)) {
       logprintf("Exception detected.\n");
@@ -747,7 +747,7 @@ DoLoop()
        */
       if (ModemQlen() > 5)
 	continue;
-      
+
       n = read(tun_in, rbuff, sizeof(rbuff));
       if (n < 0) {
 	perror("read from tun");
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 6eaea886bb5f..c371a6478dcf 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: mbuf.c,v 1.2 1995/02/26 12:17:42 amurai Exp $
+ *
  */
 #include "defs.h"
 
@@ -112,7 +112,7 @@ int len;
   }
   return(bp);
 }
-  
+
 void
 mbwrite(bp, ptr, cnt)
 struct mbuf *bp;
diff --git a/usr.sbin/ppp/md5.h b/usr.sbin/ppp/md5.h
index dc07614a8454..f6f5b9b1a83f 100644
--- a/usr.sbin/ppp/md5.h
+++ b/usr.sbin/ppp/md5.h
@@ -3,25 +3,25 @@
  *
  * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
  * rights reserved.
- * 
+ *
  * License to copy and use this software is granted provided that it
  * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
  * Algorithm" in all material mentioning or referencing this software
  * or this function.
- * 
+ *
  * License is also granted to make and use derivative works provided
  * that such works are identified as "derived from the RSA Data
  * Security, Inc. MD5 Message-Digest Algorithm" in all material
  * mentioning or referencing the derived work.
- * 
+ *
  * RSA Data Security, Inc. makes no representations concerning either
  * the merchantability of this software or the suitability of this
  * software for any particular purpose. It is provided "as is"
  * without express or implied warranty of any kind.
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
- * 
- * $Id:$
+ *
+ * $Id: md5.h,v 1.1.1.1 1995/01/31 06:29:56 amurai Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/md5c.c b/usr.sbin/ppp/md5c.c
index 173b536e8bc8..e2695f2e05b2 100644
--- a/usr.sbin/ppp/md5c.c
+++ b/usr.sbin/ppp/md5c.c
@@ -1,7 +1,7 @@
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- * 
- * $Id:$
- * 
+ *
+ * $Id: md5c.c,v 1.2 1995/02/26 12:17:44 amurai Exp $
+ *
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index 5595bc901218..0a251562c71d 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.c,v 1.4 1995/03/11 15:18:48 amurai Exp $
- * 
+ * $Id: modem.c,v 1.5 1995/04/16 13:38:39 amurai Exp $
+ *
  *  TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/os.c b/usr.sbin/ppp/os.c
index 11fb9a66ef56..92acff6eb303 100644
--- a/usr.sbin/ppp/os.c
+++ b/usr.sbin/ppp/os.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: os.c,v 1.2 1995/02/26 12:17:48 amurai Exp $
+ *
  */
 #include "fsm.h"
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 38ced4354fa3..0c06307a8dc5 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -18,8 +18,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: pap.c,v 1.2 1995/02/26 12:17:51 amurai Exp $
+ *
  *	TODO:
  */
 #include "fsm.h"
@@ -66,7 +66,7 @@ int papid;
   cp += namelen;
   *cp++ = keylen;
   bcopy(VarAuthKey, cp, keylen);
- 
+
   HdlcOutput(PRI_NORMAL, PROTO_PAP, bp);
 }
 
diff --git a/usr.sbin/ppp/pathnames.h b/usr.sbin/ppp/pathnames.h
index ed5c7f473365..fbabf37743bf 100644
--- a/usr.sbin/ppp/pathnames.h
+++ b/usr.sbin/ppp/pathnames.h
@@ -30,9 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 
- * $Id:$
- * 
+ *
+ * $Id: pathnames.h,v 1.3 1995/02/26 12:17:52 amurai Exp $
+ *
  *	@(#)pathnames.h	5.2 (Berkeley) 6/1/90
  */
 
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 826cd5c1d1e5..d0bffb5d6a86 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -4,9 +4,9 @@
 #include "ccp.h"
 
 /*
- * 
- * $Id:$
- * 
+ *
+ * $Id: pred.c,v 1.2 1995/02/26 12:17:55 amurai Exp $
+ *
  * pred.c -- Test program for Dave Rand's rendition of the
  * predictor algorithm
  * Updated by: iand@labtam.labtam.oz.au (Ian Donaldson)
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index f36cfcb7ce82..5d8267052a43 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: route.c,v 1.2 1995/02/26 12:17:56 amurai Exp $
+ *
  */
 #include <sys/types.h>
 #include <machine/endian.h>
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index f3d57ce2270a..5bf842a4dbc6 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: slcompress.c,v 1.2 1995/02/26 12:17:57 amurai Exp $
+ *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  */
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index ee1fe7789a52..4e0b8badc1d6 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -1,7 +1,7 @@
 /*
  * Definitions for tcp compression routines.
  *
- * $Header: /home/tony-o/src/ppp/RCS/slcompress.h,v 1.1 1993/09/11 05:30:49 tony-o Exp tony-o $
+ * $Header: /home/ncvs/src/usr.sbin/ppp/slcompress.h,v 1.2 1995/02/26 12:17:58 amurai Exp $
  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
@@ -17,9 +17,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: slcompress.h,v 1.2 1995/02/26 12:17:58 amurai Exp $
+ *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  */
@@ -40,7 +40,7 @@
  * sequence number changes, one change per bit set in the header
  * (there may be no changes and there are two special cases where
  * the receiver implicitly knows what changed -- see below).
- * 
+ *
  * There are 5 numbers which can change (they are always inserted
  * in the following order): TCP urgent pointer, window,
  * acknowlegement, sequence number and IP ID.  (The urgent pointer
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index 340d3e769eef..bc4a7509dcf6 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: systems.c,v 1.3 1995/02/26 12:17:59 amurai Exp $
- * 
+ * $Id: systems.c,v 1.4 1995/04/29 13:38:14 ache Exp $
+ *
  *  TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index b91fbcda1d7f..d76ab14f093e 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -17,15 +17,15 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: timer.c,v 1.2 1995/02/26 12:18:01 amurai Exp $
- * 
+ * $Id: timer.c,v 1.3 1995/03/11 15:18:51 amurai Exp $
+ *
  *  TODO:
  */
 #include "defs.h"
 #include <sys/time.h>
 #include <signal.h>
 #include "timeout.h"
-#ifdef SIGALRM 
+#ifdef SIGALRM
 #include <errno.h>
 #endif
 void StopTimerNoBlock( struct pppTimer *);
@@ -180,7 +180,7 @@ TimerService()
 #endif
 	if (exp->func)
 	  (*exp->func)(exp->arg);
-	/* 
+	/*
          * Just Removing each item from expired list
          * And exp->enext will be intialized at next expire
          * in this funtion.
@@ -212,7 +212,7 @@ u_int sleep( u_int sec )
   gettimeofday( &st, NULL );
   to.tv_sec =  sec;
   to.tv_usec = 0;
-  std = st.tv_sec * 1000000 + st.tv_usec; 
+  std = st.tv_sec * 1000000 + st.tv_usec;
   for (;;) {
     if ( select ( 0, NULL, NULL, NULL, &to) == 0 ||
          errno != EINTR ) {
@@ -221,7 +221,7 @@ u_int sleep( u_int sec )
        gettimeofday( &et, NULL );
        sld = to.tv_sec * 1000000 + to.tv_sec;
        nwd = et.tv_sec * 1000000 + et.tv_usec - std;
-       if ( sld > nwd ) 
+       if ( sld > nwd )
           sld -= nwd;
        else
           sld  = 1; /* Avoid both tv_sec/usec is 0 */
@@ -241,7 +241,7 @@ void usleep( u_int usec)
   gettimeofday( &st, NULL );
   to.tv_sec =  0;
   to.tv_usec = usec;
-  std = st.tv_sec * 1000000 + st.tv_usec; 
+  std = st.tv_sec * 1000000 + st.tv_usec;
   for (;;) {
     if ( select ( 0, NULL, NULL, NULL, &to) == 0 ||
          errno != EINTR ) {
@@ -250,7 +250,7 @@ void usleep( u_int usec)
        gettimeofday( &et, NULL );
        sld = to.tv_sec * 1000000 + to.tv_sec;
        nwd = et.tv_sec * 1000000 + et.tv_usec - std;
-       if ( sld > nwd ) 
+       if ( sld > nwd )
           sld -= nwd;
        else
           sld  = 1; /* Avoid both tv_sec/usec is 0 */
diff --git a/usr.sbin/ppp/uucplock.c b/usr.sbin/ppp/uucplock.c
index 455c8c4adeeb..2a9e3840a2db 100644
--- a/usr.sbin/ppp/uucplock.c
+++ b/usr.sbin/ppp/uucplock.c
@@ -29,9 +29,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $Id: uucplock.c,v 1.2 1995/02/26 12:18:04 amurai Exp $
- * 
+ *
+ * $Id: uucplock.c,v 1.4 1995/03/11 15:18:53 amurai Exp $
+ *
  */
 
 #ifndef lint
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)uucplock.c	5.5 (Berkeley) 6/1/90";
 #include <errno.h>
 #include "pathnames.h"
 
-/* 
+/*
  * uucp style locking routines
  * return: 0 - success
  * 	  -1 - failure
diff --git a/usr.sbin/ppp/vars.c b/usr.sbin/ppp/vars.c
index c984d1252ff3..ef5c7964a1da 100644
--- a/usr.sbin/ppp/vars.c
+++ b/usr.sbin/ppp/vars.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: vars.c,v 1.2 1995/02/26 12:18:05 amurai Exp $
+ *
  */
 #include "fsm.h"
 #include "command.h"
@@ -46,7 +46,7 @@ struct confdesc pppConfs[] = {
 
 struct pppvars pppVars = {
   DEF_MRU, 0, MODEM_SPEED, CS8, 180, 30, 3,
-  MODEM_DEV, OPEN_PASSIVE, LOCAL_NO_AUTH, 
+  MODEM_DEV, OPEN_PASSIVE, LOCAL_NO_AUTH,
 };
 
 int
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 8c5df5609c81..0c9c8568fcad 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: vjcomp.c,v 1.2 1995/02/26 12:18:08 amurai Exp $
+ *
  *  TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 950ef024e6b7..e8b2d06e15d6 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.6 1994/05/25 06:25:05 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.2 1994/09/25 02:31:52 wollman Exp $";
 #endif
 
 #include <stdio.h>
@@ -758,7 +758,7 @@ check_access(f, filename)
  * NONWILD_CLIENT set if the secret didn't have "*" for the client, and
  * NONWILD_SERVER set if the secret didn't have "*" for the server.
  * Any following words on the line (i.e. address authorization
- * info) are placed in a wordlist and returned in *addrs.  
+ * info) are placed in a wordlist and returned in *addrs.
  */
 static int
 scan_authfile(f, client, server, secret, addrs, filename)
@@ -851,7 +851,7 @@ scan_authfile(f, client, server, secret, addrs, filename)
 	}
 	if (secret != NULL)
 	    strcpy(secret, word);
-		
+
 	best_flag = got_flag;
 
 	/*
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index 64f39bc51c1b..14b28b16b3d4 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap.c,v 1.3 1994/04/18 04:01:07 paulus Exp $";
+static char rcsid[] = "$Id: chap.c,v 1.2 1994/09/25 02:31:54 wollman Exp $";
 #endif
 
 /*
@@ -95,7 +95,7 @@ ChapAuthWithPeer(unit, our_name, digest)
 
     /*
      * We get here as a result of LCP coming up.
-     * So even if CHAP was open before, we will 
+     * So even if CHAP was open before, we will
      * have to re-authenticate ourselves.
      */
     cstate->clientstate = CHAPCS_LISTEN;
@@ -112,7 +112,7 @@ ChapAuthPeer(unit, our_name, digest)
     int digest;
 {
     chap_state *cstate = &chap[unit];
-  
+
     cstate->chal_name = our_name;
     cstate->chal_type = digest;
 
@@ -137,7 +137,7 @@ ChapChallengeTimeout(arg)
     caddr_t arg;
 {
     chap_state *cstate = (chap_state *) arg;
-  
+
     /* if we aren't sending challenges, don't worry.  then again we */
     /* probably shouldn't be here either */
     if (cstate->serverstate != CHAPSS_INITIAL_CHAL &&
@@ -205,7 +205,7 @@ ChapLowerUp(unit)
     int unit;
 {
     chap_state *cstate = &chap[unit];
-  
+
     if (cstate->clientstate == CHAPCS_INITIAL)
 	cstate->clientstate = CHAPCS_CLOSED;
     else if (cstate->clientstate == CHAPCS_PENDING)
@@ -231,7 +231,7 @@ ChapLowerDown(unit)
     int unit;
 {
     chap_state *cstate = &chap[unit];
-  
+
     /* Timeout(s) pending?  Cancel if so. */
     if (cstate->serverstate == CHAPSS_INITIAL_CHAL ||
 	cstate->serverstate == CHAPSS_RECHALLENGE)
@@ -279,7 +279,7 @@ ChapInput(unit, inpacket, packet_len)
     u_char *inp;
     u_char code, id;
     int len;
-  
+
     /*
      * Parse header (code, id and length).
      * If packet too short, drop it.
@@ -301,7 +301,7 @@ ChapInput(unit, inpacket, packet_len)
 	return;
     }
     len -= CHAP_HEADERLEN;
-  
+
     /*
      * Action depends on code (as in fact it usually does :-).
      */
@@ -309,11 +309,11 @@ ChapInput(unit, inpacket, packet_len)
     case CHAP_CHALLENGE:
 	ChapReceiveChallenge(cstate, inp, id, len);
 	break;
-    
+
     case CHAP_RESPONSE:
 	ChapReceiveResponse(cstate, inp, id, len);
 	break;
-    
+
     case CHAP_FAILURE:
 	ChapReceiveFailure(cstate, inp, id, len);
 	break;
@@ -345,7 +345,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
     char secret[MAXSECRETLEN];
     char rhostname[256];
     MD5_CTX mdContext;
- 
+
     CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: Rcvd id %d.", id));
     if (cstate->clientstate == CHAPCS_CLOSED ||
 	cstate->clientstate == CHAPCS_PENDING) {
@@ -392,7 +392,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
     cstate->resp_transmits = 0;
 
     /*  generate MD based on negotiated type */
-    switch (cstate->resp_type) { 
+    switch (cstate->resp_type) {
 
     case CHAP_DIGEST_MD5:		/* only MD5 is defined for now */
 	MD5Init(&mdContext);
@@ -494,7 +494,7 @@ ChapReceiveResponse(cstate, inp, id, len)
     } else {
 
 	/*  generate MD based on negotiated type */
-	switch (cstate->chal_type) { 
+	switch (cstate->chal_type) {
 
 	case CHAP_DIGEST_MD5:		/* only MD5 is defined for now */
 	    if (remmd_len != MD5_SIGNATURE_SIZE)
@@ -503,7 +503,7 @@ ChapReceiveResponse(cstate, inp, id, len)
 	    MD5Update(&mdContext, &cstate->chal_id, 1);
 	    MD5Update(&mdContext, secret, secret_len);
 	    MD5Update(&mdContext, cstate->challenge, cstate->chal_len);
-	    MD5Final(&mdContext); 
+	    MD5Final(&mdContext);
 
 	    /* compare local and remote MDs and send the appropriate status */
 	    if (bcmp (mdContext.digest, remmd, MD5_SIGNATURE_SIZE) == 0)
@@ -583,7 +583,7 @@ ChapReceiveFailure(cstate, inp, id, len)
 {
     u_char msglen;
     u_char *msg;
-  
+
     CHAPDEBUG((LOG_INFO, "ChapReceiveFailure: Rcvd id %d.", id));
 
     if (cstate->clientstate != CHAPCS_RESPONSE) {
@@ -635,7 +635,7 @@ ChapSendChallenge(cstate)
     BCOPY(cstate->chal_name, outp, name_len);	/* append hostname */
 
     output(cstate->unit, outpacket_buf, outlen + DLLHEADERLEN);
-  
+
     CHAPDEBUG((LOG_INFO, "ChapSendChallenge: Sent id %d.", cstate->chal_id));
 
     TIMEOUT(ChapChallengeTimeout, (caddr_t) cstate, cstate->timeouttime);
@@ -665,13 +665,13 @@ ChapSendStatus(cstate, code)
     outp = outpacket_buf;
 
     MAKEHEADER(outp, CHAP);	/* paste in a header */
-  
+
     PUTCHAR(code, outp);
     PUTCHAR(cstate->chal_id, outp);
     PUTSHORT(outlen, outp);
     BCOPY(msg, outp, msglen);
     output(cstate->unit, outpacket_buf, outlen + DLLHEADERLEN);
-  
+
     CHAPDEBUG((LOG_INFO, "ChapSendStatus: Sent code %d, id %d.", code,
 	       cstate->chal_id));
 }
@@ -691,8 +691,8 @@ ChapGenChallenge(cstate)
     u_char *ptr = cstate->challenge;
     unsigned int i;
 
-    /* pick a random challenge length between MIN_CHALLENGE_LENGTH and 
-       MAX_CHALLENGE_LENGTH */  
+    /* pick a random challenge length between MIN_CHALLENGE_LENGTH and
+       MAX_CHALLENGE_LENGTH */
     chal_len =  (unsigned) ((drand48() *
 			     (MAX_CHALLENGE_LENGTH - MIN_CHALLENGE_LENGTH)) +
 			    MIN_CHALLENGE_LENGTH);
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index 902ad64cbbc2..4e05873a24d5 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: fsm.c,v 1.3 1994/05/24 11:21:10 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.2 1994/09/25 02:31:57 wollman Exp $";
 #endif
 
 /*
@@ -330,28 +330,28 @@ fsm_input(f, inpacket, l)
     case CONFREQ:
 	fsm_rconfreq(f, id, inp, len);
 	break;
-    
+
     case CONFACK:
 	fsm_rconfack(f, id, inp, len);
 	break;
-    
+
     case CONFNAK:
     case CONFREJ:
 	fsm_rconfnakrej(f, code, id, inp, len);
 	break;
-    
+
     case TERMREQ:
 	fsm_rtermreq(f, id);
 	break;
-    
+
     case TERMACK:
 	fsm_rtermack(f);
 	break;
-    
+
     case CODEREJ:
 	fsm_rcoderej(f, inp, len);
 	break;
-    
+
     default:
 	if( !f->callbacks->extcode
 	   || !(*f->callbacks->extcode)(f, code, id, inp, len) )
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 6c9abb15f2be..2508cdc73517 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.8 1994/05/26 06:37:34 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.2 1994/09/25 02:31:59 wollman Exp $";
 #endif
 
 /*
@@ -734,7 +734,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
      * Reset all his options.
      */
     BZERO(ho, sizeof(*ho));
-    
+
     /*
      * Process all his options.
      */
@@ -837,11 +837,11 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
 		    PUTLONG(tl, p);
 		}
 	    }
-	
+
 	    ho->neg_addr = 1;
 	    ho->hisaddr = ciaddr1;
 	    break;
-	
+
 	case CI_COMPRESSTYPE:
 	    IPCPDEBUG((LOG_INFO, "ipcp: received COMPRESSTYPE "));
 	    if (!ao->neg_vj ||
@@ -862,7 +862,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
 	    ho->vj_protocol = cishort;
 	    if (cilen == CILEN_VJ) {
 		GETCHAR(maxslotindex, p);
-		if (maxslotindex > ao->maxslotindex) { 
+		if (maxslotindex > ao->maxslotindex) {
 		    orc = CONFNAK;
 		    if (!reject_if_disagree){
 			DECPTR(1, p);
@@ -1019,7 +1019,7 @@ ipcp_up(f)
     }
 
     /* assign a default route through the interface if required */
-    if (ipcp_wantoptions[f->unit].default_route) 
+    if (ipcp_wantoptions[f->unit].default_route)
 	if (sifdefaultroute(f->unit, ho->hisaddr))
 	    go->default_route = 1;
 
@@ -1055,7 +1055,7 @@ ipcp_down(f)
     hisaddr = ipcp_hisoptions[f->unit].hisaddr;
     if (ipcp_gotoptions[f->unit].proxy_arp)
 	cifproxyarp(f->unit, hisaddr);
-    if (ipcp_gotoptions[f->unit].default_route) 
+    if (ipcp_gotoptions[f->unit].default_route)
 	cifdefaultroute(f->unit, hisaddr);
     sifdown(f->unit);
     cifaddr(f->unit, ouraddr, hisaddr);
diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h
index 2d1988d5e0f4..393c9af90258 100644
--- a/usr.sbin/pppd/ipcp.h
+++ b/usr.sbin/pppd/ipcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.h,v 1.3 1994/04/18 04:05:15 paulus Exp $
+ * $Id: ipcp.h,v 1.2 1994/09/25 02:32:00 wollman Exp $
  */
 
 /*
@@ -35,7 +35,7 @@
 
 #define IPCP_VJ_COMP 0x002d	/* current value for VJ compression option*/
 #define IPCP_VJ_COMP_OLD 0x0037	/* "old" (i.e, broken) value for VJ */
-				/* compression option*/ 
+				/* compression option*/
 
 typedef struct ipcp_options {
     int neg_addr : 1;		/* Negotiate IP Address? */
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index 25815187e9a6..c64296120d22 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: lcp.c,v 1.8 1994/05/30 02:38:49 paulus Exp $";
+static char rcsid[] = "$Id: lcp.c,v 1.2 1994/09/25 02:32:01 wollman Exp $";
 #endif
 
 /*
@@ -275,7 +275,7 @@ lcp_extcode(f, code, id, inp, len)
     case PROTREJ:
 	lcp_rprotrej(f, inp, len);
 	break;
-    
+
     case ECHOREQ:
 	if (f->state != OPENED)
 	    break;
@@ -286,7 +286,7 @@ lcp_extcode(f, code, id, inp, len)
 	    len = CILEN_LONG;
 	fsm_sdata(f, ECHOREP, id, inp, len);
 	break;
-    
+
     case ECHOREP:
 	lcp_received_echo_reply(f, id, inp, len);
 	break;
@@ -300,7 +300,7 @@ lcp_extcode(f, code, id, inp, len)
     return 1;
 }
 
-    
+
 /*
  * lcp_rprotrej - Receive an Protocol-Reject.
  *
@@ -1601,7 +1601,7 @@ LcpSendEchoRequest (f)
 	            : 0L;
 	pktp = pkt;
 	PUTLONG(lcp_magic, pktp);
-      
+
         fsm_sdata(f, ECHOREQ,
 		  lcp_echo_number++ & 0xFF, pkt, pktp - pkt);
     }
@@ -1621,7 +1621,7 @@ lcp_echo_lowerup (unit)
     lcp_echos_pending      = 0;
     lcp_echo_number        = 0;
     lcp_echo_timer_running = 0;
-  
+
     /* If a timeout interval is specified then start the timer */
     if (lcp_echo_interval != 0)
         LcpEchoCheck (f);
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index 707773fc96d2..946e4d1d26b2 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.2 1994/09/25 02:32:07 wollman Exp $";
+static char rcsid[] = "$Id: main.c,v 1.3 1995/04/29 13:55:34 ache Exp $";
 #endif
 
 #define SETSID
@@ -205,7 +205,7 @@ main(argc, argv)
     p = ttyname(0);
     if (p)
 	strcpy(devname, p);
-  
+
     if (gethostname(hostname, MAXNAMELEN) < 0 ) {
 	perror("couldn't get hostname");
 	die(1);
@@ -228,7 +228,7 @@ main(argc, argv)
      */
     for (i = 0; i < N_PROTO; i++)
 	(*prottbl[i].init)(0);
-  
+
     progname = *argv;
 
     if (!options_from_file(_PATH_SYSOPTIONS, REQ_SYSOPTIONS, 0) ||
@@ -322,7 +322,7 @@ main(argc, argv)
 	syslog(LOG_ERR, "socket : %m");
 	die(1);
     }
-  
+
     /*
      * Compute mask of all interesting signals and install signal handlers
      * for each.  Only one signal handler may be active at a time.  Therefore,
@@ -411,7 +411,7 @@ main(argc, argv)
 	syslog(LOG_INFO, "Connected...");
 	sleep(1);		/* give it time to set up its terminal */
     }
-  
+
     /* set line speed, flow control, etc.; clear CLOCAL if modem option */
     set_up_tty(fd, 0);
 
@@ -473,7 +473,7 @@ main(argc, argv)
 	syslog(LOG_ERR, "fcntl(F_SETFL, FNDELAY | FASYNC): %m");
 	die(1);
     }
-  
+
     /*
      * Block all signals, start opening the connection, and  wait for
      * incoming signals (reply, timeout, etc.).
@@ -732,7 +732,7 @@ int fd, on;
 /*
  * quit - Clean up state and exit.
  */
-void 
+void
 quit()
 {
     die(0);
@@ -784,7 +784,7 @@ cleanup(status, arg)
 	fd = -1;
     }
 
-    if (pidfilename[0] != 0 && unlink(pidfilename) < 0) 
+    if (pidfilename[0] != 0 && unlink(pidfilename) < 0)
 	syslog(LOG_WARNING, "unable to unlink pid file: %m");
     pidfilename[0] = 0;
 
@@ -810,10 +810,10 @@ timeout(func, arg, time)
 {
     struct itimerval itv;
     struct callout *newp, **oldpp;
-  
+
     MAINDEBUG((LOG_DEBUG, "Timeout %x:%x in %d seconds.",
 	       (int) func, (int) arg, time));
-  
+
     /*
      * Allocate timeout.
      */
@@ -823,7 +823,7 @@ timeout(func, arg, time)
     }
     newp->c_arg = arg;
     newp->c_func = func;
-  
+
     /*
      * Find correct place to link it in and decrement its time by the
      * amount of time used by preceding timeouts.
@@ -837,7 +837,7 @@ timeout(func, arg, time)
     if (*oldpp)
 	(*oldpp)->c_time -= time;
     *oldpp = newp;
-  
+
     /*
      * If this is now the first callout then we have to set a new
      * itimer.
@@ -871,9 +871,9 @@ untimeout(func, arg)
     struct itimerval itv;
     struct callout **copp, *freep;
     int reschedule = 0;
-  
+
     MAINDEBUG((LOG_DEBUG, "Untimeout %x:%x.", (int) func, (int) arg));
-  
+
     /*
      * If the first callout is unscheduled then we have to set a new
      * itimer.
@@ -882,7 +882,7 @@ untimeout(func, arg)
 	callout->c_func == func &&
 	callout->c_arg == arg)
 	reschedule = 1;
-  
+
     /*
      * Find first matching timeout.  Add its time to the next timeouts
      * time.
@@ -897,7 +897,7 @@ untimeout(func, arg)
 	    (void) free((char *) freep);
 	    break;
 	}
-  
+
     if (reschedule) {
 	itv.it_interval.tv_sec = itv.it_interval.tv_usec =
 	    itv.it_value.tv_usec = 0;
@@ -925,7 +925,7 @@ adjtimeout()
 {
     struct timeval tv;
     int timediff;
-  
+
     if (callout == NULL)
 	return;
     /*
@@ -941,7 +941,7 @@ adjtimeout()
     if (timediff < 0 ||
 	timediff > callout->c_time + 1)
 	return;
-  
+
     callout->c_time -= timediff;	/* OK, Adjust time */
 }
 
@@ -1052,7 +1052,7 @@ alrm(sig)
 	list = list->c_next;
 	(void) free((char *) freep);
     }
-  
+
 }
 
 
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 14dc3c2c2612..b0ec67cea4ac 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: options.c,v 1.2 1994/09/25 02:32:08 wollman Exp $";
+static char rcsid[] = "$Id: options.c,v 1.3 1995/05/24 01:56:52 davidg Exp $";
 #endif
 
 #include <stdio.h>
@@ -940,7 +940,7 @@ setconnector(argv)
     connector = strdup(*argv);
     if (connector == NULL)
 	novm("connector string");
-  
+
     return (1);
 }
 
@@ -954,13 +954,13 @@ setdisconnector(argv)
     disconnector = strdup(*argv);
     if (disconnector == NULL)
 	novm("disconnector string");
-  
+
     return (1);
 }
 
 
 /*
- * setdomain - Set domain name to append to hostname 
+ * setdomain - Set domain name to append to hostname
  */
 static int
 setdomain(argv)
@@ -1048,7 +1048,7 @@ setdevname(cp)
     struct stat statbuf;
     char *tty, *ttyname();
     char dev[MAXPATHLEN];
-  
+
     if (strncmp("/dev/", cp, 5) != 0) {
 	strcpy(dev, "/dev/");
 	strncat(dev, cp, MAXPATHLEN - 5);
@@ -1065,11 +1065,11 @@ setdevname(cp)
 	syslog(LOG_ERR, cp);
 	return -1;
     }
-  
+
     (void) strncpy(devname, cp, MAXPATHLEN);
     devname[MAXPATHLEN-1] = 0;
     default_device = FALSE;
-  
+
     return 1;
 }
 
@@ -1085,13 +1085,13 @@ setipaddr(arg)
     char *colon, *index();
     u_long local, remote;
     ipcp_options *wo = &ipcp_wantoptions[0];
-  
+
     /*
      * IP address pair separated by ":".
      */
     if ((colon = index(arg, ':')) == NULL)
 	return 0;
-  
+
     /*
      * If colon first character, then no local addr.
      */
@@ -1117,7 +1117,7 @@ setipaddr(arg)
 	    wo->ouraddr = local;
 	*colon = ':';
     }
-  
+
     /*
      * If colon last character, then no remote addr.
      */
@@ -1229,7 +1229,7 @@ setnetmask(argv)
 
 /*
  * Return user specified netmask. A value of zero means no netmask has
- * been set. 
+ * been set.
  */
 /* ARGSUSED */
 u_long
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index e38687d7ac17..ddacee541347 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pppd.h,v 1.3 1994/05/26 06:43:42 paulus Exp $
+ * $Id: pppd.h,v 1.2 1994/09/25 02:32:13 wollman Exp $
  */
 
 /*
@@ -154,7 +154,7 @@ u_long GetMask __ARGS((u_long)); /* get netmask for address */
 #ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
 #if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUG) \
   || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-  || defined(DEBUGCHAP) 
+  || defined(DEBUGCHAP)
 #define LOG_PPP LOG_LOCAL2
 #else
 #define LOG_PPP LOG_DAEMON
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 65c0b7716faf..647315167383 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-bsd.c,v 1.7 1994/05/30 06:10:07 paulus Exp $";
+static char rcsid[] = "$Id: sys-bsd.c,v 1.2 1994/09/25 02:32:15 wollman Exp $";
 #endif
 
 /*
@@ -71,7 +71,7 @@ establish_ppp()
     /*
      * Find out which interface we were given.
      */
-    if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) {	
+    if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) {
 	syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m");
 	die(1);
     }
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 61d22acbf286..14b2e767b10e 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: upap.c,v 1.2 1994/04/11 07:13:44 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.2 1994/09/25 02:32:16 wollman Exp $";
 #endif
 
 /*
@@ -434,7 +434,7 @@ upap_sauthreq(u)
     outlen = UPAP_HEADERLEN + 2 * sizeof (u_char) +
 	u->us_userlen + u->us_passwdlen;
     outp = outpacket_buf;
-    
+
     MAKEHEADER(outp, UPAP);
 
     PUTCHAR(UPAP_AUTHREQ, outp);
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index 1a1e7ebec3d9..454c4dd18753 100644
--- a/usr.sbin/pppstats/pppstats.c
+++ b/usr.sbin/pppstats/pppstats.c
@@ -1,6 +1,6 @@
 /*
  * print PPP statistics:
- * 	pppstats [-i interval] [-v] [interface] [system] [core] 
+ * 	pppstats [-i interval] [-v] [interface] [system] [core]
  *
  *	Brad Parker (brad@cayman.com) 6/92
  *
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: pppstats.c,v 1.2 1994/11/12 19:33:41 lars Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.3 1994/11/19 13:57:06 jkh Exp $";
 #endif
 
 #include <ctype.h>
@@ -112,7 +112,7 @@ struct nlist nl[] = {
 char	*system = "/vmunix";
 #else
 #include <paths.h>
-#if defined(__FreeBSD__) 
+#if defined(__FreeBSD__)
 	/* _PATH_UNIX is defined as "Do not use _PATH_UNIX" */
 char	*system = NULL;
 #else
@@ -206,7 +206,7 @@ main(argc, argv)
 	}
 #endif
 #else
-#if defined(sun) 
+#if defined(sun)
 	/* SunOS */
 	if ((kd = kvm_open(system, kmemf, (char *)0, O_RDONLY, NULL)) == NULL) {
 	    perror("kvm_open");
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index af0b4b30ce4c..736c96dd7018 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -365,7 +365,7 @@ vnode_print(avnode, vp)
 	struct vnode *avnode;
 	struct vnode *vp;
 {
-	char *type, flags[16]; 
+	char *type, flags[16];
 	char *fp = flags;
 	register int flag;
 
@@ -391,7 +391,7 @@ vnode_print(avnode, vp)
 		type = "fif"; break;
 	case VBAD:
 		type = "bad"; break;
-	default: 
+	default:
 		type = "unk"; break;
 	}
 	/*
@@ -420,13 +420,13 @@ vnode_print(avnode, vp)
 }
 
 void
-ufs_header() 
+ufs_header()
 {
 	(void)printf(" FILEID IFLAG RDEV|SZ");
 }
 
 int
-ufs_print(vp) 
+ufs_print(vp)
 	struct vnode *vp;
 {
 	register int flag;
@@ -465,7 +465,7 @@ ufs_print(vp)
 	type = ip->i_mode & S_IFMT;
 	if (S_ISCHR(ip->i_mode) || S_ISBLK(ip->i_mode))
 		if (usenumflag || ((name = devname(ip->i_rdev, type)) == NULL))
-			(void)printf("   %2d,%-2d", 
+			(void)printf("   %2d,%-2d",
 			    major(ip->i_rdev), minor(ip->i_rdev));
 		else
 			(void)printf(" %7s", name);
@@ -475,13 +475,13 @@ ufs_print(vp)
 }
 
 void
-nfs_header() 
+nfs_header()
 {
 	(void)printf(" FILEID NFLAG RDEV|SZ");
 }
 
 int
-nfs_print(vp) 
+nfs_print(vp)
 	struct vnode *vp;
 {
 	struct nfsnode nfsnode, *np = &nfsnode;
@@ -515,7 +515,7 @@ nfs_print(vp)
 	type = VT.va_mode & S_IFMT;
 	if (S_ISCHR(VT.va_mode) || S_ISBLK(VT.va_mode))
 		if (usenumflag || ((name = devname(VT.va_rdev, type)) == NULL))
-			(void)printf("   %2d,%-2d", 
+			(void)printf("   %2d,%-2d",
 			    major(VT.va_rdev), minor(VT.va_rdev));
 		else
 			(void)printf(" %7s", name);
@@ -523,7 +523,7 @@ nfs_print(vp)
 		(void)printf(" %7qd", np->n_size);
 	return (0);
 }
-	
+
 /*
  * Given a pointer to a mount structure in kernel space,
  * read it in and return a usable pointer to it.
@@ -740,7 +740,7 @@ kinfo_vnodes(avnodes)
 	*avnodes = num;
 	return ((struct e_vnode *)vbuf);
 }
-	
+
 char hdr[]="  LINE RAW CAN OUT  HWT LWT     COL STATE  SESS  PGID DISC\n";
 int ttyspace = 128;
 
@@ -760,7 +760,7 @@ ttymode()
 	}
 #endif
 #ifdef vax
-	if (nl[SNQD].n_type != 0) 
+	if (nl[SNQD].n_type != 0)
 		qdss();
 	if (nl[SNDZ].n_type != 0)
 		ttytype(tty, "dz", SDZ, SNDZ);
@@ -867,11 +867,11 @@ ttyprt(tp, line)
 
 	if (usenumflag || tp->t_dev == 0 ||
 	   (name = devname(tp->t_dev, S_IFCHR)) == NULL)
-		(void)printf("%7d ", line); 
+		(void)printf("%7d ", line);
 	else
 		(void)printf("%7s ", name);
 	(void)printf("%2d %3d ", tp->t_rawq.c_cc, tp->t_canq.c_cc);
-	(void)printf("%3d %4d %3d %7d ", tp->t_outq.c_cc, 
+	(void)printf("%3d %4d %3d %7d ", tp->t_outq.c_cc,
 		tp->t_hiwat, tp->t_lowat, tp->t_column);
 	for (i = j = 0; ttystates[i].flag; i++)
 		if (tp->t_state&ttystates[i].flag)
@@ -931,7 +931,7 @@ filemode()
 	addr = *((struct file **)buf);
 	fp = (struct file *)(buf + sizeof(struct file *));
 	nfile = (len - sizeof(struct file *)) / sizeof(struct file);
-	
+
 	(void)printf("%d/%d open files\n", nfile, maxfile);
 	(void)printf("   LOC   TYPE    FLG     CNT  MSG    DATA    OFFSET\n");
 	for (; (char *)fp < buf + len; addr = fp->f_filef, fp++) {
@@ -1076,7 +1076,7 @@ swapmode()
 		 * Don't report statistics for partitions which have not
 		 * yet been activated via swapon(8).
 		 */
-		if (!(sw[i].sw_flags & SW_FREED)) 
+		if (!(sw[i].sw_flags & SW_FREED))
 			continue;
 
 		if (!totalflag)
@@ -1084,7 +1084,7 @@ swapmode()
 			    devname(sw[i].sw_dev, S_IFBLK),
 			    hlen, sw[i].sw_nblks / div);
 
-		/* The first dmmax is never allocated to avoid trashing of 
+		/* The first dmmax is never allocated to avoid trashing of
 		 * disklabels
 		 */
 		xsize = sw[i].sw_nblks - dmmax;
@@ -1094,14 +1094,14 @@ swapmode()
 		avail += xsize;
 		if (totalflag)
 			continue;
-		(void)printf("%8d %8d %5.0f%%    %s\n", 
+		(void)printf("%8d %8d %5.0f%%    %s\n",
 		    used / div, xfree / div,
 		    (double)used / (double)xsize * 100.0,
 		    (sw[i].sw_flags & SW_SEQUENTIAL) ?
 			     "Sequential" : "Interleaved");
 	}
 
-	/* 
+	/*
 	 * If only one partition has been set up via swapon(8), we don't
 	 * need to bother with totals.
 	 */
diff --git a/usr.sbin/pwd_mkdb/pw_scan.c b/usr.sbin/pwd_mkdb/pw_scan.c
index 602006e4c4dd..9d280f7ded8b 100644
--- a/usr.sbin/pwd_mkdb/pw_scan.c
+++ b/usr.sbin/pwd_mkdb/pw_scan.c
@@ -129,7 +129,7 @@ pw_scan(bp, pw)
 				break;
 			}
 			if (!strcmp(p, sh))
-				break;	
+				break;
 		}
 	if(p[0]) pw->pw_fields |= _PWF_SHELL;
 
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 2369008ebef1..bbee5fa3bf60 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -391,7 +391,7 @@ main(argc, argv)
 	if (makeold) {
 		(void)snprintf(buf2, sizeof(buf2), "%s/%s", prefix, _PASSWD);
 		(void)snprintf(buf, sizeof(buf), "%s.orig", pname);
-		mv(buf, buf2); 
+		mv(buf, buf2);
 	}
 	/*
 	 * Move the master password LAST -- chpass(1), passwd(1) and vipw(8)
@@ -400,7 +400,7 @@ main(argc, argv)
 	 * can no longer be accessed.
 	 */
 	(void)snprintf(buf, sizeof(buf), "%s/%s", prefix, _MASTERPASSWD);
-	mv(pname, buf); 
+	mv(pname, buf);
 	exit(0);
 }
 
diff --git a/usr.sbin/rarpd/arptab.c b/usr.sbin/rarpd/arptab.c
index f1f5cfccffaa..7757814f2690 100644
--- a/usr.sbin/rarpd/arptab.c
+++ b/usr.sbin/rarpd/arptab.c
@@ -95,7 +95,7 @@ struct	{
 }	m_rtmsg;
 
 /*
- * Set an individual arp entry 
+ * Set an individual arp entry
  */
 arptab_set(eaddr, host)
 	u_char *eaddr;
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 6c81f1808a43..a884f1cde22a 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -26,16 +26,16 @@ char copyright[] =
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Header: /a/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.2 1995/03/03 22:20:13 wpaul Exp $ (LBL)";
+    "@(#) $Header: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.3 1995/04/02 01:35:54 wpaul Exp $ (LBL)";
 #endif
 
 
-/* 
+/*
  * rarpd - Reverse ARP Daemon
  *
  * Usage:	rarpd -a [ -f ] [ hostname ]
  *		rarpd [ -f ] interface [ hostname ]
- * 
+ *
  * 'hostname' is optional solely for backwards compatibility with Sun's rarpd.
  * Currently, the argument is ignored.
  */
@@ -88,7 +88,7 @@ extern int errno;
 extern int ether_ntohost __P((char *, struct ether_addr *));
 
 /*
- * The structure for each interface.  
+ * The structure for each interface.
  */
 struct if_info {
 	int 	ii_fd;		/* BPF file descriptor */
@@ -135,7 +135,7 @@ main(argc, argv)
 	if (*name == '-')
 		++name;
 
-	/* 
+	/*
 	 * All error reporting is done through syslogs.
 	 */
 	openlog(name, LOG_PID, LOG_DAEMON);
@@ -165,7 +165,7 @@ main(argc, argv)
 		init_all();
 	else
 		init_one(ifname);
-		
+
 	if (!fflag) {
 		pid = fork();
 		if (pid > 0)
@@ -258,7 +258,7 @@ bpf_open()
 	char device[sizeof "/dev/bpf000"];
 
 	/*
-	 * Go through all the minors and find one that isn't in use. 
+	 * Go through all the minors and find one that isn't in use.
 	 */
 	do {
 		(void)sprintf(device, "/dev/bpf%d", n++);
@@ -294,13 +294,13 @@ rarp_open(device)
                 BPF_STMT(BPF_RET+BPF_K, 0),
         };
 
-        static struct bpf_program filter = { 
-                sizeof insns / sizeof(insns[0]), 
+        static struct bpf_program filter = {
+                sizeof insns / sizeof(insns[0]),
                 (struct bpf_insn *)&insns
         };
 
 	fd = bpf_open();
-	/* 
+	/*
 	 * Set immediate mode so packets are processed as they arrive.
 	 */
 	immediate = 1;
@@ -380,7 +380,7 @@ rarp_check(p, len)
 #endif
 
 /*
- * Loop indefinitely listening for RARP requests on the 
+ * Loop indefinitely listening for RARP requests on the
  * interfaces in 'iflist'.
  */
 void
@@ -415,7 +415,7 @@ rarp_loop()
 	}
 	while (1) {
 		listeners = fds;
-		if (select(maxfd + 1, &listeners, (struct fd_set *)0, 
+		if (select(maxfd + 1, &listeners, (struct fd_set *)0,
 			   (struct fd_set *)0, (struct timeval *)0) < 0) {
 			syslog(LOG_ERR, "select: %m");
 			exit(1);
@@ -426,8 +426,8 @@ rarp_loop()
 			again:
 				cc = read(fd, (char *)bhp, bufsize);
 				/*
-				 * Due to a SunOS bug, after 2^31 bytes, the 
-				 * file offset overflows and read fails with 
+				 * Due to a SunOS bug, after 2^31 bytes, the
+				 * file offset overflows and read fails with
 				 * EINVAL.  The lseek() to 0 will fix things.
 				 */
 				if (cc < 0) {
@@ -538,7 +538,7 @@ rarp_process(ii, pkt)
 
 	ep = (struct ether_header *)pkt;
 	/*
-	 * If the address in the one element cache, don't bother 
+	 * If the address in the one element cache, don't bother
 	 * looking up names.
 	 */
 	if (bcmp((char *)cache_eaddr, (char *)&ep->ether_shost, 6) == 0)
@@ -554,11 +554,11 @@ rarp_process(ii, pkt)
 			syslog(LOG_ERR, "cannot handle non IP addresses");
 			exit(1);
 		}
-		target_ipaddr = choose_ipaddr((u_long **)hp->h_addr_list, 
+		target_ipaddr = choose_ipaddr((u_long **)hp->h_addr_list,
 					      ii->ii_ipaddr & ii->ii_netmask,
 					      ii->ii_netmask);
 		if (target_ipaddr == 0) {
-			syslog(LOG_ERR, "cannot find %s on %08x", 
+			syslog(LOG_ERR, "cannot find %s on %08x",
 			       ename, ii->ii_ipaddr & ii->ii_netmask);
 			return;
 		}
@@ -660,7 +660,7 @@ update_arptab(ep, ipaddr)
 
 /*
  * Build a reverse ARP packet and sent it out on the interface.
- * 'ep' points to a valid ARPOP_REVREQUEST.  The ARPOP_REVREPLY is built 
+ * 'ep' points to a valid ARPOP_REVREQUEST.  The ARPOP_REVREPLY is built
  * on top of the request, then written to the network.
  *
  * RFC 903 defines the ether_arp fields as follows.  The following comments
@@ -684,11 +684,11 @@ update_arptab(ep, ipaddr)
  * arp_tha is the hardware address of the target, and should be the same as
  *   that which was given in the request.
  * arp_tpa is the protocol address of the target, that is, the desired address.
- * 
+ *
  * Note that the requirement that arp_spa be filled in with the responder's
- * protocol is purely for convenience.  For instance, if a system were to use 
- * both ARP and RARP, then the inclusion of the valid protocol-hardware 
- * address pair (arp_spa, arp_sha) may eliminate the need for a subsequent 
+ * protocol is purely for convenience.  For instance, if a system were to use
+ * both ARP and RARP, then the inclusion of the valid protocol-hardware
+ * address pair (arp_spa, arp_sha) may eliminate the need for a subsequent
  * ARP request.
  */
 rarp_reply(ii, ep, ipaddr)
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 2904a6033234..ca897a704989 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -214,8 +214,8 @@ repquota(fs, type, qfpathname)
 			continue;
 		printf("%-10s", fup->fu_name);
 		printf("%c%c%8lu%8lu%8lu%7s",
-			fup->fu_dqblk.dqb_bsoftlimit && 
-			    fup->fu_dqblk.dqb_curblocks >= 
+			fup->fu_dqblk.dqb_bsoftlimit &&
+			    fup->fu_dqblk.dqb_curblocks >=
 			    fup->fu_dqblk.dqb_bsoftlimit ? '+' : '-',
 			fup->fu_dqblk.dqb_isoftlimit &&
 			    fup->fu_dqblk.dqb_curinodes >=
@@ -223,8 +223,8 @@ repquota(fs, type, qfpathname)
 			(u_long)(dbtob(fup->fu_dqblk.dqb_curblocks) / 1024),
 			(u_long)(dbtob(fup->fu_dqblk.dqb_bsoftlimit) / 1024),
 			(u_long)(dbtob(fup->fu_dqblk.dqb_bhardlimit) / 1024),
-			fup->fu_dqblk.dqb_bsoftlimit && 
-			    fup->fu_dqblk.dqb_curblocks >= 
+			fup->fu_dqblk.dqb_bsoftlimit &&
+			    fup->fu_dqblk.dqb_curblocks >=
 			    fup->fu_dqblk.dqb_bsoftlimit ?
 			    timeprt(fup->fu_dqblk.dqb_btime) : "");
 		printf("  %6lu%6lu%6lu%7s\n",
diff --git a/usr.sbin/routed/af.c b/usr.sbin/routed/af.c
index 05bf8fab805e..b78f771135d5 100644
--- a/usr.sbin/routed/af.c
+++ b/usr.sbin/routed/af.c
@@ -95,7 +95,7 @@ inet_netmatch(sin1, sin2)
 inet_portmatch(sin)
 	register struct sockaddr_in *sin;
 {
-	
+
 	return (sin->sin_port == sp->s_port);
 }
 
diff --git a/usr.sbin/routed/if.c b/usr.sbin/routed/if.c
index 54e8705c7699..77a4674702cc 100644
--- a/usr.sbin/routed/if.c
+++ b/usr.sbin/routed/if.c
@@ -86,7 +86,7 @@ if_ifwithdstaddr(addr)
 }
 
 /*
- * Find the interface on the network 
+ * Find the interface on the network
  * of the specified address.
  */
 struct interface *
diff --git a/usr.sbin/routed/input.c b/usr.sbin/routed/input.c
index fb0ee798bebd..5a70e1a6b158 100644
--- a/usr.sbin/routed/input.c
+++ b/usr.sbin/routed/input.c
@@ -94,7 +94,7 @@ rip_input(from, rip, size)
 			    n->rip_dst.sa_len = sizeof(n->rip_dst);
 #endif
 			n->rip_metric = ntohl(n->rip_metric);
-			/* 
+			/*
 			 * A single entry with sa_family == AF_UNSPEC and
 			 * metric ``infinity'' means ``all routes''.
 			 * We respond to routers only if we are acting
@@ -164,7 +164,7 @@ rip_input(from, rip, size)
 			}
 			rt = rtfind(from);
 			if (rt == 0 || ((rt->rt_state & RTS_INTERFACE) == 0) &&
-			    rt->rt_metric >= ifp->int_metric) 
+			    rt->rt_metric >= ifp->int_metric)
 				addrouteforif(ifp);
 			else
 				rt->rt_timer = 0;
diff --git a/usr.sbin/routed/main.c b/usr.sbin/routed/main.c
index 187aca115544..d073a0ab5cc8 100644
--- a/usr.sbin/routed/main.c
+++ b/usr.sbin/routed/main.c
@@ -74,7 +74,7 @@ main(argc, argv)
 	register struct rip *query = msg;
 	fd_set ibits;
 	u_char retry;
-	
+
 	argv0 = argv;
 #if BSD >= 43
 	openlog("routed", LOG_PID | LOG_ODELAY, LOG_DAEMON);
diff --git a/usr.sbin/routed/query/query.c b/usr.sbin/routed/query/query.c
index a80038815544..93eaee4f47e9 100644
--- a/usr.sbin/routed/query/query.c
+++ b/usr.sbin/routed/query/query.c
@@ -262,7 +262,7 @@ rip_input(from, size)
 		    n->rip_metric);
 		break;
 		}
-			
+
 	    }
 	    size -= sizeof (struct netinfo), n++;
 	}
diff --git a/usr.sbin/routed/startup.c b/usr.sbin/routed/startup.c
index e87d9e9b71c7..fc4195ced5a1 100644
--- a/usr.sbin/routed/startup.c
+++ b/usr.sbin/routed/startup.c
@@ -302,7 +302,7 @@ addrouteforif(ifp)
 			rtadd(dst, &ifp->int_addr, ifp->int_metric,
 			    ((ifp->int_flags & (IFF_INTERFACE|IFF_REMOTE)) |
 			    RTS_PASSIVE | RTS_INTERNAL | RTS_SUBNET));
-		else if ((rt->rt_state & (RTS_INTERNAL|RTS_SUBNET)) == 
+		else if ((rt->rt_state & (RTS_INTERNAL|RTS_SUBNET)) ==
 		    (RTS_INTERNAL|RTS_SUBNET) &&
 		    ifp->int_metric < rt->rt_metric)
 			rtchange(rt, &rt->rt_router, ifp->int_metric);
diff --git a/usr.sbin/routed/tables.c b/usr.sbin/routed/tables.c
index ac837f80dffb..baa9c3943895 100644
--- a/usr.sbin/routed/tables.c
+++ b/usr.sbin/routed/tables.c
@@ -418,7 +418,7 @@ rtioctl(action, ort)
 			len++;
 			w.w_netmask.sin_len = len;
 			len = 1 + ((len - 1) | (sizeof(long) - 1));
-		} else 
+		} else
 			len = sizeof(long);
 		rtm.rtm_msglen -= (sizeof(w.w_netmask) - len);
 	}
diff --git a/usr.sbin/routed/trace/trace.c b/usr.sbin/routed/trace/trace.c
index 38c630cfe953..84fcc43d1098 100644
--- a/usr.sbin/routed/trace/trace.c
+++ b/usr.sbin/routed/trace/trace.c
@@ -65,7 +65,7 @@ main(argc, argv)
 	register struct rip *msg = (struct rip *)packet;
 	struct hostent *hp;
 	struct servent *sp;
-	
+
 	if (argc < 3) {
 usage:
 		printf("usage: trace cmd machines,\n");
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index dac27240c4f5..2f1e95a20765 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -29,11 +29,11 @@
  */
 
 #ifndef LINT
-static char copright[] = 
+static char copright[] =
 "@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
  All rights reserved.\n";
 
-static char rcsid[] = "$Id: main.c,v 1.1 1994/03/24 18:41:51 cgd Exp $";
+static char rcsid[] = "$Id: main.c,v 1.1.1.1 1994/09/26 21:22:56 davidg Exp $";
 #endif
 
 /*
@@ -167,7 +167,7 @@ main(argc, argv)
 				break;
 			case '?':
 	                default:
-				(void)fprintf(stderr,   
+				(void)fprintf(stderr,
 				    "usage: sa [-abcdDfijkKlmnqrstu] [-v cutoff] [file ...]\n");
 				exit(1);
 		}
@@ -221,7 +221,7 @@ main(argc, argv)
 				unmask = 0;
 				error = 1;
 			}
-			if (unmask && 
+			if (unmask &&
 			    (sigprocmask(SIG_BLOCK, &nmask, &omask) == -1)) {
 				warn("couldn't set signal mask ");
 				unmask = 0;
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index 083f9daa87da..1ccbe90ef43a 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: pdb.c,v 1.1 1994/03/24 18:41:54 cgd Exp $";
+static char rcsid[] = "$Id: pdb.c,v 1.1.1.1 1994/09/26 21:22:56 davidg Exp $";
 #endif
 
 #include <sys/types.h>
@@ -136,10 +136,10 @@ pacct_add(ci)
 		bzero(&newci, sizeof newci);
 		bcopy(key.data, newci.ci_comm, key.size);
 	}
-	
+
 	add_ci(ci, &newci);
 
-	data.data = &newci; 
+	data.data = &newci;
 	data.size = sizeof newci;
 	rv = DB_PUT(pacct_db, &key, &data, 0);
 	if (rv < 0) {
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index af7d0fdbad40..4d383b76e193 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: usrdb.c,v 1.1 1994/03/24 18:42:01 cgd Exp $";
+static char rcsid[] = "$Id: usrdb.c,v 1.1.1.1 1994/09/26 21:22:57 davidg Exp $";
 #endif
 
 #include <sys/types.h>
@@ -84,7 +84,7 @@ usracct_init()
 				warn("initializing user accounting stats");
 				error = -1;
 				break;
-			} 
+			}
 
 			serr = DB_SEQ(saved_usracct_db, &key, &data, R_NEXT);
 			if (serr < 0) {
@@ -151,7 +151,7 @@ usracct_add(ci)
 	newui.ui_mem += ci->ci_mem;
 	newui.ui_io += ci->ci_io;
 
-	data.data = &newui; 
+	data.data = &newui;
 	data.size = sizeof newui;
 	rv = DB_PUT(usracct_db, &key, &data, 0);
 	if (rv < 0) {
@@ -272,7 +272,7 @@ uid_compare(k1, k2)
 
 	bcopy(k1->data, &d1, sizeof d1);
 	bcopy(k2->data, &d2, sizeof d2);
-	
+
 	if (d1 < d2)
 		return -1;
 	else if (d1 == d2)
diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile
index f8c2a88694fd..3d0ab693f2d4 100644
--- a/usr.sbin/sendmail/cf/cf/Makefile
+++ b/usr.sbin/sendmail/cf/cf/Makefile
@@ -27,7 +27,7 @@ CLEANFILES=	cs-hidden.cf cs-exposed.cf \
 
 all: $(CLEANFILES)
 
-depend install: 
+depend install:
 
 # this is overkill, but....
 M4FILES=\
diff --git a/usr.sbin/sendmail/cf/cf/Makefile.dist b/usr.sbin/sendmail/cf/cf/Makefile.dist
index 074529edae69..07b62f244087 100644
--- a/usr.sbin/sendmail/cf/cf/Makefile.dist
+++ b/usr.sbin/sendmail/cf/cf/Makefile.dist
@@ -31,7 +31,7 @@ all: $(ALL)
 clean cleandir:
 	$(RM) $(ALL) core
 
-depend install: 
+depend install:
 
 # this is overkill, but....
 M4FILES=\
diff --git a/usr.sbin/sendmail/contrib/bitdomain.c b/usr.sbin/sendmail/contrib/bitdomain.c
index 4fad76175494..d5e854935932 100644
--- a/usr.sbin/sendmail/contrib/bitdomain.c
+++ b/usr.sbin/sendmail/contrib/bitdomain.c
@@ -187,7 +187,7 @@ char *domainlen;
 	    case NO_DATA:
 		err = "registered in DNS, but not mailable";
 		break;
-		
+
 	    default:
 		err = "unknown nameserver error";
 		break;
@@ -210,7 +210,7 @@ valhost(host, hbsize)
 	int hbsize;
 {
 	register u_char *eom, *ap;
-	register int n; 
+	register int n;
 	HEADER *hp;
 	querybuf answer;
 	int ancount, qdcount;
@@ -406,4 +406,4 @@ finish()
 	}
     }
 }
-	    
+
diff --git a/usr.sbin/sendmail/contrib/xla/xla.c b/usr.sbin/sendmail/contrib/xla/xla.c
index 627d383676bb..ef998e3fb4ca 100644
--- a/usr.sbin/sendmail/contrib/xla/xla.c
+++ b/usr.sbin/sendmail/contrib/xla/xla.c
@@ -166,7 +166,7 @@ xla_init(line)
 	}
 	XlaRules[XlaNext].reject = atoi(s);
 	if (tTd(59, 10))
-		printf("xla_init: rule #%d = %s q=%d r=%d\n", XlaNext, 
+		printf("xla_init: rule #%d = %s q=%d r=%d\n", XlaNext,
 			XlaRules[XlaNext].mask,
 			XlaRules[XlaNext].queue, XlaRules[XlaNext].reject);
 	XlaNext++;
diff --git a/usr.sbin/sendmail/makemap/makemap.c b/usr.sbin/sendmail/makemap/makemap.c
index a676cd7f43be..14548bd2b50a 100644
--- a/usr.sbin/sendmail/makemap/makemap.c
+++ b/usr.sbin/sendmail/makemap/makemap.c
@@ -274,7 +274,7 @@ main(argc, argv)
 				progname, mapname, lineno, sizeof ibuf);
 			continue;
 		}
-			
+
 		if (ibuf[0] == '\0' || ibuf[0] == '#')
 			continue;
 		if (isspace(ibuf[0]))
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 71f44ed795d8..83d363e7760c 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -19,8 +19,8 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
 	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
-DPADD=	
-LDADD=	
+DPADD=
+LDADD=
 MAN1=	mailq.1 newaliases.1
 MAN5=	aliases.5
 MAN8=	sendmail.8
diff --git a/usr.sbin/sendmail/src/Makefile.386BSD b/usr.sbin/sendmail/src/Makefile.386BSD
index 63d94aa5654e..397ce8b67db6 100644
--- a/usr.sbin/sendmail/src/Makefile.386BSD
+++ b/usr.sbin/sendmail/src/Makefile.386BSD
@@ -19,11 +19,11 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
 	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
-DPADD=	
+DPADD=
 LDADD=	$(LIBUTIL)
 MAN1=	newaliases.0 mailq.0
 MAN5=	aliases.0
-MAN8=	sendmail.0 
+MAN8=	sendmail.0
 LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
 	/usr/sbin/sendmail /usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sendmail/src/Makefile.BSDI b/usr.sbin/sendmail/src/Makefile.BSDI
index 898de3e819fc..a45016dd1c7a 100644
--- a/usr.sbin/sendmail/src/Makefile.BSDI
+++ b/usr.sbin/sendmail/src/Makefile.BSDI
@@ -13,7 +13,7 @@ DPADD=	${LIBUTIL} ${LIBKVM}
 LDADD=	-lutil -lkvm
 MAN1=	mailq.0 newaliases.0
 MAN5=	aliases.0
-MAN8=	sendmail.0 
+MAN8=	sendmail.0
 LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
 	/usr/sbin/sendmail /usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sendmail/src/Makefile.ConvexOS b/usr.sbin/sendmail/src/Makefile.ConvexOS
index 7bf74505243b..82a77d5be943 100644
--- a/usr.sbin/sendmail/src/Makefile.ConvexOS
+++ b/usr.sbin/sendmail/src/Makefile.ConvexOS
@@ -35,7 +35,7 @@ ENVDEF=
 #LIBDIRS=-L/usr/sww/lib
 
 # libraries required on your system
-LIBS=	
+LIBS=
 
 # location of sendmail binary (usually /usr/sbin or /usr/lib)
 BINDIR=	${DESTDIR}/usr/lib
diff --git a/usr.sbin/sendmail/src/Makefile.FreeBSD b/usr.sbin/sendmail/src/Makefile.FreeBSD
index e86ff5961740..3a94730db203 100644
--- a/usr.sbin/sendmail/src/Makefile.FreeBSD
+++ b/usr.sbin/sendmail/src/Makefile.FreeBSD
@@ -23,7 +23,7 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
 	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
-DPADD=	
+DPADD=
 LDADD=	$(LIBUTIL)
 #
 # FreeBSD 1.0 RELEASE has GNU man and doesn't need preformatted man pages anymore
@@ -31,7 +31,7 @@ LDADD=	$(LIBUTIL)
 #
 MAN1=	mailq.1 newaliases.1
 MAN5=	aliases.5
-MAN8=	sendmail.8 
+MAN8=	sendmail.8
 LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
 	/usr/sbin/sendmail /usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sendmail/src/Makefile.HP-UX b/usr.sbin/sendmail/src/Makefile.HP-UX
index cebc4991d273..c1b51ec12721 100644
--- a/usr.sbin/sendmail/src/Makefile.HP-UX
+++ b/usr.sbin/sendmail/src/Makefile.HP-UX
@@ -24,7 +24,7 @@ O=	+O1
 DBMDEF=	-DNDBM -DNEWDB -DNIS
 
 # environment definitions (e.g., -D_AIX3)
-ENVDEF=	
+ENVDEF=
 
 # see also conf.h for additional compilation flags
 
diff --git a/usr.sbin/sendmail/src/Makefile.NetBSD b/usr.sbin/sendmail/src/Makefile.NetBSD
index ebeacd016220..b253c0b0b83a 100644
--- a/usr.sbin/sendmail/src/Makefile.NetBSD
+++ b/usr.sbin/sendmail/src/Makefile.NetBSD
@@ -17,7 +17,7 @@ PROG=	sendmail
 # spiral snail, but it will work.
 DBMDEF=	-DNEWDB -DNIS
 
-#nasty warning about gcc 2.4.x caused bugs 
+#nasty warning about gcc 2.4.x caused bugs
 CFLAGS=-I${.CURDIR} ${DBMDEF} -DNETISO
 #CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
 
@@ -28,7 +28,7 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	util.c version.c
 MAN1=	mailq.0 newaliases.0
 MAN5=	aliases.0
-MAN8=	sendmail.0 
+MAN8=	sendmail.0
 LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
 	/usr/sbin/sendmail /usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sendmail/src/Makefile.SCO b/usr.sbin/sendmail/src/Makefile.SCO
index f1e73165ee76..0eccdabc3b31 100644
--- a/usr.sbin/sendmail/src/Makefile.SCO
+++ b/usr.sbin/sendmail/src/Makefile.SCO
@@ -46,7 +46,7 @@ STDIR=	${DESTDIR}/usr/lib
 HFDIR=	${DESTDIR}/usr/lib
 
 # additional .o files needed
-OBJADD=	
+OBJADD=
 
 ###################  end of user configuration flags  ######################
 
diff --git a/usr.sbin/sendmail/src/Makefile.Solaris b/usr.sbin/sendmail/src/Makefile.Solaris
index cf359e61e398..8256a3e62464 100644
--- a/usr.sbin/sendmail/src/Makefile.Solaris
+++ b/usr.sbin/sendmail/src/Makefile.Solaris
@@ -12,7 +12,7 @@
 
 # use O=-O (usual) or O=-g (debugging)
 # warning: do not use -O with gcc
-O=	
+O=
 
 CC=	gcc
 
diff --git a/usr.sbin/sendmail/src/Makefile.SunOS.5.1 b/usr.sbin/sendmail/src/Makefile.SunOS.5.1
index cf359e61e398..8256a3e62464 100644
--- a/usr.sbin/sendmail/src/Makefile.SunOS.5.1
+++ b/usr.sbin/sendmail/src/Makefile.SunOS.5.1
@@ -12,7 +12,7 @@
 
 # use O=-O (usual) or O=-g (debugging)
 # warning: do not use -O with gcc
-O=	
+O=
 
 CC=	gcc
 
diff --git a/usr.sbin/sendmail/src/Makefile.SunOS.5.2 b/usr.sbin/sendmail/src/Makefile.SunOS.5.2
index cf359e61e398..8256a3e62464 100644
--- a/usr.sbin/sendmail/src/Makefile.SunOS.5.2
+++ b/usr.sbin/sendmail/src/Makefile.SunOS.5.2
@@ -12,7 +12,7 @@
 
 # use O=-O (usual) or O=-g (debugging)
 # warning: do not use -O with gcc
-O=	
+O=
 
 CC=	gcc
 
diff --git a/usr.sbin/sendmail/src/Makefile.SunOS.5.x b/usr.sbin/sendmail/src/Makefile.SunOS.5.x
index d40f9dd4828f..1b7d2687421c 100644
--- a/usr.sbin/sendmail/src/Makefile.SunOS.5.x
+++ b/usr.sbin/sendmail/src/Makefile.SunOS.5.x
@@ -12,7 +12,7 @@
 
 # use O=-O (usual) or O=-g (debugging)
 # warning: do not use -O with gcc
-O=	
+O=
 
 CC=	gcc
 
diff --git a/usr.sbin/sendmail/src/Makefile.Utah b/usr.sbin/sendmail/src/Makefile.Utah
index 84ee57139f23..84f2403f6403 100644
--- a/usr.sbin/sendmail/src/Makefile.Utah
+++ b/usr.sbin/sendmail/src/Makefile.Utah
@@ -20,10 +20,10 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
 DPADD=	${LIBDBM} ${LIBCOMPAT}
-LDADD=	
+LDADD=
 MAN1=	mailq.0 newaliases.0
 MAN5=	aliases.0
-MAN8=	sendmail.0 
+MAN8=	sendmail.0
 LINKS=	${DESTDIR}/usr/sbin/sendmail ${DESTDIR}/usr/bin/newaliases \
 	${DESTDIR}/usr/sbin/sendmail ${DESTDIR}/usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c
index 5e94bfa4a11c..de7185129827 100644
--- a/usr.sbin/sendmail/src/conf.c
+++ b/usr.sbin/sendmail/src/conf.c
@@ -852,7 +852,7 @@ getla()
 	FILE *fp;
 
 	fp = fopen(_PATH_LOADAVG, "r");
-	if (fp == NULL) 
+	if (fp == NULL)
 	{
 		if (tTd(3, 1))
 			printf("getla: fopen(%s): %s\n",
@@ -915,7 +915,7 @@ getla()
 
 /* Non Apollo stuff removed by Don Lewis 11/15/93 */
 #ifndef lint
-static char  rcsid[] = "@(#)$Id: conf.c,v 1.5 1995/02/23 00:46:30 pst Exp $";
+static char  rcsid[] = "@(#)$Id: conf.c,v 1.6 1995/03/10 05:08:13 pst Exp $";
 #endif /* !lint */
 
 #ifdef apollo
@@ -1284,7 +1284,7 @@ uname(name)
 			return (0);
 	}
 #endif
-	
+
 	return (-1);
 }
 #endif /* HASUNAME */
@@ -1885,7 +1885,7 @@ lockfile(fd, filename, ext, type)
 
 	if (ext == NULL)
 		ext = "";
-		
+
 	bzero(&lfd, sizeof lfd);
 	if (bitset(LOCK_UN, type))
 		lfd.l_type = F_UNLCK;
diff --git a/usr.sbin/sendmail/src/conf.h b/usr.sbin/sendmail/src/conf.h
index e3cc1ad31bfb..10a8d3dd46c7 100644
--- a/usr.sbin/sendmail/src/conf.h
+++ b/usr.sbin/sendmail/src/conf.h
@@ -891,7 +891,7 @@ typedef int		pid_t;
 # undef BSD
 # define LA_AVENRUN	"avenrun"
 #endif
- 
+
 
 
 
diff --git a/usr.sbin/sendmail/src/deliver.c b/usr.sbin/sendmail/src/deliver.c
index cce380088953..9e29de9fa20b 100644
--- a/usr.sbin/sendmail/src/deliver.c
+++ b/usr.sbin/sendmail/src/deliver.c
@@ -169,13 +169,13 @@ sendall(e, mode)
 			continue;
 		if (a != NULL)
 			q->q_owner = a->q_owner;
-				
+
 		if (q->q_owner != NULL &&
 		    !bitset(QDONTSEND, q->q_flags) &&
 		    strcmp(q->q_owner, e->e_from.q_paddr) == 0)
 			q->q_owner = NULL;
 	}
-		
+
 	owner = "";
 	otherowners = 1;
 	while (owner != NULL && otherowners > 0)
@@ -248,7 +248,7 @@ sendall(e, mode)
 			ee->e_errormode = EM_MAIL;
 			ee->e_sibling = splitenv;
 			splitenv = ee;
-			
+
 			for (q = e->e_sendqueue; q != NULL; q = q->q_next)
 				if (q->q_owner == owner)
 				{
@@ -630,7 +630,7 @@ deliver(e, firstto)
 		_res.retrans = 30;
 		_res.retry = 2;
 	}
-#endif 
+#endif
 
 	m = to->q_mailer;
 	host = to->q_host;
@@ -1904,7 +1904,7 @@ logdelivery(m, mci, stat, ctladdr, e)
 	bp += strlen(bp);
 
 	(void) strcpy(bp, shortenstring(stat, (STATLEN)));
-		
+
 	l = SYSLOG_BUFSIZE - 100 - strlen(buf);
 	p = e->e_to;
 	while (strlen(p) >= l)
diff --git a/usr.sbin/sendmail/src/domain.c b/usr.sbin/sendmail/src/domain.c
index ee761a91a05c..da2a79587a62 100644
--- a/usr.sbin/sendmail/src/domain.c
+++ b/usr.sbin/sendmail/src/domain.c
@@ -402,7 +402,7 @@ mxrand(host)
 **	This algorithm tries to be smart about wildcard MX records.
 **	This is hard to do because DNS doesn't tell is if we matched
 **	against a wildcard or a specific MX.
-**	
+**
 **	We always prefer A & CNAME records, since these are presumed
 **	to be specific.
 **
@@ -434,7 +434,7 @@ getcanonname(host, hbsize, trymx)
 	extern int h_errno;
 	register u_char *eom, *ap;
 	register char *cp;
-	register int n; 
+	register int n;
 	HEADER *hp;
 	querybuf answer;
 	int ancount, qdcount;
diff --git a/usr.sbin/sendmail/src/headers.c b/usr.sbin/sendmail/src/headers.c
index 8493e79cf7e6..a55ba95c7ee5 100644
--- a/usr.sbin/sendmail/src/headers.c
+++ b/usr.sbin/sendmail/src/headers.c
@@ -82,7 +82,7 @@ chompheader(line, def, e)
 	{
 		/* have some */
 		register char *q = strchr(p + 1, *p);
-		
+
 		if (q != NULL)
 		{
 			*q++ = '\0';
@@ -1187,6 +1187,6 @@ copyheader(header)
 		header = header->h_link;
 	}
 	*tail = NULL;
-	
+
 	return ret;
 }
diff --git a/usr.sbin/sendmail/src/main.c b/usr.sbin/sendmail/src/main.c
index a0253a252de7..bae41d5f67d6 100644
--- a/usr.sbin/sendmail/src/main.c
+++ b/usr.sbin/sendmail/src/main.c
@@ -208,10 +208,10 @@ main(argc, argv, envp)
 #ifdef LOG
 # ifdef LOG_MAIL
 	openlog("sendmail", LOG_PID, LOG_MAIL);
-# else 
+# else
 	openlog("sendmail", LOG_PID);
 # endif
-#endif 
+#endif
 
 	/* set up the blank envelope */
 	BlankEnvelope.e_puthdr = putheader;
@@ -511,7 +511,7 @@ main(argc, argv, envp)
 				break;
 			}
 			break;
-		
+
 		  case 'n':	/* don't alias */
 			NoAlias = TRUE;
 			break;
@@ -1051,7 +1051,7 @@ main(argc, argv, envp)
 
 #endif /* DAEMON */
 	}
-	
+
 # ifdef SMTP
 	/*
 	**  If running SMTP protocol, start collecting and executing
diff --git a/usr.sbin/sendmail/src/parseaddr.c b/usr.sbin/sendmail/src/parseaddr.c
index 00621c253450..2683728beb14 100644
--- a/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr.sbin/sendmail/src/parseaddr.c
@@ -1084,7 +1084,7 @@ rewrite(pvp, ruleset, reclevel, e)
 			if (xpvp != NULL)
 			{
 				cataddr(xpvp, NULL, replac,
-					&pvpbuf[sizeof pvpbuf] - replac, 
+					&pvpbuf[sizeof pvpbuf] - replac,
 					'\0');
 				*++arg_rvp = replac;
 			}
diff --git a/usr.sbin/sendmail/src/readcf.c b/usr.sbin/sendmail/src/readcf.c
index 11a895b0ec53..a2d37d94cf8d 100644
--- a/usr.sbin/sendmail/src/readcf.c
+++ b/usr.sbin/sendmail/src/readcf.c
@@ -385,7 +385,7 @@ readcf(cfname, safe, e)
 				continue;
 			if (!isascii(*p) || !isdigit(*p))
 			{
-				syserr("invalid argument to S line: \"%.20s\"", 
+				syserr("invalid argument to S line: \"%.20s\"",
 					&bp[1]);
 				break;
 			}
@@ -494,7 +494,7 @@ readcf(cfname, safe, e)
 				continue;
 			if (!isascii(*p) || !isdigit(*p))
 			{
-				syserr("invalid argument to V line: \"%.20s\"", 
+				syserr("invalid argument to V line: \"%.20s\"",
 					&bp[1]);
 				break;
 			}
diff --git a/usr.sbin/sendmail/src/recipient.c b/usr.sbin/sendmail/src/recipient.c
index a43cf5c93dff..0b12c2cdf3f8 100644
--- a/usr.sbin/sendmail/src/recipient.c
+++ b/usr.sbin/sendmail/src/recipient.c
@@ -835,7 +835,7 @@ include(fname, forwarding, ctladdr, sendq, e)
 			if (uid != 0)
 				(void) setreuid(0, uid);
 		}
-#endif                   
+#endif
 	}
 
 	if (tTd(27, 9))
diff --git a/usr.sbin/sendmail/src/savemail.c b/usr.sbin/sendmail/src/savemail.c
index 214dca5c96f1..65c915d37893 100644
--- a/usr.sbin/sendmail/src/savemail.c
+++ b/usr.sbin/sendmail/src/savemail.c
@@ -774,17 +774,17 @@ errbody(mci, e)
 }
 /*
 **  PRUNEROUTE -- prune an RFC-822 source route
-** 
+**
 **	Trims down a source route to the last internet-registered hop.
 **	This is encouraged by RFC 1123 section 5.3.3.
-** 
+**
 **	Parameters:
 **		addr -- the address
-** 
+**
 **	Returns:
 **		TRUE -- address was modified
 **		FALSE -- address could not be pruned
-** 
+**
 **	Side Effects:
 **		modifies addr in-place
 */
diff --git a/usr.sbin/sendmail/src/srvrsmtp.c b/usr.sbin/sendmail/src/srvrsmtp.c
index eef525de730b..e2a09e400f52 100644
--- a/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr.sbin/sendmail/src/srvrsmtp.c
@@ -294,7 +294,7 @@ smtp(e)
 					MyHostName, CurSmtpClient);
 				break;
 			}
-			
+
 			/* print extended message and brag */
 			message("250-%s Hello %s, pleased to meet you",
 				MyHostName, CurSmtpClient);
@@ -486,7 +486,7 @@ smtp(e)
 					MaxMessageSize);
 				/* NOTREACHED */
 			}
-				
+
 			if (!enoughspace(msize))
 			{
 				message("452 Insufficient disk space; try again later");
diff --git a/usr.sbin/sendmail/src/udb.c b/usr.sbin/sendmail/src/udb.c
index 7887cb367c8a..4739a081cf76 100644
--- a/usr.sbin/sendmail/src/udb.c
+++ b/usr.sbin/sendmail/src/udb.c
@@ -533,7 +533,7 @@ udbmatch(user, field)
 		  case UDB_HESIOD:
 			key.data = keybuf;
 			key.size = keylen;
-			i = hes_udb_get(&key, &info); 
+			i = hes_udb_get(&key, &info);
 			if (i != 0 || info.size <= 0)
 			{
 				if (tTd(28, 2))
@@ -621,7 +621,7 @@ udbmatch(user, field)
 			{
 				key.data = ":default:mailname";
 				key.size = strlen(key.data);
-				i = hes_udb_get(&key, &info); 
+				i = hes_udb_get(&key, &info);
 
 				if (i != 0 || info.size <= 0)
 				{
diff --git a/usr.sbin/sendmail/src/usersmtp.c b/usr.sbin/sendmail/src/usersmtp.c
index 06acd3f2fc8e..2850defa53ba 100644
--- a/usr.sbin/sendmail/src/usersmtp.c
+++ b/usr.sbin/sendmail/src/usersmtp.c
@@ -617,7 +617,7 @@ smtpquit(m, mci, e)
 
 	/*
 	**	Suppress errors here -- we may be processing a different
-	**	job when we do the quit connection, and we don't want the 
+	**	job when we do the quit connection, and we don't want the
 	**	new job to be penalized for something that isn't it's
 	**	problem.
 	*/
diff --git a/usr.sbin/sendmail/src/util.c b/usr.sbin/sendmail/src/util.c
index 3f6e1828855c..b7e1d14a7bb3 100644
--- a/usr.sbin/sendmail/src/util.c
+++ b/usr.sbin/sendmail/src/util.c
@@ -192,7 +192,7 @@ copyqueue(addr)
 		addr = addr->q_next;
 	}
 	*tail = NULL;
-	
+
 	return ret;
 }
 /*
diff --git a/usr.sbin/sgsc/sgsc.c b/usr.sbin/sgsc/sgsc.c
index 056a1c19c342..12ab1692b0a8 100644
--- a/usr.sbin/sgsc/sgsc.c
+++ b/usr.sbin/sgsc/sgsc.c
@@ -58,7 +58,7 @@ main(int argc, char **argv)
   int fd;
 
   char *file = DEFAULT_FILE;
-  
+
   int show_dpi     = 0;
   int show_width   = 0;
   int show_height  = 0;
@@ -74,7 +74,7 @@ main(int argc, char **argv)
   int set_switch   = 0;
 
   char *progn = *argv;
-  
+
   if (argc == 0) usage(progn);
 
   while( (c = getopt(argc, argv, "sqf:b:r:w:h:t:")) != FAIL)
diff --git a/usr.sbin/sliplogin/sliplogin.c b/usr.sbin/sliplogin/sliplogin.c
index d8af95958b49..f8736313586d 100644
--- a/usr.sbin/sliplogin/sliplogin.c
+++ b/usr.sbin/sliplogin/sliplogin.c
@@ -122,7 +122,7 @@ findid(name)
 		if (ferror(fp))
 			break;
 		n = sscanf(loginargs, "%15s%*[ \t]%15s%*[ \t]%15s%*[ \t]%15s%*[ \t]%15s%*[ \t]%15s%*[ \t]%15s%*[ \t]%15s%*[ \t]%15s\n",
-                        user, laddr, raddr, mask, slopt[0], slopt[1], 
+                        user, laddr, raddr, mask, slopt[0], slopt[1],
 			slopt[2], slopt[3], slopt[4]);
 		if (user[0] == '#' || isspace(user[0]))
 			continue;
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c
index 87e91382817f..402c24840d17 100644
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@@ -22,7 +22,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: slstat.c,v 1.2 1994/10/17 06:05:32 davidg Exp $";
+static char rcsid[] = "$Id: slstat.c,v 1.3 1994/11/19 13:57:21 jkh Exp $";
 #endif
 
 #include <stdio.h>
@@ -56,7 +56,7 @@ struct nlist nl[] = {
 	{ 0 }
 };
 
-#define INTERFACE_PREFIX        "sl%d" 
+#define INTERFACE_PREFIX        "sl%d"
 char    interface[IFNAMSIZ];
 
 const char	*system = NULL;
@@ -293,7 +293,7 @@ knlist(system, nl, errstr)
 	if (kd == 0)
 		/* kopen() must be called first */
 		abort();
-		
+
 	if (kvm_nlist(nl) < 0 || nl[0].n_type == 0) {
 		fprintf(stderr, "%s: %s: no namelist\n", errstr, system);
 		return -1;
diff --git a/usr.sbin/sysctl/sysctl.c b/usr.sbin/sysctl/sysctl.c
index 1ce0453db2f7..4666cf6d541b 100644
--- a/usr.sbin/sysctl/sysctl.c
+++ b/usr.sbin/sysctl/sysctl.c
@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)sysctl.c	8.1 (Berkeley) 6/6/93"; */
 static const char rcsid[] =
-	"$Id: sysctl.c,v 1.4 1995/02/16 00:28:42 wollman Exp $";
+	"$Id: sysctl.c,v 1.5 1995/05/12 19:10:56 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -291,7 +291,7 @@ parse(string, flags)
 			getloadavg(loads, 3);
 			if (!nflag)
 				fprintf(stdout, "%s: ", string);
-			fprintf(stdout, "%.2f %.2f %.2f\n", 
+			fprintf(stdout, "%.2f %.2f %.2f\n",
 			    loads[0], loads[1], loads[2]);
 			return;
 		}
@@ -333,7 +333,7 @@ parse(string, flags)
 	default:
 		fprintf(stderr, "Illegal top level value: %d\n", mib[0]);
 		return;
-	
+
 	}
 	if (bufp) {
 		fprintf(stderr, "name %s in %s is unknown\n", *bufp, string);
@@ -404,7 +404,7 @@ parse(string, flags)
 		}
 		if (!nflag)
 			fprintf(stdout, "%s = %s\n", string,
-			    devname(dev, 
+			    devname(dev,
 				    (special & CONSDEV) ? S_IFCHR : S_IFBLK));
 		else
 			fprintf(stdout, "0x%x\n", dev);
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index d1a79d74f242..5cae35cd6be3 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -361,7 +361,7 @@ main(argc, argv)
 				printline(cvthname(&frominet), line);
 			} else if (i < 0 && errno != EINTR)
 				logerror("recvfrom inet");
-		} 
+		}
 	}
 }
 
diff --git a/usr.sbin/tcpdump/tcpdump/ipx.h b/usr.sbin/tcpdump/tcpdump/ipx.h
index 0a707241701a..075d727322b0 100644
--- a/usr.sbin/tcpdump/tcpdump/ipx.h
+++ b/usr.sbin/tcpdump/tcpdump/ipx.h
@@ -1,7 +1,7 @@
 /*
- * IPX protocol formats 
+ * IPX protocol formats
  *
- * @(#) $Header: ipx.h,v 1.1 94/06/09 11:47:03 mccanne Exp $
+ * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/ipx.h,v 1.1 1995/03/08 12:52:15 olah Exp $
  */
 
 /* well-known sockets */
diff --git a/usr.sbin/tcpdump/tcpdump/print-tcp.c b/usr.sbin/tcpdump/tcpdump/print-tcp.c
index 0642315d8a5e..7d5d65cdd1e6 100644
--- a/usr.sbin/tcpdump/tcpdump/print-tcp.c
+++ b/usr.sbin/tcpdump/tcpdump/print-tcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/print-tcp.c,v 1.2 1995/03/08 12:52:44 olah Exp $ (LBL)";
+    "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/print-tcp.c,v 1.3 1995/03/08 13:13:01 olah Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
@@ -265,7 +265,7 @@ tcp_print(register const u_char *bp, register int length,
 				cp += l;
 				continue;
 			}
-				
+
 			/* print the option body */
 			switch (*cp) {
 			case TCPOPT_MAXSEG:
diff --git a/usr.sbin/tcpdump/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump/tcpdump.c
index 64b9150f7990..48f6f636b097 100644
--- a/usr.sbin/tcpdump/tcpdump/tcpdump.c
+++ b/usr.sbin/tcpdump/tcpdump/tcpdump.c
@@ -22,7 +22,7 @@
 char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994\nThe Regents of the University of California.  All rights reserved.\n";
 static  char rcsid[] =
-    "@(#)$Header: tcpdump.c,v 1.93 94/06/10 17:01:44 mccanne Exp $ (LBL)";
+    "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/tcpdump.c,v 1.2 1995/03/08 12:52:48 olah Exp $ (LBL)";
 #endif
 
 /*
@@ -111,7 +111,7 @@ void
 abort_on_misalignment()
 {
 	int buf[2];
-	
+
 	buf[0] = SSIN_UACPROC;
 	buf[1] = UAC_SIGBUS;
 	if (setsysinfo(SSI_NVPAIRS, buf, 1, 0, 0) < 0) {
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 9cbd66541254..deb4d0eb035c 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)byteorder.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.3 $"
+#ident "$Revision: 1.1.1.1 $"
 #endif
 
 #include "globals.h"
@@ -59,7 +59,7 @@ bytenetorder(ptr)
 		ptr->tsp_time.tv_sec = htonl((u_long)ptr->tsp_time.tv_sec);
 		ptr->tsp_time.tv_usec = htonl((u_long)ptr->tsp_time.tv_usec);
 		break;
-	
+
 	default:
 		break;		/* nothing more needed */
 	}
@@ -79,7 +79,7 @@ bytehostorder(ptr)
 		ptr->tsp_time.tv_sec = ntohl((u_long)ptr->tsp_time.tv_sec);
 		ptr->tsp_time.tv_usec = ntohl((u_long)ptr->tsp_time.tv_usec);
 		break;
-	
+
 	default:
 		break;		/* nothing more needed */
 	}
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index 294eb9b553d4..38700bc45d87 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)candidate.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.9 $"
+#ident "$Revision: 1.1.1.1 $"
 #endif
 
 #include "globals.h"
@@ -123,7 +123,7 @@ again:
 		case TSP_REFUSE:
 			/*
 			 * Collision: change value of election timer
-			 * using exponential backoff. 
+			 * using exponential backoff.
 			 *
 			 *  Fooey.
 			 * An exponential backoff on a delay starting at
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index c8535a452ba1..2b49eaa4ed8d 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)measure.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.1.1.1 $"
+#ident "$Revision: 1.2 $"
 #endif
 
 #include "globals.h"
@@ -96,7 +96,7 @@ measure(maxmsec, wmsec, hname, addr, print)
 			goto quit;
 		}
 	}
-	    
+
 
 	/*
 	 * empty the icmp input queue
@@ -191,7 +191,7 @@ measure(maxmsec, wmsec, hname, addr, print)
 			if (cc < 0)
 				goto quit;
 
-			/* 
+			/*
 			 * got something.  See if it is ours
 			 */
 			icp = (struct icmp *)(packet + (ip->ip_hl << 2));
diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c
index 7548c58db76a..2fde4f879e6e 100644
--- a/usr.sbin/trsp/trsp.c
+++ b/usr.sbin/trsp/trsp.c
@@ -273,7 +273,7 @@ ptime(ms)
 numeric(c1, c2)
 	caddr_t *c1, *c2;
 {
-	
+
 	return (*c1 - *c2);
 }
 
diff --git a/usr.sbin/tzsetup/main.c b/usr.sbin/tzsetup/main.c
index bfdd1e1fda9e..4b6481039a15 100644
--- a/usr.sbin/tzsetup/main.c
+++ b/usr.sbin/tzsetup/main.c
@@ -12,7 +12,7 @@
  * no representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied
  * warranty.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
  * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -28,7 +28,7 @@
  */
 
 static const char rcsid[] =
-	"$Id$";
+	"$Id: main.c,v 1.1 1995/04/24 21:04:33 wollman Exp $";
 
 #include <stdio.h>
 #include <ncurses.h>
@@ -51,7 +51,7 @@ static int time_adjust = 0;
 static enum cmos cmos(enum cmos);
 static void fiddle_cmos(void);
 
-int 
+int
 main(void)
 {
 	const char *tz;
@@ -69,7 +69,7 @@ main(void)
 	dialog_notify("Reboot the machine for changes to take effect.\n");
 	end_dialog();
 
-	fprintf(stderr, 
+	fprintf(stderr,
 		"Now reboot your computer for the changes to take effect.\n");
 	return tz ? 0 : 1;
 }
@@ -97,7 +97,7 @@ set_time(void)
 		cmos_state = CMOS_LEAVE;
 		return 0;
 	}
-	       
+
 	usertm = systm;
 	usertm.tm_isdst = -1;
 
@@ -162,7 +162,7 @@ cmos(enum cmos state)
 	unsigned char buf[_POSIX2_LINE_MAX];
 	unsigned char result[_POSIX2_LINE_MAX];
 
-	snprintf(buf, sizeof buf, "%s seems most likely", 
+	snprintf(buf, sizeof buf, "%s seems most likely",
 		 state == CMOS_UTC ? "UTC" : "local time");
 
 	rv = dialog_menu("CMOS clock in local time or UTC",
@@ -208,11 +208,11 @@ setzone(const char *zone)
 	systime += time_adjust;
 	tm = localtime(&systime);
 
-	snprintf(msg, sizeof msg, 
+	snprintf(msg, sizeof msg,
 		 "Does %02d:%02d:%02d %d.%d.%04d %s look reasonable?",
 		 tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_mday, tm->tm_mon,
 		 tm->tm_year + 1900, tm->tm_zone);
-		 
+
 	rv = dialog_yesno("Verifying timezone selection",
 			  msg, -1, -1);
 	if (rv)
@@ -230,7 +230,7 @@ setzone(const char *zone)
 
 	ofp = fopen(PATH_LOCALTIME, "w");
 	if (!ofp) {
-		snprintf(msg, sizeof msg, "Could not open " PATH_LOCALTIME 
+		snprintf(msg, sizeof msg, "Could not open " PATH_LOCALTIME
 			 ": %s", strerror(errno));
 		dialog_notify(msg);
 		fclose(ifp);
@@ -240,7 +240,7 @@ setzone(const char *zone)
 	while((rv = fread(msg, 1, sizeof msg, ifp)) > 0) {
 		int rv2;
 		if((rv2 = fwrite(msg, 1, rv, ofp)) != rv) {
-			snprintf(msg, sizeof msg, 
+			snprintf(msg, sizeof msg,
 				 "Could not write " PATH_LOCALTIME ": %s",
 				 strerror(errno));
 out:
@@ -250,7 +250,7 @@ out:
 			unlink(PATH_LOCALTIME);
 			return 1;
 		}
-	}		
+	}
 	if (rv < 0) {
 		snprintf(msg, sizeof msg, "Could not read timezone file: %s",
 			 strerror(errno));
diff --git a/usr.sbin/tzsetup/tzmenu.c b/usr.sbin/tzsetup/tzmenu.c
index c27c417b7dc4..bec4cfd33794 100644
--- a/usr.sbin/tzsetup/tzmenu.c
+++ b/usr.sbin/tzsetup/tzmenu.c
@@ -12,7 +12,7 @@
  * no representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied
  * warranty.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
  * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -28,7 +28,7 @@
  */
 
 static const char rcsid[] =
-	"$Id$";
+	"$Id: tzmenu.c,v 1.1 1995/04/24 21:04:34 wollman Exp $";
 
 #include <stdio.h>
 #include <ncurses.h>
@@ -71,7 +71,7 @@ tzmenu(void)
 	int item = 0;
 	int sc = 0;
 	const char *res;
-	
+
 	while(1) {
 		dialog_clear();
 		rv = dialog_menu("Timezone Selector",
@@ -92,7 +92,7 @@ tzmenu(void)
 
 		res = country_menu(regions[item],
 				   regmenu[2 * item + 1]);
-		
+
 		if (res)
 			return res;
 	}
@@ -109,7 +109,7 @@ country_menu(const struct region *reg, const char *name)
 	int item = 0;
 	int sc = 0;
 	const char *res;
-	
+
 	snprintf(title, sizeof title, "Timezone Selector - %s", name);
 
 	while(1) {
@@ -133,7 +133,7 @@ country_menu(const struct region *reg, const char *name)
 
 		res = location_menu(reg->r_ctrylist[rv - 1],
 				    reg->r_menu[2 * (rv - 1) + 1]);
-		
+
 		if (res)
 			return res;
 	}
@@ -148,7 +148,7 @@ location_menu(const struct country *ctry, const char *name)
 	int item = 0;
 	int sc = 0;
 	const char *res;
-	
+
 	snprintf(title, sizeof title, "Timezone Selector - %s", name);
 
 	while(1) {
@@ -170,7 +170,7 @@ location_menu(const struct country *ctry, const char *name)
 
 
 		rv = setzone(ctry->c_filelist[item]);
-		
+
 		if (rv == 0)
 			return ctry->c_filelist[item];
 	}
diff --git a/usr.sbin/tzsetup/tzsetup.h b/usr.sbin/tzsetup/tzsetup.h
index ab8731bf211e..bceff7ebe005 100644
--- a/usr.sbin/tzsetup/tzsetup.h
+++ b/usr.sbin/tzsetup/tzsetup.h
@@ -12,7 +12,7 @@
  * no representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied
  * warranty.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
  * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * 	$Id: tzsetup.h,v 1.1 1995/04/24 21:04:35 wollman Exp $
  */
 
 struct country {
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index 38dd912193f5..d1046c5956c9 100644
--- a/usr.sbin/vidcontrol/decode.c
+++ b/usr.sbin/vidcontrol/decode.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: decode.c,v 1.1 1994/08/17 09:00:09 sos Exp $
+ *	$Id: decode.c,v 1.2 1995/01/28 22:18:02 sos Exp $
  */
 
 #include <stdio.h>
@@ -39,7 +39,7 @@ int decode(FILE *fd, char *buffer)
 #define	DEC(c)	(((c) - ' ') & 0x3f)
 
 	do {
-		if (!fgets(temp, sizeof(temp), fd)) 
+		if (!fgets(temp, sizeof(temp), fd))
 			return(0);
 	} while (strncmp(temp, "begin ", 6));
 	sscanf(temp, "begin %o %s", &n, temp);
@@ -60,7 +60,7 @@ int decode(FILE *fd, char *buffer)
 						DEC(p[0])<<2 | DEC(p[1])>>4;
 				}
 				if (n >= 2) {
-					buffer[pos++] = 
+					buffer[pos++] =
 						DEC(p[1])<<4 | DEC(p[2])>>2;
 				}
 				if (n >= 3) {
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 786549fba772..bd568439c68a 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: vidcontrol.c,v 1.9 1995/02/22 13:41:27 sos Exp $
+ *	$Id: vidcontrol.c,v 1.10 1995/03/03 21:21:24 dima Exp $
  */
 
 #include <ctype.h>
@@ -166,7 +166,7 @@ print_scrnmap()
 		if (i > 0 && i % 16 == 0)
 			fprintf(stdout, "\n");
 		if (hex)
-			fprintf(stdout, " %02x", map[i]); 
+			fprintf(stdout, " %02x", map[i]);
 		else
 			fprintf(stdout, " %03d", map[i]);
 	}
@@ -174,7 +174,7 @@ print_scrnmap()
 
 }
 
-void 
+void
 load_font(char *type, char *filename)
 {
 	FILE	*fd;
@@ -255,7 +255,7 @@ set_cursor_type(char *appearence)
 	else if (!strcmp(appearence, "destructive"))
 		type = 3;
 	else {
-		fprintf(stderr, 
+		fprintf(stderr,
 		    "argument to -c must be normal, blink or destructive\n");
 		return;
 	}
@@ -292,7 +292,7 @@ video_mode(int argc, char **argv, int *index)
 	}
 	return;
 }
-		
+
 int
 get_color_number(char *color)
 {
@@ -312,8 +312,8 @@ set_normal_colors(int argc, char **argv, int *index)
 	if (*index < argc && (color = get_color_number(argv[*index])) != -1) {
 		(*index)++;
 		fprintf(stderr, "[=%dF", color);
-		if (*index < argc 
-		    && (color = get_color_number(argv[*index])) != -1 
+		if (*index < argc
+		    && (color = get_color_number(argv[*index])) != -1
 		    && color < 8) {
 			(*index)++;
 			fprintf(stderr, "[=%dG", color);
@@ -327,8 +327,8 @@ set_reverse_colors(int argc, char **argv, int *index)
 
 	if ((color = get_color_number(argv[*(index)-1])) != -1) {
 		fprintf(stderr, "[=%dH", color);
-		if (*index < argc 
-		    && (color = get_color_number(argv[*index])) != -1 
+		if (*index < argc
+		    && (color = get_color_number(argv[*index])) != -1
 		    && color < 8) {
 			(*index)++;
 			fprintf(stderr, "[=%dI", color);
@@ -344,7 +344,7 @@ set_border_color(char *arg)
 		fprintf(stderr, "[=%dA", color);
 	}
 	else
-		usage(); 
+		usage();
 }
 
 test_frame()
@@ -356,11 +356,11 @@ test_frame()
 		fprintf(stdout, "[=15F[=0G        %2d [=%dF%-16s"
 				"[=15F[=0G        %2d [=%dF%-16s        "
 				"[=15F %2d [=%dGBACKGROUND[=0G\n",
-			i, i, legal_colors[i], i+8, i+8, 
-			legal_colors[i+8], i, i); 
+			i, i, legal_colors[i], i+8, i+8,
+			legal_colors[i+8], i, i);
 	}
 	fprintf(stdout, "[=%dF[=%dG[=%dH[=%dI\n",
-		info.mv_norm.fore, info.mv_norm.back, 
+		info.mv_norm.fore, info.mv_norm.back,
 		info.mv_rev.fore, info.mv_rev.back);
 }
 
@@ -371,7 +371,7 @@ main(int argc, char **argv)
 	extern int	optind;
 	int		opt;
 
-	
+
 	info.size = sizeof(info);
 	if (ioctl(0, CONS_GETINFO, &info) < 0) {
 		perror("Must be on a virtual console");
diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c
index c851fcbefa87..8dd4e4c5fd0a 100644
--- a/usr.sbin/vipw/pw_util.c
+++ b/usr.sbin/vipw/pw_util.c
@@ -105,7 +105,7 @@ pw_init()
 int
 pw_lock()
 {
-	/* 
+	/*
 	 * If the master password file doesn't exist, the system is hosed.
 	 * Might as well try to build one.  Set the close-on-exec bit so
 	 * that users can't get at the encrypted passwords while editing.
@@ -167,7 +167,7 @@ pw_edit(notsetuid)
 		editor = _PATH_VI;
 	if (p = strrchr(editor, '/'))
 		++p;
-	else 
+	else
 		p = editor;
 
 	if (!(editpid = vfork())) {
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index c67162331de2..d69111f290b7 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -73,7 +73,7 @@ main(argc, argv)
 		default:
 			usage();
 		}
-	
+
 	argc -= optind;
 	argv += optind;
 
@@ -109,7 +109,7 @@ copyfile(from, to)
 {
 	int nr, nw, off;
 	char buf[8*1024];
-	
+
 	while ((nr = read(from, buf, sizeof(buf))) > 0)
 		for (off = 0; off < nr; nr -= nw, off += nw)
 			if ((nw = write(to, buf + off, nr)) < 0)
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index 96b75261f53b..8e20a1181d71 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -183,7 +183,7 @@ main(argc, argv)
 	exit(rv);
 }
 
-int 
+int
 what_opt(str,p)
 	char *str;
 	u_long *p;
@@ -267,7 +267,7 @@ config(vnp)
 			printf("%s: %d bytes on %s\n",
 			       dev, vnio.vn_size, file);
 	}
-	/* 
+	/*
 	 * Set an option
 	 */
 	if (flags & VN_SET) {
@@ -281,7 +281,7 @@ config(vnp)
 		} else if (verbose)
 			printf("%s: flags now=%08x\n",dev,l);
 	}
-	/* 
+	/*
 	 * Reset an option
 	 */
 	if (flags & VN_RESET) {
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 56b2d4f0b1fe..6691067820a1 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -345,7 +345,7 @@ main(ac, av)
 						set_dev(dev_name);
 					}
 				}
-					
+
 			}
 		}
 		if (!FD_ISSET(snp_io, &fd_s))
diff --git a/usr.sbin/xntpd/Makefile.inc b/usr.sbin/xntpd/Makefile.inc
index bb225ee5e51f..ce551ea5a08b 100644
--- a/usr.sbin/xntpd/Makefile.inc
+++ b/usr.sbin/xntpd/Makefile.inc
@@ -3,7 +3,7 @@ NTPDEFS=   -DSYS_FREEBSD -DSYS_44BSD
 AUTHDEFS=  -DMD5
 CLOCKDEFS= -DLOCAL_CLOCK -DPST -DWWVB -DAS2201 -DGOES -DGPSTM -DOMEGA \
 	-DLEITCH -DTRAK -DACTS -DATOM -DDATUM -DHEATH -DMSFEES \
-	-DMX4200 -DNMEA -DWWVB	
+	-DMX4200 -DNMEA -DWWVB
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${AUTHDEFS} ${CLOCKDEFS} ${COPTS}
 BINDIR?= /usr/sbin
 
diff --git a/usr.sbin/xntpd/authstuff/authcert.c b/usr.sbin/xntpd/authstuff/authcert.c
index 0f04d61b5f01..19ade8c9980c 100644
--- a/usr.sbin/xntpd/authstuff/authcert.c
+++ b/usr.sbin/xntpd/authstuff/authcert.c
@@ -89,7 +89,7 @@ put8(lp)
 {
 	int i;
 
-	
+
 	for(i = 0; i < 2; i++)
 		printf("%08lx", (u_long)(*lp++));
 }
diff --git a/usr.sbin/xntpd/authstuff/authspeed.c b/usr.sbin/xntpd/authstuff/authspeed.c
index a6362a85b768..93965d2e278c 100644
--- a/usr.sbin/xntpd/authstuff/authspeed.c
+++ b/usr.sbin/xntpd/authstuff/authspeed.c
@@ -84,7 +84,7 @@ char *argv[];
 		case 'n':
 			loops = atoi(ntp_optarg);
 			if (loops <= 0) {
-				(void) fprintf(stderr, 
+				(void) fprintf(stderr,
 			"%s: %s is unlikely to be a useful number of loops\n",
 					       progname, ntp_optarg);
 				errflg++;
@@ -182,22 +182,22 @@ dodelay(loops)
 	/*
 	 *  If we're attempting to compute the cost of an auth2crypt()
 	 *  for first compute the total cost, then compute the
-	 *  cost of only doing the first step, auth1crypt().  What 
+	 *  cost of only doing the first step, auth1crypt().  What
 	 *  remains is the cost of auth2crypt.
 	 */
 	loopcount = loops;
 	(void) gettimeofday(&tstart, (struct timezone *)0);
 	(void) getrusage(RUSAGE_SELF, &rstart);
-	
+
 	while (loopcount-- > 0) {
 		auth1crypt((loops & 0xf) + domd5, pkt, 48);
 		L_ADDUF(&dummy1, dummy3);
 		auth2crypt((loops & 0xf) + domd5, pkt, 48);
 	}
-	
+
 	(void) getrusage(RUSAGE_SELF, &rend);
 	(void) gettimeofday(&tend, (struct timezone *)0);
-	
+
 	subtime(&tstart, &tend, &rtime1);
 #ifdef FAKE_RUSAGE
 	vtime1 = (rend.tms_utime - rstart.tms_utime) * 1.0 / HZ;
diff --git a/usr.sbin/xntpd/authstuff/keyparity.c b/usr.sbin/xntpd/authstuff/keyparity.c
index aed05d9c5ccb..8a12c13f3399 100644
--- a/usr.sbin/xntpd/authstuff/keyparity.c
+++ b/usr.sbin/xntpd/authstuff/keyparity.c
@@ -237,7 +237,7 @@ decodekey(keytype, str, key)
 				    | ((key[i] >> 7) & STD_PARITY_BITS);
 		}
 		break;
-	
+
 	case KEY_TYPE_ASCII:
 		/*
 		 * Make up key from ascii representation
@@ -250,7 +250,7 @@ decodekey(keytype, str, key)
 		key[1] = keybytes[4] << 24 | keybytes[5] << 16
 		    | keybytes[6] << 8 | keybytes[7];
 		break;
-	
+
 	default:
 		/* Oh, well */
 		return 0;
diff --git a/usr.sbin/xntpd/authstuff/makeSP.c b/usr.sbin/xntpd/authstuff/makeSP.c
index 4fcd78c35e3a..7daefa6cc834 100644
--- a/usr.sbin/xntpd/authstuff/makeSP.c
+++ b/usr.sbin/xntpd/authstuff/makeSP.c
@@ -61,7 +61,7 @@ u_char S[8][64] = {
 	 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
 	 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
 	13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
- 
+
 	10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
 	13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
 	13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
diff --git a/usr.sbin/xntpd/authstuff/unixcert.c b/usr.sbin/xntpd/authstuff/unixcert.c
index 47c76f6fa93c..9ec2c9834a97 100644
--- a/usr.sbin/xntpd/authstuff/unixcert.c
+++ b/usr.sbin/xntpd/authstuff/unixcert.c
@@ -88,7 +88,7 @@ U_LONG *lp;
 {
 	int i;
 
-	
+
 	for(i=0;i<2;i++){
 		printf("%08x",*lp++);
 	}
diff --git a/usr.sbin/xntpd/clockstuff/chutest.c b/usr.sbin/xntpd/clockstuff/chutest.c
index 2bf058c3b012..d8b804ad5b78 100644
--- a/usr.sbin/xntpd/clockstuff/chutest.c
+++ b/usr.sbin/xntpd/clockstuff/chutest.c
@@ -166,7 +166,7 @@ openterm(dev)
 		error("ioctl(TIOCEXCL)", "", "");
 	if (debug)
 		(void) fprintf(stderr, "done\n");
-	
+
 	ttyb.sg_ispeed = ttyb.sg_ospeed = B300;
 	ttyb.sg_erase = ttyb.sg_kill = 0;
 	ttyb.sg_flags = EVENP|ODDP|RAW;
@@ -552,7 +552,7 @@ chufilter(chuc, rtime)
 			(void) printf("Bad format, halves don't match\n");
 			return;
 		}
-	
+
 	/*
 	 * Break out the code into the BCD nibbles.  Only need to fiddle
 	 * with the first half since both are identical.  Note the first
@@ -705,7 +705,7 @@ codeokay:
 		isneg = 1;
 	else
 		isneg = 0;
-	
+
 	/*
 	 * Here is a multiply-by-0.1 optimization that should apply
 	 * just about everywhere.  If the magnitude of the sum
diff --git a/usr.sbin/xntpd/clockstuff/propdelay.c b/usr.sbin/xntpd/clockstuff/propdelay.c
index 0c1f1bb3e38c..507bc08b4070 100644
--- a/usr.sbin/xntpd/clockstuff/propdelay.c
+++ b/usr.sbin/xntpd/clockstuff/propdelay.c
@@ -171,7 +171,7 @@ char *argv[];
 			errflg++;
 			break;
 		}
-	if (errflg || (!(Cflag || Wflag || Gflag) && ntp_optind+4 != argc) || 
+	if (errflg || (!(Cflag || Wflag || Gflag) && ntp_optind+4 != argc) ||
             ((Cflag || Wflag || Gflag) && ntp_optind+2 != argc)) {
 		(void) fprintf(stderr,
 		    "usage: %s [-d] [-h height] lat1 long1 lat2 long2\n",
@@ -183,7 +183,7 @@ char *argv[];
 		exit(2);
 	}
 
-		   
+
 	if (!(Cflag || Wflag || Gflag)) {
 		lat1 = latlong(argv[ntp_optind], 1);
 		long1 = latlong(argv[ntp_optind + 1], 0);
@@ -456,7 +456,7 @@ finddelay(lat1, long1, lat2, long2, h, delay)
 	dg = greatcircle(lat1, long1, lat2, long2);
 	if (debug)
 		printf("great circle distance %g km %g miles\n", dg, dg/MILE);
-	
+
 	n = 1;
 	while ((delta = waveangle(dg, h, n)) < 0.0) {
 		if (debug)
diff --git a/usr.sbin/xntpd/include/in.h b/usr.sbin/xntpd/include/in.h
index abd404ceda8d..c18d5698443e 100644
--- a/usr.sbin/xntpd/include/in.h
+++ b/usr.sbin/xntpd/include/in.h
@@ -183,7 +183,7 @@ struct sockaddr_in {
 #define	IP_MULTICAST_LOOP	4	/* set/get IP multicast loopback   */
 #define	IP_ADD_MEMBERSHIP	5	/* add  an IP group membership     */
 #define	IP_DROP_MEMBERSHIP	6	/* drop an IP group membership     */
-  
+
 #define	IP_DEFAULT_MULTICAST_TTL   1	/* normally limit m'casts to 1 hop  */
 #define	IP_DEFAULT_MULTICAST_LOOP  1	/* normally hear sends if a member  */
 #define	IP_MAX_MEMBERSHIPS         20	/* per socket; must fit in one mbuf */
diff --git a/usr.sbin/xntpd/include/l_stdlib.h b/usr.sbin/xntpd/include/l_stdlib.h
index 426dc48b2e34..221682e45b30 100644
--- a/usr.sbin/xntpd/include/l_stdlib.h
+++ b/usr.sbin/xntpd/include/l_stdlib.h
@@ -55,7 +55,7 @@ extern  void    bzero		P((char *, int));
 extern  int	bcmp		P((char *, char *, int));
 extern  void	bcopy		P((char *, char *, int));
 #endif
-extern  char   *mktemp		P((char *));	
+extern  char   *mktemp		P((char *));
 
 extern  int	tolower		P((int));
 
@@ -196,7 +196,7 @@ extern	int	close		P((int));
 extern  char *	getpass		P((char *));
 extern  int	getpid		P((void));
 extern  int	ioctl		P((int, int, char *));
-extern  char   *mktemp		P((char *));	
+extern  char   *mktemp		P((char *));
 extern	int	unlink		P((const char *));
 extern	int	link		P((const char *, const char *));
 
diff --git a/usr.sbin/xntpd/include/ntp.h b/usr.sbin/xntpd/include/ntp.h
index 733f2e72893f..5eca0e81a771 100644
--- a/usr.sbin/xntpd/include/ntp.h
+++ b/usr.sbin/xntpd/include/ntp.h
@@ -467,7 +467,7 @@ struct pkt {
  *  the maximum length NTP packet is a full length NTP control message with
  *  the maximum length message authenticator.  I hate to hard-code 468 and 12,
  *  but only a few modules include ntp_control.h...
- */   
+ */
 #define	RX_BUFF_SIZE	(468+12+MAX_MAC_LEN)
 
 struct recvbuf {
diff --git a/usr.sbin/xntpd/include/ntp_in.h b/usr.sbin/xntpd/include/ntp_in.h
index 80aa45151fc6..494051f9c0f4 100755
--- a/usr.sbin/xntpd/include/ntp_in.h
+++ b/usr.sbin/xntpd/include/ntp_in.h
@@ -186,7 +186,7 @@ struct sockaddr_in {
 #define	IP_MULTICAST_LOOP	4	/* set/get IP multicast loopback   */
 #define	IP_ADD_MEMBERSHIP	5	/* add  an IP group membership     */
 #define	IP_DROP_MEMBERSHIP	6	/* drop an IP group membership     */
-  
+
 #define	IP_DEFAULT_MULTICAST_TTL   1	/* normally limit m'casts to 1 hop  */
 #define	IP_DEFAULT_MULTICAST_LOOP  1	/* normally hear sends if a member  */
 #define	IP_MAX_MEMBERSHIPS         20	/* per socket; must fit in one mbuf */
diff --git a/usr.sbin/xntpd/include/ntp_io.h b/usr.sbin/xntpd/include/ntp_io.h
index d60f08359b84..ebe20b49684e 100644
--- a/usr.sbin/xntpd/include/ntp_io.h
+++ b/usr.sbin/xntpd/include/ntp_io.h
@@ -1,5 +1,5 @@
 /*
- * POSIX says use <fnct.h> to get O_* symbols and 
+ * POSIX says use <fnct.h> to get O_* symbols and
  * SEEK_SET symbol form <untisd.h>.
  */
 #if defined(NTP_POSIX_SOURCE)
diff --git a/usr.sbin/xntpd/include/ntp_machine.h b/usr.sbin/xntpd/include/ntp_machine.h
index 9d2bab866085..0b62ed1d1712 100644
--- a/usr.sbin/xntpd/include/ntp_machine.h
+++ b/usr.sbin/xntpd/include/ntp_machine.h
@@ -9,7 +9,7 @@
     Various options.
     They can defined with the DEFS directive in the Config file if they
     are not defined here.
- 
+
 WHICH NICE
 
   HAVE_ATT_NICE     - Use att nice(priority_change)
@@ -17,11 +17,11 @@ WHICH NICE
   HAVE_NO_NICE      - Don't have (or use) either
 
 KERNEL MUCKING - If you porting to a new system see xntpd/ntp_unixclock.c and
-		 util/tickadj.c to see what these do. This is very system 
+		 util/tickadj.c to see what these do. This is very system
 	         dependent stuff!!!
-		 
+
   HAVE_LIBKVM       - Use libkvm to read kernal memory
-  HAVE_READKMEM     - Use read to read kernal memory 
+  HAVE_READKMEM     - Use read to read kernal memory
   NOKMEM	    - Don't read kmem
   HAVE_N_UN         - Have u_nn nlist struct.
 
@@ -31,7 +31,7 @@ WHICH SETPGRP TO USE - Not needed if NTP_POSIX_SOURCE is defined since you
   HAVE_ATT_SETPGRP  - setpgrp(void) instead of setpgrp(int, int)
 
 
-Signaled IO -  Signled IO defines. 
+Signaled IO -  Signled IO defines.
 
   HAVE_SIGNALED_IO  - Enable signaled io. Assumes you are going to use SIGIO
 		      for tty and udp io.
@@ -39,10 +39,10 @@ Signaled IO -  Signled IO defines.
 		      sockets routines are defined on top of streams.
   USE_TTY_SIGPOLL   - Use SIGPOLL on tty io. This assumes streams.
   UDP_BACKWARDS_SETOWN - SunOS 3.5 or Ultirx 2.0 system.
-	      
 
-WHICH TERMINAL MODEL TO USE - I would assume HAVE_TERMIOS if 
-		      NTP_POSIX_SOURCE was set but can't.  The 
+
+WHICH TERMINAL MODEL TO USE - I would assume HAVE_TERMIOS if
+		      NTP_POSIX_SOURCE was set but can't.  The
 		      posix tty driver is too restrictive on most systems.
 		      It is defined if you define STREAMS.
 
@@ -65,8 +65,8 @@ THIS MAKES PORTS TO NEW SYSTEMS EASY - You only have to wory about
 
 STEP SLEW OR TWO STEP - The Default is to step.
 
-  SLEWALWAYS  	    - setttimeofday can not be used to set the time of day at 
-		      all. 
+  SLEWALWAYS  	    - setttimeofday can not be used to set the time of day at
+		      all.
   STEP_SLEW 	    - setttimeofday can not set the seconds part of time
 		      time use setttimeofday to set the seconds part of the
 		      time and the slew the seconds.
@@ -101,8 +101,8 @@ WHAT DOES IOCTL(SIOCGIFCONF) RETURN IN THE BUFFER
   When requesting the IP interface configuration with an ioctl(2) calll,
   an array of ifreq structures are placed in the provided buffer.  Some
   implementations also place the length of the buffer information in
-  the first integer position of the buffer.  
-  
+  the first integer position of the buffer.
+
   SIZE_RETURNED_IN_BUFFER - size integer is in the buffer
 
 WILL IOCTL(SIOCGIFCONF) WORK ON A SOCKET
@@ -113,7 +113,7 @@ WILL IOCTL(SIOCGIFCONF) WORK ON A SOCKET
 
   USE_STREAMS_DEVICE_FOR_IF_CONFIG - use the /dev/ip device for configuration
 
-MISC  
+MISC
 
   USE_PROTOTYPES    - Prototype functions
   DOSYNCTODR        - Resync TODR clock  every hour.
@@ -136,13 +136,13 @@ have, some that can do proto typing and others that cannot on the same system.
 I get a chance to twiddle some of the configuration parameters at compile
 time based on compiler/machine combinations by using this include file.
 See convex, aix and sun configurations see how complex it get.
-  
+
 Note that it _is_ considered reasonable to add some system-specific defines
 to the machine/<os> file if it would be too inconvenient to puzzle them out
 in this file.
-  
+
 */
-  
+
 
 /*
  * RS6000 running AIX.
@@ -175,7 +175,7 @@ in this file.
 #if defined(SYS_SUNOS4)
 #define NTP_NEED_BOPS
 #define NO_SIGNED_CHAR_DECL
-#define HAVE_LIBKVM 
+#define HAVE_LIBKVM
 #define HAVE_MALLOC_H
 #define HAVE_BSD_NICE
 #define	RETSIGTYPE	void
@@ -195,7 +195,7 @@ in this file.
 #undef USE_TTY_SIGPOLL
 #undef USE_UDP_SIGPOLL
 #define STREAMS_TLI
-#define NO_SIGNED_CHAR_DECL 
+#define NO_SIGNED_CHAR_DECL
 #define STEP_SLEW 		/* TWO step */
 #define	RETSIGTYPE void
 #define NTP_POSIX_SOURCE
@@ -213,7 +213,7 @@ in this file.
 #define HAVE_SIGNALED_IO
 #define USE_TTY_SIGPOLL
 #define USE_UDP_SIGPOLL
-#define NO_SIGNED_CHAR_DECL 
+#define NO_SIGNED_CHAR_DECL
 #define STEP_SLEW 		/* TWO step */
 #define	RETSIGTYPE void
 #define NTP_POSIX_SOURCE
@@ -232,9 +232,9 @@ in this file.
 #if defined(SYS_CONVEXOS10) || defined(SYS_CONVEXOS9)
 #define HAVE_SIGNALED_IO
 #define HAVE_N_UN
-#define HAVE_READKMEM 
+#define HAVE_READKMEM
 #define HAVE_BSD_NICE
-#if defined(convex) 
+#if defined(convex)
 #define	RETSIGTYPE int
 #define NO_SIGNED_CHAR_DECL
 #else
@@ -275,7 +275,7 @@ in this file.
  */
 #if defined(SYS_ULTRIX)
 #define S_CHAR_DEFINED
-#define HAVE_READKMEM 
+#define HAVE_READKMEM
 #define HAVE_BSD_NICE
 #define	RETSIGTYPE	void
 #define	NTP_SYSCALLS_STD
@@ -399,7 +399,7 @@ in this file.
 #define NTP_POSIX_SOURCE
 #define ADJTIME_IS_ACCURATE
 #define HAVE_SYS_TIMEX_H
-/* hope there will be a standard interface 
+/* hope there will be a standard interface
  * along with a standard name one day ! */
 #define ntp_adjtime __adjtimex
 #define HAVE_BSD_NICE
@@ -478,8 +478,8 @@ in this file.
  * XXX - what OS?
  */
 #if defined(SYS_I386)
-#define HAVE_READKMEM 
-#define S_CHAR_DEFINED 
+#define HAVE_READKMEM
+#define S_CHAR_DEFINED
 #define HAVE_BSD_NICE
 #ifndef STR_SYSTEM
 #define STR_SYSTEM "UNIX/I386"
@@ -490,7 +490,7 @@ in this file.
  * Mips
  */
 #if defined(SYS_MIPS)
-#define NOKMEM 
+#define NOKMEM
 #define HAVE_BSD_NICE
 #ifndef STR_SYSTEM
 #define STR_SYSTEM "UNIX/Mips"
@@ -513,7 +513,7 @@ in this file.
 #if defined(SYS_PTX)
 #define NO_SIGNED_CHAR_DECL
 #define STREAMS_TLI
-#define HAVE_ATT_SETPGRP 
+#define HAVE_ATT_SETPGRP
 #define HAVE_SIGNALED_IO
 #define USE_UDP_SIGPOLL
 #define USE_TTY_SIGPOLL
@@ -547,7 +547,7 @@ typedef unsigned long u_long;
  * Sony NEWS
  */
 #if defined(SYS_SONY)
-#define NO_SIGNED_CHAR_DECL 
+#define NO_SIGNED_CHAR_DECL
 #define HAVE_READKMEM
 #define HAVE_BSD_NICE
 #ifndef STR_SYSTEM
@@ -560,15 +560,15 @@ typedef unsigned long u_long;
  * XXX - VMS?
  */
 #if defined(SYS_VAX)
-#define NO_SIGNED_CHAR_DECL 
-#define HAVE_READKMEM 
+#define NO_SIGNED_CHAR_DECL
+#define HAVE_READKMEM
 #define HAVE_BSD_NICE
 #ifndef STR_SYSTEM
 #define STR_SYSTEM "UNIX/VAX"
 #endif
 #endif
 
-/* 
+/*
  * UNIX V.4 on and NCR 3000
  */
 #if defined(SYS_SVR4)
@@ -576,7 +576,7 @@ typedef unsigned long u_long;
 #define USE_PROTOTYPES
 #define NTP_POSIX_SOURCE
 #define HAVE_ATT_NICE
-#define HAVE_READKMEM 
+#define HAVE_READKMEM
 #define USE_TTY_SIGPOLL
 #define USE_UDP_SIGPOLL
 #define STREAM
@@ -598,7 +598,7 @@ typedef unsigned long u_long;
 #define USE_PROTOTYPES
 #define NTP_POSIX_SOURCE
 #define HAVE_ATT_NICE
-#define HAVE_READKMEM 
+#define HAVE_READKMEM
 #define USE_TTY_SIGPOLL
 #define USE_UDP_SIGPOLL
 #define UDP_WILDCARD_DELIVERY
@@ -611,7 +611,7 @@ typedef unsigned long u_long;
 /* #define USE_STREAMS_DEVICE_FOR_IF_CONFIG */
 #undef STEP_SLEW 		/* TWO step */
 #define LOCK_PROCESS
-#define NO_SIGNED_CHAR_DECL 
+#define NO_SIGNED_CHAR_DECL
 #undef SYSV_TIMEOFDAY
 #define SIZE_RETURNED_IN_BUFFER
 #define	RETSIGTYPE void
diff --git a/usr.sbin/xntpd/include/ntp_request.h b/usr.sbin/xntpd/include/ntp_request.h
index 698e20a99555..ea2d76992e93 100644
--- a/usr.sbin/xntpd/include/ntp_request.h
+++ b/usr.sbin/xntpd/include/ntp_request.h
@@ -582,7 +582,7 @@ struct conf_restrict {
 /*
  * Structure used for returning monitor data
  */
-struct info_monitor_1 {	
+struct info_monitor_1 {
 	U_LONG lasttime;		/* last packet from this host */
 	U_LONG firsttime;		/* first time we received a packet */
 	U_LONG lastdrop;	        /* last time we rejected a packet due to client limitation policy */
@@ -599,7 +599,7 @@ struct info_monitor_1 {
 /*
  * Structure used for returning monitor data
  */
-struct info_monitor {	
+struct info_monitor {
 	U_LONG lasttime;		/* last packet from this host */
 	U_LONG firsttime;		/* first time we received a packet */
 	U_LONG lastdrop;	        /* last time we rejected a packet due to client limitation policy */
@@ -613,7 +613,7 @@ struct info_monitor {
 /*
  * Structure used for returning monitor data (old format
  */
-struct old_info_monitor {	
+struct old_info_monitor {
 	U_LONG lasttime;		/* last packet from this host */
 	U_LONG firsttime;		/* first time we received a packet */
 	U_LONG count;			/* count of packets received */
diff --git a/usr.sbin/xntpd/include/ntp_select.h b/usr.sbin/xntpd/include/ntp_select.h
index e3ce0e7e41bb..14e498d20b47 100644
--- a/usr.sbin/xntpd/include/ntp_select.h
+++ b/usr.sbin/xntpd/include/ntp_select.h
@@ -1,6 +1,6 @@
 /*
  * Not all machines define FD_SET in sys/types.h
- */ 
+ */
 #ifndef _ntp_select_h
 #define _ntp_select_h
 
diff --git a/usr.sbin/xntpd/include/ntp_string.h b/usr.sbin/xntpd/include/ntp_string.h
index cc2eec858069..90a29dae2aac 100644
--- a/usr.sbin/xntpd/include/ntp_string.h
+++ b/usr.sbin/xntpd/include/ntp_string.h
@@ -1,5 +1,5 @@
 /*
- * Define string ops: strchr strrchr memcmp memmove memset 
+ * Define string ops: strchr strrchr memcmp memmove memset
  */
 
 #ifndef  _ntp_string_h
diff --git a/usr.sbin/xntpd/include/ntp_types.h b/usr.sbin/xntpd/include/ntp_types.h
index ac3d76cbc911..bbcea1bce405 100644
--- a/usr.sbin/xntpd/include/ntp_types.h
+++ b/usr.sbin/xntpd/include/ntp_types.h
@@ -55,6 +55,6 @@
 #define U_LONG u_long
 #endif /* U_LONG */
 #endif /* __ alplha */
-    
+
 #endif /* _NTP_TYPES_ */
 
diff --git a/usr.sbin/xntpd/include/parse.h b/usr.sbin/xntpd/include/parse.h
index 49ed4e55b82c..774cf5e29ba9 100644
--- a/usr.sbin/xntpd/include/parse.h
+++ b/usr.sbin/xntpd/include/parse.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1989,1990,1991,1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -204,8 +204,8 @@ typedef struct parsetime parsetime_t;
 #define PARSE_IO_CSIZE	0x00000003
 #define PARSE_IO_CS5	0x00000000
 #define PARSE_IO_CS6	0x00000001
-#define PARSE_IO_CS7	0x00000002 
-#define PARSE_IO_CS8	0x00000003 
+#define PARSE_IO_CS7	0x00000002
+#define PARSE_IO_CS8	0x00000003
 
 /*
  * sizes
@@ -215,7 +215,7 @@ typedef struct parsetime parsetime_t;
 /*
  * ioctl structure
  */
-union parsectl 
+union parsectl
 {
   struct parsestatus
     {
@@ -243,7 +243,7 @@ union parsectl
       u_long         parse_cs;	/* character size (needed for stripping) */
     } parsesetcs;
 };
-  
+
 typedef union parsectl parsectl_t;
 
 /*------ for conversion routines --------*/
@@ -253,7 +253,7 @@ typedef union parsectl parsectl_t;
 struct parse			/* parse module local data */
 {
   int            parse_flags;	/* operation and current status flags */
-  
+
   int		 parse_ioflags;	   /* io handling flags (5-8 Bit control currently) */
   int		 parse_syncflags;	   /* possible sync events (START/END/character) */
   /*
@@ -292,7 +292,7 @@ struct parse			/* parse module local data */
   char          *parse_ldata;	/* last data buffer */
   unsigned short parse_ldsize;	/* last data buffer length */
   u_long         parse_badformat;	/* number of unparsable pakets */
-  
+
   /*
    * time stamp filtering
    */
diff --git a/usr.sbin/xntpd/include/parse_conf.h b/usr.sbin/xntpd/include/parse_conf.h
index 47f8c0c4fbd7..3c512aac8bb6 100644
--- a/usr.sbin/xntpd/include/parse_conf.h
+++ b/usr.sbin/xntpd/include/parse_conf.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/usr.sbin/xntpd/include/sys/parsestreams.h b/usr.sbin/xntpd/include/sys/parsestreams.h
index 7c054afbace6..ac66f42845dc 100644
--- a/usr.sbin/xntpd/include/sys/parsestreams.h
+++ b/usr.sbin/xntpd/include/sys/parsestreams.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1989,1990,1991,1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                   
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/usr.sbin/xntpd/kernel/chuinit.c b/usr.sbin/xntpd/kernel/chuinit.c
index 5fd96fdfee0b..80b36a9a6e10 100644
--- a/usr.sbin/xntpd/kernel/chuinit.c
+++ b/usr.sbin/xntpd/kernel/chuinit.c
@@ -1,9 +1,9 @@
 /*
 **	dynamically loadable chu driver
 **
-**	$Header: /usr/src/etc/xntp3.3ww/kernel/RCS/chuinit.c,v 1.1 1994/06/15 22:14:38 rob Exp $
+**	$Header: /home/ncvs/src/usr.sbin/xntpd/kernel/chuinit.c,v 1.1.1.1 1994/09/29 23:02:42 wollman Exp $
 **
-**	william robertson <rob@agate.berkeley.edu>  
+**	william robertson <rob@agate.berkeley.edu>
 */
 
 #include <sys/types.h>
@@ -42,10 +42,10 @@ struct vdstat *vds;
 	       log(LOG_ERR, "chu stream module already loaded\n");
 	       return (EADDRINUSE);
 	  }
- 
+
 	  i = findmod("\0");
 
-	  if (i == -1 || fmodsw[i].f_name[0] != '\0') 
+	  if (i == -1 || fmodsw[i].f_name[0] != '\0')
 	    return(-1);
 
 	  for (j = 0; vd.Drv_name[j] != '\0'; j++)	/* XXX check bounds */
@@ -66,7 +66,7 @@ struct vdstat *vds;
 	  fmodsw[i].f_str = 0;
 
 	  return(0);
-     
+
 	case VDSTAT:
 	  return(0);
 
diff --git a/usr.sbin/xntpd/kernel/clkinit.c b/usr.sbin/xntpd/kernel/clkinit.c
index e15b114cf00f..b8fe4563bf0f 100644
--- a/usr.sbin/xntpd/kernel/clkinit.c
+++ b/usr.sbin/xntpd/kernel/clkinit.c
@@ -1,9 +1,9 @@
 /*
 **	dynamically loadable clk driver
 **
-**	$Header: /usr/src/etc/xntp3.3ww/kernel/RCS/clkinit.c,v 1.1 1994/06/15 22:14:38 rob Exp $
+**	$Header: /home/ncvs/src/usr.sbin/xntpd/kernel/clkinit.c,v 1.1.1.1 1994/09/29 23:02:47 wollman Exp $
 **
-**	william robertson <rob@agate.berkeley.edu>  
+**	william robertson <rob@agate.berkeley.edu>
 */
 
 #include <sys/types.h>
@@ -42,10 +42,10 @@ struct vdstat *vds;
 	       log(LOG_ERR, "clk stream module already loaded\n");
 	       return (EADDRINUSE);
 	  }
- 
+
 	  i = findmod("\0");
 
-	  if (i == -1 || fmodsw[i].f_name[0] != '\0') 
+	  if (i == -1 || fmodsw[i].f_name[0] != '\0')
 	    return(-1);
 
 	  for (j = 0; vd.Drv_name[j] != '\0'; j++)	/* XXX check bounds */
@@ -66,7 +66,7 @@ struct vdstat *vds;
 	  fmodsw[i].f_str = 0;
 
 	  return(0);
-     
+
 	case VDSTAT:
 	  return(0);
 
diff --git a/usr.sbin/xntpd/lib/a_md512crypt.c b/usr.sbin/xntpd/lib/a_md512crypt.c
index e3705c0483ea..515d83b68a6f 100644
--- a/usr.sbin/xntpd/lib/a_md512crypt.c
+++ b/usr.sbin/xntpd/lib/a_md512crypt.c
@@ -25,7 +25,7 @@ extern U_LONG authnokey;
  *	a variable amount of encrypted data, multiple of 8 bytes, followed by:
  *	NOCRYPT_OCTETS worth of unencrypted data, followed by:
  *	BLOCK_OCTETS worth of ciphered checksum.
- */ 
+ */
 #define	NOCRYPT_OCTETS	4
 #define	BLOCK_OCTETS	16
 
@@ -80,7 +80,7 @@ MD5auth2crypt(keyno, pkt, length)
     MD5Final(&ctx);
 
     memmove((char *) &pkt[NOCRYPT_LONGS + length/sizeof(U_LONG)],
-	    (char *) ctx.digest,	    
+	    (char *) ctx.digest,
 	    BLOCK_OCTETS);
     return (4 + BLOCK_OCTETS);
 }
diff --git a/usr.sbin/xntpd/lib/a_md5decrypt.c b/usr.sbin/xntpd/lib/a_md5decrypt.c
index bde17c0dbfc9..958c21f61d9e 100644
--- a/usr.sbin/xntpd/lib/a_md5decrypt.c
+++ b/usr.sbin/xntpd/lib/a_md5decrypt.c
@@ -25,7 +25,7 @@ extern U_LONG authnokey;
  *	a variable amount of encrypted data, multiple of 8 bytes, followed by:
  *	NOCRYPT_OCTETS worth of unencrypted data, followed by:
  *	BLOCK_OCTETS worth of ciphered checksum.
- */ 
+ */
 #define	NOCRYPT_OCTETS	4
 #define	BLOCK_OCTETS	16
 
diff --git a/usr.sbin/xntpd/lib/a_md5encrypt.c b/usr.sbin/xntpd/lib/a_md5encrypt.c
index 0d816dc20976..6fae6fbb7d11 100644
--- a/usr.sbin/xntpd/lib/a_md5encrypt.c
+++ b/usr.sbin/xntpd/lib/a_md5encrypt.c
@@ -25,7 +25,7 @@ extern U_LONG authnokey;
  *	a variable amount of encrypted data, multiple of 8 bytes, followed by:
  *	NOCRYPT_OCTETS worth of unencrypted data, followed by:
  *	BLOCK_OCTETS worth of ciphered checksum.
- */ 
+ */
 #define	NOCRYPT_OCTETS	4
 #define	BLOCK_OCTETS	16
 
diff --git a/usr.sbin/xntpd/lib/atoint.c b/usr.sbin/xntpd/lib/atoint.c
index 33b5c5d5bc31..57abd4454ffc 100644
--- a/usr.sbin/xntpd/lib/atoint.c
+++ b/usr.sbin/xntpd/lib/atoint.c
@@ -42,7 +42,7 @@ atoint(str, ival)
 
 	if (isneg)
 		*ival = -u;
-	else 
+	else
 		*ival = u;
 	return 1;
 }
diff --git a/usr.sbin/xntpd/lib/atolfp.c b/usr.sbin/xntpd/lib/atolfp.c
index 649303e3caa6..644a38c41875 100644
--- a/usr.sbin/xntpd/lib/atolfp.c
+++ b/usr.sbin/xntpd/lib/atolfp.c
@@ -49,12 +49,12 @@ atolfp(str, lfp)
 	 */
 	while (isspace(*cp))
 		cp++;
-	
+
 	if (*cp == '-') {
 		cp++;
 		isneg = 1;
 	}
-	
+
 	if (*cp == '+')
 		cp++;
 
@@ -70,7 +70,7 @@ atolfp(str, lfp)
 	if (*cp != '\0' && !isspace(*cp)) {
 		if (*cp++ != '.')
 			return 0;
-	
+
 		while (ndec < 9 && *cp != '\0'
 		    && (ind = strchr(digits, *cp)) != NULL) {
 			ndec++;
@@ -81,7 +81,7 @@ atolfp(str, lfp)
 
 		while (isdigit(*cp))
 			cp++;
-		
+
 		if (*cp != '\0' && !isspace(*cp))
 			return 0;
 	}
@@ -110,7 +110,7 @@ atolfp(str, lfp)
 
 	if (isneg)
 		M_NEG(dec_i, dec_f);
-	
+
 	lfp->l_ui = dec_i;
 	lfp->l_uf = dec_f;
 	return 1;
diff --git a/usr.sbin/xntpd/lib/auth12crypt.c b/usr.sbin/xntpd/lib/auth12crypt.c
index 0e69dbea2b07..7d69122e0ce3 100644
--- a/usr.sbin/xntpd/lib/auth12crypt.c
+++ b/usr.sbin/xntpd/lib/auth12crypt.c
@@ -11,7 +11,7 @@
  *	an 8 byte chunk of data which is encrypted in pass 2
  *	NOCRYPT_OCTETS worth of unencrypted data, followed by:
  *	BLOCK_OCTETS worth of ciphered checksum.
- */ 
+ */
 #define	NOCRYPT_OCTETS	4
 #define	BLOCK_OCTETS	8
 
diff --git a/usr.sbin/xntpd/lib/authdecrypt.c b/usr.sbin/xntpd/lib/authdecrypt.c
index 7462941bf662..6ad3aebaf467 100644
--- a/usr.sbin/xntpd/lib/authdecrypt.c
+++ b/usr.sbin/xntpd/lib/authdecrypt.c
@@ -9,7 +9,7 @@
  *	a variable amount of unencrypted data, multiple of 8 bytes, followed by:
  *	NOCRYPT_OCTETS worth of unencrypted data, followed by:
  *	BLOCK_OCTETS worth of ciphered checksum.
- */ 
+ */
 #define	NOCRYPT_OCTETS	4
 #define	BLOCK_OCTETS	8
 
@@ -42,7 +42,7 @@ DESauthdecrypt(keyno, pkt, length)
 	U_LONG work[2];
 
 	authdecryptions++;
-	
+
 	if (keyno == 0)
 		keys = DESzerodkeys;
 	else {
diff --git a/usr.sbin/xntpd/lib/authencrypt.c b/usr.sbin/xntpd/lib/authencrypt.c
index eb203e426f64..f84d10fa7372 100644
--- a/usr.sbin/xntpd/lib/authencrypt.c
+++ b/usr.sbin/xntpd/lib/authencrypt.c
@@ -9,7 +9,7 @@
  *	a variable amount of encrypted data, multiple of 8 bytes, followed by:
  *	NOCRYPT_OCTETS worth of unencrypted data, followed by:
  *	BLOCK_OCTETS worth of ciphered checksum.
- */ 
+ */
 #define	NOCRYPT_OCTETS	4
 #define	BLOCK_OCTETS	8
 
diff --git a/usr.sbin/xntpd/lib/authkeys.c b/usr.sbin/xntpd/lib/authkeys.c
index 8e590ceb0945..9fce02009100 100644
--- a/usr.sbin/xntpd/lib/authkeys.c
+++ b/usr.sbin/xntpd/lib/authkeys.c
@@ -200,7 +200,7 @@ authhavekey(keyno)
 		authkeynotfound++;
 		return 0;
 	}
-	
+
 	cache_keyid = sk->keyid;
 	cache_flags = sk->flags;
 #ifdef	MD5
@@ -233,7 +233,7 @@ auth_moremem()
 	sk = (struct savekey *)malloc(MEMINC * sizeof(struct savekey));
 	if (sk == 0)
 		return 0;
-	
+
 	for (i = MEMINC; i > 0; i--) {
 		sk->next = authfreekeys;
 		authfreekeys = sk++;
@@ -262,7 +262,7 @@ authtrust(keyno, trust)
 
 	if (sk == 0 && !trust)
 		return;
-	
+
 	if (sk != 0) {
 		if (cache_keyid == keyno)
 			cache_flags = cache_keyid = 0;
@@ -405,7 +405,7 @@ MD5auth_setkey(keyno, key)
 	while (sk != 0) {
 		if (keyno == sk->keyid) {
 			strncpy(sk->k.MD5_key, (char *)key, sizeof(sk->k.MD5_key));
-			if ((sk->keylen = strlen((char *)key)) > 
+			if ((sk->keylen = strlen((char *)key)) >
 			                          sizeof(sk->k.MD5_key))
 			    sk->keylen = sizeof(sk->k.MD5_key);
 
@@ -441,7 +441,7 @@ MD5auth_setkey(keyno, key)
 	return;
 }
 #endif
-    
+
 /*
  * auth_delkeys - delete all known keys, in preparation for rereading
  *		  the keys file (presumably)
diff --git a/usr.sbin/xntpd/lib/authreadkeys.c b/usr.sbin/xntpd/lib/authreadkeys.c
index 8d2697fa2bab..ee134411e5fc 100644
--- a/usr.sbin/xntpd/lib/authreadkeys.c
+++ b/usr.sbin/xntpd/lib/authreadkeys.c
@@ -44,7 +44,7 @@ nexttok(str)
 	 */
 	while (*cp == ' ' || *cp == '\t')
 		cp++;
-	
+
 	/*
 	 * Save this and space to end of token
 	 */
@@ -52,19 +52,19 @@ nexttok(str)
 	while (*cp != '\0' && *cp != '\n' && *cp != ' '
 	    && *cp != '\t' && *cp != '#')
 		cp++;
-	
+
 	/*
 	 * If token length is zero return an error, else set end of
 	 * token to zero and return start.
 	 */
 	if (starttok == cp)
 		return 0;
-	
+
 	if (*cp == ' ' || *cp == '\t')
 		*cp++ = '\0';
 	else
 		*cp = '\0';
-	
+
 	*str = cp;
 	return starttok;
 }
@@ -107,7 +107,7 @@ extern	int	fclose		P((FILE *stream));
 		token = nexttok(&line);
 		if (token == 0)
 			continue;
-		
+
 		/*
 		 * First is key number.  See if it is okay.
 		 */
diff --git a/usr.sbin/xntpd/lib/authusekey.c b/usr.sbin/xntpd/lib/authusekey.c
index 20d7f3c3f447..05fc0d79c7f1 100644
--- a/usr.sbin/xntpd/lib/authusekey.c
+++ b/usr.sbin/xntpd/lib/authusekey.c
@@ -84,14 +84,14 @@ authusekey(keyno, keytype, str)
 		if (!DESauth_parity(key)) {
 			return 0;
 		}
-		
+
 		/*
 		 * We can't find a good reason not to use this key.
 		 * So use it.
 		 */
 		DESauth_setkey(keyno, key);
 		break;
-	
+
 	case KEY_TYPE_ASCII:
 		/*
 		 * Make up key from ascii representation
@@ -103,7 +103,7 @@ authusekey(keyno, keytype, str)
 		    | (U_LONG)keybytes[2] << 8 | (U_LONG)keybytes[3];
 		key[1] = (U_LONG)keybytes[4] << 24 | (U_LONG)keybytes[5] << 16
 		    | (U_LONG)keybytes[6] << 8 | (U_LONG)keybytes[7];
-		
+
 		/*
 		 * Set parity on key
 		 */
diff --git a/usr.sbin/xntpd/lib/caljulian.c b/usr.sbin/xntpd/lib/caljulian.c
index 070fa0d6f34e..64efd1e0e0d7 100644
--- a/usr.sbin/xntpd/lib/caljulian.c
+++ b/usr.sbin/xntpd/lib/caljulian.c
@@ -60,7 +60,7 @@ caljulian(ntptime, jt)
 		nt -= SECSPERCYCLE;
 		cyear++;
 	}
-	
+
 	/*
 	 * Seconds, minutes and hours are too hard to do without
 	 * divides, so we don't.
@@ -96,7 +96,7 @@ caljulian(ntptime, jt)
 	for (i = 0; i < 11; i++)
 		if (snt < calmonthtab[i+1])
 			break;
-	
+
 	if (i > 9)
 		jt->month = i - 9;	/* January or February */
 	else
diff --git a/usr.sbin/xntpd/lib/calleapwhen.c b/usr.sbin/xntpd/lib/calleapwhen.c
index 83613efc15ff..d68bbe97bb03 100644
--- a/usr.sbin/xntpd/lib/calleapwhen.c
+++ b/usr.sbin/xntpd/lib/calleapwhen.c
@@ -52,7 +52,7 @@ calleapwhen(ntpdate, leaplast, leapnext)
 	for (i = 1; i < 9; i++)
 		if (dateincycle < (u_long)calleaptab[i])
 			break;
-	
+
 	/*
 	 * i points at the next leap.  Compute the last and the next.
 	 */
diff --git a/usr.sbin/xntpd/lib/calyearstart.c b/usr.sbin/xntpd/lib/calyearstart.c
index 015ed933b7fa..e78c058a4557 100644
--- a/usr.sbin/xntpd/lib/calyearstart.c
+++ b/usr.sbin/xntpd/lib/calyearstart.c
@@ -35,7 +35,7 @@ calyearstart(dateinyear)
 		cyclestart = MAR1900;
 	while ((cyclestart + SECSPERCYCLE) <= dateinyear)
 		cyclestart += SECSPERCYCLE;
-	
+
 	/*
 	 * If we're in the first year of the cycle, January 1 is
 	 * two months back from the cyclestart and the year is
diff --git a/usr.sbin/xntpd/lib/clocktypes.c b/usr.sbin/xntpd/lib/clocktypes.c
index 38b8cd28a6b2..4c5f437f39ca 100644
--- a/usr.sbin/xntpd/lib/clocktypes.c
+++ b/usr.sbin/xntpd/lib/clocktypes.c
@@ -63,7 +63,7 @@ clockname(num)
 	int num;
 {
 	register struct clktype *clk;
-  
+
 	for (clk = clktypes; clk->code != -1; clk++) {
 		if (num == clk->code)
 			return (clk->abbrev);
diff --git a/usr.sbin/xntpd/lib/decodenetnum.c b/usr.sbin/xntpd/lib/decodenetnum.c
index 65e77619c33d..f19b1376c8e3 100644
--- a/usr.sbin/xntpd/lib/decodenetnum.c
+++ b/usr.sbin/xntpd/lib/decodenetnum.c
@@ -50,7 +50,7 @@ decodenetnum(num, netnum)
 		*netnum <<= 8;
 		*netnum += temp;
 	}
-	
+
 	if (i < 4)
 		return 0;
 	*netnum = htonl(*netnum);
diff --git a/usr.sbin/xntpd/lib/dofptoa.c b/usr.sbin/xntpd/lib/dofptoa.c
index 31673fbbbc59..bfa9c713fe02 100644
--- a/usr.sbin/xntpd/lib/dofptoa.c
+++ b/usr.sbin/xntpd/lib/dofptoa.c
@@ -72,7 +72,7 @@ dofptoa(fpv, neg, ndec, msec)
 
 	if (dec > 6)
 		dec = 6;
-	
+
 	if (dec > 0) {
 		do {
 			val &= 0xffff;
@@ -99,14 +99,14 @@ dofptoa(fpv, neg, ndec, msec)
 	 */
 	while (cp < (cpdec -1) && *cp == 0)
 		cp++;
-	
+
 	/*
 	 * Copy it into the buffer, asciizing as we go.
 	 */
 	bp = buf;
 	if (neg)
 		*bp++ = '-';
-	
+
 	while (cp < cpend) {
 		if (cp == cpdec)
 			*bp++ = '.';
diff --git a/usr.sbin/xntpd/lib/dolfptoa.c b/usr.sbin/xntpd/lib/dolfptoa.c
index a79d8c669577..24fc2138d787 100644
--- a/usr.sbin/xntpd/lib/dolfptoa.c
+++ b/usr.sbin/xntpd/lib/dolfptoa.c
@@ -81,7 +81,7 @@ dolfptoa(fpi, fpv, neg, ndec, msec)
 	}
 	if (dec > 12)
 		dec = 12;
-	
+
 	/*
 	 * If there's a fraction to deal with, do so.
 	 */
diff --git a/usr.sbin/xntpd/lib/findconfig.c b/usr.sbin/xntpd/lib/findconfig.c
index 83126686b40c..a65f32c0b2fc 100755
--- a/usr.sbin/xntpd/lib/findconfig.c
+++ b/usr.sbin/xntpd/lib/findconfig.c
@@ -11,8 +11,8 @@ FindConfig(base)
 {
     static char result[BUFSIZ];
     char hostname[BUFSIZ], *cp;
-    struct stat sbuf; 
-    struct utsname unamebuf; 
+    struct stat sbuf;
+    struct utsname unamebuf;
 
     /* All keyed by initial target being a directory */
     (void) strcpy(result, base);
@@ -46,8 +46,8 @@ FindConfig(base)
 			}
 		    }
 		}
-	    } 
-	} 
+	    }
+	}
     }
 outahere:
     return(result);
diff --git a/usr.sbin/xntpd/lib/getopt.c b/usr.sbin/xntpd/lib/getopt.c
index 8505d808d430..b5164c608ac3 100644
--- a/usr.sbin/xntpd/lib/getopt.c
+++ b/usr.sbin/xntpd/lib/getopt.c
@@ -63,7 +63,7 @@ ntp_getopt(argc, argv, optstring)
 		scan = NULL;
 		ntp_optind++;
 	}
-	
+
 	if (scan == NULL || *scan == '\0') {
 		if (ntp_optind >= argc
 		    || argv[ntp_optind][0] != '-'
@@ -75,7 +75,7 @@ ntp_getopt(argc, argv, optstring)
 			ntp_optind++;
 			return (EOF);
 		}
-	
+
 		scan = argv[ntp_optind++]+1;
 	}
 
diff --git a/usr.sbin/xntpd/lib/hextolfp.c b/usr.sbin/xntpd/lib/hextolfp.c
index d9291cc994a4..104446c9f963 100644
--- a/usr.sbin/xntpd/lib/hextolfp.c
+++ b/usr.sbin/xntpd/lib/hextolfp.c
@@ -30,7 +30,7 @@ hextolfp(str, lfp)
 	 */
 	while (isspace(*cp))
 		cp++;
-	
+
 	cpstart = cp;
 	while (*cp != '\0' && (cp - cpstart) < 8 &&
 	    (ind = strchr(digits, *cp)) != NULL) {
@@ -56,7 +56,7 @@ hextolfp(str, lfp)
 
 	if ((cp - cpstart) < 8 || ind == NULL)
 		return 0;
-	
+
 	if (*cp != '\0' && !isspace(*cp))
 		return 0;
 
diff --git a/usr.sbin/xntpd/lib/humandate.c b/usr.sbin/xntpd/lib/humandate.c
index 8ea936fa1e46..b7b89bc6ec4f 100644
--- a/usr.sbin/xntpd/lib/humandate.c
+++ b/usr.sbin/xntpd/lib/humandate.c
@@ -29,14 +29,14 @@ humandate(ntptime)
 	time_t sec;
 
 	LIB_GETBUF(bp);
-	
+
 	sec = ntptime - JAN_1970;
 	tm = localtime(&sec);
 
 	(void) sprintf(bp, "%s, %s %2d %4d %2d:%02d:%02d",
 	    days[tm->tm_wday], months[tm->tm_mon], tm->tm_mday,
 	    1900+tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec);
-	
+
 	return bp;
 }
 
@@ -50,12 +50,12 @@ humanlogtime()
 	char *bp;
 	time_t cursec = time((time_t *) 0);
 	struct tm *tm = localtime(&cursec);
-	
+
 	LIB_GETBUF(bp);
-	
+
 	(void) sprintf(bp, "%2d %s %02d:%02d:%02d",
 		tm->tm_mday, months[tm->tm_mon],
 		tm->tm_hour, tm->tm_min, tm->tm_sec);
-		
+
 	return bp;
 }
diff --git a/usr.sbin/xntpd/lib/md5.c b/usr.sbin/xntpd/lib/md5.c
index 2c373cf0d128..a5aca7a2584f 100644
--- a/usr.sbin/xntpd/lib/md5.c
+++ b/usr.sbin/xntpd/lib/md5.c
@@ -82,7 +82,7 @@ unsigned char PADDING[64] = {
  * inline assembly code, we can speed this up a bit.
  */
 inline UINT4 ROTATE_LEFT(UINT4 x, int n)
-{   
+{
     asm("roll %2,%0" : "=d" (x) : "0" (x), "Ir" (n));
     return x;
 }
diff --git a/usr.sbin/xntpd/lib/mstolfp.c b/usr.sbin/xntpd/lib/mstolfp.c
index f9c21b7e3da4..e4c4d469f566 100644
--- a/usr.sbin/xntpd/lib/mstolfp.c
+++ b/usr.sbin/xntpd/lib/mstolfp.c
@@ -32,7 +32,7 @@ mstolfp(str, lfp)
 	cp = str;
 	while (isspace(*cp))
 		cp++;
-	
+
 	if (*cp == '-') {
 		*bp++ = '-';
 		cp++;
@@ -81,7 +81,7 @@ mstolfp(str, lfp)
 	 */
 	while (cp < cpdec)
 		*bp++ = (char)*cp++;
-	
+
 	if (*cp == '.') {
 		cp++;
 		while (isdigit(*cp))
diff --git a/usr.sbin/xntpd/lib/netof.c b/usr.sbin/xntpd/lib/netof.c
index def3013dd425..1823fb20bf31 100644
--- a/usr.sbin/xntpd/lib/netof.c
+++ b/usr.sbin/xntpd/lib/netof.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * netof - return the net address part of an ip address
  *         (zero out host part)
  */
diff --git a/usr.sbin/xntpd/lib/numtohost.c b/usr.sbin/xntpd/lib/numtohost.c
index 844bbceb63b4..9d835849ed51 100644
--- a/usr.sbin/xntpd/lib/numtohost.c
+++ b/usr.sbin/xntpd/lib/numtohost.c
@@ -29,9 +29,9 @@ numtohost(netnum)
 	    || ((hp = gethostbyaddr((char *)&netnum, sizeof netnum, AF_INET))
 	      == 0))
 		return numtoa(netnum);
-	
+
 	LIB_GETBUF(bp);
-	
+
 	bp[LIB_BUFLENGTH-1] = '\0';
 	(void) strncpy(bp, hp->h_name, LIB_BUFLENGTH-1);
 	return bp;
diff --git a/usr.sbin/xntpd/lib/prettydate.c b/usr.sbin/xntpd/lib/prettydate.c
index 747e31018e7d..fd4a8b1f0464 100644
--- a/usr.sbin/xntpd/lib/prettydate.c
+++ b/usr.sbin/xntpd/lib/prettydate.c
@@ -29,7 +29,7 @@ prettydate(ts)
 	};
 
 	LIB_GETBUF(bp);
-	
+
 	sec = ts->l_ui - JAN_1970;
 	msec = ts->l_uf / 4294967;	/* fract / (2 ** 32 / 1000) */
 
@@ -39,6 +39,6 @@ prettydate(ts)
 		       (u_long)ts->l_ui, (u_long)ts->l_uf, days[tm->tm_wday],
 		       months[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year,
 		       tm->tm_hour,tm->tm_min, tm->tm_sec, msec);
-	
+
 	return bp;
 }
diff --git a/usr.sbin/xntpd/lib/refnumtoa.c b/usr.sbin/xntpd/lib/refnumtoa.c
index b46fdd8cb350..8bb7d38091fa 100644
--- a/usr.sbin/xntpd/lib/refnumtoa.c
+++ b/usr.sbin/xntpd/lib/refnumtoa.c
@@ -14,9 +14,9 @@ refnumtoa(num)
 	register u_long netnum;
 	register char *buf;
 	register const char *rclock;
-	
+
 	netnum = ntohl(num);
-	
+
 	LIB_GETBUF(buf);
 
 	rclock = clockname((int)((netnum >> 8) & 0xff));
diff --git a/usr.sbin/xntpd/lib/systime.c b/usr.sbin/xntpd/lib/systime.c
index 4464e8dae3f4..53f0e674c6f3 100644
--- a/usr.sbin/xntpd/lib/systime.c
+++ b/usr.sbin/xntpd/lib/systime.c
@@ -100,7 +100,7 @@ int
 step_systime(ts)
 	l_fp *ts;
 {
-#ifdef SLEWALWAYS 
+#ifdef SLEWALWAYS
 #ifdef STEP_SLEW
 	register u_long tmp_ui;
 	register u_long tmp_uf;
@@ -121,7 +121,7 @@ step_systime(ts)
 	if (tmp_ui >= 3) {		/* Step it and slew we  might win */
              n = step_systime_real(ts);
 	     if (!n) return n;
-	     if (isneg) 
+	     if (isneg)
 		ts->l_ui = ~0;
 	     else
 		ts->l_ui = ~0;
diff --git a/usr.sbin/xntpd/lib/utvtoa.c b/usr.sbin/xntpd/lib/utvtoa.c
index 48310a837135..5a192e198a4c 100644
--- a/usr.sbin/xntpd/lib/utvtoa.c
+++ b/usr.sbin/xntpd/lib/utvtoa.c
@@ -14,7 +14,7 @@ utvtoa(tv)
 	register char *buf;
 
 	LIB_GETBUF(buf);
-	
+
 	(void) sprintf(buf, "%lu.%06lu", (u_long)tv->tv_sec,
 	    (u_long)tv->tv_usec);
 	return buf;
diff --git a/usr.sbin/xntpd/ntpdate/ntpdate.c b/usr.sbin/xntpd/ntpdate/ntpdate.c
index 20fa604f00eb..bb5ede5a0f7f 100644
--- a/usr.sbin/xntpd/ntpdate/ntpdate.c
+++ b/usr.sbin/xntpd/ntpdate/ntpdate.c
@@ -247,7 +247,7 @@ main(argc, argv)
 		default:
 			break;
 		}
-	
+
 	sys_maxservers = argc - ntp_optind;
 	if (errflg || sys_maxservers == 0) {
 		(void) fprintf(stderr,
@@ -532,7 +532,7 @@ receive(rbufp)
 			    PKT_MODE(rpkt->li_vn_mode), rpkt->stratum);
 		return;
 	}
-	
+
 	/*
 	 * So far, so good.  See if this is from a server we know.
 	 */
@@ -553,7 +553,7 @@ receive(rbufp)
 			printf("receive: pkt.org and peer.xmt differ\n");
 		return;
 	}
-	
+
 	/*
 	 * Check out the authenticity if we're doing that.
 	 */
@@ -564,7 +564,7 @@ receive(rbufp)
 
 		if (debug > 3)
 		    printf("receive: rpkt keyid=%ld sys_authkey=%ld decrypt=%ld\n",
-			   (long int)ntohl(rpkt->keyid), (long int)sys_authkey, 
+			   (long int)ntohl(rpkt->keyid), (long int)sys_authkey,
 			   (long int)authdecrypt(sys_authkey, (U_LONG *)rpkt,
 				       LEN_PKT_NOMAC));
 
@@ -578,7 +578,7 @@ receive(rbufp)
 	server->trust <<= 1;
 	if (!is_authentic)
 		server->trust |= 1;
-	
+
 	/*
 	 * Looks good.  Record info from the packet.
 	 */
@@ -685,7 +685,7 @@ clock_filter(server)
 	 */
 	for (i = 0; i < sys_samples; i++)
 		ord[i] = i;
-	
+
 	for (i = 0; i < (sys_samples-1); i++) {
 		for (j = i+1; j < sys_samples; j++) {
 			if (server->filter_delay[ord[j]] == 0)
@@ -866,7 +866,7 @@ clock_select()
 				server_list[i] = server_list[j];
 				server_list[j] = server;
 			}
-		
+
 		/*
 		 * Calculate the fixed part of the dispersion limit
 		 */
@@ -910,7 +910,7 @@ clock_select()
 				if (n > server_list[j]->precision)
 					n = server_list[j]->precision;
 			}
-			
+
 			/*
 			 * i is the index of the server with the worst
 			 * dispersion.  If his dispersion is less than
@@ -965,7 +965,7 @@ clock_adjust()
 		    "no server suitable for synchronization found");
 		return(1);
 	}
-	
+
 	dostep = 1;
 	if (!always_step) {
 		absoffset = server->soffset;
@@ -1237,7 +1237,7 @@ getrecvbufs()
 	if (full_recvbufs == 0) {
 		return (struct recvbuf *)0;	/* nothing has arrived */
 	}
-	
+
 	/*
 	 * Get the fulllist chain and mark it empty
 	 */
@@ -1418,7 +1418,7 @@ static int
 l_step_systime(ts)
 	l_fp *ts;
 {
-#ifdef SLEWALWAYS 
+#ifdef SLEWALWAYS
 #ifdef STEP_SLEW
 	l_fp ftmp;
 	int isneg;
@@ -1439,7 +1439,7 @@ l_step_systime(ts)
              n = step_systime_real(ts);
 	     if (!n)
 		return n;
-	     if (isneg) 
+	     if (isneg)
 		ts->l_ui = ~0;
 	     else
 		ts->l_ui = ~0;
@@ -1512,7 +1512,7 @@ printserver(pp, fp)
 	    pp->leap & 0x2 ? '1' : '0',
 	    pp->leap & 0x1 ? '1' : '0',
 	    pp->trust);
-	
+
 	if (pp->stratum == 1) {
 		junk[4] = 0;
 		memmove(junk, (char *)&pp->refid, 4);
@@ -1524,7 +1524,7 @@ printserver(pp, fp)
 	    "refid [%s], delay %s, dispersion %s\n",
 	    str, fptoa(pp->delay, 5),
 	    ufptoa(pp->dispersion, 5));
-	
+
 	(void) fprintf(fp, "transmitted %d, in filter %d\n",
 	    pp->xmtcnt, pp->filter_nextpt);
 
@@ -1534,7 +1534,7 @@ printserver(pp, fp)
 	    prettydate(&pp->org));
 	(void) fprintf(fp, "transmit timestamp:  %s\n",
 	    prettydate(&pp->xmt));
-	
+
 	(void) fprintf(fp, "filter delay: ");
 	for (i = 0; i < NTP_SHIFT; i++) {
 		(void) fprintf(fp, " %-8.8s", fptoa(pp->filter_delay[i], 5));
diff --git a/usr.sbin/xntpd/ntpq/ntpq.c b/usr.sbin/xntpd/ntpq/ntpq.c
index 441b283bad6d..2c5eacf32705 100644
--- a/usr.sbin/xntpd/ntpq/ntpq.c
+++ b/usr.sbin/xntpd/ntpq/ntpq.c
@@ -146,7 +146,7 @@ struct ctl_var peer_var[] = {
 	{ CP_RECEIVED,	UI,	"received" },	/* 31 */
 	{ CP_SENT,	UI,	"sent" },	/* 32 */
 	{ CP_FILTERROR,	AR,	"filterror" },	/* 33 */
-	{ CP_FLASH,     TST,	"flash"},	/* 34 */ 
+	{ CP_FLASH,     TST,	"flash"},	/* 34 */
 	{ CP_DISP,      AR,	"disp" },	/* 35 */
 	/*
 	 * These are duplicate entries so that we can
@@ -608,7 +608,7 @@ openhost(hname)
 
 	if (!getnetnum(hname, &netnum, temphost))
 		return 0;
-	
+
 	if (debug > 2)
 		printf("Opening host %s\n", temphost);
 
@@ -627,7 +627,7 @@ openhost(hname)
 	sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sockfd == -1)
 		error("socket", "", "");
-	
+
 #if defined(SYS_HPUX) && (SYS_HPUX < 8)
 #ifdef SO_RCVBUF
 	{ int rbufsize = DATASIZE + 2048;	/* 2K for slop */
@@ -641,7 +641,7 @@ openhost(hname)
 	if (connect(sockfd, (struct sockaddr *)&hostaddr,
 		    sizeof(hostaddr)) == -1)
 		error("connect", "", "");
-	
+
 	havehost = 1;
 	return 1;
 }
@@ -726,7 +726,7 @@ again:
 		tvo = tvout;
 	else
 		tvo = tvsout;
-	
+
 	FD_SET(sockfd, &fds);
 	n = select(sockfd+1, &fds, (fd_set *)0, (fd_set *)0, &tvo);
 
@@ -954,22 +954,22 @@ again:
 			printf("Number of fragments exceeds maximum\n");
 		return ERR_TOOMUCH;
 	}
-	
+
 	for (n = 0; n < numfrags; n++) {
 		if (offset == offsets[n])
 			goto again;	/* duplicate */
 		if (offset < offsets[n])
 			break;
 	}
-	
+
 	if ((u_short)(n > 0 && offsets[n-1] + counts[n-1]) > offset)
 		goto overlap;
 	if (n < numfrags && (u_short)(offset + count) > offsets[n])
 		goto overlap;
-	
+
 	{
 		register int i;
-		
+
 		for (i = numfrags; i > n; i--) {
 			offsets[i] = offsets[i-1];
 			counts[i] = counts[i-1];
@@ -1162,7 +1162,7 @@ again:
 	res = sendrequest(opcode, associd, auth, qsize, qdata);
 	if (res != 0)
 		return res;
-	
+
 	/*
 	 * Get the response.  If we got a standard error, print a message
 	 */
@@ -1286,7 +1286,7 @@ docmd(cmdline)
 	tokenize(cmdline, tokens, &ntok);
 	if (ntok == 0)
 		return;
-	
+
 	/*
 	 * Find the appropriate command description.
 	 */
@@ -1300,7 +1300,7 @@ docmd(cmdline)
 		    tokens[0]);
 		return;
 	}
-	
+
 	/*
 	 * Save the keyword, then walk through the arguments, interpreting
 	 * as we go.
@@ -1623,7 +1623,7 @@ rtdatetolfp(str, lfp)
 
 	if (*cp++ != '-')
 		return 0;
-	
+
 	for (i = 0; i < 3; i++)
 		buf[i] = *cp++;
 	buf[3] = '\0';
@@ -1637,7 +1637,7 @@ rtdatetolfp(str, lfp)
 
 	if (*cp++ != '-')
 		return 0;
-	
+
 	if (!isdigit(*cp))
 		return 0;
 	cal.year = *cp++ - '0';
@@ -2488,7 +2488,7 @@ statustoa(type, st)
 		(void)strcat(cb, ", ");
 		(void)strcat(cb, getcode(CTL_SYS_EVENT(st), sys_codes));
 		break;
-	
+
 	case TYPE_PEER:
 		/*
 		 * Handcraft the bits
@@ -2535,7 +2535,7 @@ statustoa(type, st)
 			    peer_codes));
 		}
 		break;
-	
+
 	case TYPE_CLOCK:
 		(void)strcpy(cb, getcode(((st)>>8) & 0xff, clock_codes));
 		(void)strcat(cb, ", last_");
@@ -2573,7 +2573,7 @@ nextvar(datalen, datap, vname, vvalue)
 		cp++;
 	if (cp == cpend)
 		return 0;
-	
+
 	/*
 	 * Copy name until we hit a ',', an '=', a '\r' or a '\n'.  Backspace
 	 * over any white space and terminate it.
@@ -2800,7 +2800,7 @@ outputarr(fp, name, narr, lfp)
 	 */
 	if ((int)strlen(name) < 10)
 		*bp++ = ' ';
-	
+
 	for (i = narr; i > 0; i--) {
 		if (i != narr)
 			*bp++ = ' ';
@@ -2937,14 +2937,14 @@ cookedprint(datatype, length, data, status, fp)
 					}
 				}
 				break;
-			
+
 			case UI:
 				if (!decodeuint(value, &uval))
 					output_raw = '?';
 				else
 					output(fp, name, uinttoa(uval));
 				break;
-			
+
 			case IN:
 				if (!decodeint(value, &ival))
 					output_raw = '?';
@@ -2961,11 +2961,11 @@ cookedprint(datatype, length, data, status, fp)
 				else
 					output(fp, name, numtoa(hval));
 				break;
-			
+
 			case ST:
 				output_raw = '*';
 				break;
-			
+
 			case RF:
 				if (decodenetnum(value, &hval))
 					output(fp, name, nntohost(hval));
@@ -3000,14 +3000,14 @@ cookedprint(datatype, length, data, status, fp)
 					output(fp, name, b);
 				}
 				break;
-			
+
 			case MD:
 				if (!decodeuint(value, &uval))
 					output_raw = '?';
 				else
 					output(fp, name, uinttoa(uval));
 				break;
-			
+
 			case AR:
 				if (!decodearr(value, &narr, lfparr))
 					output_raw = '?';
@@ -3021,7 +3021,7 @@ cookedprint(datatype, length, data, status, fp)
 				else
 					output(fp, name, tstflags(uval));
 				break;
-			
+
 			default:
 				(void) fprintf(stderr,
 			"Internal error in cookedprint, %s=%s, fmt %d\n",
diff --git a/usr.sbin/xntpd/ntpq/ntpq_ops.c b/usr.sbin/xntpd/ntpq/ntpq_ops.c
index 8bab73df576f..8e59a7172c38 100644
--- a/usr.sbin/xntpd/ntpq/ntpq_ops.c
+++ b/usr.sbin/xntpd/ntpq/ntpq_ops.c
@@ -370,7 +370,7 @@ makequerydata(vlist, datalen, data)
 		totallen = namelen + valuelen + (valuelen != 0) + (cp != data);
 		if (cp + totallen > cpend)
 			break;
-		
+
 		if (cp != data)
 			*cp++ = ',';
 		memmove(cp, vl->name, namelen);
@@ -833,15 +833,15 @@ dogetassoc(fp)
 
 	res = doquery(CTL_OP_READSTAT, 0, 0, 0, (char *)0, &rstatus,
 	    &dsize, (char **)&datap);
-	
+
 	if (res != 0)
 		return 0;
-	
+
 	if (dsize == 0) {
 		(void) fprintf(fp, "No association ID's returned\n");
 		return 0;
 	}
-	
+
 	if (dsize & 0x3) {
 		(void) fprintf(stderr,
 	    "***Server returned %d octets, should be multiple of 4\n",
@@ -964,7 +964,7 @@ printassoc(showall, fp)
 					condition = "sys.peer";
 			       	 	break;
 				}
-			
+
 		} else {
 			reach = "no";
 			auth = condition = "";
@@ -1164,7 +1164,7 @@ when(ts, rec, reftime)
 		lasttime = reftime;
 	else
 		return "-";
-	
+
 	diff = (long)(ts->l_ui - lasttime->l_ui);
 	if (diff <= 0) {
 		/*
@@ -1237,7 +1237,7 @@ struct varlist peervarlist[] = {
 #define	HAVE_REFID	1
 #define	HAVE_STRATUM	2
 #define	HAVE_HPOLL	3
-#define	HAVE_PPOLL 	4	
+#define	HAVE_PPOLL 	4
 #define	HAVE_REACH	5
 #define	HAVE_DELAY	6
 #define	HAVE_OFFSET	7
@@ -1286,7 +1286,7 @@ doprintpeers(pvl, associd, rstatus, datalen, data, fp)
 
 	memset((char *)havevar, 0, sizeof(havevar));
 	gettstamp(&ts);
-	
+
 	while (nextvar(&datalen, &data, &name, &value)) {
 		u_long dummy;
 		i = findvar(name, peer_var);
@@ -1405,7 +1405,7 @@ doprintpeers(pvl, associd, rstatus, datalen, data, fp)
 			    pvl[i].name, associd);
 			return 0;
 		}
-	
+
 
 	/*
 	 * Got everything, format the line
@@ -1439,7 +1439,7 @@ doprintpeers(pvl, associd, rstatus, datalen, data, fp)
 #undef	HAVE_REC
 #undef	HAVE_SRCPORT
 #undef	HAVE_REFTIME
-#undef	MAXHAVE	
+#undef	MAXHAVE
 
 
 /*
@@ -1478,7 +1478,7 @@ dogetpeers(pvl, associd, fp)
 		return 0;
 	}
 
-	
+
 	return doprintpeers(pvl, associd, (int)rstatus, dsize, datap, fp);
 }
 
diff --git a/usr.sbin/xntpd/ntptrace/ntptrace.c b/usr.sbin/xntpd/ntptrace/ntptrace.c
index b4c5c57138af..206c73861709 100644
--- a/usr.sbin/xntpd/ntptrace/ntptrace.c
+++ b/usr.sbin/xntpd/ntptrace/ntptrace.c
@@ -159,7 +159,7 @@ main(argc, argv)
 		default:
 			break;
 		}
-	
+
 	if (errflg || (argc - ntp_optind) > 1) {
 		(void) fprintf(stderr,
 			"usage: %s [-vnd] [-r retries] [-t timeout] [server]\n",
@@ -186,7 +186,7 @@ main(argc, argv)
 		firstserver = addservbyname(argv[ntp_optind]);
 	else
 		firstserver = addservbyname("localhost");
-		
+
 	if (firstserver == NULL) {
 		/* a message has already been printed */
 		exit(2);
@@ -196,7 +196,7 @@ main(argc, argv)
 	 * Initialize the time of day routines and the I/O subsystem
 	 */
 	setup_io();
-	
+
 	DoTrace(firstserver);
 
 	exit(0);
@@ -291,7 +291,7 @@ register struct server *server;
 	    timeout.tv_sec = sys_timeout;
 	    timeout.tv_usec = 0;
 	    n = select(fd+1, &fds, (fd_set *)0, (fd_set *)0, &timeout);
-	    
+
 	    if (n == 0) {	/* timed out */
 		if (debug)
 			printf("timeout\n");
@@ -302,7 +302,7 @@ register struct server *server;
 		return(0);
 	    }
 	    get_systime(&ts);
-	    
+
 	    if (free_recvbufs == 0) {
 		syslog(LOG_ERR, "no buffers");
 		exit(1);
@@ -335,7 +335,7 @@ register struct server *server;
 	    status = ReceiveBuf(server, rb);
 
 	    freerecvbuf(rb);
-	    
+
 	    return(status);
 	}
 }
@@ -357,7 +357,7 @@ ReceiveBuf(server, rbufp)
 	l_fp ci;
 	struct server *nextserver;
 	struct in_addr nextia;
-	
+
 
 	if (debug) {
 		printf("ReceiveBuf(%s, ", ntoa(&server->srcadr));
@@ -401,7 +401,7 @@ ReceiveBuf(server, rbufp)
 			    PKT_MODE(rpkt->li_vn_mode), rpkt->stratum);
 		return(0);
 	}
-	
+
 	/*
 	 * Decode the org timestamp and make sure we're getting a response
 	 * to our last request.
@@ -412,7 +412,7 @@ ReceiveBuf(server, rbufp)
 			printf("receive: pkt.org and peer.xmt differ\n");
 		return(0);
 	}
-	
+
 	/*
 	 * Looks good.  Record info from the packet.
 	 */
@@ -504,7 +504,7 @@ struct in_addr *iap;
 	server->srcadr.sin_port = htons(NTP_PORT);
 
 	sys_servers[sys_numservers++] = server;
-	
+
 	return(server);
 }
 /*
@@ -653,7 +653,7 @@ decodeipaddr(num, ipaddr)
 		*ipaddr <<= 8;
 		*ipaddr += temp;
 	}
-	
+
 	if (i < 4)
 		return 0;
 	*ipaddr = htonl(*ipaddr);
@@ -694,7 +694,7 @@ printserver(pp, fp)
 	    pp->stratum, pp->precision,
 	    pp->leap & 0x2 ? '1' : '0',
 	    pp->leap & 0x1 ? '1' : '0');
-	
+
 	(void) fprintf(fp, "refid ");
 	printrefid(fp, pp);
 
@@ -708,7 +708,7 @@ printserver(pp, fp)
 		fptoa(pp->rootdelay, 5), ufptoa(pp->rootdispersion, 5));
 	(void) fprintf(fp, ", synch dist %s\n",
 		ufptoa(synchdist, 5));
-	
+
 	(void) fprintf(fp, "reference time:      %s\n",
 	    prettydate(&pp->reftime));
 	(void) fprintf(fp, "originate timestamp: %s\n",
diff --git a/usr.sbin/xntpd/parse/clk_dcf7000.c b/usr.sbin/xntpd/parse/clk_dcf7000.c
index 208e52932ae0..82e791578a33 100644
--- a/usr.sbin/xntpd/parse/clk_dcf7000.c
+++ b/usr.sbin/xntpd/parse/clk_dcf7000.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_DCF7000)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_dcf7000.c,v 3.12 1994/05/30 10:19:57 kardel Exp
- *  
+ *
  * clk_dcf7000.c,v 3.12 1994/05/30 10:19:57 kardel Exp
  *
  * ELV DCF7000 module
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -33,7 +33,7 @@ static struct format dcf7000_fmt =
   },
   "  -  -  -  -  -  -  -  \r",
   0
-};    
+};
 
 static u_long cvt_dcf7000();
 
@@ -92,7 +92,7 @@ cvt_dcf7000(buffer, size, format, clock)
 	{
 	  char *f = &buffer[format->field_offsets[O_FLAGS].offset];
 	  long flags;
-	  
+
 	  clock->flags = 0;
 	  clock->usecond = 0;
 
diff --git a/usr.sbin/xntpd/parse/clk_meinberg.c b/usr.sbin/xntpd/parse/clk_meinberg.c
index 6e3b22453bc9..10389cfce827 100644
--- a/usr.sbin/xntpd/parse/clk_meinberg.c
+++ b/usr.sbin/xntpd/parse/clk_meinberg.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_MEINBERG)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_meinberg.c,v 3.15 1994/05/30 10:19:59 kardel Exp
- *  
+ *
  * clk_meinberg.c,v 3.15 1994/05/30 10:19:59 kardel Exp
  *
  * Meinberg clock support
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -27,7 +27,7 @@
 /*
  * The Meinberg receiver every second sends a datagram of the following form
  * (Standard Format)
- * 
+ *
  *     <STX>D:<dd>.<mm>.<yy>;T:<w>;U:<hh>:<mm>:<ss>;<S><F><D><A><ETX>
  * pos:  0  00 00 0 00 0 11 111 1 111 12 2 22 2 22 2 2  2  3  3   3
  *       1  23 45 6 78 9 01 234 5 678 90 1 23 4 56 7 8  9  0  1   2
@@ -85,7 +85,7 @@
  *        123456789012345678901234567890123456789012345678901234567890123456
  *     \x0209.07.93; 5; 08:48:26; +00:00;        ; 49.5736N  11.0280E  373m\x03
  *
- * 
+ *
  * <STX>           = '\002' ASCII start of text
  * <ETX>           = '\003' ASCII end of text
  * <dd>,<mm>,<yy>  = day, month, year(2 digits!!)
@@ -227,7 +227,7 @@ cvt_meinberg(buffer, size, format, clock)
       else
 	{
 	  char *f = &buffer[format->field_offsets[O_FLAGS].offset];
-	  
+
 	  clock->flags = 0;
 	  clock->usecond = 0;
 
@@ -260,22 +260,22 @@ cvt_meinberg(buffer, size, format, clock)
 		case ' ':
 		  clock->utcoffset = -1*60*60; /* MET */
 		  break;
-		  
+
 		case 'S':
 		  clock->utcoffset = -2*60*60; /* MED */
 		  break;
-		  
+
 		default:
 		  return CVT_FAIL|CVT_BADFMT;
 		}
 	    }
-	  
+
 	  /*
 	   * gather status flags
 	   */
 	  if (buffer[format->field_offsets[O_ZONE].offset] == 'S')
 	    clock->flags    |= PARSEB_DST;
-	  
+
 	  if (f[0] == '#')
 	    clock->flags |= PARSEB_POWERUP;
 
@@ -284,12 +284,12 @@ cvt_meinberg(buffer, size, format, clock)
 
 	  if (f[3] == '!')
 	    clock->flags |= PARSEB_ANNOUNCE;
-	  
+
 	  if (format->flags & MBG_EXTENDED)
 	    {
 	      clock->flags |= PARSEB_S_LEAP;
 	      clock->flags |= PARSEB_S_ANTENNA;
-	      
+
 	      /*
 	       * DCF77 does not encode the direction -
 	       * so we take the current default -
@@ -343,9 +343,9 @@ cvt_mgps(buffer, size, format, clock)
 	{
 	  long h;
 	  char *f = &buffer[format->field_offsets[O_FLAGS].offset];
-	  
+
 	  clock->flags = PARSEB_S_LEAP|PARSEB_S_POSITION;
-	      
+
 	  clock->usecond = 0;
 
 	  /*
@@ -371,23 +371,23 @@ cvt_mgps(buffer, size, format, clock)
 		  clock->utcoffset = -clock->utcoffset;
 		}
 	    }
-	  
+
 	  /*
 	   * gather status flags
 	   */
 	  if (buffer[format->field_offsets[O_ZONE].offset] == 'S')
 	    clock->flags    |= PARSEB_DST;
-	  
+
 	  if ((f[0] == 'U') ||
 	      (clock->utcoffset == 0))
 	    clock->flags |= PARSEB_UTC;
-	  
+
 	  /*
 	   * no sv's seen - no time & position
 	   */
 	  if (f[1] == '#')
 	    clock->flags |= PARSEB_POWERUP;
-	  
+
 	  /*
 	   * at least one sv seen - time (for last position)
 	   */
@@ -396,13 +396,13 @@ cvt_mgps(buffer, size, format, clock)
 	  else
 	    if (!(clock->flags & PARSEB_POWERUP))
 	      clock->flags |= PARSEB_POSITION;
-	  
+
 	  /*
 	   * oncoming zone switch
 	   */
 	  if (f[4] == '!')
 	    clock->flags |= PARSEB_ANNOUNCE;
-	  
+
 	  /*
 	   * oncoming leap second
 	   * data format does not (yet) specify whether
@@ -411,7 +411,7 @@ cvt_mgps(buffer, size, format, clock)
 	   */
 	  if (f[5] == 'A')
 	    clock->flags |= PARSEB_LEAPADD;
-	  
+
 	  /*
 	   * this is the leap second
 	   */
diff --git a/usr.sbin/xntpd/parse/clk_rawdcf.c b/usr.sbin/xntpd/parse/clk_rawdcf.c
index 296af9e22b02..042e5d35e551 100644
--- a/usr.sbin/xntpd/parse/clk_rawdcf.c
+++ b/usr.sbin/xntpd/parse/clk_rawdcf.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_RAWDCF)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_rawdcf.c,v 3.16 1994/05/31 20:02:40 kardel Exp
- *  
+ *
  * clk_rawdcf.c,v 3.16 1994/05/31 20:02:40 kardel Exp
  *
  * Raw DCF77 pulse clock support
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -106,13 +106,13 @@ static struct dcfparam
 {
   unsigned char onebits[60];
   unsigned char zerobits[60];
-} dcfparam = 
+} dcfparam =
 {
   "###############RADMLS1248124P124812P1248121241248112481248P", /* 'ONE' representation */
   "--------------------s-------p------p----------------------p"  /* 'ZERO' representation */
 };
 
-static struct rawdcfcode 
+static struct rawdcfcode
 {
   char offset;			/* start bit */
 } rawdcfcode[] =
@@ -166,7 +166,7 @@ static u_long ext_bf(buf, idx, zero)
   register int i, first;
 
   first = rawdcfcode[idx].offset;
-  
+
   for (i = rawdcfcode[idx+1].offset - 1; i >= first; i--)
     {
       sum <<= 1;
@@ -213,7 +213,7 @@ static u_long convert_rawdcf(buffer, size, dcfparam, clock)
 #endif
 	  return CVT_NONE;
     }
-  
+
   for (i = 0; i < 58; i++)
     {
       if ((*s != *b) && (*s != *c))
@@ -232,7 +232,7 @@ static u_long convert_rawdcf(buffer, size, dcfparam, clock)
       c++;
       s++;
     }
-  
+
   /*
    * check Start and Parity bits
    */
@@ -489,7 +489,7 @@ static u_long snt_rawdcf(parseio, ptime)
   clocktime_t clock;
   u_long cvtrtc;
   time_t t;
-  
+
   /*
    * start at last sample and add second index - gross, may have to be much more careful
    */
@@ -531,7 +531,7 @@ static u_long snt_rawdcf(parseio, ptime)
 /*
  * History:
  *
- * clk_rawdcf.c,v $ 
+ * clk_rawdcf.c,v $
  * Revision 3.16  1994/05/31  20:02:40  kardel
  * sync on ONE transition
  *
diff --git a/usr.sbin/xntpd/parse/clk_schmid.c b/usr.sbin/xntpd/parse/clk_schmid.c
index d15ba908da55..457a659426d6 100644
--- a/usr.sbin/xntpd/parse/clk_schmid.c
+++ b/usr.sbin/xntpd/parse/clk_schmid.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_SCHMID)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_schmid.c,v 3.16 1994/05/30 10:20:03 kardel Exp
- *  
+ *
  * clk_schmid.c,v 3.16 1994/05/30 10:20:03 kardel Exp
  *
  * Schmid clock support
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -30,7 +30,7 @@
  * The command to Schmid's DCF77 clock is a single byte; each bit
  * allows the user to select some part of the time string, as follows (the
  * output for the lsb is sent first).
- * 
+ *
  * Bit 0:	time in MEZ, 4 bytes *binary, not BCD*; hh.mm.ss.tenths
  * Bit 1:	date 3 bytes *binary, not BCD: dd.mm.yy
  * Bit 2:	week day, 1 byte (unused here)
@@ -128,7 +128,7 @@ cvt_schmid(buffer, size, format, clock)
 	      default:
 		return CVT_FAIL|CVT_BADFMT;
 	      }
-	  
+
 	    if (!(buffer[7] & WS_TIME))
 	      {
 		clock->flags |= PARSEB_POWERUP;
@@ -158,7 +158,7 @@ cvt_schmid(buffer, size, format, clock)
 	      }
 
 	    clock->flags |= PARSEB_S_LEAP|PARSEB_S_ANTENNA;
-	  
+
 	    return CVT_OK;
 	  }
     }
diff --git a/usr.sbin/xntpd/parse/clk_trimtsip.c b/usr.sbin/xntpd/parse/clk_trimtsip.c
index f622beac08db..422fac1412ec 100644
--- a/usr.sbin/xntpd/parse/clk_trimtsip.c
+++ b/usr.sbin/xntpd/parse/clk_trimtsip.c
@@ -1,6 +1,6 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMTSIP)
 /*
- * $Header: /src/NTP/REPOSITORY/v3/parse/clk_trimble.c,v 3.9 1994/02/02 17:45:27 kardel Exp $
+ * $Header: /home/ncvs/src/usr.sbin/xntpd/parse/clk_trimtsip.c,v 1.1.1.1 1994/09/29 23:01:31 wollman Exp $
  *
  * Trimble TSIP support - CURRENTLY VERY MUCH UNDER CONSTRUCTION
  */
@@ -159,7 +159,7 @@ static unsigned LONG inp_tsip(parseio, ch, ctime)
 
   return (parseio->parse_index == parseio->parse_dsize-1); /* buffer full - attempt to parse (likely to fail) */
 }
-     
+
 #define GPSORIGIN	2524953600	/* NTP origin - GPS origin in seconds */
 #define SECSPERWEEK	604800	/* seconds per week - GPS tells us about weeks */
 #define L_UF_SCALE	4294967296.0	/* scale a float fraction to l_uf units */
@@ -227,7 +227,7 @@ cvt_trimtsip(buffer, size, format, clock, t)
   else
     {
       cmd = buffer[1];
-      
+
 #ifdef DEBUG
       if (debug > 1)
       switch(cmd)
@@ -323,7 +323,7 @@ cvt_trimtsip(buffer, size, format, clock, t)
 		{
 #ifdef DEBUG
 		  if (debug)
-		    printf("sv6+ seconds <= 0 (%e), setting POWERUP\n"); 
+		    printf("sv6+ seconds <= 0 (%e), setting POWERUP\n");
 #endif
 		  clock->flags = PARSEB_POWERUP;
 		  return CVT_OK;
@@ -341,10 +341,10 @@ cvt_trimtsip(buffer, size, format, clock, t)
 
 		if (t->t_leap == ADDSECOND)
 		    clock->flags |= PARSEB_LEAPADD;
-		      
+
 		if (t->t_leap == DELSECOND)
 		    clock->flags |= PARSEB_LEAPDEL;
-	
+
 		if (t->t_operable)
 		    clock->flags &= ~(PARSEB_NOSYNC|PARSEB_POWERUP);
 		else
@@ -467,5 +467,8 @@ getint(bp)
 /*
  * History:
  *
- * $Log: clk_trimble.c,v $
+ * $Log: clk_trimtsip.c,v $
+ * Revision 1.1.1.1  1994/09/29  23:01:31  wollman
+ * xntp 3.4e from Dave Mills @ UDel
+ *
  */
diff --git a/usr.sbin/xntpd/parse/parse.c b/usr.sbin/xntpd/parse/parse.c
index 16c7813acedc..713d3e6ace6c 100644
--- a/usr.sbin/xntpd/parse/parse.c
+++ b/usr.sbin/xntpd/parse/parse.c
@@ -1,7 +1,7 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
 /*
  * /src/NTP/REPOSITORY/v3/parse/parse.c,v 3.27 1994/06/01 08:18:33 kardel Exp
- *  
+ *
  * parse.c,v 3.27 1994/06/01 08:18:33 kardel Exp
  *
  * Parser module for reference clock
@@ -14,7 +14,7 @@
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -100,7 +100,7 @@ Strcmp(s, t)
 
   while (!(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
 
@@ -165,7 +165,7 @@ setup_bitmaps(parseio, low, high)
       parseprintf(DD_PARSE, ("setup_bitmaps: failed: bounds error (low=%d, high=%d, nformats=%d)\n", low, high, nformats));
       return 0;
     }
-  
+
   bzero(parseio->parse_startsym, sizeof (parseio->parse_startsym));
   bzero(parseio->parse_endsym, sizeof (parseio->parse_endsym));
   bzero(parseio->parse_syncsym, sizeof (parseio->parse_syncsym));
@@ -175,7 +175,7 @@ setup_bitmaps(parseio, low, high)
   parseio->parse_syncflags = 0;
   parseio->parse_timeout.tv_sec = 0;
   parseio->parse_timeout.tv_usec = 0;
-  
+
   /*
    * gather bitmaps of possible start and end values
    */
@@ -189,7 +189,7 @@ setup_bitmaps(parseio, low, high)
 	  parseio->parse_dsize = fmt->length;
 	continue;
       }
-      
+
       if (fmt->flags & F_START)
 	{
 	  index = fmt->startsym >> 3;
@@ -244,7 +244,7 @@ setup_bitmaps(parseio, low, high)
 	{
 	  parseio->parse_timeout = fmt->timeout;
 	}
-      
+
       if (parseio->parse_dsize < fmt->length)
 	parseio->parse_dsize = fmt->length;
     }
@@ -299,10 +299,10 @@ parse_ioinit(parseio)
   register parse_t *parseio;
 {
   parseprintf(DD_PARSE, ("parse_iostart\n"));
-  
+
   parseio->parse_plen = 0;
   parseio->parse_pdata = (void *)0;
-  
+
   if (!setup_bitmaps(parseio, 0, nformats))
     return 0;
 
@@ -323,7 +323,7 @@ parse_ioinit(parseio)
   parseio->parse_flags     = 0;		/* true samples */
   parseio->parse_index     = 0;
   parseio->parse_ldsize    = 0;
-  
+
   return 1;
 }
 
@@ -369,7 +369,7 @@ parse_ioread(parseio, ch, ctime)
     case PARSE_IO_CS7:
       ch &= 0x7F;
       break;
-      
+
     case PARSE_IO_CS8:
       break;
     }
@@ -388,7 +388,7 @@ parse_ioread(parseio, ch, ctime)
 	{
 	  if (clockformats[parseio->parse_lformat]->input(parseio, ch, ctime))
 	    updated = timepacket(parseio); /* got a datagram - process */
-	  
+
 	  low = high = 0;	/* all done - just post processing */
 	}
       else
@@ -430,7 +430,7 @@ parse_ioread(parseio, ch, ctime)
 		}
 	    }
 	}
-		
+
       if ((((parseio->parse_syncflags & SYNC_START) &&
 	    (parseio->parse_startsym[index] & mask)) ||
 	   (parseio->parse_index == 0)) ||
@@ -525,7 +525,7 @@ parse_ioread(parseio, ch, ctime)
     {
       updated = clockformats[parseio->parse_lformat]->synth(parseio, ctime);
     }
-  
+
   /*
    * remember last character time
    */
@@ -613,13 +613,13 @@ parse_to_unixtime(clock, cvtrtc)
   register u_long *cvtrtc;
 {
 #define SETRTC(_X_)	{ if (cvtrtc) *cvtrtc = (_X_); }
-  static int days_of_month[] = 
+  static int days_of_month[] =
     {
       0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
     };
   register int i;
   time_t t;
-  
+
   if (clock->utctime)
     return clock->utctime;	/* if the conversion routine gets it right away - why not */
 
@@ -634,7 +634,7 @@ parse_to_unixtime(clock, cvtrtc)
       SETRTC(CVT_FAIL|CVT_BADDATE);
       return -1;
     }
-  
+
   /*
    * sorry, slow section here - but it's not time critical anyway
    */
@@ -683,7 +683,7 @@ parse_to_unixtime(clock, cvtrtc)
 
   t = TIMES60(t) + clock->minute;
 				/* sec */
-  
+
   if (clock->second < 0 || clock->second > 60)	/* allow for LEAPs */
     {
       SETRTC(CVT_FAIL|CVT_BADTIME);
@@ -717,7 +717,7 @@ Stoi(s, zp, cnt)
 
   while(*s == ' ')
     s++;
-  
+
   if (*s == '-')
     {
       s++;
@@ -726,7 +726,7 @@ Stoi(s, zp, cnt)
   else
     if (*s == '+')
       s++;
-  
+
   for(;;)
     {
       c = *s++;
@@ -794,14 +794,14 @@ updatetimeinfo(parseio, t, usec, flags)
     usecoff += (t - parseio->parse_dtime.parse_stime.fp.l_ui + JAN_1970) * 1000000
               + usec;
 #endif
-  
+
   /*
    * filtering (median) if requested
    */
   if (parseio->parse_flags & PARSE_STAT_FILTER)
     {
       register int n, i, s, k;
-      
+
       parseio->parse_delta[parseio->parse_dindex] = usecoff;
 
       parseio->parse_dindex = (parseio->parse_dindex + 1) % PARSE_DELTA;
@@ -810,14 +810,14 @@ updatetimeinfo(parseio, t, usec, flags)
        * sort always - thus every sample gets its data
        */
       bcopy((caddr_t)parseio->parse_delta, (caddr_t)delta, sizeof(delta));
-  
+
       for (s = 0; s < PARSE_DELTA; s++)
 	for (k = s+1; k < PARSE_DELTA; k++)
 	  {			/* Yes - it's slow sort */
-	    if (delta[s] > delta[k]) 
+	    if (delta[s] > delta[k])
 	      {
 		register long tmp;
-		
+
 		tmp      = delta[k];
 		delta[k] = delta[s];
 		delta[s] = tmp;
@@ -835,7 +835,7 @@ updatetimeinfo(parseio, t, usec, flags)
 	  register long top = delta[n-1];
 	  register long mid = delta[(n+i)>>1];
 	  register long low = delta[i];
-	  
+
 	  if ((top - mid) > (mid - low))
 	    {
 	      /*
@@ -851,7 +851,7 @@ updatetimeinfo(parseio, t, usec, flags)
 	      i++;
 	    }
 	}
-      
+
       parseio->parse_dtime.parse_usecdisp  = delta[n-1] - delta[i];
 
       if (parseio->parse_flags & PARSE_STAT_AVG)
@@ -873,7 +873,7 @@ updatetimeinfo(parseio, t, usec, flags)
 	{
 	  mean = delta[(n+i)>>1];
 	}
-      
+
       parseio->parse_dtime.parse_usecerror = mean;
     }
   else
@@ -881,26 +881,26 @@ updatetimeinfo(parseio, t, usec, flags)
       parseio->parse_dtime.parse_usecerror = usecoff;
       parseio->parse_dtime.parse_usecdisp  = 0;
     }
-  
+
   parseprintf(DD_PARSE,("parse: updatetimeinfo: T=%x+%d usec, useccoff=%d, usecerror=%d, usecdisp=%d\n",
 			(int)t, (int)usec, (int)usecoff, (int)parseio->parse_dtime.parse_usecerror,
 			(int)parseio->parse_dtime.parse_usecdisp));
-  
+
 
 #ifdef PARSEKERNEL
   {
     int s = splhigh();
 #endif
-  
+
     parseio->parse_lstate          = parseio->parse_dtime.parse_state | flags | PARSEB_TIMECODE;
-    
+
     parseio->parse_dtime.parse_state = parseio->parse_lstate;
 
 #ifdef PARSEKERNEL
     (void)splx(s);
   }
 #endif
-  
+
   return CVT_OK;		/* everything fine and dandy... */
 }
 
@@ -935,7 +935,7 @@ pps_simple(parseio, status, ptime)
 {
   parseio->parse_dtime.parse_ptime  = *ptime;
   parseio->parse_dtime.parse_state |= PARSEB_PPS|PARSEB_S_PPS;
-  
+
   return CVT_NONE;
 }
 
@@ -954,7 +954,7 @@ timepacket(parseio)
   register u_long cvtsum = 0;/* accumulated CVT_FAIL errors */
   u_long cvtrtc;		/* current conversion result */
   clocktime_t clock;
-  
+
   bzero(&clock, sizeof clock);
   format = parseio->parse_lformat;
 
@@ -967,7 +967,7 @@ timepacket(parseio)
 	case CVT_FAIL:
 	  parseio->parse_badformat++;
 	  cvtsum = cvtrtc & ~CVT_MASK;
-	      
+
 	  /*
 	   * may be too often ... but is nice to know when it happens
 	   */
@@ -977,7 +977,7 @@ timepacket(parseio)
 	  syslog(LOG_WARNING, "parse: \"%s\" failed to convert\n", clockformats[format]->name);
 #endif
 	  break;
-	  
+
 	case CVT_NONE:
 	  /*
 	   * too bad - pretend bad format
@@ -985,7 +985,7 @@ timepacket(parseio)
 	  parseio->parse_badformat++;
 	  cvtsum = CVT_BADFMT;
 	  break;
-	  
+
 	case CVT_OK:
 	  k = 1;
 	  break;
@@ -1000,7 +1000,7 @@ timepacket(parseio)
 	  printf("parse: INTERNAL error: bad return code of convert routine \"%s\"\n", clockformats[format]->name);
 #else
 	  syslog(LOG_WARNING, "parse: INTERNAL error: bad return code of convert routine \"%s\"\n", clockformats[format]->name);
-#endif	  
+#endif
 	  return CVT_FAIL|cvtrtc;
 	}
     }
@@ -1011,7 +1011,7 @@ timepacket(parseio)
        * and convert time packet
        * RR search starting at last successful conversion routine
        */
-  
+
       if (nformats)		/* very careful ... */
 	{
 	  do
@@ -1023,20 +1023,20 @@ timepacket(parseio)
 		case CVT_FAIL:
 		  parseio->parse_badformat++;
 		  cvtsum |= cvtrtc & ~CVT_MASK;
-	      
+
 		  /*
 		   * may be too often ... but is nice to know when it happens
 		   */
 #ifdef PARSEKERNEL
 		  printf("parse: \"%s\" failed to convert\n", clockformats[format]->name);
-#else		  
+#else
 		  syslog(LOG_WARNING, "parse: \"%s\" failed to convert\n", clockformats[format]->name);
 #endif
 		  /*FALLTHROUGH*/
 		case CVT_NONE:
 		  format++;
 		  break;
-	  
+
 		case CVT_OK:
 		  k = 1;
 		  break;
@@ -1066,7 +1066,7 @@ timepacket(parseio)
 #endif
       return CVT_FAIL|cvtsum;
     }
-  
+
   if (k == 2) return CVT_OK;
 
   if ((t = parse_to_unixtime(&clock, &cvtrtc)) == -1)
@@ -1078,7 +1078,7 @@ timepacket(parseio)
 #endif
       return CVT_FAIL|cvtrtc;
     }
-  
+
   parseio->parse_lformat = format;
 
   /*
@@ -1111,7 +1111,7 @@ parse_getstat(dct, parse)
   return 1;
 }
 
-		  
+
 /*ARGSUSED*/
 int
 parse_setstat(dct, parse)
@@ -1122,7 +1122,7 @@ parse_setstat(dct, parse)
   return 1;
 }
 
-		  
+
 /*ARGSUSED*/
 int
 parse_timecode(dct, parse)
@@ -1139,7 +1139,7 @@ parse_timecode(dct, parse)
    */
   dct->parsegettc.parse_badformat = parse->parse_badformat;
   parse->parse_badformat = 0;
-		  
+
   if (parse->parse_ldsize <= PARSE_TCMAX)
     {
       dct->parsegettc.parse_count = parse->parse_ldsize;
@@ -1152,7 +1152,7 @@ parse_timecode(dct, parse)
     }
 }
 
-		  
+
 /*ARGSUSED*/
 int
 parse_setfmt(dct, parse)
diff --git a/usr.sbin/xntpd/parse/parse_conf.c b/usr.sbin/xntpd/parse/parse_conf.c
index ed306d4a0385..cc931e371257 100644
--- a/usr.sbin/xntpd/parse/parse_conf.c
+++ b/usr.sbin/xntpd/parse/parse_conf.c
@@ -1,7 +1,7 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
 /*
  * /src/NTP/REPOSITORY/v3/parse/parse_conf.c,v 3.15 1994/02/02 17:45:32 kardel Exp
- *  
+ *
  * parse_conf.c,v 3.15 1994/02/02 17:45:32 kardel Exp
  *
  * Parser configuration module for reference clocks
@@ -14,7 +14,7 @@
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/usr.sbin/xntpd/parse/parsesolaris.c b/usr.sbin/xntpd/parse/parsesolaris.c
index 513cd00b4c93..a67f0bf03d72 100644
--- a/usr.sbin/xntpd/parse/parsesolaris.c
+++ b/usr.sbin/xntpd/parse/parsesolaris.c
@@ -1,6 +1,6 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/parsesolaris.c,v 3.16 1994/05/30 09:57:40 kardel Exp
- *  
+ *
  * parsesolaris.c,v 3.16 1994/05/30 09:57:40 kardel Exp
  *
  * STREAMS module for reference clocks
@@ -11,7 +11,7 @@
  * derived work from parsestreams.c ((c) 1991-1993, Frank Kardel) and
  * dcf77sync.c((c) Frank Kardel)
  * Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -71,7 +71,7 @@ static struct fmodsw fmod_templ =
 
 extern struct mod_ops mod_strmodops;
 
-static struct modlstrmod modlstrmod = 
+static struct modlstrmod modlstrmod =
 {
   &mod_strmodops,		/* a STREAMS module */
   "PARSE      - NTP reference",	/* name this baby - keep room for revision number */
@@ -129,7 +129,7 @@ int Strcmp(s, t)
 
   while (!(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
 
@@ -141,7 +141,7 @@ int _init(void)
 {
   static char revision[] = "3.16";
   char *s, *S, *t;
-  
+
   /*
    * copy RCS revision into Drv_name
    *
@@ -160,20 +160,20 @@ int _init(void)
 	}
       if (*s == ' ') s++;
     }
-	  
-  t = modlstrmod.strmod_linkinfo; 
+
+  t = modlstrmod.strmod_linkinfo;
   while (*t && (*t != ' '))
     {
       t++;
     }
   if (*t == ' ') t++;
-	  
+
   S = s;
   while (*S && (((*S >= '0') && (*S <= '9')) || (*S == '.')))
     {
       S++;
     }
-	  
+
   if (*s && *t && (S > s))
     {
       if (Strlen(t) >= (S - s))
@@ -304,7 +304,7 @@ struct delays
   unsigned char type;		/* what to match */
   unsigned long xsdelay;	/* external status direct delay in us */
   unsigned long stdelay;	/* STREAMS message delay (M_[UN]HANGUP) */
-} isr_delays[] = 
+} isr_delays[] =
 {
   /*
    * WARNING: must still be measured - currently taken from Craig Leres ppsdev
@@ -372,7 +372,7 @@ setup_stream(queue_t *q, int mode)
     }
   else
     {
-      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n")); 
+      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n"));
       return 0;
     }
 }
@@ -383,33 +383,33 @@ static int parseopen(queue_t *q, dev_t *dev, int flag, int sflag, cred_t *credp)
   register mblk_t *mp;
   register parsestream_t *parse;
   static int notice = 0;
-  
-  parseprintf(DD_OPEN,("parse: OPEN - q=%x\n", q)); 
-  
+
+  parseprintf(DD_OPEN,("parse: OPEN - q=%x\n", q));
+
   if (sflag != MODOPEN)
     {			/* open only for modules */
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n"));
       return EIO;
     }
 
   if (q->q_ptr != (caddr_t)NULL)
     {
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n"));
       return EBUSY;
     }
 
   parsebusy++;
-  
+
   q->q_ptr = (caddr_t)kmem_alloc(sizeof(parsestream_t), KM_SLEEP);
   if (q->q_ptr == (caddr_t)0)
     {
       return ENOMEM;
     }
 
-  parseprintf(DD_OPEN,("parse: OPEN - parse area q=%x, q->q_ptr=%x\n", q, q->q_ptr)); 
+  parseprintf(DD_OPEN,("parse: OPEN - parse area q=%x, q->q_ptr=%x\n", q, q->q_ptr));
   SAFE_WR(q)->q_ptr = q->q_ptr;
-  parseprintf(DD_OPEN,("parse: OPEN - WQ parse area q=%x, q->q_ptr=%x\n", SAFE_WR(q), SAFE_WR(q)->q_ptr)); 
-  
+  parseprintf(DD_OPEN,("parse: OPEN - WQ parse area q=%x, q->q_ptr=%x\n", SAFE_WR(q), SAFE_WR(q)->q_ptr));
+
   parse = (parsestream_t *) q->q_ptr;
   bzero((caddr_t)parse, sizeof(*parse));
   parse->parse_queue     = q;
@@ -420,7 +420,7 @@ static int parseopen(queue_t *q, dev_t *dev, int flag, int sflag, cred_t *credp)
 
   qprocson(q);
 
-  parseprintf(DD_OPEN,("parse: OPEN - initializing io subsystem q=%x\n", q)); 
+  parseprintf(DD_OPEN,("parse: OPEN - initializing io subsystem q=%x\n", q));
 
   if (!parse_ioinit(&parse->parse_io))
     {
@@ -436,13 +436,13 @@ static int parseopen(queue_t *q, dev_t *dev, int flag, int sflag, cred_t *credp)
       return EIO;
     }
 
-  parseprintf(DD_OPEN,("parse: OPEN - initializing stream q=%x\n", q)); 
+  parseprintf(DD_OPEN,("parse: OPEN - initializing stream q=%x\n", q));
 
   if (setup_stream(q, M_PARSE))
     {
       (void) init_linemon(q);	/* hook up PPS ISR routines if possible */
       setup_delays();
-      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n"));
 
       /*
        * I know that you know the delete key, but you didn't write this
@@ -473,19 +473,19 @@ static int parseclose(queue_t *q, int flags)
 {
   register parsestream_t *parse = (parsestream_t *)q->q_ptr;
   register unsigned long s;
-  
+
   parseprintf(DD_CLOSE,("parse: CLOSE\n"));
-  
+
   qprocsoff(q);
 
   s = splhigh();
-  
+
   if (parse->parse_dqueue)
     close_linemon(parse->parse_dqueue, q);
   parse->parse_dqueue = (queue_t *)0;
 
   (void) splx(s);
-      
+
   parse_ioend(&parse->parse_io);
 
   kmem_free((caddr_t)parse, sizeof(parsestream_t));
@@ -502,7 +502,7 @@ static int parseclose(queue_t *q, int flags)
 static parsersvc(queue_t *q)
 {
   mblk_t *mp;
-  
+
   while (mp = getq(q))
     {
       if (canput(q->q_next) || (mp->b_datap->db_type > QPCTL))
@@ -530,15 +530,15 @@ static int parsewput(queue_t *q, mblk_t *mp)
   register mblk_t *datap;
   register struct iocblk *iocp;
   parsestream_t         *parse = (parsestream_t *)q->q_ptr;
-  
+
   parseprintf(DD_WPUT,("parse: parsewput\n"));
-  
+
   switch (mp->b_datap->db_type)
     {
     default:
       putnext(q, mp);
       break;
-      
+
     case M_IOCTL:
       iocp = (struct iocblk *)mp->b_rptr;
       switch (iocp->ioc_cmd)
@@ -571,7 +571,7 @@ static int parsewput(queue_t *q, mblk_t *mp)
 	  iocp->ioc_count = sizeof(struct ppsclockev);
 	  qreply(q, mp);
 	  break;
-	  
+
 	case PARSEIOC_ENABLE:
 	case PARSEIOC_DISABLE:
 	  {
@@ -589,7 +589,7 @@ static int parsewput(queue_t *q, mblk_t *mp)
 	      }
 	    qreply(q, mp);
 	    break;
-	  }	    
+	  }
 
 	case PARSEIOC_SETSTAT:
 	case PARSEIOC_GETSTAT:
@@ -607,17 +607,17 @@ static int parsewput(queue_t *q, mblk_t *mp)
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_GETSTAT\n"));
 		  ok = parse_getstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETSTAT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETSTAT\n"));
 		  ok = parse_setstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_TIMECODE:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_TIMECODE\n"));
 		  ok = parse_timecode(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETFMT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETFMT\n"));
 		  ok = parse_setfmt(dct, &parse->parse_io);
@@ -660,7 +660,7 @@ static unsigned long rdchar(mblk_t **mp)
       else
 	{
 	  register mblk_t *mmp = *mp;
-	  
+
 	  *mp = (*mp)->b_cont;
 	  freeb(mmp);
 	}
@@ -675,7 +675,7 @@ static int parserput(queue_t *q, mblk_t *imp)
 {
   register unsigned char type;
   mblk_t *mp = imp;
-  
+
   switch (type = mp->b_datap->db_type)
     {
      default:
@@ -692,7 +692,7 @@ static int parserput(queue_t *q, mblk_t *imp)
       else
 	putq(q, mp);
       break;
-      
+
      case M_BREAK:
      case M_DATA:
       {
@@ -746,7 +746,7 @@ static int parserput(queue_t *q, mblk_t *imp)
 			  if (nmp) freemsg(nmp);
 			parse_iodone(&parse->parse_io);
 		      }
-		  }	
+		  }
 	      }
 	    else
 	      {
@@ -785,11 +785,11 @@ static int parserput(queue_t *q, mblk_t *imp)
 	register int status = cd_invert ^ (type == M_HANGUP);
 
 	SET_LED(status);
-	
+
 	uniqtime(&ctime.tv);
-	
+
 	TIMEVAL_USADD(&ctime.tv, stdelay);
-	
+
 	parseprintf(DD_RPUT,("parse: parserput - M_%sHANGUP\n", (type == M_HANGUP) ? "" : "UN"));
 
 	if ((parse->parse_status & PARSE_ENABLE) &&
@@ -814,7 +814,7 @@ static int parserput(queue_t *q, mblk_t *imp)
 	    }
 	  else
 	    putq(q, mp);
-	
+
 	if (status)
 	  {
 	    parse->parse_ppsclockev.tv = ctime.tv;
@@ -833,7 +833,7 @@ static void zs_xsisr();		/* zs external status interupt handler */
 static int init_linemon(queue_t *q)
 {
   register queue_t *dq;
-  
+
   dq = SAFE_WR(q);
   /*
    * we ARE doing very bad things down here (basically stealing ISR
@@ -935,7 +935,7 @@ static int init_zs_linemon(queue_t *q, queue_t *my_q)
   else
     {
       unsigned long s;
-      
+
       /*
        * we do a direct replacement, in case others fiddle also
        * if somebody else grabs our hook and we disconnect
@@ -961,14 +961,14 @@ static int init_zs_linemon(queue_t *q, queue_t *my_q)
 	  szs->zsops.zsop_xsint = (void (*)())zs_xsisr; /* place our bastard */
 	  szs->oldzsops         = zs->zs_ops;
 	  emergencyzs           = zs->zs_ops;
-	  
+
 	  zs->zs_ops = &szs->zsops; /* hook it up */
 	  /*
-	   * XXX: this is usually done via zsopinit() 
+	   * XXX: this is usually done via zsopinit()
 	   * - have yet to find a way to call that routine
 	   */
 	  zs->zs_xsint          = (void (*)())zs_xsisr;
-	  
+
 	  mutex_exit(zs->zs_excl);
 
           parseprintf(DD_INSTALL, ("init_zs_linemon: CD monitor installed\n"));
@@ -1010,7 +1010,7 @@ static void close_zs_linemon(queue_t *q, queue_t *my_q)
       mutex_exit(zs->zs_excl);
 
       kmem_free((caddr_t)szs, sizeof (struct savedzsops));
-      
+
       parseprintf(DD_INSTALL, ("close_zs_linemon: CD monitor deleted\n"));
       return;
     }
@@ -1041,7 +1041,7 @@ static void zs_xsisr(struct zscom *zs)
     {
       timestamp_t cdevent;
       register int status;
-      
+
       /*
        * CONDITIONAL external measurement support
        */
@@ -1051,14 +1051,14 @@ static void zs_xsisr(struct zscom *zs)
 				 * are just interested in edge delays in the
 				 * lower us range
 				 */
-      
+
       /*
        * time stamp
        */
       uniqtime(&cdevent.tv);
 
       TIMEVAL_USADD(&cdevent.tv, xsdelay);
-	
+
       q = za->za_ttycommon.t_readq;
 
       /*
@@ -1070,7 +1070,7 @@ static void zs_xsisr(struct zscom *zs)
        * ok - now the hard part - find ourself
        */
       loopcheck = MAXDEPTH;
-      
+
       while (q)
 	{
 	  if (q->q_qinfo && q->q_qinfo->qi_minfo)
@@ -1098,7 +1098,7 @@ static void zs_xsisr(struct zscom *zs)
 		       */
 		      parse_iodone(&((parsestream_t *)q->q_ptr)->parse_io);
 		    }
-		  
+
 		  if (status)
 		    {
 		      ((parsestream_t *)q->q_ptr)->parse_ppsclockev.tv = cdevent.tv;
@@ -1132,9 +1132,9 @@ static void zs_xsisr(struct zscom *zs)
 	  SCC_WRITE0(ZSWR0_RESET_STATUS); /* might kill other conditions here */
 	  return;
 	}
-    }      
+    }
 
-   parseprintf(DD_ISR, ("zs_xsisr: non CD event 0x%x for \"%s\"\n", 
+   parseprintf(DD_ISR, ("zs_xsisr: non CD event 0x%x for \"%s\"\n",
 			(za->za_rr0 ^ zsstatus) & ~ZSRR0_CD,dname));
   /*
    * we are now gathered here to process some unusual external status
@@ -1149,7 +1149,7 @@ static void zs_xsisr(struct zscom *zs)
   q = za->za_ttycommon.t_readq;
 
   loopcheck = MAXDEPTH;
-      
+
   /*
    * the real thing for everything else ...
    */
@@ -1161,7 +1161,7 @@ static void zs_xsisr(struct zscom *zs)
 	  if (!Strcmp(dname, parseinfo.st_rdinit->qi_minfo->mi_idname))
 	    {
 	      register void (*zsisr)();
-		  
+
 	      /*
 	       * back home - phew (hopping along stream queues might
 	       * prove dangerous to your health)
@@ -1170,7 +1170,7 @@ static void zs_xsisr(struct zscom *zs)
 		zsisr(zs);
 	      else
 		panic("zs_xsisr: unable to locate original ISR");
-		  
+
 	      parseprintf(DD_ISR, ("zs_xsisr: non CD event was processed for \"%s\"\n", dname));
 	      /*
 	       * now back to our program ...
@@ -1192,7 +1192,7 @@ static void zs_xsisr(struct zscom *zs)
    * corrupted TTY structures
    */
   printf("zs_zsisr: looking for \"%s\" - found \"%s\" - taking EMERGENCY path\n", parseinfo.st_rdinit->qi_minfo->mi_idname, dname ? dname : "-NIL-");
-      
+
   if (emergencyzs && emergencyzs->zsop_xsint)
     emergencyzs->zsop_xsint(zs);
   else
diff --git a/usr.sbin/xntpd/parse/parsestreams.c b/usr.sbin/xntpd/parse/parsestreams.c
index 19e5c10e5045..990f2b325f77 100644
--- a/usr.sbin/xntpd/parse/parsestreams.c
+++ b/usr.sbin/xntpd/parse/parsestreams.c
@@ -1,6 +1,6 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/parsestreams.c,v 3.22 1994/06/01 10:41:16 kardel Exp
- *  
+ *
  * parsestreams.c,v 3.22 1994/06/01 10:41:16 kardel Exp
  *
  * STREAMS module for reference clocks
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1989,1990,1991,1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -68,7 +68,7 @@ static unsigned int parsebusy = 0;
 
 extern struct streamtab parseinfo;
 
-struct vdldrv parsesync_vd = 
+struct vdldrv parsesync_vd =
 {
   VDMAGIC_PSEUDO,		/* nothing like a real driver - a STREAMS module */
   "PARSE        ",		/* name this baby - keep room for revision number */
@@ -118,7 +118,7 @@ static int strcmp(s, t)
 
   while (!(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
 
@@ -136,10 +136,10 @@ static int strncmp(s, t, n)
 
   while (n-- && !(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
- 
+
 /*
  * driver init routine
  * since no mechanism gets us into and out of the fmodsw, we have to
@@ -154,12 +154,12 @@ int xxxinit(fc, vdp, vdi, vds)
 {
   extern struct fmodsw fmodsw[];
   extern int fmodcnt;
-  
+
   struct fmodsw *fm    = fmodsw;
   struct fmodsw *fmend = &fmodsw[fmodcnt];
   struct fmodsw *ifm   = (struct fmodsw *)0;
   char *mname          = parseinfo.st_rdinit->qi_minfo->mi_idname;
-  
+
   switch (fc)
     {
     case VDLOAD:
@@ -176,7 +176,7 @@ int xxxinit(fc, vdp, vdi, vds)
 	      return(EBUSY);
 	    }
 	  else
-	    if ((ifm == (struct fmodsw *)0) && 
+	    if ((ifm == (struct fmodsw *)0) &&
                 (fm->f_name[0] == '\0') && (fm->f_str == (struct streamtab *)0))
 	      {
 		/*
@@ -197,7 +197,7 @@ int xxxinit(fc, vdp, vdi, vds)
         {
 	  static char revision[] = "3.22";
 	  char *s, *S, *t;
-	  
+
 	  strncpy(ifm->f_name, mname, FMNAMESZ);
 	  ifm->f_name[FMNAMESZ] = '\0';
 	  ifm->f_str = &parseinfo;
@@ -219,20 +219,20 @@ int xxxinit(fc, vdp, vdi, vds)
 		}
 	      if (*s == ' ') s++;
 	    }
-	  
-	  t = parsesync_vd.Drv_name; 
+
+	  t = parsesync_vd.Drv_name;
 	  while (*t && (*t != ' '))
 	    {
 	      t++;
 	    }
 	  if (*t == ' ') t++;
-	  
+
 	  S = s;
 	  while (*S && (((*S >= '0') && (*S <= '9')) || (*S == '.')))
 	    {
 	      S++;
 	    }
-	  
+
 	  if (*s && *t && (S > s))
 	    {
 	      if (strlen(t) >= (S - s))
@@ -241,9 +241,9 @@ int xxxinit(fc, vdp, vdi, vds)
 		}
 	    }
 	  return (0);
-        } 
+        }
       break;
-      
+
     case VDUNLOAD:
       if (parsebusy > 0)
 	{
@@ -262,7 +262,7 @@ int xxxinit(fc, vdp, vdi, vds)
 		  fm->f_name[0] = '\0';
 		  fm->f_str = (struct streamtab *)0;
 		  fm++;
-		  
+
 		  break;
 		}
 	      fm++;
@@ -275,14 +275,14 @@ int xxxinit(fc, vdp, vdi, vds)
 	  else
 	    return (0);
 	}
-      
+
 
     case VDSTAT:
       return (0);
 
     default:
       return (EIO);
-      
+
     }
   return EIO;
 }
@@ -392,7 +392,7 @@ struct delays
   unsigned char type;		/* what to match */
   unsigned long xsdelay;	/* external status direct delay in us */
   unsigned long stdelay;	/* STREAMS message delay (M_[UN]HANGUP) */
-} isr_delays[] = 
+} isr_delays[] =
 {
   /*
    * WARNING: must still be measured - currently taken from Craig Leres ppsdev
@@ -457,7 +457,7 @@ setup_stream(q, mode)
     }
   else
     {
-      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n")); 
+      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n"));
       return 0;
     }
 }
@@ -472,34 +472,34 @@ static int parseopen(q, dev, flag, sflag)
   register mblk_t *mp;
   register parsestream_t *parse;
   static int notice = 0;
-  
-  parseprintf(DD_OPEN,("parse: OPEN\n")); 
-  
+
+  parseprintf(DD_OPEN,("parse: OPEN\n"));
+
   if (sflag != MODOPEN)
     {			/* open only for modules */
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n"));
       return OPENFAIL;
     }
 
   if (q->q_ptr != (caddr_t)NULL)
     {
       u.u_error = EBUSY;
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n"));
       return OPENFAIL;
     }
 
 #ifdef VDDRV
   parsebusy++;
 #endif
-  
+
   q->q_ptr = (caddr_t)kmem_alloc(sizeof(parsestream_t));
   if (q->q_ptr == (caddr_t)0)
     {
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - no memory\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - no memory\n"));
       return OPENFAIL;
     }
   WR(q)->q_ptr = q->q_ptr;
-  
+
   parse = (parsestream_t *) q->q_ptr;
   bzero((caddr_t)parse, sizeof(*parse));
   parse->parse_queue     = q;
@@ -524,7 +524,7 @@ static int parseopen(q, dev, flag, sflag)
     {
       (void) init_linemon(q);	/* hook up PPS ISR routines if possible */
       setup_delays();
-      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n"));
 
       /*
        * I know that you know the delete key, but you didn't write this
@@ -556,17 +556,17 @@ static int parseclose(q, flags)
 {
   register parsestream_t *parse = (parsestream_t *)q->q_ptr;
   register unsigned long s;
-  
+
   parseprintf(DD_CLOSE,("parse: CLOSE\n"));
-  
+
   s = splhigh();
-  
+
   if (parse->parse_dqueue)
     close_linemon(parse->parse_dqueue, q);
   parse->parse_dqueue = (queue_t *)0;
 
   (void) splx(s);
-      
+
   parse_ioend(&parse->parse_io);
 
   kmem_free((caddr_t)parse, sizeof(parsestream_t));
@@ -586,7 +586,7 @@ static parsersvc(q)
   queue_t *q;
 {
   mblk_t *mp;
-  
+
   while (mp = getq(q))
     {
       if (canput(q->q_next) || (mp->b_datap->db_type > QPCTL))
@@ -616,15 +616,15 @@ static int parsewput(q, mp)
   register mblk_t *datap;
   register struct iocblk *iocp;
   parsestream_t         *parse = (parsestream_t *)q->q_ptr;
-  
+
   parseprintf(DD_WPUT,("parse: parsewput\n"));
-  
+
   switch (mp->b_datap->db_type)
     {
     default:
       putnext(q, mp);
       break;
-      
+
     case M_IOCTL:
       iocp = (struct iocblk *)mp->b_rptr;
       switch (iocp->ioc_cmd)
@@ -657,7 +657,7 @@ static int parsewput(q, mp)
 	  iocp->ioc_count = sizeof(struct ppsclockev);
 	  qreply(q, mp);
 	  break;
-	  
+
 	case PARSEIOC_ENABLE:
 	case PARSEIOC_DISABLE:
 	  {
@@ -675,7 +675,7 @@ static int parsewput(q, mp)
 	      }
 	    qreply(q, mp);
 	    break;
-	  }	    
+	  }
 
 	case PARSEIOC_SETSTAT:
 	case PARSEIOC_GETSTAT:
@@ -693,17 +693,17 @@ static int parsewput(q, mp)
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_GETSTAT\n"));
 		  ok = parse_getstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETSTAT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETSTAT\n"));
 		  ok = parse_setstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_TIMECODE:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_TIMECODE\n"));
 		  ok = parse_timecode(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETFMT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETFMT\n"));
 		  ok = parse_setfmt(dct, &parse->parse_io);
@@ -747,7 +747,7 @@ static unsigned long rdchar(mp)
       else
 	{
 	  register mblk_t *mmp = *mp;
-	  
+
 	  *mp = (*mp)->b_cont;
 	  freeb(mmp);
 	}
@@ -763,7 +763,7 @@ static int parserput(q, mp)
   mblk_t *mp;
 {
   unsigned char type;
-  
+
   switch (type = mp->b_datap->db_type)
     {
      default:
@@ -779,7 +779,7 @@ static int parserput(q, mp)
       else
 	putq(q, mp);
       break;
-      
+
      case M_BREAK:
      case M_DATA:
       {
@@ -832,7 +832,7 @@ static int parserput(q, mp)
 			  if (nmp) freemsg(nmp);
 			parse_iodone(&parse->parse_io);
 		      }
-		  }	
+		  }
 	      }
 	    else
 	      {
@@ -871,11 +871,11 @@ static int parserput(q, mp)
 	register int status = cd_invert ^ (type == M_HANGUP);
 
 	SET_LED(status);
-	
+
 	uniqtime(&ctime.tv);
-	
+
 	TIMEVAL_USADD(&ctime.tv, stdelay);
-	
+
 	parseprintf(DD_RPUT,("parse: parserput - M_%sHANGUP\n", (type == M_HANGUP) ? "" : "UN"));
 
 	if ((parse->parse_status & PARSE_ENABLE) &&
@@ -900,7 +900,7 @@ static int parserput(q, mp)
 	    }
 	  else
 	    putq(q, mp);
-	
+
 	if (status)
 	  {
 	    parse->parse_ppsclockev.tv = ctime.tv;
@@ -920,7 +920,7 @@ static int init_linemon(q)
   register queue_t *q;
 {
   register queue_t *dq;
-  
+
   dq = WR(q);
   /*
    * we ARE doing very bad things down here (basically stealing ISR
@@ -1019,7 +1019,7 @@ static int init_zs_linemon(q, my_q)
   else
     {
       unsigned long s;
-      
+
       /*
        * we do a direct replacement, in case others fiddle also
        * if somebody else grabs our hook and we disconnect
@@ -1045,9 +1045,9 @@ static int init_zs_linemon(q, my_q)
 	  szs->zsops.zsop_xsint = (int (*)())zs_xsisr; /* place our bastard */
 	  szs->oldzsops         = zs->zs_ops;
 	  emergencyzs           = zs->zs_ops;
-	  
+
 	  zsopinit(zs, &szs->zsops); /* hook it up */
-	  
+
 	  (void) splx(s);
 
 	  parseprintf(DD_INSTALL, ("init_zs_linemon: CD monitor installed\n"));
@@ -1078,11 +1078,11 @@ static void close_zs_linemon(q, my_q)
   else
     {
       register struct savedzsops *szs = (struct savedzsops *)parsestream->parse_data;
-      
+
       zsopinit(zs, szs->oldzsops); /* reset to previous handler functions */
 
       kmem_free((caddr_t)szs, sizeof (struct savedzsops));
-      
+
       parseprintf(DD_INSTALL, ("close_zs_linemon: CD monitor deleted\n"));
       return;
     }
@@ -1121,7 +1121,7 @@ static void zs_xsisr(zs)
     {
       timestamp_t cdevent;
       register int status;
-      
+
       /*
        * CONDITIONAL external measurement support
        */
@@ -1139,7 +1139,7 @@ static void zs_xsisr(zs)
        * time stamp
        */
       uniqtime(&cdevent.tv);
-      
+
 #ifdef PPS_SYNC
       splx(s);
 #endif
@@ -1161,14 +1161,14 @@ static void zs_xsisr(zs)
 #endif
 
       TIMEVAL_USADD(&cdevent.tv, xsdelay);
-	
+
       q = za->za_ttycommon.t_readq;
 
       /*
        * ok - now the hard part - find ourself
        */
       loopcheck = MAXDEPTH;
-      
+
       while (q)
 	{
 	  if (q->q_qinfo && q->q_qinfo->qi_minfo)
@@ -1196,7 +1196,7 @@ static void zs_xsisr(zs)
 		       */
 		      parse_iodone(&((parsestream_t *)q->q_ptr)->parse_io);
 		    }
-		  
+
 		  if (status)
 		    {
 		      ((parsestream_t *)q->q_ptr)->parse_ppsclockev.tv = cdevent.tv;
@@ -1230,7 +1230,7 @@ static void zs_xsisr(zs)
 	  zsaddr->zscc_control = ZSWR0_RESET_STATUS; /* might kill other conditions here */
 	  return;
 	}
-    }      
+    }
 
   /*
    * we are now gathered here to process some unusual external status
@@ -1245,7 +1245,7 @@ static void zs_xsisr(zs)
   q = za->za_ttycommon.t_readq;
 
   loopcheck = MAXDEPTH;
-      
+
   /*
    * the real thing for everything else ...
    */
@@ -1257,7 +1257,7 @@ static void zs_xsisr(zs)
 	  if (!strcmp(dname, parseinfo.st_rdinit->qi_minfo->mi_idname))
 	    {
 	      register int (*zsisr)();
-		  
+
 	      /*
 	       * back home - phew (hopping along stream queues might
 	       * prove dangerous to your health)
@@ -1266,7 +1266,7 @@ static void zs_xsisr(zs)
 		(void)zsisr(zs);
 	      else
 		panic("zs_xsisr: unable to locate original ISR");
-		  
+
 	      parseprintf(DD_ISR, ("zs_xsisr: non CD event was processed for \"%s\"\n", dname));
 	      /*
 	       * now back to our program ...
@@ -1288,7 +1288,7 @@ static void zs_xsisr(zs)
    * corrupted TTY structures
    */
   printf("zs_zsisr: looking for \"%s\" - found \"%s\" - taking EMERGENCY path\n", parseinfo.st_rdinit->qi_minfo->mi_idname, dname ? dname : "-NIL-");
-      
+
   if (emergencyzs && emergencyzs->zsop_xsint)
     emergencyzs->zsop_xsint(zs);
   else
diff --git a/usr.sbin/xntpd/parse/util/dcfd.c b/usr.sbin/xntpd/parse/util/dcfd.c
index cc338cb3e456..e8103d4d9975 100644
--- a/usr.sbin/xntpd/parse/util/dcfd.c
+++ b/usr.sbin/xntpd/parse/util/dcfd.c
@@ -1,8 +1,8 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/util/dcfd.c,v 3.18 1994/05/12 12:49:23 kardel Exp
- *  
+ *
  * dcfd.c,v 3.18 1994/05/12 12:49:23 kardel Exp
- * 
+ *
  * Ported to FreeBSD 2.0 1995/03/20 by Vincenzo Capuano
  *
  * DCF77 100/200ms pulse synchronisation daemon program (via 50Baud serial line)
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 1993,1994
  * Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -269,7 +269,7 @@ typedef struct clocktime clocktime_t;
  *   while the length is given as the difference between the start index and
  *   the start index of the following field.
  */
-static struct rawdcfcode 
+static struct rawdcfcode
 {
   char offset;			/* start bit */
 } rawdcfcode[] =
@@ -336,7 +336,7 @@ static struct dcfparam
 {
   unsigned char onebits[60];
   unsigned char zerobits[60];
-} dcfparam = 
+} dcfparam =
 {
   "###############RADMLS1248124P124812P1248121241248112481248P", /* 'ONE' representation */
   "--------------------s-------p------p----------------------p"  /* 'ZERO' representation */
@@ -357,7 +357,7 @@ static unsigned long ext_bf(buf, idx)
   register int i, first;
 
   first = rawdcfcode[idx].offset;
-  
+
   for (i = rawdcfcode[idx+1].offset - 1; i >= first; i--)
     {
       sum <<= 1;
@@ -407,7 +407,7 @@ static unsigned long convert_rawdcf(buffer, size, clock)
       PRINTF("%-30s", "*** INCOMPLETE");
       return CVT_NONE;
     }
-  
+
   /*
    * check Start and Parity bits
    */
@@ -705,7 +705,7 @@ static unsigned long cvt_rawdcf(buffer, size, clock)
    * if everything went well so far return the result of the symbolic
    * conversion routine else just the accumulated errors
    */
-  if (rtc != CVT_NONE) 
+  if (rtc != CVT_NONE)
     {
       PRINTF("%-30s", "*** BAD DATA");
     }
@@ -723,13 +723,13 @@ dcf_to_unixtime(clock, cvtrtc)
   register unsigned long *cvtrtc;
 {
 #define SETRTC(_X_)	{ if (cvtrtc) *cvtrtc = (_X_); }
-  static int days_of_month[] = 
+  static int days_of_month[] =
     {
       0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
     };
   register int i;
   time_t t;
-  
+
   /*
    * map 2 digit years to 19xx (DCF77 is a 20th century item)
    */
@@ -751,7 +751,7 @@ dcf_to_unixtime(clock, cvtrtc)
       SETRTC(CVT_FAIL|CVT_BADDATE);
       return -1;
     }
-  
+
   /*
    * sorry, slow section here - but it's not time critical anyway
    */
@@ -817,7 +817,7 @@ dcf_to_unixtime(clock, cvtrtc)
    */
   t = TIMES60(t) + clock->minute;
 				/* sec */
-  
+
   /*
    * calculate UTC in minutes
    */
@@ -1219,7 +1219,7 @@ main(argc, argv)
 			errs=1;
 		      }
 		    break;
-	      
+
 	      case 'd':
 		    if (ac > 1)
 		      {
@@ -1232,7 +1232,7 @@ main(argc, argv)
 			errs=1;
 		      }
 		    break;
-	      
+
 	      default:
 		    fprintf(stderr, "%s: unknown option -%c\n", argv[0], c);
 		    errs=1;
@@ -1340,7 +1340,7 @@ main(argc, argv)
        */
       if (!interactive)
 	detach();
-      
+
       /*
        * get syslog() initialized
        */
@@ -1379,7 +1379,7 @@ main(argc, argv)
 	it.it_interval.tv_usec = 0;
 	it.it_value.tv_sec     = 1<<ADJINTERVAL;
 	it.it_value.tv_usec    = 0;
-	
+
       if (setitimer(ITIMER_REAL, &it, (struct itimerval *)0) == -1)
 	{
 	  syslog(LOG_ERR, "setitimer: %m");
@@ -1392,7 +1392,7 @@ main(argc, argv)
 #if defined(SYS_FREEBSD) && defined(BOEDER)
       if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NONBLOCK) == -1)
 	perror("F_SETFL");
-      
+
       if (ioctl(fd, TIOCCDTR, 0) == -1)
 	perror("TIOCCDTR");
 #endif
@@ -1603,7 +1603,7 @@ main(argc, argv)
 		fflush(stdout);
 	    }
 	} while ((rrc == -1) && (errno == EINTR));
-      
+
       /*
        * lost IO - sorry guys
        */
@@ -1613,6 +1613,6 @@ main(argc, argv)
     }
 
   closelog();
-  
+
   return 0;
 }
diff --git a/usr.sbin/xntpd/parse/util/parsetest.c b/usr.sbin/xntpd/parse/util/parsetest.c
index 7fa62a927b83..33f3d9ce1a6b 100644
--- a/usr.sbin/xntpd/parse/util/parsetest.c
+++ b/usr.sbin/xntpd/parse/util/parsetest.c
@@ -5,12 +5,15 @@
  *
  * Copyright (c) 1989,1990,1991,1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $Log: parsetest.c,v $
+ * Revision 1.1.1.4  1994/09/29  23:01:34  wollman
+ * xntp 3.4e from Dave Mills @ UDel
+ *
  * Revision 3.14  1994/05/12  12:49:27  kardel
  * printf fmt/arg cleanup
  *
@@ -90,7 +93,7 @@ static char *strstatus(buffer, state)
   int i;
 
   *buffer = '\0';
-  
+
   i = 0;
   while (flagstrings[i].bit)
     {
@@ -102,18 +105,18 @@ static char *strstatus(buffer, state)
 	}
       i++;
     }
-  
+
   if (state & (PARSEB_S_LEAP|PARSEB_S_ANTENNA|PARSEB_S_PPS|PARSEB_S_POSITION))
     {
       register char *s, *t;
-      
+
       if (buffer[0])
 	strcat(buffer, "; ");
 
       strcat(buffer, "(");
 
       t = s = buffer + strlen(buffer);
-      
+
       i = 0;
       while (sflagstrings[i].bit)
 	{
@@ -124,7 +127,7 @@ static char *strstatus(buffer, state)
 		  strcpy(t, "; ");
 		  t += 2;
 		}
-	      
+
 	      strcpy(t, sflagstrings[i].name);
 	      t += strlen(t);
 	    }
@@ -159,7 +162,7 @@ static char *parsestatus(state, buffer)
   int i;
 
   *buffer = '\0';
-  
+
   i = 0;
   while (flagstrings[i].bit)
     {
@@ -171,7 +174,7 @@ static char *parsestatus(state, buffer)
 	}
       i++;
     }
-  
+
   return buffer;
 }
 
@@ -188,7 +191,7 @@ main(argc, argv)
   else
     {
       int fd;
-      
+
       fd = open(argv[1], O_RDWR);
       if (fd == -1)
 	{
@@ -200,9 +203,9 @@ main(argc, argv)
 	  parsectl_t  dct;
 	  parsetime_t parsetime;
 	  struct strioctl strioc;
-	  
+
 	  printf("parsetest.c,v 3.11 1994/01/23 19:00:01 kardel Exp\n");
-	  
+
 	  while (ioctl(fd, I_POP, 0) == 0)
 	    ;
 
@@ -226,14 +229,14 @@ main(argc, argv)
 
 	  dct.parsestatus.flags |= PARSE_STAT_FILTER;
 	  strioc.ic_cmd = PARSEIOC_SETSTAT;
-	  
+
 	  if (ioctl(fd, I_STR, &strioc) == -1)
 	    {
 	      perror("ioctl(fd, I_STR(PARSEIOC_SETSTAT))");
 	      exit(1);
 	    }
 	  printf("PARSE clock FILTERMODE\n");
-	  
+
 	  if (ioctl(fd, I_STR, &strioc) == -1)
 	    {
 	      perror("ioctl(fd, I_STR(PARSEIOC_GETSTAT))");
@@ -264,7 +267,7 @@ main(argc, argv)
 		     (unsigned long)parsetime.parse_status,
 		     parsestatus(parsetime.parse_status, tmp1));
 	    }
-	  
+
 	  close(fd);
 	}
     }
diff --git a/usr.sbin/xntpd/parse/util/testdcf.c b/usr.sbin/xntpd/parse/util/testdcf.c
index 73c8d893c398..219b7c3975b9 100644
--- a/usr.sbin/xntpd/parse/util/testdcf.c
+++ b/usr.sbin/xntpd/parse/util/testdcf.c
@@ -1,13 +1,13 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/util/testdcf.c,v 3.13 1994/05/12 12:49:31 kardel Exp
- *  
+ *
  * testdcf.c,v 3.13 1994/05/12 12:49:31 kardel Exp
  *
  * simple DCF77 100/200ms pulse test program (via 50Baud serial line)
  *
  * Copyright (c) 1993,1994
  * Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -112,7 +112,7 @@ typedef struct clocktime clocktime_t;
  * 59		      - usually missing (minute indication), except for leap insertion
  */
 
-static struct rawdcfcode 
+static struct rawdcfcode
 {
   char offset;			/* start bit */
 } rawdcfcode[] =
@@ -165,7 +165,7 @@ static unsigned long ext_bf(buf, idx)
   register int i, first;
 
   first = rawdcfcode[idx].offset;
-  
+
   for (i = rawdcfcode[idx+1].offset - 1; i >= first; i--)
     {
       sum <<= 1;
@@ -199,7 +199,7 @@ static unsigned long convert_rawdcf(buffer, size, clock)
       printf("%-30s", "*** INCOMPLETE");
       return CVT_NONE;
     }
-  
+
   /*
    * check Start and Parity bits
    */
diff --git a/usr.sbin/xntpd/util/byteorder.c b/usr.sbin/xntpd/util/byteorder.c
index 665c146153ad..ff7d239379ef 100644
--- a/usr.sbin/xntpd/util/byteorder.c
+++ b/usr.sbin/xntpd/util/byteorder.c
@@ -32,8 +32,8 @@ main()
 	else		    big = 0;
     }
     for (i=0; i< sizeof(long); i++) {
-	if (big == 1 && (u.c[i] == (sizeof(long) - i))) { 
-		continue; 
+	if (big == 1 && (u.c[i] == (sizeof(long) - i))) {
+		continue;
        	} else if (big == 0 && (u.c[i] == (i+1))) {
 		continue;
 	} else {
diff --git a/usr.sbin/xntpd/util/longsize.c b/usr.sbin/xntpd/util/longsize.c
index 6bdbdfeff5f1..bb884ba3d416 100644
--- a/usr.sbin/xntpd/util/longsize.c
+++ b/usr.sbin/xntpd/util/longsize.c
@@ -2,7 +2,7 @@
 
 main()
 {
-    if (sizeof(long) == 8) { 
+    if (sizeof(long) == 8) {
         printf("-DLONG8\n");
     } else if (sizeof(long) == 4) {
 	printf("-DLONG4\n");
diff --git a/usr.sbin/xntpd/util/ntptime.c b/usr.sbin/xntpd/util/ntptime.c
index 15159051b8e8..38d9a4a3c2d4 100644
--- a/usr.sbin/xntpd/util/ntptime.c
+++ b/usr.sbin/xntpd/util/ntptime.c
@@ -189,7 +189,7 @@ main(argc, argv)
 	}
 	status = ntp_adjtime(&ntx);
 	if (status < 0)
-		perror((errno == EPERM) ? 
+		perror((errno == EPERM) ?
 		"Must be root to set kernel values\nntp_adjtime() call fails" :
 		"ntp_adjtime() call fails");
 	else {
diff --git a/usr.sbin/xntpd/util/precision.c b/usr.sbin/xntpd/util/precision.c
index 6961475b4920..64fe336fe662 100644
--- a/usr.sbin/xntpd/util/precision.c
+++ b/usr.sbin/xntpd/util/precision.c
@@ -108,7 +108,7 @@ int default_get_resolution()
  * In order to guard against spurious values, which could occur if we
  * happen to hit a fat interrupt, we do this for MINLOOPS times and
  * keep the minimum value obtained.
- */  
+ */
 int default_get_precision()
 {
 	struct timeval tp;
diff --git a/usr.sbin/xntpd/util/testrs6000.c b/usr.sbin/xntpd/util/testrs6000.c
index 9a5e0cd77634..0d4bf4fdc6a4 100644
--- a/usr.sbin/xntpd/util/testrs6000.c
+++ b/usr.sbin/xntpd/util/testrs6000.c
@@ -35,7 +35,7 @@ int sig,code;
 struct sigcontext *scp;
 {
 	signal (SIGALRM, timeout);
-	if (adjtime(&adjustment, &result)) 
+	if (adjtime(&adjustment, &result))
 		printf("adjtime call failed\n");
 	if (result.tv_sec != 0 || result.tv_usec != 0) {
 		printf("result.u = %d.%06.6d  ", (int) result.tv_sec,
diff --git a/usr.sbin/xntpd/util/tickadj.c b/usr.sbin/xntpd/util/tickadj.c
index 75d2ab7cabfb..74757dd95dc4 100644
--- a/usr.sbin/xntpd/util/tickadj.c
+++ b/usr.sbin/xntpd/util/tickadj.c
@@ -39,7 +39,7 @@ main(int argc, char ** argv)
     }
   else
     txc.mode = 0;
-    
+
   if (__adjtimex(&txc) < 0)
     perror("adjtimex");
   else
@@ -194,29 +194,29 @@ char *argv[];
 	}
 
 	if (setnoprintf && (noprintf_offset == 0)) {
-		(void) fprintf(stderr, 
+		(void) fprintf(stderr,
 			       "No noprintf kernal variable\n");
 		errflg++;
 	}
 
 	if (unsetdosync && (dosync_offset == 0)) {
-		(void) fprintf(stderr, 
+		(void) fprintf(stderr,
 			       "No dosynctodr kernal variable\n");
 		errflg++;
 	}
-	
+
 	if (writeopttickadj && (tickadj_offset == 0)) {
-		(void) fprintf(stderr, 
+		(void) fprintf(stderr,
 			       "No tickadj kernal variable\n");
 		errflg++;
 	}
 
 	if (writetick && (tick_offset == 0)) {
-		(void) fprintf(stderr, 
+		(void) fprintf(stderr,
 			       "No tick kernal variable\n");
 		errflg++;
 	}
-	
+
 
 	if (tickadj_offset != 0)
 		readvar(fd, tickadj_offset, &tickadj);
@@ -273,7 +273,7 @@ char *argv[];
 	if ((!quiet) && (tickadj_offset != 0))
 		(void) printf("recommended value of tickadj = %d us\n",
 		    recommend_tickadj);
-	
+
 	if (writetickadj == 0 && !writeopttickadj &&
 	    !unsetdosync && writetick == 0 && !setnoprintf)
 		exit(errflg ? 1 : 0);
@@ -344,7 +344,7 @@ getoffsets(filex, tick_off, tickadj_off, dosync_off, noprintf_off)
 #if defined(SYS_AUX3) || defined(SYS_AUX2)
 #define X_TICKADJ       0
 #define X_TICK          1
-#define X_DEF	
+#define X_DEF
 	static struct nlist nl[] =
 	{	{"tickadj"},
 		{"tick"},
@@ -357,7 +357,7 @@ getoffsets(filex, tick_off, tickadj_off, dosync_off, noprintf_off)
 #define	X_TICK		1
 #define	X_DOSYNC	2
 #define	X_NOPRINTF	3
-#define X_DEF	
+#define X_DEF
 	static struct nlist nl[] =
 	{	{{"_tickadj"}},
 		{{"_tick"}},
@@ -372,7 +372,7 @@ getoffsets(filex, tick_off, tickadj_off, dosync_off, noprintf_off)
 #define	X_TICK		1
 #define	X_DOSYNC	2
 #define	X_NOPRINTF	3
-#define X_DEF	
+#define X_DEF
 	static struct nlist nl[] =
 	{	{{"tickadj"}},
 		{{"tick"}},
@@ -388,7 +388,7 @@ getoffsets(filex, tick_off, tickadj_off, dosync_off, noprintf_off)
 #endif
 #define	X_DOSYNC	1
 #define	X_NOPRINTF	2
-#define X_DEF	
+#define X_DEF
 	static struct nlist nl[] =
 	{	{"tickadj"},
 		{"dosynctodr"},
@@ -405,7 +405,7 @@ getoffsets(filex, tick_off, tickadj_off, dosync_off, noprintf_off)
 #define	X_TICKADJ	0
 #define	X_TICK		1
 #define	X_DEF
-	static struct nlist nl[] = 
+	static struct nlist nl[] =
 #ifdef hp9000s300
 	{       {"_tickadj"},
 	        {"_old_tick"},
@@ -452,7 +452,7 @@ getoffsets(filex, tick_off, tickadj_off, dosync_off, noprintf_off)
 	for (kname = kernels; *kname != NULL; kname++) {
 		if (stat(*kname, &stbuf) == -1)
 			continue;
-		if (nlist(*kname, nl) >= 0) 
+		if (nlist(*kname, nl) >= 0)
 			break;
 	}
 #endif
@@ -537,7 +537,7 @@ writevar(fd, off, var)
 	unsigned long off;
 	int var;
 {
-	
+
 	if (lseek(fd, off, L_SET) == -1) {
 		(void) fprintf(stderr, "%s: lseek fails: ", progname);
 		perror("");
@@ -561,7 +561,7 @@ readvar(fd, off, var)
 	int *var;
 {
 	int i;
-	
+
 	if (lseek(fd, off, L_SET) == -1) {
 		(void) fprintf(stderr, "%s: lseek fails: ", progname);
 		perror("");
diff --git a/usr.sbin/xntpd/util/timetrim.c b/usr.sbin/xntpd/util/timetrim.c
index a1635c158c42..7b9413f66b57 100644
--- a/usr.sbin/xntpd/util/timetrim.c
+++ b/usr.sbin/xntpd/util/timetrim.c
@@ -1,6 +1,6 @@
 /*
  * timetrim.c
- * 
+ *
  * "timetrim" allows setting and adjustment of the system clock frequency
  * trim parameter on Silicon Graphics machines.  The trim value native
  * units are nanoseconds per second (10**-9), so a trim value of 1 makes
@@ -8,7 +8,7 @@
  * of zero.  Xntpd currently uses units of 2**-20 secs for its frequency
  * offset (drift) values; to convert to a timetrim value, multiply by
  * 1E9 / 2**20 (about 954).
- * 
+ *
  * "timetrim" with no arguments just prints out the current kernel value.
  * With a numeric argument, the kernel value is set to the supplied value.
  * The "-i" flag causes the supplied value to be added to the kernel value.
@@ -17,7 +17,7 @@
  *
  * Note that there is a limit of +-3000000 (0.3%) on the timetrim value
  * which is (silently?) enforced by the kernel.
- * 
+ *
  */
 
 #include <stdio.h>
@@ -37,7 +37,7 @@ char **argv;
 	int c, incremental = 0, ntpunits = 0;
 	LONG timetrim;
 	double value, strtod();
-	
+
 	while (--argc && **++argv == '-' && isalpha(argv[0][1])) {
 		switch (argv[0][1]) {
 		case 'i':
diff --git a/usr.sbin/xntpd/xntpd/ntp_config.c b/usr.sbin/xntpd/xntpd/ntp_config.c
index 202a029e7b6b..bc88b5af38b8 100644
--- a/usr.sbin/xntpd/xntpd/ntp_config.c
+++ b/usr.sbin/xntpd/xntpd/ntp_config.c
@@ -55,7 +55,7 @@
  * clientlimit [ n ]
  * clientperiod [ 3600 ]
  * trustedkey [ key ]
- * requestkey [ key] 
+ * requestkey [ key]
  * controlkey [ key ]
  * trap [ addr ]
  * fudge [ addr ] [ stratum ] [ refid ] ...
@@ -105,7 +105,7 @@
 #define	CONF_MOD_KEY		2
 #define	CONF_MOD_MINPOLL	3
 #define CONF_MOD_MAXPOLL	4
-#define CONF_MOD_PREFER		5	
+#define CONF_MOD_PREFER		5
 #define CONF_MOD_TTL		6
 #define CONF_MOD_MODE		7
 
@@ -171,7 +171,7 @@ static	struct keyword keywords[] = {
 	{ "trap",		CONFIG_TRAP },
 	{ "fudge",		CONFIG_FUDGE },
 	{ "statsdir",		CONFIG_STATSDIR },
-	{ "filegen",		CONFIG_FILEGEN },  
+	{ "filegen",		CONFIG_FILEGEN },
 	{ "statistics",		CONFIG_STATISTICS },
 	{ "pidfile",		CONFIG_PIDFILE },
 	{ "setvar",		CONFIG_SETVAR },
@@ -376,7 +376,7 @@ getstartup(argc, argv)
 		default:
 			break;
 		}
-	
+
 	if (errflg || ntp_optind != argc) {
 		(void) fprintf(stderr, "usage: %s [ -abd ] [ -c config_file ] [ -e encryption delay ]\n", progname);
 		(void) fprintf(stderr, "\t\t[ -f frequency file ] [ -k key file ] [ -l log file ]\n");
@@ -487,7 +487,7 @@ getconfig(argc, argv)
 		case 'e':
 			do {
 				l_fp tmp;
-				
+
 				if (!atolfp(ntp_optarg, &tmp)) {
 					syslog(LOG_ERR,
 			"command line encryption delay value %s undecodable",
@@ -503,7 +503,7 @@ getconfig(argc, argv)
 				}
 			} while (0);
 			break;
-			
+
 		case 'f':
 			stats_config(STATS_FREQ_FILE, ntp_optarg);
 			break;
@@ -531,7 +531,7 @@ getconfig(argc, argv)
 		case 'r':
 			do {
 				l_fp tmp;
-				
+
 				if (!atolfp(ntp_optarg, &tmp)) {
 					syslog(LOG_ERR,
 			"command line broadcast delay value %s undecodable",
@@ -545,15 +545,15 @@ getconfig(argc, argv)
 				}
 			} while (0);
 			break;
-			
+
 		case 's':
 			stats_config(STATS_STATSDIR, ntp_optarg);
 			break;
-			
+
 		case 't':
 			do {
 				u_long tkey;
-				
+
 				tkey = atol(ntp_optarg);
 				if (tkey <= 0 || tkey > NTP_MAXKEY) {
 					syslog(LOG_ERR,
@@ -564,19 +564,19 @@ getconfig(argc, argv)
 				}
 			} while (0);
 			break;
-			
+
 		case 'v':
 		case 'V':
 			set_sys_var(ntp_optarg, strlen(ntp_optarg)+1,
 			    RW | ((c == 'V') ? DEF : 0));
 			break;
-			
+
 		default:
 			errflg++;
 			break;
 		}
 	}
-	
+
 	if (errflg || ntp_optind != argc) {
 		(void) fprintf(stderr,
 		    "usage: %s [ -bd ] [ -c config_file ]\n", progname);
@@ -603,19 +603,19 @@ getconfig(argc, argv)
 				hmode = MODE_CLIENT;
 			else
 				hmode = MODE_BROADCAST;
-			
+
 			if (ntokens < 2) {
 				syslog(LOG_ERR,
 				   "No address for %s, line ignored",
 				    tokens[0]);
 				break;
 			}
-			
+
 			if (!getnetnum(tokens[1], &peeraddr, 0)) {
 				errflg = -1;
 			} else {
 				errflg = 0;
-				
+
 				if (
 #ifdef REFCLOCK
 				    !ISREFCLOCKADR(&peeraddr) &&
@@ -627,7 +627,7 @@ getconfig(argc, argv)
 					break;
 				}
 			}
-			
+
 			peerversion = NTP_VERSION;
 			minpoll = NTP_MINDPOLL;
 			maxpoll = NTP_MAXDPOLL;
@@ -652,7 +652,7 @@ getconfig(argc, argv)
 						errflg = 1;
 					}
 					break;
-					
+
 				case CONF_MOD_KEY:
 					if (i >= ntokens-1) {
 						syslog(LOG_ERR,
@@ -723,7 +723,7 @@ getconfig(argc, argv)
 			}
 			if (errflg == 0) {
 				if (peer_config(&peeraddr,
-				    (struct interface *)0, hmode, peerversion, 
+				    (struct interface *)0, hmode, peerversion,
 				    minpoll, maxpoll, peerflags, ttl, peerkey)
 				    == 0) {
 					syslog(LOG_ERR,
@@ -735,7 +735,7 @@ getconfig(argc, argv)
 				    minpoll, maxpoll, peerflags, ttl, peerkey);
 			}
 			break;
-			
+
 		case CONFIG_PRECISION:
 			if (ntokens >= 2) {
 				i = atoi(tokens[1]);
@@ -747,25 +747,25 @@ getconfig(argc, argv)
 					proto_config(PROTO_PRECISION, i);
 			}
 			break;
-			
+
 		case CONFIG_DRIFTFILE:
 			if (ntokens >= 2)
 				stats_config(STATS_FREQ_FILE, tokens[1]);
 			else
 				stats_config(STATS_FREQ_FILE, (char *)0);
 			break;
-	
+
 		case CONFIG_PIDFILE:
 			if (ntokens >= 2)
 				stats_config(STATS_PID_FILE, tokens[1]);
 			else
 				stats_config(STATS_PID_FILE, (char *)0);
 			break;
-				
+
 		case CONFIG_BROADCASTCLIENT:
 			proto_config(PROTO_BROADCLIENT, 1);
 			break;
-			
+
 		case CONFIG_MULTICASTCLIENT:
 			if (ntokens > 1) {
 				for (i = 1; i < ntokens; i++) {
@@ -789,12 +789,12 @@ getconfig(argc, argv)
 			} else {
 				errflg++;
 			}
-			
+
 			if (errflg)
 				syslog(LOG_ERR,
 				    "should be `authenticate yes|no'");
 			break;
-			
+
 		case CONFIG_KEYS:
 			if (ntokens >= 2) {
 				getauthkeys(tokens[1]);
@@ -808,7 +808,7 @@ getconfig(argc, argv)
 				}
 			}
 			break;
-			
+
 		case CONFIG_MONITOR:
 			errflg = 0;
 			if (ntokens >= 2) {
@@ -821,16 +821,16 @@ getconfig(argc, argv)
 			} else {
 				errflg++;
 			}
-			
+
 			if (errflg)
 				syslog(LOG_ERR,
 				    "should be `monitor yes|no'");
 			break;
-			
+
 		case CONFIG_AUTHDELAY:
 			if (ntokens >= 2) {
 				l_fp tmp;
-				
+
 				if (!atolfp(tokens[1], &tmp)) {
 					syslog(LOG_ERR,
 					    "authdelay value %s undecodable",
@@ -854,7 +854,7 @@ getconfig(argc, argv)
 				peeraddr.sin_addr.s_addr = htonl(INADDR_ANY);
 			else if (!getnetnum(tokens[1], &peeraddr, 1))
 				break;
-			
+
 			/*
 			 * Use peerversion as flags, peerkey as mflags.  Ick.
 			 */
@@ -875,47 +875,47 @@ getconfig(argc, argv)
 					if (!getnetnum(tokens[i], &maskaddr, 1))
 						errflg++;
 					break;
-					
+
 				case CONF_RES_IGNORE:
 					peerversion |= RES_IGNORE;
 					break;
-				
+
 				case CONF_RES_NOSERVE:
 					peerversion |= RES_DONTSERVE;
 					break;
-				
+
 				case CONF_RES_NOTRUST:
 					peerversion |= RES_DONTTRUST;
 					break;
-				
+
 				case CONF_RES_NOQUERY:
 					peerversion |= RES_NOQUERY;
 					break;
-					
+
 				case CONF_RES_NOMODIFY:
 					peerversion |= RES_NOMODIFY;
 					break;
-					
+
 				case CONF_RES_NOPEER:
 					peerversion |= RES_NOPEER;
 					break;
-					
+
 				case CONF_RES_NOTRAP:
 					peerversion |= RES_NOTRAP;
 					break;
-					
+
 				case CONF_RES_LPTRAP:
 					peerversion |= RES_LPTRAP;
 					break;
-					
+
 				case CONF_RES_NTPPORT:
 					peerkey |= RESM_NTPONLY;
 					break;
-					
+
 				case CONF_RES_LIMITED:
 					peerversion |= RES_LIMITED;
 					break;
-					
+
 				case CONFIG_UNKNOWN:
 					errflg++;
 					break;
@@ -927,11 +927,11 @@ getconfig(argc, argv)
 				restrict(RESTRICT_FLAGS, &peeraddr, &maskaddr,
 				    (int)peerkey, peerversion);
 			break;
-			
+
 		case CONFIG_BDELAY:
 			if (ntokens >= 2) {
 				l_fp tmp;
-				
+
 				if (!atolfp(tokens[1], &tmp)) {
 					syslog(LOG_ERR,
 					    "broadcastdelay value %s undecodable",
@@ -945,11 +945,11 @@ getconfig(argc, argv)
 				}
 			}
 			break;
-			
+
 		case CONFIG_TRUSTEDKEY:
 			for (i = 1; i < ntokens; i++) {
 				u_long tkey;
-				
+
 				tkey = atol(tokens[i]);
 				if (tkey == 0) {
 					syslog(LOG_ERR,
@@ -960,11 +960,11 @@ getconfig(argc, argv)
 				}
 			}
 			break;
-			
+
 		case CONFIG_REQUESTKEY:
 			if (ntokens >= 2) {
 				u_long rkey;
-				
+
 				if (!atouint(tokens[1], &rkey)) {
 					syslog(LOG_ERR,
 					    "%s is undecodeable as request key",
@@ -983,12 +983,12 @@ getconfig(argc, argv)
 				}
 			}
 			break;
-			
+
 		case CONFIG_CONTROLKEY:
 			if (ntokens >= 2) {
 				u_long ckey;
 				extern u_long ctl_auth_keyid;
-				
+
 				ckey = atol(tokens[1]);
 				if (ckey == 0) {
 					syslog(LOG_ERR,
@@ -999,7 +999,7 @@ getconfig(argc, argv)
 				}
 			}
 			break;
-			
+
 		case CONFIG_TRAP:
 			if (ntokens < 2) {
 				syslog(LOG_ERR,
@@ -1008,7 +1008,7 @@ getconfig(argc, argv)
 			}
 			if (!getnetnum(tokens[1], &peeraddr, 1))
 				break;
-			
+
 			/*
 			 * Use peerversion for port number.  Barf.
 			 */
@@ -1033,7 +1033,7 @@ getconfig(argc, argv)
 						errflg = 1;
 					}
 					break;
-					
+
 				case CONF_TRAP_INTERFACE:
 					if (i >= ntokens-1) {
 						syslog(LOG_ERR,
@@ -1041,13 +1041,13 @@ getconfig(argc, argv)
 						errflg = 1;
 						break;
 					}
-					
+
 					if (!getnetnum(tokens[++i],
 					    &maskaddr, 1)) {
 						errflg = 1;
 						break;
 					}
-					
+
 					localaddr = findinterface(&maskaddr);
 					if (localaddr == NULL) {
 						syslog(LOG_ERR,
@@ -1056,15 +1056,15 @@ getconfig(argc, argv)
 						errflg = 1;
 					}
 					break;
-					
+
 				case CONFIG_UNKNOWN:
 					errflg++;
 					break;
 				}
-			
+
 			if (!errflg) {
 				extern struct interface *any_interface;
-				
+
 				if (peerversion != 0)
 					peeraddr.sin_port = htons(peerversion);
 				else
@@ -1078,7 +1078,7 @@ getconfig(argc, argv)
 					    ntoa(&peeraddr));
 			}
 			break;
-		
+
 		case CONFIG_FUDGE:
 			if (ntokens < 2) {
 				syslog(LOG_ERR,
@@ -1087,14 +1087,14 @@ getconfig(argc, argv)
 			}
 			if (!getnetnum(tokens[1], &peeraddr, 1))
 				break;
-			
+
 			if (!ISREFCLOCKADR(&peeraddr)) {
 				syslog(LOG_ERR,
 				    "%s is inappropriate address for the fudge command, line ignored",
 				    ntoa(&peeraddr));
 				break;
 			}
-			
+
 			memset((char *)&clock, 0, sizeof clock);
 			errflg = 0;
 			for (i = 2; i < ntokens-1; i++) {
@@ -1111,7 +1111,7 @@ getconfig(argc, argv)
 					}
 					clock.haveflags |= CLK_HAVETIME1;
 					break;
-					
+
 				case CONF_FDG_TIME2:
 					if (!atolfp(tokens[++i],
 					    &clock.fudgetime2)) {
@@ -1123,7 +1123,7 @@ getconfig(argc, argv)
 					}
 					clock.haveflags |= CLK_HAVETIME2;
 					break;
-					
+
 				case CONF_FDG_STRATUM:
 					if (!atoint(tokens[++i],
 					    (long *)&clock.fudgeval1)) {
@@ -1135,7 +1135,7 @@ getconfig(argc, argv)
 					}
 					clock.haveflags |= CLK_HAVEVAL1;
 					break;
-					
+
 				case CONF_FDG_REFID:
 					strncpy((char *)&clock.fudgeval2,
 					    tokens[++i], 4);
@@ -1177,13 +1177,13 @@ getconfig(argc, argv)
 					else
 						clock.flags |= c;
 					break;
-					
+
 				case CONFIG_UNKNOWN:
 					errflg = -1;
 					break;
 				}
 			}
-			
+
 #ifdef REFCLOCK
 			/*
 			 * If reference clock support isn't defined the
@@ -1202,7 +1202,7 @@ getconfig(argc, argv)
 				stats_config(STATS_STATSDIR,tokens[1]);
 			}
 			break;
-			
+
 		case CONFIG_STATISTICS:
 			for (i = 1; i < ntokens; i++) {
 				filegen = filegen_get(tokens[i]);
@@ -1221,14 +1221,14 @@ getconfig(argc, argv)
 				filegen->flag |= FGEN_FLAG_ENABLED;
 			}
 			break;
-			
+
 		case CONFIG_FILEGEN:
 			if (ntokens < 2) {
 				syslog(LOG_ERR,
 				    "no id for filegen command, line ignored");
 				break;
 			}
-			
+
 			filegen = filegen_get(tokens[1]);
 			if (filegen == NULL) {
 				syslog(LOG_ERR,
@@ -1245,12 +1245,12 @@ getconfig(argc, argv)
 			peerkey =     filegen->type;
 			peerflags =   filegen->flag;
 			errflg = 0;
-			
+
 			for (i = 2; i < ntokens; i++) {
 				switch (matchkey(tokens[i], filegen_keywords)) {
 				case CONF_FGEN_FILE:
 					if (i >= ntokens - 1) {
-						syslog(LOG_ERR, 
+						syslog(LOG_ERR,
 						    "filegen %s file requires argument",
 						    tokens[1]);
 						errflg = i;
@@ -1309,7 +1309,7 @@ getconfig(argc, argv)
 				    "default"))) ? DEF : 0));
 			}
 			break;
-			
+
 		case CONFIG_CLIENTLIMIT:
 			if (ntokens < 2) {
 				syslog(LOG_ERR,
@@ -1377,7 +1377,7 @@ getconfig(argc, argv)
 				flag = matchkey(tokens[i], flags_keywords);
 				if (flag == CONFIG_UNKNOWN) {
 					syslog(LOG_ERR,
-					    "disable unknown flag %s", 
+					    "disable unknown flag %s",
 					    tokens[i]);
 					errflg = 1;
 					break;
diff --git a/usr.sbin/xntpd/xntpd/ntp_control.c b/usr.sbin/xntpd/xntpd/ntp_control.c
index 0f1dc2b4d494..af4365c9e3d1 100644
--- a/usr.sbin/xntpd/xntpd/ntp_control.c
+++ b/usr.sbin/xntpd/xntpd/ntp_control.c
@@ -484,7 +484,7 @@ ctl_error(errcode)
 
 		*(u_long *)((u_char *)&rpkt + CTL_HEADER_LEN)
 		    = htonl(res_keyid);
-		maclen = 
+		maclen =
 		    authencrypt(res_keyid, (U_LONG *)&rpkt, CTL_HEADER_LEN);
 		sendpkt(rmt_addr, lcl_inter, -2, (struct pkt *)&rpkt,
 		    CTL_HEADER_LEN + maclen);
@@ -643,7 +643,7 @@ process_control(rbufp, restrict)
 	 */
 	for (cc = control_codes; cc->control_code != NO_REQUEST; cc++) {
 		if (cc->control_code == res_opcode) {
-#ifdef DEBUG	
+#ifdef DEBUG
 			if (debug >= 2)
 				printf("opcode %d, found command handler\n",
 				    res_opcode);
@@ -742,7 +742,7 @@ ctlsysstatus()
 				clock |= CTL_SST_TS_PPS;
 		}
 	}
-	return (u_short)CTL_SYS_STATUS(sys_leap, clock, 
+	return (u_short)CTL_SYS_STATUS(sys_leap, clock,
 	    ctl_sys_num_events, ctl_sys_last_event);
 }
 
@@ -815,7 +815,7 @@ ctl_flushpkt(more)
 			    totlen++;
 			}
 			*(u_long *)datapt = htonl(res_keyid);
-			maclen = 
+			maclen =
 			    authencrypt(res_keyid, (U_LONG *)&rpkt, totlen);
 
  			sendpkt(rmt_addr, lcl_inter, -5, (struct pkt *)&rpkt,
@@ -900,7 +900,7 @@ ctl_putstr(tag, data, len)
 	cq = tag;
 	while (*cq != '\0')
 		*cp++ = *cq++;
-	
+
 	if (len > 0) {
 		*cp++ = '=';
 		*cp++ = '"';
@@ -936,7 +936,7 @@ ctl_putlfp(tag, ts)
 	cq = lfptoms(ts, 3);
 	while (*cq != '\0')
 		*cp++ = *cq++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -961,7 +961,7 @@ ctl_putfp(tag, fp)
 	cq = fptoms(fp, 2);
 	while (*cq != '\0')
 		*cp++ = *cq++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -986,7 +986,7 @@ ctl_putufp(tag, ufp)
 	cq = ufptoms(ufp, 2);
 	while (*cq != '\0')
 		*cp++ = *cq++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -1011,7 +1011,7 @@ ctl_putuint(tag, uval)
 	(void) sprintf(cp, "%lu", uval);
 	while (*cp != '\0')
 		cp++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -1061,7 +1061,7 @@ ctl_putint(tag, ival)
 	(void) sprintf(cp, "%ld", ival);
 	while (*cp != '\0')
 		cp++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -1087,7 +1087,7 @@ ctl_putts(tag, ts)
 	    ts->l_uf & 0xffffffffL);
 	while (*cp != '\0')
 		cp++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -1112,7 +1112,7 @@ ctl_putadr(tag, addr)
 	cq = numtoa(addr);
 	while (*cq != '\0')
 		*cp++ = *cq++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -1137,7 +1137,7 @@ ctl_putid(tag, id)
 	cq = id;
 	while (*cq != '\0' && (cq - id) < 4)
 		*cp++ = *cq++;
-	
+
 	ctl_putdata(buffer, cp - buffer, 0);
 }
 
@@ -1292,7 +1292,7 @@ ctl_putsys(varid)
 		  be = buf + sizeof(buf) - strlen(sys_var[CS_VARLIST].text) - 4;
 		  if (s > be)
 		    break;	/* really long var name 8-( - Killer */
-		  
+
 		  strcpy(s, sys_var[CS_VARLIST].text);
 		  strcat(s, "=\"");
 		  s += strlen(s);
@@ -1335,7 +1335,7 @@ ctl_putsys(varid)
 
 		  if (s+2 >= be)
 		    break;
-		  
+
 		  *s++ = '"';
 		  *s = '\0';
 
@@ -1496,7 +1496,7 @@ ctl_putpeer(varid, peer)
 		  be = buf + sizeof(buf) - strlen(peer_var[CP_VARLIST].text) - 4;
 		  if (s > be)
 		    break;	/* really long var name 8-( - Killer */
-		  
+
 		  strcpy(s, peer_var[CP_VARLIST].text);
 		  strcat(s, "=\"");
 		  s += strlen(s);
@@ -1518,7 +1518,7 @@ ctl_putpeer(varid, peer)
 
 		  if (s+2 >= be)
 		    break;
-		  
+
 		  *s++ = '"';
 		  *s = '\0';
 
@@ -1611,7 +1611,7 @@ ctl_putclock(varid, clock, mustput)
 		  be = buf + sizeof(buf) - strlen(clock_var[CC_VARLIST].text) - 4;
 		  if (s > be)
 		    break;	/* really long var name 8-( - Killer */
-		  
+
 		  strcpy(s, clock_var[CC_VARLIST].text);
 		  strcat(s, "=\"");
 		  s += strlen(s);
@@ -1639,7 +1639,7 @@ ctl_putclock(varid, clock, mustput)
 		      ss = k->text;
 		      if (!ss)
 			continue;
-		      
+
 		      while (*ss && *ss != '=')
 			ss++;
 
@@ -1655,7 +1655,7 @@ ctl_putclock(varid, clock, mustput)
 
 		  if (s+2 >= be)
 		    break;
-		  
+
 		  *s++ = '"';
 		  *s = '\0';
 
@@ -1693,7 +1693,7 @@ ctl_getitem(var_list, data)
 
 	if (var_list == (struct ctl_var *)0)
 	  return &eol;
-	
+
 	/*
 	 * Look for a first character match on the tag.  If we find
 	 * one, see if it is a full match.
@@ -2017,7 +2017,7 @@ write_variables(rbufp, restrict)
 		        t = v->text;
 			while (*t && *t != '=')
 			  *tt++ = *t++;
-			
+
 			*tt++ = '=';
 			strcat(tt, valuep);
 
@@ -2112,7 +2112,7 @@ read_clock_status(rbufp, restrict)
 	 * If we got here we have a peer which is a clock.  Get his status.
 	 */
 	clock.kv_list = (struct ctl_var *)0;
-	
+
 	refclock_control(&peer->srcadr, (struct refclockstat *)0, &clock);
 
 	/*
@@ -2346,7 +2346,7 @@ ctlsettrap(raddr, linter, traptype, version)
 	 */
 	if (tptouse == NULL)
 		return 0;
-	
+
 	/*
 	 * Set up this structure for him.
 	 */
@@ -2380,11 +2380,11 @@ ctlclrtrap(raddr, linter, traptype)
 
 	if ((tp = ctlfindtrap(raddr, linter)) == NULL)
 		return 0;
-	
+
 	if (tp->tr_flags & TRAP_CONFIGURED
 	    && traptype != TRAP_TYPE_CONFIG)
 		return 0;
-	
+
 	tp->tr_flags = 0;
 	num_ctl_traps--;
 	return 1;
@@ -2527,7 +2527,7 @@ report_event(err, peer)
 				struct ctl_var *kv;
 
 				clock.kv_list = (struct ctl_var *)0;
-				
+
  				refclock_control(&peer->srcadr,
 						 (struct refclockstat *)0,
 						 &clock);
diff --git a/usr.sbin/xntpd/xntpd/ntp_filegen.c b/usr.sbin/xntpd/xntpd/ntp_filegen.c
index 4c23bed44f06..cc4882b97985 100644
--- a/usr.sbin/xntpd/xntpd/ntp_filegen.c
+++ b/usr.sbin/xntpd/xntpd/ntp_filegen.c
@@ -28,7 +28,7 @@
  * NTP is intended to run long periods of time without restart.
  * Thus log and statistic files generated by NTP will grow large.
  *
- * this set of routines provides a central interface 
+ * this set of routines provides a central interface
  * to generating files using file generations
  *
  * the generation of a file is changed according to file generation type
@@ -85,13 +85,13 @@ filegen_open(gen, newid)
 	len = strlen(gen->prefix) + strlen(gen->basename) + 1;
 	basename = emalloc(len);
 	sprintf(basename, "%s%s", gen->prefix, gen->basename);
-  
+
 	switch(gen->type) {
 	default:
 		syslog(LOG_ERR, "unsupported file generations type %d for \"%s\" - reverting to FILEGEN_NONE",
 		       gen->type, basename);
 		gen->type = FILEGEN_NONE;
-      
+
 		/*FALLTHROUGH*/
 	case FILEGEN_NONE:
 		filename = emalloc(len);
@@ -102,7 +102,7 @@ filegen_open(gen, newid)
 		filename = emalloc(len + 1 + 1 + 10);
 		sprintf(filename,"%s%c#%ld", basename, SUFFIX_SEP, newid);
 		break;
-      
+
 	case FILEGEN_DAY:
 		/* You can argue here in favor of using MJD, but
 		 * I would assume it to be easier for humans to interpret dates
@@ -113,7 +113,7 @@ filegen_open(gen, newid)
 		sprintf(filename, "%s%c%04d%02d%02d",
 			basename, SUFFIX_SEP, cal.year, cal.month, cal.monthday);
 		break;
-      
+
 	case FILEGEN_WEEK:
 		/*
 		 * This is still a hack
@@ -145,7 +145,7 @@ filegen_open(gen, newid)
 		sprintf(filename, "%s%ca%08ld", basename, SUFFIX_SEP, newid);
 		break;
 	}
-  
+
 	if (gen->type != FILEGEN_NONE) {
 		/*
 		 * check for existence of a file with name 'basename'
@@ -204,7 +204,7 @@ filegen_open(gen, newid)
 	 * now, try to open new file generation...
 	 */
 	fp = fopen(filename, "a");
-  
+
 #ifdef DEBUG
 	if (debug > 3)
 		printf("opening filegen (type=%d/id=%lu) \"%s\"\n",
@@ -249,7 +249,7 @@ filegen_open(gen, newid)
 
 		}		/*flags & FGEN_FLAG_LINK*/
 	}			/*else fp == NULL*/
-	
+
 	free(basename);
 	free(filename);
 	return;
@@ -276,12 +276,12 @@ filegen_setup(gen,now)
 			fclose(gen->fp);
 		return;
 	}
-	
+
 	switch (gen->type) {
 	case FILEGEN_NONE:
 		if (gen->fp != NULL) return; /* file already open */
 		break;
-      
+
 	case FILEGEN_PID:
 		new_gen = getpid();
 		break;
@@ -291,7 +291,7 @@ filegen_setup(gen,now)
 		cal.hour = cal.minute = cal.second = 0;
 		new_gen = caltontp(&cal);
 		break;
-      
+
 	case FILEGEN_WEEK:
 		/* Would be nice to have a calweekstart() routine */
 		/* so just use a hack ... */
@@ -308,7 +308,7 @@ filegen_setup(gen,now)
 		cal.hour = cal.minute = cal.second = 0;
 		new_gen = caltontp(&cal);
 		break;
-      
+
 	case FILEGEN_MONTH:
 		caljulian(now, &cal);
 		cal.yearday -= cal.monthday - 1;
@@ -316,7 +316,7 @@ filegen_setup(gen,now)
 		cal.hour = cal.minute = cal.second = 0;
 		new_gen = caltontp(&cal);
 		break;
-      
+
 	case FILEGEN_YEAR:
 		new_gen = calyearstart(now);
 		break;
@@ -352,13 +352,13 @@ filegen_config(gen,basename,type,flag)
 	    type == gen->type &&
 	    flag == gen->flag)
 		return;
-  
+
 	/*
 	 * validate parameters
 	 */
 	if (!valid_fileref(gen->prefix,basename))
 		return;
-  
+
 	if (gen->fp != NULL)
 		fclose(gen->fp);
 
@@ -412,7 +412,7 @@ valid_fileref(prefix,basename)
 	 * (however, it would be possible to perform some checks here...)
 	 */
 	register char *p = basename;
-  
+
 	/*
 	 * Just to catch, dumb errors opening up the world...
 	 */
@@ -421,12 +421,12 @@ valid_fileref(prefix,basename)
 
 	if (basename == NULL)
 		return 0;
-  
+
 	for (p = basename; p; p = strchr(p, '/')) {
 		if (*p == '.' && *(p+1) == '.' && (*(p+2) == '\0' || *(p+2) == '/'))
 			return 0;
 	}
-  
+
 	return 1;
 }
 
@@ -503,7 +503,7 @@ filegen_register(name, filegen)
 		}
 #endif
 	}
-	
+
 	return;
 }
 
@@ -513,7 +513,7 @@ filegen_unregister(name)
   char *name;
 {
 	struct filegen_entry **f = &filegen_registry;
-  
+
 #ifdef DEBUG
 	if (debug > 3)
 		printf("filegen_unregister(\"%s\")\n", name);
@@ -523,7 +523,7 @@ filegen_unregister(name)
 		if (strcmp((*f)->name,name) == 0) {
 			struct filegen_entry *ff = *f;
 			FILEGEN *fg;
-			
+
 			*f = (*f)->next;
 			fg = ff->filegen;
 			free(ff->name);
@@ -533,6 +533,6 @@ filegen_unregister(name)
 		f = &((*f)->next);
 	}
 	return NULL;
-}	
+}
 #endif	/* UNUSED */
-		
+
diff --git a/usr.sbin/xntpd/xntpd/ntp_intres.c b/usr.sbin/xntpd/xntpd/ntp_intres.c
index c05354b6837d..62d379235c6c 100644
--- a/usr.sbin/xntpd/xntpd/ntp_intres.c
+++ b/usr.sbin/xntpd/xntpd/ntp_intres.c
@@ -186,7 +186,7 @@ ntp_intres()
 	doconfigure(1);
 	if (confentries == NULL)
 		exit(0);		/* done that quick */
-	
+
 	/*
 	 * Here we've got some problem children.  Set up the timer
 	 * and wait for it.
@@ -379,7 +379,7 @@ openntp()
 
 	if (sockfd >= 0)
 		return;
-	
+
 	sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sockfd == -1) {
 		syslog(LOG_ERR, "socket() failed: %m");
@@ -435,7 +435,7 @@ request(conf)
 
 	if (sockfd < 0)
 		openntp();
-	
+
 	/*
 	 * Try to clear out any previously received traffic so it
 	 * doesn't fool us.  Note the socket is nonblocking.
@@ -589,17 +589,17 @@ request(conf)
 		case INFO_OKAY:
 			/* success */
 			return 1;
-		
+
 		case INFO_ERR_IMPL:
 			syslog(LOG_ERR,
 			    "server reports implementation mismatch!!");
 			return 0;
-		
+
 		case INFO_ERR_REQ:
 			syslog(LOG_ERR,
 			    "server claims configuration request is unknown");
 			return 0;
-		
+
 		case INFO_ERR_FMT:
 			syslog(LOG_ERR,
 			    "server indicates a format error occured(!!)");
@@ -609,7 +609,7 @@ request(conf)
 			syslog(LOG_ERR,
 		"server indicates no data available (shouldn't happen)");
 			return 0;
-		
+
 		case INFO_ERR_AUTH:
 			syslog(LOG_ERR,
 			    "server returns a permission denied error");
@@ -641,7 +641,7 @@ nexttoken(lptr)
 	 */
 	while (*cp == ' ' || *cp == '\t')
 		cp++;
-	
+
 	/*
 	 * If this is the end of the line, return nothing.
 	 */
@@ -649,7 +649,7 @@ nexttoken(lptr)
 		*lptr = cp;
 		return NULL;
 	}
-	
+
 	/*
 	 * Must be the start of a token.  Record the pointer and look
 	 * for the end.
@@ -657,7 +657,7 @@ nexttoken(lptr)
 	tstart = cp++;
 	while (*cp != ' ' && *cp != '\t' && *cp != '\n' && *cp != '\0')
 		cp++;
-	
+
 	/*
 	 * Terminate the token with a \0.  If this isn't the end of the
 	 * line, space to the next character.
@@ -750,7 +750,7 @@ readconf(fp, name)
 			flags |= CONF_FLAG_AUTHENABLE;
 		if (intval[TOK_FLAGS] & FLAG_PREFER)
 			flags |= CONF_FLAG_PREFER;
-		
+
 		/*
 		 * This is as good as we can check it.  Add it in.
 		 */
diff --git a/usr.sbin/xntpd/xntpd/ntp_io.c b/usr.sbin/xntpd/xntpd/ntp_io.c
index dcb68efd9089..bcf50f9bb344 100644
--- a/usr.sbin/xntpd/xntpd/ntp_io.c
+++ b/usr.sbin/xntpd/xntpd/ntp_io.c
@@ -402,7 +402,7 @@ create_sockets(port)
 
 	maxactivefd = 0;
 	FD_ZERO(&activefds);
-			
+
 	for (i = 0; i < ninterfaces; i++) {
 		inter_list[i].fd = open_socket(&inter_list[i].sin,
 		    inter_list[i].flags & INT_BROADCAST);
@@ -546,7 +546,7 @@ io_multicast_add(addr)
 			mreq.imr_multiaddr, mreq.imr_interface.s_addr,
 			inet_ntoa(iaddr));
 	inter_list[i].flags |= INT_MULTICAST;
-	if (i >= ninterfaces) ninterfaces = i+1;	
+	if (i >= ninterfaces) ninterfaces = i+1;
 #else /* MCAST */
 	struct in_addr iaddr;
 	iaddr.s_addr = addr;
@@ -813,7 +813,7 @@ getrecvbufs()
 #endif
 		return (struct recvbuf *)0;	/* nothing has arrived */
 	}
-	
+
 	/*
 	 * Get the fulllist chain and mark it empty
 	 */
@@ -932,7 +932,7 @@ sendpkt(dest, inter, ttl, pkt, len)
 		if (badaddrs[slot].port == dest->sin_port &&
 		    badaddrs[slot].addr.s_addr == dest->sin_addr.s_addr)
 			break;
-			
+
 	cc = sendto(inter->fd, (char *)pkt, len, 0, (struct sockaddr *)dest,
 	    sizeof(struct sockaddr_in));
 	if (cc == -1) {
@@ -1030,7 +1030,7 @@ again:
 				i = (rp->datalen == 0
 				    || rp->datalen > sizeof(rb->recv_space))
 				    ? sizeof(rb->recv_space) : rp->datalen;
-				
+
 				rb->recv_length =
 					read(fd, (char *)&rb->recv_space, i);
 
@@ -1041,7 +1041,7 @@ again:
 					free_recvbufs++;
 					continue;
 				}
-	
+
 				/*
 				 * Got one.  Mark how and when it got here,
 				 * put it on the full list and do bookkeeping.
@@ -1121,11 +1121,11 @@ again:
 						continue;
 					}
 				}
-	
+
 				rb = freelist;
 				freelist = rb->next;
 				free_recvbufs--;
-	
+
 				fromlen = sizeof(struct sockaddr_in);
 				rb->recv_length = recvfrom(fd,
 				    (char *)&rb->recv_space,
@@ -1159,7 +1159,7 @@ again:
 				rb->fd = fd;
 				rb->recv_time = ts;
 				rb->receiver = receive;
-	
+
 
 				if (fulllist == 0) {
 					beginlist = rb;
@@ -1170,7 +1170,7 @@ again:
 				}
 				fulllist = rb;
 				full_recvbufs++;
-	
+
 				inter_list[i].received++;
 				packets_received++;
 			}
@@ -1300,7 +1300,7 @@ io_closeclock(rio)
 				rp->next = rio->next;
 				break;
 			}
-		
+
 		if (rp == 0) {
 			/*
 			 * Internal error.  Report it.
@@ -1367,7 +1367,7 @@ init_clock_sig(rio)
 	struct refclockio *rio;
 {
 	int pgrp, on = 1;
-	
+
         pgrp = getpid();
         if (ioctl(rio->fd, FIOSSAIOOWN, (char *)&pgrp) == -1) {
                 syslog(LOG_ERR, "ioctl(FIOSSAIOOWN) fails for clock I/O: %m");
@@ -1389,7 +1389,7 @@ init_clock_sig(rio)
                 exit(1);
                 /*NOTREACHED*/
         }
-	return 0;	
+	return 0;
 }
 #endif /* SYS_HPUX */
 #if defined(SYS_AIX)&&!defined(_BSD)
@@ -1435,7 +1435,7 @@ init_clock_sig(rio)
                     "fcntl(FNDELAY|FASYNC) fails for clock I/O: %m");
                 return 1;
         }
-	return 0;	
+	return 0;
 }
 #endif /* CLOCK_DONE */
 #else /* !USE_TTY_SIGPOLL */
@@ -1798,7 +1798,7 @@ void
 wait_for_signal()
 {
 	int mask, omask;
-	
+
 	mask = sigmask(SIGIO)|sigmask(SIGALRM);
         omask = sigblock(0);
         omask &= ~mask;
diff --git a/usr.sbin/xntpd/xntpd/ntp_leap.c b/usr.sbin/xntpd/xntpd/ntp_leap.c
index 6473362cf652..5e7eca77a9b2 100644
--- a/usr.sbin/xntpd/xntpd/ntp_leap.c
+++ b/usr.sbin/xntpd/xntpd/ntp_leap.c
@@ -140,7 +140,7 @@ leap_process()
 				bits = leap_indicator;
 			else if (leapbits != 0)
 				bits = leapbits;
-			
+
 			if (bits != 0 && !pll_control) {
 				l_fp tmp;
 
@@ -259,7 +259,7 @@ leap_setleap(indicator, warning)
 	if (indicator != ~0)
 		if (leapnext > DAYBEFORE)
 			i = 1;
-	
+
 	if (i) {
 		syslog(LOG_ERR,
 		    "attempt to set leap bits at unlikely time of month");
diff --git a/usr.sbin/xntpd/xntpd/ntp_loopfilter.c b/usr.sbin/xntpd/xntpd/ntp_loopfilter.c
index 6fcf0a0b77b6..69939ec3deb4 100644
--- a/usr.sbin/xntpd/xntpd/ntp_loopfilter.c
+++ b/usr.sbin/xntpd/xntpd/ntp_loopfilter.c
@@ -76,7 +76,7 @@
  * run time using xntpdc. If true, the kernel modifications are active
  * as described above; if false, the kernel is bypassed entirely (except
  * for the PPS frequency update, if enabled) and the daemon PLL used
- * instead. 
+ * instead.
  */
 #define RSH_DRIFT_TO_FRAC (CLOCK_DSCALE - 16)
 #define RSH_DRIFT_TO_ADJ (RSH_DRIFT_TO_FRAC - CLOCK_ADJ)
@@ -389,7 +389,7 @@ local_clock(fp_offset, peer)
 	 * by the time constant, which is adjusted in response to the
 	 * phase error and dispersion. Note the frequency is not changed
 	 * if the local clock driver is in control.
-	 */ 
+	 */
 	} else if (interval < allan) {
 		int time_constant = min(peer->ppoll, sys_poll) -
 		    NTP_MINPOLL;
@@ -507,7 +507,7 @@ local_clock(fp_offset, peer)
 #endif /* DEBUG */
 
 	(void) record_loop_stats(fp_offset, drift_comp, sys_poll);
-	
+
 	/*
 	 * Whew.  I've had enough.
 	 */
diff --git a/usr.sbin/xntpd/xntpd/ntp_monitor.c b/usr.sbin/xntpd/xntpd/ntp_monitor.c
index 55bd5d542b90..e6a1c4f461b8 100644
--- a/usr.sbin/xntpd/xntpd/ntp_monitor.c
+++ b/usr.sbin/xntpd/xntpd/ntp_monitor.c
@@ -127,7 +127,7 @@ mon_start(mode)
 	}
 	if (mode == MON_OFF)
 		return;		/* Ooops.. */
-	
+
 	if (!mon_have_memory) {
 		mon_total_mem = 0;
 		mon_mem_increments = 0;
@@ -164,7 +164,7 @@ mon_stop(mode)
 	mon_enabled &= ~mode;
 	if (mon_enabled != MON_OFF)
 		return;
-	
+
 	/*
 	 * Put everything back on the free list
 	 */
@@ -210,7 +210,7 @@ monitor(rbufp)
 
 	md = mon_hash[hash];
 	while (md != NULL) {
-		if (md->rmtadr == netnum && 
+		if (md->rmtadr == netnum &&
 		    /* ?? md->interface == rbufp->dstadr && ?? */
 		    md->mode == (u_char)mode) {
 			md->lasttime = current_time;
@@ -254,7 +254,7 @@ monitor(rbufp)
 		 */
 		md->fifo_prev->fifo_next = md->fifo_next;
 		md->fifo_next->fifo_prev = md->fifo_prev;
-		
+
 	} else {
 		if (mon_free == NULL)           /* if free list empty */
 			mon_getmoremem();       /* then get more */
diff --git a/usr.sbin/xntpd/xntpd/ntp_peer.c b/usr.sbin/xntpd/xntpd/ntp_peer.c
index 389cc2c75671..f77773494f29 100644
--- a/usr.sbin/xntpd/xntpd/ntp_peer.c
+++ b/usr.sbin/xntpd/xntpd/ntp_peer.c
@@ -176,7 +176,7 @@ findexistingpeer(addr, start_peer)
 		peer = peer_hash[HASH_ADDR(addr)];
 	else
 		peer = start_peer->next;
-	
+
 	while (peer != 0) {
 		if (NSRCADR(addr) == NSRCADR(&peer->srcadr)
 		    && NSRCPORT(addr) == NSRCPORT(&peer->srcadr))
@@ -233,8 +233,8 @@ findpeer(srcadr, dstadr, fd)
 					    ntoa(srcadr));
 			}
 
-			/* 
-			 * Multicast hacks to determine peer when a 
+			/*
+			 * Multicast hacks to determine peer when a
 			 * packet arrives and there exists an assoc.
 			 * with src in client/server mode
 			 */
@@ -316,7 +316,7 @@ unpeer(peer_to_remove)
 		peer = peer_hash[hash];
 		while (peer != 0 && peer->next != peer_to_remove)
 			peer = peer->next;
-		
+
 		if (peer == 0) {
 			peer_hash_count[hash]++;
 			syslog(LOG_ERR, "peer struct for %s not in table!",
@@ -339,7 +339,7 @@ unpeer(peer_to_remove)
 		peer = assoc_hash[hash];
 		while (peer != 0 && peer->ass_next != peer_to_remove)
 			peer = peer->ass_next;
-		
+
 		if (peer == 0) {
 			assoc_hash_count[hash]++;
 			syslog(LOG_ERR,
@@ -453,7 +453,7 @@ newpeer(srcadr, dstadr, hmode, version, minpoll, maxpoll, ttl, key)
 	 */
 	extern s_fp sys_bdelay;
 	extern long sys_clock;
-	
+
 	if (peer_free_count == 0)
 		getmorepeermem();
 
diff --git a/usr.sbin/xntpd/xntpd/ntp_proto.c b/usr.sbin/xntpd/xntpd/ntp_proto.c
index 7889d9315e47..fb812060541e 100644
--- a/usr.sbin/xntpd/xntpd/ntp_proto.c
+++ b/usr.sbin/xntpd/xntpd/ntp_proto.c
@@ -626,7 +626,7 @@ receive(rbufp)
 		    if (!(peer->reach && peer->keyid != hiskeyid)) {
 			peer->keyid = hiskeyid;
 			peer->flags |= FLAG_AUTHENABLE;
-		    } 
+		    }
 		} else {
 			peer->keyid = 0;
 			peer->flags &= ~FLAG_AUTHENABLE;
@@ -659,7 +659,7 @@ receive(rbufp)
 		trustable = 0;
 	else
 		trustable = 1;
-	
+
 	if (sys_authenticate && trustable) {
 		if (!(peer->flags & FLAG_CONFIG) ||
 		    (peer->flags & FLAG_AUTHENABLE)) {
@@ -733,7 +733,7 @@ receive(rbufp)
 		}
 		break;
 
-	
+
 	case MODE_BCLIENT:
 		/*
 		 * Broadcast client pseudo-mode. We accept both server
@@ -771,10 +771,10 @@ receive(rbufp)
 				 */
 				unpeer(peer);
 			break;
-		
+
 		case MODE_PASSIVE:
 			break;
-		
+
 		case MODE_SERVER:
 		case MODE_BROADCAST:
 			process_packet(peer, pkt, &rbufp->recv_time,
@@ -871,7 +871,7 @@ process_packet(peer, pkt, recv_ts, has_mac, trustable)
 	}
 	peer->org = p_xmt;	/* reuse byte-swapped pkt->xmt */
 	peer->ppoll = pkt->ppoll;
-		
+
 	/*
 	 * Call poll_update(). This will either start us, if the
 	 * association is new, or drop the polling interval if the
@@ -1131,7 +1131,7 @@ clock_update(peer)
 		sys_leap = leap_consensus & leap_mask;
 		L_CLR(&sys_refskew);
 		break;
-		
+
 	case 1:
 
 		/*
@@ -1363,11 +1363,11 @@ clock_filter(peer, sample_offset, sample_delay, sample_error)
 			}
 		}
 		skewmax += (1 << peer->hpoll);
-	} 
+	}
 	peer->filter_nextpt++;
 	if (peer->filter_nextpt >= NTP_SHIFT)
 		peer->filter_nextpt = 0;
-	
+
 	/*
 	 * We compute the dispersion as per the spec. Note that, to make
 	 * things simple, both the l_fp and s_fp offsets are retained
@@ -1738,7 +1738,7 @@ clock_select()
 		}
 		nlist--;
 	}
-	
+
 #ifdef DEBUG
 	if (debug > 1) {
 		for (i = 0; i < nlist; i++)
@@ -1847,7 +1847,7 @@ clock_select()
  *
  * Note: this routine uses only those peers at the lowest stratum.
  * Strictly speaking, this is at variance with the spec.
- */  
+ */
 void
 clock_combine(peers, npeers)
 	struct peer **peers;
@@ -2060,7 +2060,7 @@ fast_xmit(rbufp, rmode, authentic)
  * In order to guard against spurious values, which could occur if we
  * happen to hit a fat interrupt, we do this for MINLOOPS times and
  * keep the minimum value obtained.
- */  
+ */
 int default_get_precision()
 {
 	struct timeval tp;
@@ -2206,14 +2206,14 @@ proto_config(item, value)
 		sys_bclient = 1;
 		io_multicast_del(value);
 		break;
-	
+
 	case PROTO_PRECISION:
 		/*
 		 * Set system precision
 		 */
 		sys_precision = (s_char)value;
 		break;
-	
+
 	case PROTO_BROADDELAY:
 		/*
 		 * Set default broadcast delay (s_fp)
@@ -2223,7 +2223,7 @@ proto_config(item, value)
 		else
 			sys_bdelay = value >> 16;
 		break;
-	
+
 	case PROTO_AUTHENTICATE:
 		/*
 		 * Specify the use of authenticated data
diff --git a/usr.sbin/xntpd/xntpd/ntp_refclock.c b/usr.sbin/xntpd/xntpd/ntp_refclock.c
index b0248fb80e12..41aec27a3910 100644
--- a/usr.sbin/xntpd/xntpd/ntp_refclock.c
+++ b/usr.sbin/xntpd/xntpd/ntp_refclock.c
@@ -907,9 +907,9 @@ refclock_ioctl(fd, flags)
 #ifdef CLK
 
 	/*
-	 * The CLK option provides timestamping at the driver level. 
+	 * The CLK option provides timestamping at the driver level.
 	 * It requires the tty_clk streams module and System V STREAMS
-	 * support. 
+	 * support.
 	 */
 	if (flags & (LDISC_CLK | LDISC_CLKPPS | LDISC_ACTS)) {
 		if (ioctl(fd, I_PUSH, "clk") < 0)
@@ -1174,15 +1174,15 @@ refclock_control(srcadr, in, out)
 		}
 		if (in->haveflags & CLK_HAVEFLAG2) {
 			pp->sloppyclockflag &= ~CLK_FLAG2;
-			pp->sloppyclockflag |= in->flags & CLK_FLAG2;           
+			pp->sloppyclockflag |= in->flags & CLK_FLAG2;
 		}
 		if (in->haveflags & CLK_HAVEFLAG3) {
 			pp->sloppyclockflag &= ~CLK_FLAG3;
-			pp->sloppyclockflag |= in->flags & CLK_FLAG3;           
+			pp->sloppyclockflag |= in->flags & CLK_FLAG3;
 		}
 		if (in->haveflags & CLK_HAVEFLAG4) {
 			pp->sloppyclockflag &= ~CLK_FLAG4;
-			pp->sloppyclockflag |= in->flags & CLK_FLAG4;           
+			pp->sloppyclockflag |= in->flags & CLK_FLAG4;
 		}
 		if (in->flags & CLK_FLAG3)
 			(void)refclock_ioctl(pp->io.fd, LDISC_PPS);
diff --git a/usr.sbin/xntpd/xntpd/ntp_request.c b/usr.sbin/xntpd/xntpd/ntp_request.c
index d06fd13e7fc7..9f58d2259fbd 100644
--- a/usr.sbin/xntpd/xntpd/ntp_request.c
+++ b/usr.sbin/xntpd/xntpd/ntp_request.c
@@ -505,7 +505,7 @@ process_private(rbufp, mod_okay)
 	 */
 	if (proc->needs_auth) {
 		l_fp ftmp;
-		
+
 		/*
 		 * If this guy is restricted from doing this, don't let him
 		 * If wrong key was used, or packet doesn't have mac, return.
@@ -548,7 +548,7 @@ process_private(rbufp, mod_okay)
 		L_SUB(&ftmp, &rbufp->recv_time);
 		if (L_ISNEG(&ftmp))
 			L_NEG(&ftmp);
-		
+
 		if (ftmp.l_ui >= INFO_TS_MAXSKEW_UI) {
 			/*
 			 * He's a loser.  Tell him.
@@ -922,7 +922,7 @@ sys_info(srcadr, inter, inpkt)
 	HTONL_FP(&sys_reftime, &is->reftime);
 
 	is->poll = sys_poll;
-	
+
 	is->flags = 0;
 	if (sys_bclient)
 		is->flags |= INFO_FLAG_BCLIENT;
@@ -1853,7 +1853,7 @@ get_auth_info(srcadr, inter, inpkt)
 	ia->decryptions = htonl(authdecryptions);
 	ia->keyuncached = htonl(authkeyuncached);
 	ia->timereset = htonl(current_time - auth_timereset);
-	
+
 	(void) more_pkt();
 	flush_pkt();
 }
@@ -2233,7 +2233,7 @@ get_kernel_info(srcadr, inter, inpkt)
 	ik->calcnt = htonl(ntx.calcnt);
 	ik->errcnt = htonl(ntx.errcnt);
 	ik->stbcnt = htonl(ntx.stbcnt);
-	
+
 	(void) more_pkt();
 	flush_pkt();
 }
diff --git a/usr.sbin/xntpd/xntpd/ntp_restrict.c b/usr.sbin/xntpd/xntpd/ntp_restrict.c
index 0cc4b7d304b9..174d07e2cefc 100644
--- a/usr.sbin/xntpd/xntpd/ntp_restrict.c
+++ b/usr.sbin/xntpd/xntpd/ntp_restrict.c
@@ -182,7 +182,7 @@ restrictions(srcadr)
 		res_not_found++;
 	else
 		res_found++;
-	
+
 	/*
 	 * The following implements limiting the number of clients
 	 * accepted from a given network. The notion of "same network"
@@ -194,7 +194,7 @@ restrictions(srcadr)
 	 *	- take the list of clients recorded
 	 *        from the given "network" seen within the last
 	 *        client_limit_period seconds
-	 *      - if there are at most client_limit entries: 
+	 *      - if there are at most client_limit entries:
 	 *        --> access allowed
 	 *      - otherwise sort by time first seen
 	 *      - current client among the first client_limit seen
@@ -226,7 +226,7 @@ restrictions(srcadr)
 		 * How nice, MRU list provides our current client as the
 		 * first entry in the list.
 		 * Monitoring was verified to be active above, thus we
-		 * know an entry for our client must exist, or some 
+		 * know an entry for our client must exist, or some
 		 * brain dead set the memory limit for mon entries to ZERO!!!
 		 */
 		this_client = mon_mru_list.mru_next;
@@ -410,7 +410,7 @@ restrict(op, resaddr, resmask, mflags, flags)
 		}
 		rl->flags |= (u_short)flags;
 		break;
-	
+
 	case RESTRICT_UNFLAG:
 		/*
 		 * Remove some bits from the flags.  If we didn't
@@ -425,7 +425,7 @@ restrict(op, resaddr, resmask, mflags, flags)
 			rl->flags &= (u_short)~flags;
 		}
 		break;
-	
+
 	case RESTRICT_REMOVE:
 		/*
 		 * Remove an entry from the table entirely if we found one.
diff --git a/usr.sbin/xntpd/xntpd/ntp_unixclock.c b/usr.sbin/xntpd/xntpd/ntp_unixclock.c
index 8123c4fae9fe..bc771b6b717f 100644
--- a/usr.sbin/xntpd/xntpd/ntp_unixclock.c
+++ b/usr.sbin/xntpd/xntpd/ntp_unixclock.c
@@ -341,7 +341,7 @@ clock_parms(tickadj, tick)
 #define	K_TICKADJ	0
 #define	K_TICK		1
 
-	/* 
+	/*
 	 * Check to see what to use for the object file for names and get
 	 * the locations of the necessary kernel variables.
 	 */
@@ -413,7 +413,7 @@ clock_parms(tickadj, tick)
 /*
  * clock_parms for Solaris 2.2 and later, with high-res timer kernel code.
  * The clock code changed in Solaris 2.2, and tickadj went away.
- * The good news is that ADJTIME_IS_ACCURATE and tick is available through 
+ * The good news is that ADJTIME_IS_ACCURATE and tick is available through
  * sysconf().
  */
 static void
@@ -425,10 +425,10 @@ clock_parms(tickadj, tick)
 
         hz = (int) sysconf (_SC_CLK_TCK);
         *tick = 1000000L/hz;
-        *tickadj = (*tick/16); /* There is no tickadj, and it is only set here 
+        *tickadj = (*tick/16); /* There is no tickadj, and it is only set here
 				for tvu_maxslew calculation above. Really,
 				clock_parms should return adj_precision
-				and tvu_maxslew, instead of the very 
+				and tvu_maxslew, instead of the very
 				BSD-centric tickadj */
 
 #ifdef DEBUG
diff --git a/usr.sbin/xntpd/xntpd/ntp_util.c b/usr.sbin/xntpd/xntpd/ntp_util.c
index 540be62a675a..e44927631984 100644
--- a/usr.sbin/xntpd/xntpd/ntp_util.c
+++ b/usr.sbin/xntpd/xntpd/ntp_util.c
@@ -61,7 +61,7 @@ extern int errno;
 
 /*
  * This controls whether stats are written to the fileset. Provided
- * so that xntpdc can turn off stats when the file system fills up. 
+ * so that xntpdc can turn off stats when the file system fills up.
  */
 int stats_control;
 
@@ -90,7 +90,7 @@ init_util()
 	peerstats.type     = FILEGEN_DAY;
 	peerstats.flag     = FGEN_FLAG_LINK; /* not yet enabled !!*/
 	filegen_register("peerstats", &peerstats);
-	
+
 	loopstats.fp       = NULL;
 	loopstats.prefix   = &statsdir[0];
 	loopstats.basename = emalloc(strlen(LOOPNAME)+1);
@@ -173,7 +173,7 @@ hourly_stats()
 	syslog(LOG_INFO, "offset %s freq %s poll %d",
 	    lfptoa(&last_offset, 6), fptoa(drift_comp, 3),
 	    sys_poll);
-	
+
 	if (stats_drift_file != 0) {
 		if ((fp = fopen(stats_temp_file, "w")) == NULL) {
 			syslog(LOG_ERR, "can't open %s: %m",
@@ -249,7 +249,7 @@ stats_config(item, value)
 		}
 		loop_config(LOOP_DRIFTCOMP, &old_drift, temp);
 		break;
-	
+
 	case STATS_STATSDIR:
 		if (strlen(value) >= sizeof(statsdir)) {
 			syslog(LOG_ERR,
@@ -413,7 +413,7 @@ getauthkeys(keyfile)
 	len = strlen(keyfile);
 	if (len == 0)
 		return;
-	
+
 	if (key_file_name != 0) {
 		if (len > (int)strlen(key_file_name)) {
 			(void) free(key_file_name);
@@ -423,7 +423,7 @@ getauthkeys(keyfile)
 
 	if (key_file_name == 0)
 		key_file_name = emalloc((u_int)(len + 1));
-	
+
 	memmove(key_file_name, keyfile, len+1);
 
 	authreadkeys(key_file_name);
diff --git a/usr.sbin/xntpd/xntpd/refclock_acts.c b/usr.sbin/xntpd/xntpd/refclock_acts.c
index af3cabf11c82..39ff433719ae 100644
--- a/usr.sbin/xntpd/xntpd/refclock_acts.c
+++ b/usr.sbin/xntpd/xntpd/refclock_acts.c
@@ -189,7 +189,7 @@
  * are consistent before switching from "*" to "#". If the user has a
  * 1200 Baud modem with the same internal delay as that used by NIST,
  * then the "#" OTM should arrive at the user within +-2 ms of the
- * correct time. 
+ * correct time.
  *
  * However, NIST has studied different brands of 1200 Baud modems and
  * found internal delays from 24 ms to 40 ms and offsets of the "#" OTM
@@ -198,7 +198,7 @@
  * with granularity of 20 to 50 ms. In any case, the repeatability of
  * the offset for the "#" OTM should be within +-2 ms, if the dial-up
  * path is reciprocal and the user doesn't change the brand or model of
- * modem used. 
+ * modem used.
  *
  * This should be true even if the dial-up path on one day is a land-
  * line of less than 40 ms (one way) and on the next day is a satellite
@@ -767,7 +767,7 @@ acts_timeout(peer)
 		default:
 		syslog(LOG_NOTICE,
 		    "clock %s ACTS invalid mode", ntoa(&peer->srcadr));
-		
+
 	}
 
 	/*
diff --git a/usr.sbin/xntpd/xntpd/refclock_as2201.c b/usr.sbin/xntpd/xntpd/refclock_as2201.c
index 6c60fd0b9447..afacb6faefa7 100644
--- a/usr.sbin/xntpd/xntpd/refclock_as2201.c
+++ b/usr.sbin/xntpd/xntpd/refclock_as2201.c
@@ -56,7 +56,7 @@
  * available using a gadget box and 1-pps signal from the receiver. This
  * improves the accuracy to the order of a few tens of microseconds. In
  * addition, the serial output and 1-pps signal can be bussed to
- * additional receivers. 
+ * additional receivers.
  */
 
 /*
diff --git a/usr.sbin/xntpd/xntpd/refclock_atom.c b/usr.sbin/xntpd/xntpd/refclock_atom.c
index 71fe05d8f0da..8df49d212200 100644
--- a/usr.sbin/xntpd/xntpd/refclock_atom.c
+++ b/usr.sbin/xntpd/xntpd/refclock_atom.c
@@ -53,7 +53,7 @@
  * pulse generator in the gadget box is adjusted to produce a start bit
  * of length 26 usec at 38400 bps. Used with the LDISC_CLKPPS line
  * discipline, this produces an ASCII DEL character ('\377') followed by
- * a timestamp at each seconds epoch. 
+ * a timestamp at each seconds epoch.
  *
  * The third way involves an auxiliary radio clock driver which calls
  * the PPS driver with a timestamp captured by that driver. This use is
@@ -297,7 +297,7 @@ atom_pps(peer)
 	 * extend the fraction and stash in the buffer. No harm is done
 	 * if previous data are overwritten. If the discipline comes bum
 	 * or the data grow stale, just forget it.
-	 */ 
+	 */
 	i = up->ev.serial;
 	if (ioctl(fdpps, CIOGETEV, (caddr_t)&up->ev) < 0)
 		return;
diff --git a/usr.sbin/xntpd/xntpd/refclock_chu.c b/usr.sbin/xntpd/xntpd/refclock_chu.c
index 2488da62e9c0..7b710fce5102 100644
--- a/usr.sbin/xntpd/xntpd/refclock_chu.c
+++ b/usr.sbin/xntpd/xntpd/refclock_chu.c
@@ -525,13 +525,13 @@ chu_receive(rbufp)
 		 * interrupt latency).  We then take the mean of the
 		 * remaining 4 offsets as our estimate.
 		 */
-		
+
 		/*
 		 * Set up the order array.
 		 */
 		for (i = 0; i < NCHUCHARS; i++)
 			ord[i] = (u_short)i;
-		
+
 		/*
 		 * Sort them into order.  Reuse variables with abandon.
 		 */
@@ -554,7 +554,7 @@ chu_receive(rbufp)
 		tmp = off[ord[4]].l_uf;
 		for (i = 5; i <= 7; i++)
 			M_ADD(date_ui, tmp, off[ord[i]].l_ui, off[ord[i]].l_uf);
-		
+
 		/*
 		 * Round properly, then right shift two bits for the
 		 * divide by four.
@@ -595,7 +595,7 @@ chu_receive(rbufp)
 		if (date_ui < 9 || date_ui > 0xfffffff7) {
 			register u_long prod_ui;
 			register u_long prod_uf;
-	
+
 			prod_ui = prod_uf = 0;
 			/*
 			 * This code knows the low order bit in 0.1 is zero
@@ -647,7 +647,7 @@ chu_receive(rbufp)
 			tmp = prod_ui;
 		}
 	}
-	
+
 	/*
 	 * At this point we have the mean offset, with the integral
 	 * part in date_ui and the fractional part in tmp.  Store
@@ -768,7 +768,7 @@ chu_process(up)
 	refclock_receive(peer, &up->offsets[imax], 0,
 	    dispersion, &up->rectimes[imax], &up->rectimes[imax],
 	    pp->leap);
-	
+
 	/*
 	 * Zero out unit for next code series
 	 */
diff --git a/usr.sbin/xntpd/xntpd/refclock_datum.c b/usr.sbin/xntpd/xntpd/refclock_datum.c
index 825dee7ad7df..00449c0e544b 100644
--- a/usr.sbin/xntpd/xntpd/refclock_datum.c
+++ b/usr.sbin/xntpd/xntpd/refclock_datum.c
@@ -162,7 +162,7 @@ struct datum_pts_unit {
   int usec;			/* miliseconds */
   u_char leap;			/* funny leap character code */
   char retbuf[8];		/* returned time from the datum pts */
-  char nbytes;			/* number of bytes received from datum pts */ 
+  char nbytes;			/* number of bytes received from datum pts */
   double sigma2;		/* average squared error (roughly) */
   int tzoff;			/* time zone offest from GMT */
 };
@@ -652,7 +652,7 @@ static void datum_pts_receive(rbufp)
   datum_pts->second =	10*((datum_pts->retbuf[4] & 0x70)>>4) +
 				(datum_pts->retbuf[4] & 0x0f);
 
-  datum_pts->msec =	100*((datum_pts->retbuf[5] & 0xf0) >> 4) + 
+  datum_pts->msec =	100*((datum_pts->retbuf[5] & 0xf0) >> 4) +
 				10*(datum_pts->retbuf[5] & 0x0f) +
 				((datum_pts->retbuf[6] & 0xf0)>>4);
 
diff --git a/usr.sbin/xntpd/xntpd/refclock_gpstm.c b/usr.sbin/xntpd/xntpd/refclock_gpstm.c
index 71eb015cb14b..9dfc87c030ca 100644
--- a/usr.sbin/xntpd/xntpd/refclock_gpstm.c
+++ b/usr.sbin/xntpd/xntpd/refclock_gpstm.c
@@ -279,7 +279,7 @@ gpstm_start(unit, peer)
 	/*
 	 * POSIX serial line parameters (termios interface)
 	 *
-	 * The GPSTMCLK option provides timestamping at the driver level. 
+	 * The GPSTMCLK option provides timestamping at the driver level.
 	 * It requires the tty_clk streams module.
 	 *
 	 * The GPSTMPPS option provides timestamping at the driver level.
@@ -333,7 +333,7 @@ gpstm_start(unit, peer)
 	/*
 	 * 4.3bsd serial line parameters (sgttyb interface)
 	 *
-	 * The GPSTMCLK option provides timestamping at the driver level. 
+	 * The GPSTMCLK option provides timestamping at the driver level.
 	 * It requires the tty_clk line discipline and 4.3bsd or later.
 	 */
     {	struct sgttyb ttyb;
@@ -513,7 +513,7 @@ gpstm_receive(rbufp)
 	dpend = dpt + rbufp->recv_length;
 	cp = gpstm->lastcode;
 	while (dpt < dpend) {
-		if ((*cp = 0x7f & *dpt++) >= ' ') cp++; 
+		if ((*cp = 0x7f & *dpt++) >= ' ') cp++;
 #ifdef GPSTMCLK
 		else if (*cp == '\r') {
 			if (dpend - dpt < 8) {
@@ -618,7 +618,7 @@ gpstm_receive(rbufp)
 		}
 
 		/*
-		 * Convert format 0 and check values 
+		 * Convert format 0 and check values
 		 */
 		gpstm->year = 0;		/* fake */
 		gpstm->day = cp[0] - '0';
diff --git a/usr.sbin/xntpd/xntpd/refclock_heath.c b/usr.sbin/xntpd/xntpd/refclock_heath.c
index 1fbb9b7e6876..a1b602cf96f5 100644
--- a/usr.sbin/xntpd/xntpd/refclock_heath.c
+++ b/usr.sbin/xntpd/xntpd/refclock_heath.c
@@ -24,7 +24,7 @@
  * sunset without warning. Since the indicated precision is 100 ms,
  * expect a host synchronized only to this thing to wander to and fro,
  * occasionally being rudely stepped when the offset exceeds the default
- * CLOCK_MAX of 128 ms. 
+ * CLOCK_MAX of 128 ms.
  *
  * The internal DIPswitches should be set to operate at 1200 baud in
  * MANUAL mode and the current year. The external DIPswitches should be
diff --git a/usr.sbin/xntpd/xntpd/refclock_leitch.c b/usr.sbin/xntpd/xntpd/refclock_leitch.c
index 753ad7673908..b6b002f5faba 100644
--- a/usr.sbin/xntpd/xntpd/refclock_leitch.c
+++ b/usr.sbin/xntpd/xntpd/refclock_leitch.c
@@ -57,7 +57,7 @@
 #define LEITCHREFID	"ATOM"	/* reference id */
 #define LEITCH_DESCRIPTION "Leitch: CSD 5300 Master Clock System Driver"
 #define LEITCH232 "/dev/leitch%d"	/* name of radio device */
-#define SPEED232 B300		/* uart speed (300 baud) */ 
+#define SPEED232 B300		/* uart speed (300 baud) */
 #define leitch_send(A,M) \
 	if (debug) fprintf(stderr,"write leitch %s\n",M); \
 	if ((write(A->leitchio.fd,M,sizeof(M)) < 0)) {\
@@ -65,7 +65,7 @@
 			fprintf(stderr, "leitch_send: unit %d send failed\n", A->unit); \
 		else \
 			syslog(LOG_ERR, "leitch_send: unit %d send failed %m",A->unit);}
-		
+
 #define STATE_IDLE 0
 #define STATE_DATE 1
 #define STATE_TIME1 2
@@ -305,7 +305,7 @@ leitch_start(unit, peer)
 	/*
 	 * POSIX serial line parameters (termios interface)
 	 *
-	 * The LEITCHCLK option provides timestamping at the driver level. 
+	 * The LEITCHCLK option provides timestamping at the driver level.
 	 * It requires the tty_clk streams module.
 	 *
 	 * The LEITCHPPS option provides timestamping at the driver level.
@@ -359,7 +359,7 @@ leitch_start(unit, peer)
 	/*
 	 * 4.3bsd serial line parameters (sgttyb interface)
 	 *
-	 * The LEITCHCLK option provides timestamping at the driver level. 
+	 * The LEITCHCLK option provides timestamping at the driver level.
 	 * It requires the tty_clk line discipline and 4.3bsd or later.
 	 */
     {	struct sgttyb ttyb;
@@ -444,7 +444,7 @@ leitch_receive(rbufp)
 
 #ifdef DEBUG
 	if (debug)
-		fprintf(stderr, "leitch_recieve(%*.*s)\n", 
+		fprintf(stderr, "leitch_recieve(%*.*s)\n",
 		    rbufp->recv_length, rbufp->recv_length,
 		    rbufp->recv_buffer);
 #endif
@@ -620,7 +620,7 @@ leitch_timeout(fp)
 	default:
 		break;
 	}
-	
+
 	leitch->leitchtimer.event_time += 30;
 	TIMER_ENQUEUE(timerqueue, &leitch->leitchtimer);
     }
@@ -639,7 +639,7 @@ int year;
 	} else {
 		if (year % 100) {	/* is a leap year */
 			return (366);
-		} else {	
+		} else {
 			if (year % 400) {
 				return (365);
 			} else {
@@ -679,7 +679,7 @@ leitch_get_date(rbufp,leitch)
 	while ( i < (leitch->month-1) )
 		leitch->yearday += days_in_month[i++];
 
-	if ((dysize((leitch->year>90?1900:2000)+leitch->year)==365) && 
+	if ((dysize((leitch->year>90?1900:2000)+leitch->year)==365) &&
 		leitch->month > 2)
 		leitch->yearday--;
 
diff --git a/usr.sbin/xntpd/xntpd/refclock_mx4200.c b/usr.sbin/xntpd/xntpd/refclock_mx4200.c
index 2cfee5293c3e..577193dde4a5 100644
--- a/usr.sbin/xntpd/xntpd/refclock_mx4200.c
+++ b/usr.sbin/xntpd/xntpd/refclock_mx4200.c
@@ -375,7 +375,7 @@ mx4200_start(unit, peer)
 	/*
 	 * POSIX serial line parameters (termios interface)
 	 *
-	 * The MX4200CLK option provides timestamping at the driver level. 
+	 * The MX4200CLK option provides timestamping at the driver level.
 	 * It requires the tty_clk streams module.
 	 *
 	 * The MX4200PPS option provides timestamping at the driver level.
@@ -429,7 +429,7 @@ mx4200_start(unit, peer)
 	/*
 	 * 4.3bsd serial line parameters (sgttyb interface)
 	 *
-	 * The MX4200CLK option provides timestamping at the driver level. 
+	 * The MX4200CLK option provides timestamping at the driver level.
 	 * It requires the tty_clk line discipline and 4.3bsd or later.
 	 */
     {	struct sgttyb ttyb;
diff --git a/usr.sbin/xntpd/xntpd/refclock_nmea.c b/usr.sbin/xntpd/xntpd/refclock_nmea.c
index 3058956df516..f8ae4bc72130 100644
--- a/usr.sbin/xntpd/xntpd/refclock_nmea.c
+++ b/usr.sbin/xntpd/xntpd/refclock_nmea.c
@@ -237,7 +237,7 @@ nmea_receive(rbufp)
 		   !isdigit(dp[2]) ||
 		   !isdigit(dp[3]) ||
 		   !isdigit(dp[4]) ||
-		   !isdigit(dp[5])	
+		   !isdigit(dp[5])
 		  ) {
 		    refclock_report(peer, CEVNT_BADREPLY);
 		    return;
@@ -290,7 +290,7 @@ nmea_receive(rbufp)
 	pp->hour = ((dp[0] - '0') * 10) + dp[1] - '0';
 	pp->minute = ((dp[2] - '0') * 10) + dp[3] -  '0';
 	pp->second = ((dp[4] - '0') * 10) + dp[5] - '0';
-	pp->msec = 0; 
+	pp->msec = 0;
 
 	if (pp->hour > 23 || pp->minute > 59 || pp->second > 59) {
 		refclock_report(peer, CEVNT_BADTIME);
diff --git a/usr.sbin/xntpd/xntpd/refclock_omega.c b/usr.sbin/xntpd/xntpd/refclock_omega.c
index 3d4e4b91d920..1dc31ff99b01 100644
--- a/usr.sbin/xntpd/xntpd/refclock_omega.c
+++ b/usr.sbin/xntpd/xntpd/refclock_omega.c
@@ -9,7 +9,7 @@
  *	Tarted up the sample filtering mechanism to give improved
  *	one-off measurements.  Improved measurement dispersion code
  *	to account for accumulated drift when the clock loses lock.
- *		
+ *
  */
 
 #if defined(REFCLOCK) && (defined(OMEGA) || defined(OMEGACLK) || defined(OMEGAPPS))
@@ -305,7 +305,7 @@ omega_start(unit, peer)
 	/*
 	 * POSIX serial line parameters (termios interface)
 	 *
-	 * The OMEGACLK option provides timestamping at the driver level. 
+	 * The OMEGACLK option provides timestamping at the driver level.
 	 * It requires the tty_clk streams module.
 	 *
 	 * The OMEGAPPS option provides timestamping at the driver level.
@@ -359,7 +359,7 @@ omega_start(unit, peer)
 	/*
 	 * 4.3bsd serial line parameters (sgttyb interface)
 	 *
-	 * The OMEGACLK option provides timestamping at the driver level. 
+	 * The OMEGACLK option provides timestamping at the driver level.
 	 * It requires the tty_clk line discipline and 4.3bsd or later.
 	 */
     {	struct sgttyb ttyb;
diff --git a/usr.sbin/xntpd/xntpd/refclock_parse.c b/usr.sbin/xntpd/xntpd/refclock_parse.c
index 089e2c34dccb..b8ef21e4d58b 100644
--- a/usr.sbin/xntpd/xntpd/refclock_parse.c
+++ b/usr.sbin/xntpd/xntpd/refclock_parse.c
@@ -803,7 +803,7 @@ static int  stream_timecode P((struct parseunit *, parsectl_t *));
 static void stream_receive  P((struct recvbuf *));
 static void stream_poll     P((struct parseunit *));
 #endif
-					 
+
 static int  local_init     P((struct parseunit *));
 static void local_end      P((struct parseunit *));
 static int  local_nop      P((struct parseunit *));
@@ -945,7 +945,7 @@ stream_setcs(parse, tcl)
      parsectl_t  *tcl;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_SETCS;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)tcl;
@@ -976,7 +976,7 @@ stream_enable(parse)
      struct parseunit *parse;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_ENABLE;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)0;
@@ -998,7 +998,7 @@ stream_disable(parse)
      struct parseunit *parse;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_DISABLE;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)0;
@@ -1021,7 +1021,7 @@ stream_getfmt(parse, tcl)
      parsectl_t  *tcl;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_GETFMT;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)tcl;
@@ -1043,7 +1043,7 @@ stream_setfmt(parse, tcl)
      parsectl_t  *tcl;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_SETFMT;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)tcl;
@@ -1066,12 +1066,12 @@ stream_getstat(parse, tcl)
      parsectl_t  *tcl;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_GETSTAT;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)tcl;
   strioc.ic_len     = sizeof (*tcl);
-  
+
   if (ioctl(parse->fd, I_STR, (caddr_t)&strioc) == -1)
     {
       syslog(LOG_ERR, "PARSE receiver #%d: stream_getstat: ioctl(fd, I_STR, PARSEIOC_GETSTAT): %m", CL_UNIT(parse->unit));
@@ -1089,12 +1089,12 @@ stream_setstat(parse, tcl)
      parsectl_t  *tcl;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_SETSTAT;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)tcl;
   strioc.ic_len     = sizeof (*tcl);
-  
+
   if (ioctl(parse->fd, I_STR, (caddr_t)&strioc) == -1)
     {
       syslog(LOG_ERR, "PARSE receiver #%d: stream_setstat: ioctl(fd, I_STR, PARSEIOC_SETSTAT): %m", CL_UNIT(parse->unit));
@@ -1112,12 +1112,12 @@ stream_timecode(parse, tcl)
      parsectl_t  *tcl;
 {
   struct strioctl strioc;
-  
+
   strioc.ic_cmd     = PARSEIOC_TIMECODE;
   strioc.ic_timout  = 0;
   strioc.ic_dp      = (char *)tcl;
   strioc.ic_len     = sizeof (*tcl);
-	
+
   if (ioctl(parse->fd, I_STR, (caddr_t)&strioc) == -1)
     {
       syslog(LOG_ERR, "PARSE receiver #%d: parse_process: ioctl(fd, I_STR, PARSEIOC_TIMECODE): %m", CL_UNIT(parse->unit), parse->fd);
@@ -1206,7 +1206,7 @@ stream_poll(parse)
    *    - read the second packet from the parse module (fresh)
    *    - compute values for xntp
    */
-	
+
   FD_ZERO(&fdmask);
   fd = parse->fd;
   FD_SET(fd, &fdmask);
@@ -1249,7 +1249,7 @@ stream_poll(parse)
 		{
 		  selecttime.tv_usec = curtime.tv_usec - starttime.tv_usec;
 		}
-	
+
 
 	      if (timercmp(&selecttime, &timeout, >))
 		{
@@ -1273,7 +1273,7 @@ stream_poll(parse)
 		{
 		  selecttime.tv_usec = timeout.tv_usec - selecttime.tv_usec;
 		}
-	
+
 	      FD_SET(fd, &fdmask);
 	      continue;
 	    }
@@ -1358,7 +1358,7 @@ stream_poll(parse)
 		{
 		  selecttime.tv_usec = curtime.tv_usec - starttime.tv_usec;
 		}
-	
+
 
 	      if (timercmp(&selecttime, &timeout, >))
 		{
@@ -1382,7 +1382,7 @@ stream_poll(parse)
 		{
 		  selecttime.tv_usec = timeout.tv_usec - selecttime.tv_usec;
 		}
-	
+
 	      FD_SET(fd, &fdmask);
 	      continue;
 	    }
@@ -1395,7 +1395,7 @@ stream_poll(parse)
 	{
           syslog(LOG_WARNING, "PARSE receiver #%d: no data[new] from device", CL_UNIT(parse->unit));
 	}
-	
+
       /*
        * we will return here iff we got a good old sample as this would
        * be misinterpreted. bad samples are passed on to be logged into the
@@ -1663,7 +1663,7 @@ local_poll(parse)
 		    {
 		      selecttime.tv_usec = curtime.tv_usec - starttime.tv_usec;
 		    }
-	
+
 
 		  if (!timercmp(&selecttime, &timeout, >))
 		    {
@@ -1681,7 +1681,7 @@ local_poll(parse)
 			{
 			  selecttime.tv_usec = timeout.tv_usec - selecttime.tv_usec;
 			}
-	
+
 		      FD_SET(fd, &fdmask);
 		      continue;
 		    }
@@ -1842,7 +1842,7 @@ parsestate(state, buffer)
 		  strcpy(t, "; ");
 		  t += 2;
 		}
-	
+
 	      strcpy(t, sflagstrings[i].name);
 	      t += strlen(t);
 	    }
@@ -2114,7 +2114,7 @@ parse_shutdown(unit)
 	register struct parseunit *parse;
 
 	unit = CL_UNIT(unit);
-	
+
 	if (unit >= MAXUNITS) {
 		syslog(LOG_ERR,
 		  "PARSE receiver #%d: parse_shutdown: INTERNAL ERROR, unit invalid (max %d)",
@@ -2123,7 +2123,7 @@ parse_shutdown(unit)
 	}
 
 	parse = parseunits[unit];
-	
+
 	if (parse && !parse->peer) {
 		syslog(LOG_ERR,
 		 "PARSE receiver #%d: parse_shutdown: INTERNAL ERROR, unit not in use", unit);
@@ -2136,7 +2136,7 @@ parse_shutdown(unit)
 	 */
 	parse_statistics(parse);
 	TIMER_DEQUEUE(&parse->stattimer);
-	
+
 #if PPSPPS
 	{
 	  /*
@@ -2151,7 +2151,7 @@ parse_shutdown(unit)
 	  {
 	    parse->parse_type->cl_end(parse);
 	  }
-	
+
 	if (parse->binding)
 	  PARSE_END(parse);
 
@@ -2301,9 +2301,9 @@ parse_start(sysunit, peer)
     memmove((char *)&peer->refid, parse->parse_type->cl_id, 4);
   else
     peer->refid = htonl(PARSEHSREFID);
-	
+
   parse->fd = fd232;
-	
+
   parse->peer = peer;		/* marks it also as busy */
 
   parse->binding = init_iobinding(parse);
@@ -2313,7 +2313,7 @@ parse_start(sysunit, peer)
       syslog(LOG_ERR, "PARSE receiver #%d: parse_start: io sub system initialisation failed.");
       parse_shutdown(parse->unit); /* let our cleaning staff do the work */
       return 0;		/* well, ok - special initialisation broke */
-    }      
+    }
 
   /*
    * configure terminal line
@@ -2392,7 +2392,7 @@ parse_start(sysunit, peer)
       parse_shutdown(parse->unit); /* let our cleaning staff do the work */
       return 0;		/* well, ok - special initialisation broke */
     }
-  
+
 #ifdef FREEBSD_CONRAD
       {
 	int i,j;
@@ -2401,13 +2401,13 @@ parse_start(sysunit, peer)
 	j = TIOCM_RTS;
 	i = ioctl(fd232, TIOCMBIC, &j);
 	if (i < 0) {
-	  syslog(LOG_ERR, 
-	    "PARSE receiver #%d: lowrts_poll: failed to lower RTS: %m", 
+	  syslog(LOG_ERR,
+	    "PARSE receiver #%d: lowrts_poll: failed to lower RTS: %m",
 	    CL_UNIT(parse->unit));
 	}
       }
 #endif
-	
+
   strcpy(tmp_ctl.parseformat.parse_buffer, parse->parse_type->cl_format);
   tmp_ctl.parseformat.parse_count = strlen(tmp_ctl.parseformat.parse_buffer);
 
@@ -2417,7 +2417,7 @@ parse_start(sysunit, peer)
       parse_shutdown(parse->unit); /* let our cleaning staff do the work */
       return 0;		/* well, ok - special initialisation broke */
     }
-  
+
 #ifdef TCFLSH
   /*
    * get rid of all IO accumulated so far
@@ -2440,7 +2440,7 @@ parse_start(sysunit, peer)
       parse_shutdown(parse->unit); /* let our cleaning staff do the work */
       return 0;		/* well, ok - special initialisation broke */
     }
-  
+
   /*
    * try to do any special initializations
    */
@@ -2702,7 +2702,7 @@ parse_control(unit, in, out)
 	  parse->peer->stratum = (u_char)(in->fudgeval1 & 0xf);
 	  if (parse->peer->stratum <= 1)
 		memmove((char *)&parse->peer->refid,
-			parse->parse_type->cl_id, 
+			parse->parse_type->cl_id,
 			4);
 	      else
 		parse->peer->refid = htonl(PARSEHSREFID);
@@ -2823,7 +2823,7 @@ parse_control(unit, in, out)
 	{
 	  strcpy(tt, prettydate(&parse->time.parse_time.fp));
 	  t = tt + strlen(tt);
-	  
+
 	  sprintf(t, " (%c%02d%02d)\"", sign, utcoff / 60, utcoff % 60);
 	}
 
@@ -2853,9 +2853,9 @@ parse_control(unit, in, out)
 
 	  parse->badformat += tmpctl.parsegettc.parse_badformat;
 	}
-	
+
       tmpctl.parseformat.parse_format = tmpctl.parsegettc.parse_format;
-	
+
       if (!PARSE_GETFMT(parse, &tmpctl))
 	{
 	  syslog (LOG_ERR, "PARSE receiver #%d: parse_control: parse_getfmt() FAILED", unit);
@@ -2882,7 +2882,7 @@ parse_control(unit, in, out)
 	  register unsigned LONG stime;
 	  register unsigned LONG div = current_time - parse->timestarted;
 	  register unsigned LONG percent;
-	
+
 	  percent = stime = PARSE_STATETIME(parse, i);
 
 	  while (((unsigned LONG)(~0) / 10000) < percent)
@@ -2890,7 +2890,7 @@ parse_control(unit, in, out)
 	      percent /= 10;
 	      div     /= 10;
 	    }
-	
+
 	  if (div)
 	    percent = (percent * 10000) / div;
 	  else
@@ -3048,7 +3048,7 @@ parse_process(parse, parsetime)
   if (parse->lastformat != parsetime->parse_format)
     {
       parsectl_t tmpctl;
-	
+
       tmpctl.parseformat.parse_format = parsetime->parse_format;
 
       if (!PARSE_GETFMT(parse, &tmpctl))
@@ -3073,10 +3073,10 @@ parse_process(parse, parsetime)
       /*
        * something happend
        */
-	
+
       (void) parsestate(parsetime->parse_state, tmp1);
       (void) parsestate(parse->time.parse_state, tmp2);
-	
+
       syslog(LOG_INFO,"PARSE receiver #%d: STATE CHANGE: %s -> %s",
 	     CL_UNIT(parse->unit), tmp2, tmp1);
     }
@@ -3189,14 +3189,14 @@ parse_process(parse, parsetime)
        * off = PARSE-timestamp + propagation delay - kernel time stamp
        */
       offset = parse->basedelay;
-    
+
       off = parsetime->parse_time.fp;
 
       reftime = off;
 
       L_ADD(&off, &offset);
       rectime = off;		/* this makes org time and xmt time somewhat artificial */
-    
+
       L_SUB(&off, &parsetime->parse_stime.fp);
 
       if ((parse->flags & PARSE_STAT_FILTER) &&
@@ -3361,7 +3361,7 @@ parse_process(parse, parsetime)
 	    leap = LEAP_NOWARNING;
 	  }
     }
-  
+
   refclock_receive(parse->peer, &off, 0, LFPTOFP(&dispersion), &reftime, &rectime, leap);
 }
 
@@ -3430,9 +3430,9 @@ poll_init(parse)
     {
       parse->localdata = (void *)malloc(sizeof(poll_timer_t));
       memset((char *)parse->localdata, 0, sizeof(poll_timer_t));
-  
+
       pt = (poll_timer_t *)parse->localdata;
-      
+
       pt->timer.peer          = (struct peer *)parse; /* well, only we know what it is */
       pt->timer.event_handler = poll_poll;
       poll_poll(parse);
@@ -3489,7 +3489,7 @@ trimbletaip_init(parse)
   else
     {
       tm.c_cc[VEOL] = TRIMBLETAIP_EOL;
-	
+
       if (TTY_SETATTR(parse->fd, &tm) == -1)
 	{
 	  syslog(LOG_ERR, "PARSE receiver #%d: trimbletaip_init: tcsetattr(fd, &tm): %m", CL_UNIT(parse->unit));
@@ -3585,7 +3585,7 @@ union {
     float   fv;
     double  dv;
 }  uval;
-  
+
 struct txbuf
 {
   short idx;			/* index to first unused byte */
@@ -3625,7 +3625,7 @@ sendetx(buf, parse)
     }
 }
 
-void  
+void
 sendint(buf, a)
   struct txbuf *buf;
   int a;
@@ -3658,7 +3658,7 @@ trimbletsip_init(parse)
   struct txbuf buf;
 
   buf.txt = buffer;
-  
+
   if (!poll_init(parse))
     {
       sendcmd(&buf, 0x1f);	/* request software versions */
diff --git a/usr.sbin/xntpd/xntpd/refclock_pst.c b/usr.sbin/xntpd/xntpd/refclock_pst.c
index 29cbfb1201ec..edc77f9b56df 100644
--- a/usr.sbin/xntpd/xntpd/refclock_pst.c
+++ b/usr.sbin/xntpd/xntpd/refclock_pst.c
@@ -17,7 +17,7 @@
  * Receivers. No specific claim of accuracy is made for these receiver,
  * but actual experience suggests that 10 ms would be a conservative
  * assumption.
- * 
+ *
  * The DIPswitches should be set for 9600 bps line speed, 24-hour day-
  * of-year format and UTC time zone. Automatic correction for DST should
  * be disabled. It is very important that the year be set correctly in
diff --git a/usr.sbin/xntpd/xntpd/refclock_tpro.c b/usr.sbin/xntpd/xntpd/refclock_tpro.c
index 388103c7c1c6..d530fbffee1a 100644
--- a/usr.sbin/xntpd/xntpd/refclock_tpro.c
+++ b/usr.sbin/xntpd/xntpd/refclock_tpro.c
@@ -18,7 +18,7 @@
  * This driver supports the KSI/Odetecs TPRO-S IRIG-B reader and TPRO-
  * SAT GPS receiver for the Sun Microsystems SBus. It requires that the
  * tpro.o device driver be installed and loaded.
- */ 
+ */
 
 /*
  * TPRO interface definitions
diff --git a/usr.sbin/xntpd/xntpdc/ntpdc.c b/usr.sbin/xntpd/xntpdc/ntpdc.c
index 387540bd365b..bb42a1990c5f 100644
--- a/usr.sbin/xntpd/xntpdc/ntpdc.c
+++ b/usr.sbin/xntpd/xntpdc/ntpdc.c
@@ -292,7 +292,7 @@ char *argv[];
 		for (ihost = 0; ihost < numhosts; ihost++) {
 			if (openhost(chosts[ihost]))
 				for (icmd = 0; icmd < numcmds; icmd++) {
-					if (numhosts > 1) 
+					if (numhosts > 1)
 					   printf ("--- %s ---\n",chosts[ihost]);
 					docmd(ccmds[icmd]);
 				}
@@ -325,7 +325,7 @@ openhost(hname)
 
 	if (!getnetnum(hname, &netnum, temphost))
 		return 0;
-	
+
 	if (debug > 2)
 		printf("Opening host %s\n", temphost);
 
@@ -344,7 +344,7 @@ openhost(hname)
 	sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sockfd == -1)
 		error("socket", "", "");
-	
+
 #if defined(SYS_HPUX) && (SYS_HPUX < 8)
 #ifdef SO_RCVBUF
 	{ int rbufsize = INITDATASIZE + 2048;	/* 2K for slop */
@@ -358,7 +358,7 @@ openhost(hname)
 	if (connect(sockfd, (struct sockaddr *)&hostaddr,
 		    sizeof(hostaddr)) == -1)
 		error("connect", "", "");
-	
+
 	havehost = 1;
 	return 1;
 }
@@ -443,7 +443,7 @@ again:
 		tvo = tvout;
 	else
 		tvo = tvsout;
-	
+
 	FD_SET(sockfd, &fds);
 	n = select(sockfd+1, &fds, (fd_set *)0, (fd_set *)0, &tvo);
 
@@ -747,7 +747,7 @@ doquery(implcode, reqcode, auth, qitems, qsize, qdata, ritems, rsize, rdata,
 	res = sendrequest(implcode, reqcode, auth, qitems, qsize, qdata);
 	if (res != 0)
 		return res;
-	
+
 	/*
 	 * Get the response.  If we got a standard error, print a message
 	 */
@@ -848,7 +848,7 @@ docmd(cmdline)
 	tokenize(cmdline, tokens, &ntok);
 	if (ntok == 0)
 		return;
-	
+
 	/*
 	 * Find the appropriate command description.
 	 */
@@ -862,7 +862,7 @@ docmd(cmdline)
 		    tokens[0]);
 		return;
 	}
-	
+
 	/*
 	 * Save the keyword, then walk through the arguments, interpreting
 	 * as we go.
diff --git a/usr.sbin/xntpd/xntpdc/ntpdc_ops.c b/usr.sbin/xntpd/xntpdc/ntpdc_ops.c
index 4d50619a170e..7010f9b47e48 100644
--- a/usr.sbin/xntpd/xntpdc/ntpdc_ops.c
+++ b/usr.sbin/xntpd/xntpdc/ntpdc_ops.c
@@ -294,7 +294,7 @@ peerlist(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_PEER_LIST, 0, 0, 0, (char *)NULL, &items,
 	    &itemsize, (char **)&plist, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -356,7 +356,7 @@ dopeers(pcmd, fp, dmstyle)
 
 	res = doquery(IMPL_XNTPD, REQ_PEER_LIST_SUM, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&plist, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -447,14 +447,14 @@ printpeer(pp, fp)
 	(void) fprintf(fp, "hmode %s, pmode %s, stratum %d, precision %d\n",
 	    modetoa(pp->hmode), modetoa(pp->pmode),
 	    pp->stratum, pp->precision);
-	
+
 	(void) fprintf(fp,
 	    "leap %c%c, refid [%s], rootdistance %s, rootdispersion %s\n",
 	    pp->leap & 0x2 ? '1' : '0',
 	    pp->leap & 0x1 ? '1' : '0',
 	    refid_string(pp->refid, pp->stratum), fptoa(NTOHS_FP(pp->rootdelay), 5),
 	    ufptoa(NTOHS_FP(pp->rootdispersion), 5));
-	
+
 	(void) fprintf(fp,
 	    "ppoll %d, hpoll %d, keyid %lu, version %d, association %u\n",
 	    pp->ppoll, pp->hpoll, (u_long)pp->keyid, pp->version, ntohs(pp->associd));
@@ -465,7 +465,7 @@ printpeer(pp, fp)
 
 	(void) fprintf(fp, "boffset %s, ttl %d\n",
 	    fptoa(NTOHS_FP(pp->estbdelay), 5), pp->ttl);
-	
+
 	(void) fprintf(fp, "timer %lds, flags", (long)ntohl(pp->timer));
 	if (pp->flags == 0) {
 		(void) fprintf(fp, " none\n");
@@ -509,7 +509,7 @@ printpeer(pp, fp)
 	NTOHL_FP(&pp->xmt, &tempts);
 	(void) fprintf(fp, "transmit timestamp:  %s\n",
 	    prettydate(&tempts));
-	
+
 	(void) fprintf(fp, "filter delay: ");
 	for (i = 0; i < NTP_SHIFT; i++) {
 		(void) fprintf(fp, " %-8.8s",
@@ -535,7 +535,7 @@ printpeer(pp, fp)
 			(void) fprintf(fp, "\n              ");
 	}
 	(void) fprintf(fp, "\n");
-	
+
 
 	NTOHL_FP(&pp->offset, &tempts);
 	(void) fprintf(fp,
@@ -571,7 +571,7 @@ showpeer(pcmd, fp)
 	res = doquery(IMPL_XNTPD, REQ_PEER_INFO, 0, qitems,
 	    sizeof(struct info_peer_list), (char *)plist, &items,
 	    &itemsize, (char **)&pp, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -615,7 +615,7 @@ peerstats(pcmd, fp)
 	res = doquery(IMPL_XNTPD, REQ_PEER_STATS, 0, qitems,
 	    sizeof(struct info_peer_list), (char *)plist, &items,
 	    &itemsize, (char **)&pp, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -687,7 +687,7 @@ loopinfo(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_LOOP_INFO, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&il, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -741,7 +741,7 @@ sysinfo(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_SYS_INFO, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&is, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -818,7 +818,7 @@ sysstats(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_SYS_STATS, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&ss, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -852,7 +852,7 @@ sysstats(pcmd, fp)
 	    (u_long)ntohl(ss->badauth));
 	if (itemsize != sizeof(struct info_sys_stats))
 		return;
-	
+
 	(void) fprintf(fp, "limitation rejects:     %ld\n",
 	    (u_long)ntohl(ss->limitrejected));
 }
@@ -875,7 +875,7 @@ iostats(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_IO_STATS, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&io, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -929,7 +929,7 @@ memstats(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_MEM_STATS, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&mem, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -980,7 +980,7 @@ timerstats(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_TIMER_STATS, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&tim, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -1104,7 +1104,7 @@ doconfig(pcmd, fp, mode)
 	res = doquery(IMPL_XNTPD, REQ_CONFIG, 1, 1,
 	    sizeof(struct conf_peer), (char *)&cpeer, &items,
 	    &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1134,7 +1134,7 @@ unconfig(pcmd, fp)
 	res = doquery(IMPL_XNTPD, REQ_UNCONFIG, 1, qitems,
 	    sizeof(struct conf_unpeer), (char *)plist, &items,
 	    &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 }
@@ -1208,7 +1208,7 @@ doset(pcmd, fp, req)
 	res = doquery(IMPL_XNTPD, req, 1, 1,
 	    sizeof(struct conf_sys_flags), (char *)&sys, &items,
 	    &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 }
@@ -1266,7 +1266,7 @@ reslist(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_GET_RESTRICT, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&rl, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -1438,7 +1438,7 @@ do_restrict(pcmd, fp, req_code)
 	res = doquery(IMPL_XNTPD, req_code, 1, 1,
 	    sizeof(struct conf_restrict), (char *)&cres, &items,
 	    &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1471,10 +1471,10 @@ monlist(pcmd, fp)
 	    &items, &itemsize, &struct_star,
 	    (version < 0) ? (1 << INFO_ERR_REQ) : 0);
 
-	if (res == INFO_ERR_REQ && version < 0) 
+	if (res == INFO_ERR_REQ && version < 0)
 	  res = doquery(IMPL_XNTPD, REQ_MON_GETLIST, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, &struct_star, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -1490,7 +1490,7 @@ monlist(pcmd, fp)
 			       "===============================================================================\n");
 		while (items > 0) {
 			addr.s_addr = ml->daddr;
-			(void) fprintf(fp, 
+			(void) fprintf(fp,
 				"%-22.22s %5d %-15s %8ld %1d %1d %6lu %6lu %7lu\n",
 				       nntohost(ml->addr),
 				       ntohs(ml->port),
@@ -1576,7 +1576,7 @@ monitor(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, req_code, 1, 0, 0, (char *)0,
 	    &items, &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1640,7 +1640,7 @@ reset(pcmd, fp)
 	res = doquery(IMPL_XNTPD, REQ_RESET_STATS, 1, 1,
 	    sizeof(struct reset_flags), (char *)&rflags, &items,
 	    &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1671,7 +1671,7 @@ preset(pcmd, fp)
 	res = doquery(IMPL_XNTPD, REQ_RESET_PEER, 1, qitems,
 	    sizeof(struct conf_unpeer), (char *)plist, &items,
 	    &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 }
@@ -1693,7 +1693,7 @@ readkeys(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_REREAD_KEYS, 1, 0, 0, (char *)0,
 	    &items, &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1748,7 +1748,7 @@ do_trustkey(pcmd, fp, req)
 
 	res = doquery(IMPL_XNTPD, req, 1, ritems, sizeof(u_long),
 	    (char *)keyids, &items, &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1772,7 +1772,7 @@ authinfo(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_AUTHINFO, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&ia, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -1815,7 +1815,7 @@ traps(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_TRAPS, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&it, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -1839,7 +1839,7 @@ traps(pcmd, fp)
 			(void) fprintf(fp, "low priority\n");
 		else
 			(void) fprintf(fp, "normal priority\n");
-		
+
 		(void) fprintf(fp, "set for %ld secs, last set %ld secs ago\n",
 		    (long)it->origtime, (long)it->settime);
 		(void) fprintf(fp, "sequence %d, number of resets %ld\n",
@@ -1901,7 +1901,7 @@ do_addclr_trap(pcmd, fp, req)
 
 	res = doquery(IMPL_XNTPD, req, 1, 1, sizeof(struct conf_trap),
 	    (char *)&ctrap, &items, &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1954,7 +1954,7 @@ do_changekey(pcmd, fp, req)
 
 	res = doquery(IMPL_XNTPD, req, 1, 1, sizeof(u_long),
 	    (char *)&key, &items, &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
@@ -1978,7 +1978,7 @@ ctlstats(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_GET_CTLSTATS, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&ic, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -2056,7 +2056,7 @@ leapinfo(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_GET_LEAPINFO, 0, 0, 0, (char *)NULL,
 	    &items, &itemsize, (char **)&il, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -2124,7 +2124,7 @@ clockstat(pcmd, fp)
 	res = doquery(IMPL_XNTPD, REQ_GET_CLOCKINFO, 0, qitems,
 	    sizeof(U_LONG), (char *)clist, &items,
 	    &itemsize, (char **)&cl, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -2282,7 +2282,7 @@ clkbug(pcmd, fp)
 	res = doquery(IMPL_XNTPD, REQ_GET_CLKBUGINFO, 0, qitems,
 	    sizeof(U_LONG), (char *)clist, &items,
 	    &itemsize, (char **)&cl, 0);
-	
+
 	if (res != 0 && items == 0)
 		return;
 
@@ -2363,7 +2363,7 @@ setprecision(pcmd, fp)
 
 	res = doquery(IMPL_XNTPD, REQ_SET_PRECISION, 1, 1, sizeof(long),
 	    (char *)&precision, &items, &itemsize, &dummy, 0);
-	
+
 	if (res == 0)
 		(void) fprintf(fp, "done!\n");
 	return;
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index f7cd13e4dc9d..49f8587ead08 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: ypbind.c,v 1.12 1995/05/12 16:52:58 wpaul Exp $";
+static char rcsid[] = "$Id: ypbind.c,v 1.14 1995/05/29 16:39:52 wpaul Exp $";
 #endif
 
 #include <sys/param.h>
@@ -169,7 +169,7 @@ CLIENT *clnt;
 			return &res;
 		}
 		ypdb = (struct _dom_binding *)malloc(sizeof *ypdb);
-		if (ypdb == NULL) {	
+		if (ypdb == NULL) {
 			syslog(LOG_WARNING, "malloc: %s", strerror(errno));
 			res.ypbind_respbody.ypbind_error = YPBIND_ERR_RESC;
 			return &res;
@@ -338,7 +338,7 @@ int sig;
 	pmap_unset(YPBINDPROG, YPBINDVERS);
 	exit(0);
 }
-	
+
 void
 main(argc, argv)
 int argc;
@@ -757,7 +757,7 @@ int force;
 		if (force == 0)
 			return;
 		ypdb = (struct _dom_binding *)malloc(sizeof *ypdb);
-		if (ypdb == NULL) {	
+		if (ypdb == NULL) {
 			syslog(LOG_WARNING, "malloc: %s", strerror(errno));
 			return;
 		}
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 525e564d6d45..faddc0aae024 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -96,6 +96,6 @@ char **argv;
                 exit(1);
 	}
         printf("The master server is %s.\n", master);
-        
+
         exit(0);
 }
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 6a25a97c917b..0fb908a2f060 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -62,7 +62,7 @@ char *dom, *server;
 	int sock, port;
 	int r;
 	unsigned long server_addr;
-	
+
 	if( (port=htons(getrpcport(server, YPPROG, YPPROC_NULL, IPPROTO_UDP))) == 0) {
 		fprintf(stderr, "%s not running ypserv.\n", server);
 		exit(1);
@@ -84,7 +84,7 @@ char *dom, *server;
 	strncpy(ypsd.ypsetdom_domain, dom, sizeof ypsd.ypsetdom_domain);
 	ypsd.ypsetdom_port = port;
 	ypsd.ypsetdom_vers = YPVERS;
-	
+
 	tv.tv_sec = 15;
 	tv.tv_usec = 0;
 	sock = RPC_ANYSOCK;