Remove trailing whitespace.

39 files changed, 142 insertions, 142 deletions

diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index 68b0207..3ae9ee7 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *  atrun.c - run jobs queued by at; run with root privileges.
  *  Copyright (C) 1993, 1994 Thomas Koenig
  *
@@ -73,7 +73,7 @@
 /* File scope variables */
 
 static char *namep;
-static char rcsid[] = "$Id: atrun.c,v 1.2 1995/04/12 02:52:15 ache Exp $";
+static char rcsid[] = "$Id: atrun.c,v 1.3 1995/04/12 19:21:43 ache Exp $";
 static debug = 0;
 
 /* Local functions */
@@ -142,7 +142,7 @@ run_file(const char *filename, uid_t uid, gid_t gid)
     pid = fork();
     if (pid == -1)
 	perr("Cannot fork");
-    
+
     else if (pid > 0)
 	return;
 
@@ -192,10 +192,10 @@ run_file(const char *filename, uid_t uid, gid_t gid)
     fclose(stream);
     if (chdir(ATSPOOL_DIR) < 0)
 	perr("Cannot chdir to " ATSPOOL_DIR);
-    
+
     /* Create a file to hold the output of the job we are about to run.
      * Write the mail header.
-     */    
+     */
     if((fd_out=open(filename,
 		O_WRONLY | O_CREAT | O_EXCL, S_IWUSR | S_IRUSR)) < 0)
 	perr("Cannot create output file");
@@ -209,7 +209,7 @@ run_file(const char *filename, uid_t uid, gid_t gid)
     close(STDIN_FILENO);
     close(STDOUT_FILENO);
     close(STDERR_FILENO);
- 
+
     pid = fork();
     if (pid < 0)
 	perr("Error in fork");
@@ -245,7 +245,7 @@ run_file(const char *filename, uid_t uid, gid_t gid)
 	PRIV_START
 
         nice(tolower(queue) - 'a');
-	
+
 	chdir(pentry->pw_dir);
 
 	if (initgroups(pentry->pw_name,pentry->pw_gid))
@@ -277,7 +277,7 @@ run_file(const char *filename, uid_t uid, gid_t gid)
 
     unlink(filename);
     if ((buf.st_size != size) || send_mail)
-    {    
+    {
 #ifdef __FreeBSD__
 	execl(_PATH_SENDMAIL, "sendmail", "-F", "Atrun Service",
 			"-odi", "-oem",
@@ -332,7 +332,7 @@ main(int argc, char *argv[])
     {
 	switch (c)
 	{
-	case 'l': 
+	case 'l':
 	    if (sscanf(optarg, "%lf", &load_avg) != 1)
 		perr("garbled option -l");
 	    if (load_avg <= 0.)
@@ -382,7 +382,7 @@ main(int argc, char *argv[])
 
 	/* We don't want directories
 	 */
-	if (!S_ISREG(buf.st_mode)) 
+	if (!S_ISREG(buf.st_mode))
 	    continue;
 
 	if (sscanf(dirent->d_name,"%c%8lx",&queue,&ctm) != 2)
@@ -399,7 +399,7 @@ main(int argc, char *argv[])
 		batch_uid = buf.st_uid;
 		batch_gid = buf.st_gid;
 	    }
-	
+
 	/* The file is executable and old enough
 	 */
 	    if (islower(queue))
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index de4dfdb..2b00e81 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,8 +1,8 @@
 # bootpd/Makefile
-# $Id: Makefile,v 1.2 1994/09/10 14:59:55 csgr Exp $
+# $Id: Makefile,v 1.1.1.1 1994/09/30 05:45:04 pst Exp $
 
 PROG=	bootpd
-#CFLAGS+= -DETC_ETHERS 
+#CFLAGS+= -DETC_ETHERS
 CFLAGS+= -DSYSLOG -DDEBUG -DVEND_CMU
 
 SUBDIR= tools
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index 323132a..cf693fd 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: bootpd.c,v 1.1.1.1 1994/09/10 14:44:54 csgr Exp $";
+static char rcsid[] = "$Id: bootpd.c,v 1.1.1.1 1994/09/30 05:45:04 pst Exp $";
 #endif
 
 /*
@@ -1235,7 +1235,7 @@ dovend_rfc1048(bp, hp, bootsize)
 			byte *p, *ep;
 			byte tag, len;
 			short msgsz = 0;
-			
+
 			p = vp + 4;
 			ep = p + BP_VEND_LEN - 4;
 			while (p < ep) {
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 41b8273..5942b22 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -39,7 +39,7 @@
 
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
- * $Id: rtmsg.c,v 1.2 1995/01/16 18:57:45 dfr Exp $
+ * $Id: rtmsg.c,v 1.3 1995/01/30 11:11:43 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -111,7 +111,7 @@ static struct	{
 }	m_rtmsg;
 
 /*
- * Set an individual arp entry 
+ * Set an individual arp entry
  */
 int bsd_arp_set(ia, eaddr, len)
 	struct in_addr *ia;
@@ -156,12 +156,12 @@ tryagain:
 			goto overwrite;
 		}
 		if (doing_proxy == 0) {
-			report(LOG_WARNING, "set: can only proxy for %s\n", 
+			report(LOG_WARNING, "set: can only proxy for %s\n",
 				inet_ntoa(sin->sin_addr));
 			return (1);
 		}
 		if (sin_m.sin_other & SIN_PROXY) {
-			report(LOG_WARNING, 
+			report(LOG_WARNING,
 				"set: proxy entry exists for non 802 device\n");
 			return(1);
 		}
@@ -172,7 +172,7 @@ tryagain:
 overwrite:
 	if (sdl->sdl_family != AF_LINK) {
 		report(LOG_WARNING,
-			"cannot intuit interface index and type for %s\n", 
+			"cannot intuit interface index and type for %s\n",
 			inet_ntoa(sin->sin_addr));
 		return (1);
 	}
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index c154d97..5350b7c 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -1,9 +1,9 @@
 # Makefile
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1994/09/30 05:45:07 pst Exp $
 
 PROG=	bootptest
 MAN8=	bootptest.8
-SRCS=	bootptest.o print-bootp.o getif.o getether.o report.o 
+SRCS=	bootptest.o print-bootp.o getif.o getether.o report.o
 
 SRCDIR=	${.CURDIR}/../..
 CFLAGS+=-I${SRCDIR}
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 4a80e11..7f88bf4 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -105,7 +105,7 @@ main(argc, argv)
 
 	if (!fgets(line, sizeof(line), stdin))
 		exit(1);
-	
+
 	comp = &av[1];
 	for (lp = line, ap = &av[2];;) {
 		*ap = strtok(lp, " \t\r\n");
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index ba6cb99..adcc919 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -7,7 +7,7 @@ SRCS=	ftpd.c ftpcmd.c logwtmp.c popen.c skey-stuff.c
 CFLAGS+=-DSETPROCTITLE -DSKEY -DSTATS
 
 LDADD=	-lskey -lmd -lcrypt
-DPADD=	${LIBSKEY} ${LIBMD} ${LIBCRYPT} 
+DPADD=	${LIBSKEY} ${LIBMD} ${LIBCRYPT}
 
 CLEANFILES+=ftpcmd.c y.tab.h
 
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 885166c..f6fc379 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ftpd.c,v 1.9 1995/05/22 11:03:55 davidg Exp $
  */
 
 #ifndef lint
@@ -1019,7 +1019,7 @@ send_data(instr, outstr, blksize, filesize, isreg)
 		 * are sending a regular file
 		 */
 		netfd = fileno(outstr);
-		filefd = fileno(instr);	
+		filefd = fileno(instr);
 
 		if (isreg && filesize < (off_t)16 * 1024 * 1024) {
 			buf = mmap(0, filesize, PROT_READ, MAP_SHARED, filefd,
@@ -1052,7 +1052,7 @@ oldway:
 			perror_reply(451, "Local resource failure: malloc");
 			return;
 		}
-				
+
 		while ((cnt = read(filefd, buf, (u_int)blksize)) > 0 &&
 		    write(netfd, buf, cnt) == cnt)
 			byte_count += cnt;
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 3a0336a..a161ed5 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -153,7 +153,7 @@ main(argc, argv)
 	 * The following is a work around for vhangup interactions
 	 * which cause great problems getting window systems started.
 	 * If the tty line is "-", we do the old style getty presuming
-	 * that the file descriptors are already set up for us. 
+	 * that the file descriptors are already set up for us.
 	 * J. Gettys - MIT Project Athena.
 	 */
 	if (argc <= 2 || strcmp(argv[2], "-") == 0)
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 607fd38..0223863 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -382,7 +382,7 @@ speed(val)
 	for (sp = speedtab; sp->speed; sp++)
 		if (sp->speed == val)
 			return (sp->uxname);
-	
+
 	return (B300);		/* default in impossible cases */
 }
 
diff --git a/libexec/lfs_cleanerd/clean.h b/libexec/lfs_cleanerd/clean.h
index 5bbece7..729d0f8 100644
--- a/libexec/lfs_cleanerd/clean.h
+++ b/libexec/lfs_cleanerd/clean.h
@@ -82,9 +82,9 @@ typedef struct fs_info {
 	off_t	fi_ifile_length;	/* length of the ifile */
 } FS_INFO;
 
-/* 
+/*
  * XXX: size (in bytes) of a segment
- *	should lfs_bsize be fsbtodb(fs,1), blksize(fs), or lfs_dsize? 
+ *	should lfs_bsize be fsbtodb(fs,1), blksize(fs), or lfs_dsize?
  */
 #define seg_size(fs) ((fs)->lfs_ssize << (fs)->lfs_bshift)
 
diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c
index 2b8566a..994992e 100644
--- a/libexec/lfs_cleanerd/cleanerd.c
+++ b/libexec/lfs_cleanerd/cleanerd.c
@@ -65,7 +65,7 @@ struct cleaner_stats {
 	int	segs_error;
 } cleaner_stats;
 
-struct seglist { 
+struct seglist {
 	int sl_id;	/* segment number */
 	int sl_cost; 	/* cleaning cost */
 	char sl_empty;	/* is segment empty */
@@ -84,7 +84,7 @@ int	 lfs_markv __P((fsid_t *, BLOCK_INFO *, int));
 
 /* function prototypes */
 int	 bi_tossold __P((const void *, const void *, const void *));
-int	 choose_segments __P((FS_INFO *, struct seglist *, 
+int	 choose_segments __P((FS_INFO *, struct seglist *,
 	     int (*)(FS_INFO *, SEGUSE *)));
 void	 clean_fs __P((FS_INFO	*, int (*)(FS_INFO *, SEGUSE *)));
 int	 clean_loop __P((FS_INFO *));
@@ -117,14 +117,14 @@ cost_benefit(fsp, su)
 
 	gettimeofday(&t, NULL);
 
-	live = su->su_nbytes;	
+	live = su->su_nbytes;
 	age = t.tv_sec < su->su_lastmod ? 0 : t.tv_sec - su->su_lastmod;
-	
+
 	lfsp = &fsp->fi_lfs;
 	if (live == 0)
 		return (t.tv_sec * lblkno(lfsp, seg_size(lfsp)));
 	else {
-		/* 
+		/*
 		 * from lfsSegUsage.c (Mendel's code).
 		 * priority calculation is done using INTEGER arithmetic.
 		 * sizes are in BLOCKS (that is why we use lblkno below).
@@ -212,7 +212,7 @@ main(argc, argv)
 		(void)printf("Cleaner going to sleep.\n");
 #endif
 		if (lfs_segwait(&fsid, &timeout) < 0)
-			err(0, "lfs_segwait: returned error\n");	
+			err(0, "lfs_segwait: returned error\n");
 #ifdef VERBOSE
 		(void)printf("Cleaner waking up.\n");
 #endif
@@ -233,8 +233,8 @@ clean_loop(fsp)
 	 * number of free blocks.
 	 */
 	max_free_segs = fsp->fi_statfsp->f_bfree / fsp->fi_lfs.lfs_ssize;
-	
-	/* 
+
+	/*
 	 * We will clean if there are not enough free blocks or total clean
 	 * space is less than BUSY_LIM % of possible clean space.
 	 */
@@ -247,7 +247,7 @@ clean_loop(fsp)
 		clean_fs(fsp, cost_benefit);
 		return (1);
 	} else {
-	        /* 
+	        /*
 		 * We will also clean if the system is reasonably idle and
 		 * the total clean space is less then IDLE_LIM % of possible
 		 * clean space.
@@ -256,16 +256,16 @@ clean_loop(fsp)
 			perror("getloadavg: failed\n");
 			return (-1);
 		}
-		if (loadavg[ONE_MIN] == 0.2 && loadavg[FIVE_MIN] && 
+		if (loadavg[ONE_MIN] == 0.2 && loadavg[FIVE_MIN] &&
 		    fsp->fi_cip->clean < max_free_segs * IDLE_LIM) {
 		        clean_fs(fsp, cost_benefit);
 			printf("Cleaner running (system idle) at %s",
 			    ctime(&now));
 			return (1);
 		}
-	} 
+	}
 #ifdef VERBOSE
-	printf("Cleaner not running at %s", ctime(&now)); 
+	printf("Cleaner not running at %s", ctime(&now));
 #endif
 	return (0);
 }
@@ -456,7 +456,7 @@ clean_segment(fsp, id)
 		}
 		num_blocks -= clean_blocks;
 	}
-		
+
 	free(block_array);
 	munmap_segment(fsp, seg_buf, do_mmap);
 	++cleaner_stats.segs_cleaned;
diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c
index 19ac0fd..62f345a 100644
--- a/libexec/lfs_cleanerd/library.c
+++ b/libexec/lfs_cleanerd/library.c
@@ -108,7 +108,7 @@ get_fs_info (lstatfsp, use_mmap)
 {
 	FS_INFO	*fsp;
 	int	i;
-	
+
 	fsp = (FS_INFO *)malloc(sizeof(FS_INFO));
 	if (fsp == NULL)
 		return NULL;
@@ -125,7 +125,7 @@ get_fs_info (lstatfsp, use_mmap)
 
 /*
  * If we are reading the ifile then we need to refresh it.  Even if
- * we are mmapping it, it might have grown.  Finally, we need to 
+ * we are mmapping it, it might have grown.  Finally, we need to
  * refresh the file system information (statfs) info.
  */
 void
@@ -134,14 +134,14 @@ reread_fs_info(fsp, use_mmap)
 	int use_mmap;
 {
 	int i;
-	
+
 	if (statfs(fsp->fi_statfsp->f_mntonname, fsp->fi_statfsp))
 		err(1, "reread_fs_info: statfs failed");
 	get_ifile (fsp, use_mmap);
 }
 
-/* 
- * Gets the superblock from disk (possibly in face of errors) 
+/*
+ * Gets the superblock from disk (possibly in face of errors)
  */
 int
 get_superblock (fsp, sbp)
@@ -161,11 +161,11 @@ get_superblock (fsp, sbp)
 
 	get(fid, LFS_LABELPAD, sbp, sizeof(struct lfs));
 	close (fid);
-	
+
 	return (0);
 }
 
-/* 
+/*
  * This function will map the ifile into memory.  It causes a
  * fatal error on failure.
  */
@@ -209,16 +209,16 @@ get_ifile (fsp, use_mmap)
 		if (fsp->fi_cip)
 			free(fsp->fi_cip);
 		if (!(ifp = malloc (file_stat.st_size)))
-			err (1, "get_ifile: malloc failed"); 
+			err (1, "get_ifile: malloc failed");
 redo_read:
 		count = read (fid, ifp, (size_t) file_stat.st_size);
 
 		if (count < 0)
-			err(1, "get_ifile: bad ifile read"); 
+			err(1, "get_ifile: bad ifile read");
 		else if (count < file_stat.st_size) {
 			err(0, "get_ifile");
 			if (lseek(fid, 0, SEEK_SET) < 0)
-				err(1, "get_ifile: bad ifile lseek"); 
+				err(1, "get_ifile: bad ifile lseek");
 			goto redo_read;
 		}
 	}
@@ -249,7 +249,7 @@ redo_read:
  * summary was read (it may have "died" since then).  Any given
  * pair will be listed at most once.
  */
-int 
+int
 lfs_segmapv(fsp, seg, seg_buf, blocks, bcount)
 	FS_INFO *fsp;		/* pointer to local file system information */
 	int seg;		/* the segment number */
@@ -345,13 +345,13 @@ lfs_segmapv(fsp, seg, seg_buf, blocks, bcount)
 
 err0:	*bcount = 0;
 	return (-1);
-	
+
 }
 
-/* 
+/*
  * This will parse a partial segment and fill in BLOCK_INFO structures
  * for each block described in the segment summary.  It will not include
- * blocks or inodes from files with new version numbers.  
+ * blocks or inodes from files with new version numbers.
  */
 void
 add_blocks (fsp, bip, countp, sp, seg_buf, segaddr, psegaddr)
@@ -429,10 +429,10 @@ add_inodes (fsp, bip, countp, sp, seg_buf, seg_addr)
 	daddr_t	*daddrp;
 	ino_t inum;
 	int i;
-	
+
 	if (sp->ss_ninos <= 0)
 		return;
-	
+
 	bp = bip + *countp;
 	lfsp = &fsp->fi_lfs;
 #ifdef VERBOSE
@@ -444,9 +444,9 @@ add_inodes (fsp, bip, countp, sp, seg_buf, seg_addr)
 			--daddrp;
 			di = (struct dinode *)(seg_buf +
 			    ((*daddrp - seg_addr) << fsp->fi_daddr_shift));
-		} else 
+		} else
 			++di;
-		
+
 		inum = di->di_inumber;
 		bp->bi_lbn = LFS_UNUSED_LBN;
 		bp->bi_inode = inum;
@@ -466,7 +466,7 @@ add_inodes (fsp, bip, countp, sp, seg_buf, seg_addr)
 			if (ifp->if_daddr == *daddrp) {
 				bp++;
 				++(*countp);
-			} 
+			}
 		}
 	}
 }
@@ -476,7 +476,7 @@ add_inodes (fsp, bip, countp, sp, seg_buf, seg_addr)
  * segment is valid or not.  Returns the size of the partial segment if it
  * is valid, * and 0 otherwise.  Use dump_summary to figure out size of the
  * the partial as well as whether or not the checksum is valid.
- */	 
+ */
 int
 pseg_valid (fsp, ssp)
 	FS_INFO *fsp;   /* pointer to file system info */
@@ -489,7 +489,7 @@ pseg_valid (fsp, ssp)
 	if ((nblocks = dump_summary(&fsp->fi_lfs, ssp, 0, NULL)) <= 0 ||
 	    nblocks > fsp->fi_lfs.lfs_ssize - 1)
 		return(0);
-		
+
 	/* check data/inode block(s) checksum too */
 	datap = (u_long *)malloc(nblocks * sizeof(u_long));
 	p = (caddr_t)ssp + LFS_SUMMARY_SIZE;
@@ -499,13 +499,13 @@ pseg_valid (fsp, ssp)
 	}
 	if (cksum ((void *)datap, nblocks * sizeof(u_long)) != ssp->ss_datasum)
 		return (0);
-	
+
 	return (nblocks);
 }
 
 
 /* #define MMAP_SEGMENT */
-/* 
+/*
  * read a segment into a memory buffer
  */
 int
@@ -562,7 +562,7 @@ mmap_segment (fsp, segment, segbuf, use_mmap)
 			free(*segbuf);
 			return (-1);
 		}
-		
+
 		if (read (fid, *segbuf, ssize) != ssize) {
 			err (0, "mmap_segment: bad read");
 			free(*segbuf);
@@ -630,7 +630,7 @@ bi_compare(a, b)
 		return (diff);
 	diff = (int)(ba->bi_daddr - bb->bi_daddr);
 	return (diff);
-}	
+}
 
 int
 bi_toss(dummy, a, b)
@@ -665,7 +665,7 @@ toss(p, nump, size, dotoss, client)
 		if (dotoss(client, p, p1)) {
 			memmove(p, p1, i * size);
 			--(*nump);
-		} else 
+		} else
 			p += size;
 	}
 }
diff --git a/libexec/lfs_cleanerd/print.c b/libexec/lfs_cleanerd/print.c
index 5c3863a..64320c5 100644
--- a/libexec/lfs_cleanerd/print.c
+++ b/libexec/lfs_cleanerd/print.c
@@ -65,7 +65,7 @@ dump_summary(lfsp, sp, flags, iaddrp)
 	FINFO *fp;
 	int ck;
 
-	if (sp->ss_sumsum != (ck = cksum(&sp->ss_datasum, 
+	if (sp->ss_sumsum != (ck = cksum(&sp->ss_datasum,
 	    LFS_SUMMARY_SIZE - sizeof(sp->ss_sumsum))))
 		return(-1);
 
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c
index 0de8978..6effa03 100644
--- a/libexec/mail.local/mail.local.c
+++ b/libexec/mail.local/mail.local.c
@@ -304,7 +304,7 @@ err2:		(void)ftruncate(mbfd, curoff);
 err1:		(void)close(mbfd);
 		return;
 	}
-		
+
 	/* Close and check -- NFS doesn't write until the close. */
 	if (close(mbfd)) {
 		e_to_sys(errno);
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index d786bc9..95febcf 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -57,7 +57,7 @@ main()
 {
 	int len;
 	char *r, key[9], salt[3];
-	
+
 	get(key, sizeof(key) - 1);
 	get(salt, sizeof(salt) - 1);
 	len = strlen(r = crypt(key, salt));
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index 7ecd419..f5e8bce 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -253,7 +253,7 @@ BpfGetIntfName(errmsg)
 #endif
 	ifrp = ibuf;
 	ifend = (struct ifreq *)((char *)ibuf + ifc.ifc_len);
-	
+
 	mp = 0;
 	minunit = 666;
 	for (; ifrp < ifend; ++ifrp) {
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index d00436f..a01a4a5 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -192,7 +192,7 @@ ParseConfig()
 			 *  the entire record is invalidated.
 			 */
 			if (i == 0) {
-				FreeClient(client);	
+				FreeClient(client);
 				continue;
 			}
 		}
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index aa01583..0164345 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -379,7 +379,7 @@ DoTimeout()
 **  FindClient -- Find client associated with a packet.
 **
 **	Parameters:
-**		rconn - the new packet. 
+**		rconn - the new packet.
 **
 **	Returns:
 **		Pointer to client info if found, NULL otherwise.
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 5feb8a7..cd94b68 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -187,7 +187,7 @@ doit(f, fromp)
 			exit(1);
 		}
 	}
-	
+
 	if (pwd->pw_uid == 0 || *pwd->pw_passwd == '\0') {
 		syslog(LOG_ERR, "%s LOGIN REFUSED from %s", user, remote);
 		error("Login incorrect.\n");
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 5792798..4ff0af7 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -705,7 +705,7 @@ do_krb_login(dest)
 	/* returns nonzero for no access */
 	if (kuserok(kdata, lusername) != 0)
 		return (-1);
-	
+
 	return (0);
 
 }
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index ade88ff..613ce51 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -29,7 +29,7 @@
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
 /*static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "$Id: rstat_proc.c,v 1.1.1.1 1994/08/28 14:49:04 csgr Exp $";
+static char rcsid[] = "$Id: rstat_proc.c,v 1.2 1994/10/15 13:39:54 davidg Exp $";
 #endif
 
 /*
@@ -107,7 +107,7 @@ static kvm_t *kd;
 extern int errno;
 
 #if defined(BSD)
-static int	cp_time_xlat[RSTAT_CPUSTATES] = { CP_USER, CP_NICE, CP_SYS, 
+static int	cp_time_xlat[RSTAT_CPUSTATES] = { CP_USER, CP_NICE, CP_SYS,
 							CP_IDLE };
 static long	bsd_cp_time[CPUSTATES];
 #endif
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 2cbdac7..972974c 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rstatd.c,v 1.1.1.1 1994/08/28 14:49:04 csgr Exp $";
+static char rcsid[] = "$Id: rstatd.c,v 1.2 1994/11/18 22:31:05 ats Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -64,7 +64,7 @@ main(argc, argv)
         int proto = 0;
 	struct sockaddr_in from;
 	int fromlen;
-        
+
         if (argc == 2)
                 closedown = atoi(argv[1]);
         if (closedown <= 0)
@@ -91,7 +91,7 @@ main(argc, argv)
 		(void) signal(SIGTERM, cleanup);
 		(void) signal(SIGHUP, cleanup);
         }
-        
+
         openlog("rpc.rstatd", LOG_CONS|LOG_PID, LOG_DAEMON);
 
 	transp = svcudp_create(sock);
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 3a603c2..d472673 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rusers_proc.c,v 1.2 1994/11/04 02:12:49 jkh Exp $";
+static char rcsid[] = "$Id: rusers_proc.c,v 1.3 1994/11/18 23:36:18 ats Exp $";
 #endif /* not lint */
 
 #include <signal.h>
@@ -146,7 +146,7 @@ getidle(char *tty, char *display)
         char devname[PATH_MAX];
         time_t now;
         u_long idle;
-        
+
         /*
          * If this is an X terminal or console, then try the
          * XIdle extension
@@ -186,17 +186,17 @@ getidle(char *tty, char *display)
 
         return(idle);
 }
-        
+
 static utmpidlearr *
 do_names_2(int all)
 {
         static utmpidlearr ut;
 	struct utmp usr;
         int nusers = 0;
-        
+
         bzero((char *)&ut, sizeof(ut));
         ut.utmpidlearr_val = &utmp_idle[0];
-        
+
 	ufp = fopen(_PATH_UTMP, "r");
         if (!ufp) {
                 syslog(LOG_ERR, "%m");
@@ -223,10 +223,10 @@ do_names_2(int all)
                         strncpy(name[nusers], usr.ut_name, UT_NAMESIZE);
                         utmp_idle[nusers].ui_utmp.ut_host = host[nusers];
                         strncpy(host[nusers], usr.ut_host, UT_HOSTSIZE);
-			
+
 			/* Make sure entries are NUL terminated */
-			line[nusers][UT_LINESIZE] = 
-			name[nusers][UT_NAMESIZE] = 
+			line[nusers][UT_LINESIZE] =
+			name[nusers][UT_NAMESIZE] =
 			host[nusers][UT_HOSTSIZE] = '\0';
                         nusers++;
                 }
@@ -270,9 +270,9 @@ do_names_1(int all)
         utmpidlearr *utidle;
         static utmparr ut;
         int i;
-        
+
         bzero((char *)&ut, sizeof(ut));
-        
+
         utidle = do_names_2(all);
         if (utidle) {
                 ut.utmparr_len = utidle->utmpidlearr_len;
@@ -280,9 +280,9 @@ do_names_1(int all)
                 for (i = 0; i < ut.utmparr_len; i++)
                         bcopy(&utmp_idle[i].ui_utmp, &old_utmp[i],
                               sizeof(old_utmp[0]));
-                
+
         }
-        
+
         return(&ut);
 }
 
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index d2a0d84..0182306 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rusersd.c,v 1.1.1.1 1994/08/28 14:53:45 csgr Exp $";
+static char rcsid[] = "$Id: rusersd.c,v 1.2 1994/11/18 22:40:11 ats Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -64,7 +64,7 @@ main(argc, argv)
         int proto = 0;
 	struct sockaddr_in from;
 	int fromlen;
-        
+
         /*
          * See if inetd started us
          */
@@ -74,7 +74,7 @@ main(argc, argv)
                 sock = RPC_ANYSOCK;
                 proto = IPPROTO_UDP;
         }
-        
+
         if (!from_inetd) {
                 daemon(0, 0);
 
@@ -87,7 +87,7 @@ main(argc, argv)
         }
 
         openlog("rpc.rusersd", LOG_CONS|LOG_PID, LOG_DAEMON);
-        
+
 	transp = svcudp_create(sock);
 	if (transp == NULL) {
 		syslog(LOG_ERR, "cannot create udp service.");
@@ -102,7 +102,7 @@ main(argc, argv)
 		syslog(LOG_ERR, "unable to register (RUSERSPROG, RUSERSVERS_ORIG, %s).", proto?"udp":"(inetd)");
 		exit(1);
 	}
-        
+
         svc_run();
 	syslog(LOG_ERR, "svc_run returned");
 	exit(1);
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index 7e99b62..adb6c3f 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rwalld.c,v 1.1.1.1 1994/08/28 14:58:36 csgr Exp $";
+static char rcsid[] = "$Id: rwalld.c,v 1.2 1994/11/18 22:50:22 ats Exp $";
 #endif /* not lint */
 
 #include <unistd.h>
@@ -90,7 +90,7 @@ main(argc, argv)
                 sock = RPC_ANYSOCK;
                 proto = IPPROTO_UDP;
         }
-        
+
         if (!from_inetd) {
                 if (!nodaemon)
                         possess();
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 9022a12..db03bbf 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -55,9 +55,9 @@ extern char hostname[];
 /*
  * Announce an invitation to talk.
  */
-	
+
 /*
- * See if the user is accepting messages. If so, announce that 
+ * See if the user is accepting messages. If so, announce that
  * a talk is requested.
  */
 announce(request, remote_machine)
@@ -80,7 +80,7 @@ announce(request, remote_machine)
 #define N_CHARS 120
 
 /*
- * Build a block of characters containing the message. 
+ * Build a block of characters containing the message.
  * It is sent blank filled and in a single block to
  * try to keep the message in one piece if the recipient
  * in in vi at the time
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 9c0085b..0769d97 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/4/93";
 static	char *types[] =
     { "leave_invite", "look_up", "delete", "announce" };
 #define	NTYPES	(sizeof (types) / sizeof (types[0]))
-static	char *answers[] = 
+static	char *answers[] =
     { "success", "not_here", "failed", "machine_unknown", "permission_denied",
       "unknown_request", "badversion", "badaddr", "badctladdr" };
 #define	NANSWERS	(sizeof (answers) / sizeof (answers[0]))
@@ -56,7 +56,7 @@ print_request(cp, mp)
 	register CTL_MSG *mp;
 {
 	char tbuf[80], *tp;
-	
+
 	if (mp->type > NTYPES) {
 		(void)sprintf(tbuf, "type %d", mp->type);
 		tp = tbuf;
@@ -71,7 +71,7 @@ print_response(cp, rp)
 	register CTL_RESPONSE *rp;
 {
 	char tbuf[80], *tp, abuf[80], *ap;
-	
+
 	if (rp->type > NTYPES) {
 		(void)sprintf(tbuf, "type %d", rp->type);
 		tp = tbuf;
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index cc8cb66..ef57206 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/4/93";
 /*
  * Routines to handle insertion, deletion, etc on the table
  * of requests kept by the daemon. Nothing fancy here, linear
- * search on a double-linked list. A time is kept with each 
+ * search on a double-linked list. A time is kept with each
  * entry so that overly old invitations can be eliminated.
  *
  * Consider this a mis-guided attempt at modularity
@@ -110,7 +110,7 @@ find_match(request)
 
 /*
  * Look for an identical request, as opposed to a complimentary
- * one as find_match does 
+ * one as find_match does
  */
 CTL_MSG *
 find_request(request)
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index ea48376..9fd5950 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)talkd.c	8.1 (Berkeley) 6/4/93";
 
 /*
  * The top level of the daemon, the format is heavily borrowed
- * from rwhod.c. Basically: find out who and where you are; 
+ * from rwhod.c. Basically: find out who and where you are;
  * disconnect all descriptors and ttys, and then endless
  * loop on waiting for and processing requests
  */
diff --git a/libexec/telnetd/pathnames.h b/libexec/telnetd/pathnames.h
index c8b0806..4e14a88 100644
--- a/libexec/telnetd/pathnames.h
+++ b/libexec/telnetd/pathnames.h
@@ -42,7 +42,7 @@
 # endif
 
 #else
- 
+
 # define	_PATH_TTY	"/dev/tty"
 # ifndef _PATH_LOGIN
 #  define	_PATH_LOGIN	"/bin/login"
diff --git a/libexec/telnetd/slc.c b/libexec/telnetd/slc.c
index 145746a..a03bd9d 100644
--- a/libexec/telnetd/slc.c
+++ b/libexec/telnetd/slc.c
@@ -109,10 +109,10 @@ get_slc_defaults()
 	init_termbuf();
 
 	for (i = 1; i <= NSLC; i++) {
-		slctab[i].defset.flag = 
+		slctab[i].defset.flag =
 			spcset(i, &slctab[i].defset.val, &slctab[i].sptr);
-		slctab[i].current.flag = SLC_NOSUPPORT; 
-		slctab[i].current.val = 0; 
+		slctab[i].current.flag = SLC_NOSUPPORT;
+		slctab[i].current.val = 0;
 	}
 
 }  /* end of get_slc_defaults */
@@ -286,7 +286,7 @@ change_slc(func, flag, val)
 	register cc_t val;
 {
 	register int hislevel, mylevel;
-	
+
 	hislevel = flag & SLC_LEVELBITS;
 	mylevel = slctab[func].defset.flag & SLC_LEVELBITS;
 	/*
@@ -345,7 +345,7 @@ change_slc(func, flag, val)
 		* request as he asks.
 		*
 		* If our level is DEFAULT, then just ack whatever was
-		* sent. 
+		* sent.
 		*
 		* If he can't change and we can't change,
 		* then degenerate to NOSUPPORT.
@@ -372,7 +372,7 @@ change_slc(func, flag, val)
 					slctab[func].defset.val;
 				val = slctab[func].current.val;
 			}
-			
+
 		}
 		add_slc(func, flag, val);
 	}
@@ -423,7 +423,7 @@ check_slc()
 						slctab[i].current.val);
 		}
 	}
-			
+
 }  /* check_slc */
 
 /*
diff --git a/libexec/telnetd/state.c b/libexec/telnetd/state.c
index c957734..db9fbe8 100644
--- a/libexec/telnetd/state.c
+++ b/libexec/telnetd/state.c
@@ -376,7 +376,7 @@ gotiac:			switch (c) {
  * All state defaults are negative, and resp defaults to 0.
  *
  * When initiating a request to change state to new_state:
- * 
+ *
  * if ((want_resp == 0 && new_state == my_state) || want_state == new_state) {
  *	do nothing;
  * } else {
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index 786661c..75070af 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -1083,7 +1083,7 @@ getptyslave()
 #ifdef	USE_TERMIO
 	ttyfd = t;
 #endif
-	if (ioctl(t, I_PUSH, "ptem") < 0) 
+	if (ioctl(t, I_PUSH, "ptem") < 0)
 		fatal(net, "I_PUSH ptem");
 	if (ioctl(t, I_PUSH, "ldterm") < 0)
 		fatal(net, "I_PUSH ldterm");
@@ -1583,7 +1583,7 @@ start_login(host, autologin, name)
 	if (bftpd) {
 		argv = addarg(argv, "-e");
 		argv = addarg(argv, BFTPPATH);
-	} else 
+	} else
 #endif
 #if	defined (SecurID)
 	/*
@@ -1677,7 +1677,7 @@ start_login(host, autologin, name)
 	if (user = getenv("USER")) {
 	if (strchr(user, '-')) {
 			syslog(LOG_ERR, "tried to pass user \"%s\" to login",
-			       user); 
+			       user);
 			fatal(net, "invalid user");
 		}
 		argv = addarg(argv, getenv("USER"));
@@ -2073,7 +2073,7 @@ rmut()
 		if (statbf.st_size && utmp) {
 			nutmp = read(f, (char *)utmp, (int)statbf.st_size);
 			nutmp /= sizeof(struct utmp);
-		
+
 			for (u = utmp ; u < &utmp[nutmp] ; u++) {
 				if (SCMPN(u->ut_line, line+5) ||
 				    u->ut_name[0]==0)
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 5b2a884..87e017d 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -784,7 +784,7 @@ doit(who)
 
 #if	defined(_SC_CRAY_SECURE_SYS)
 	/*
-	 *	set ttyp line security label 
+	 *	set ttyp line security label
 	 */
 	if (secflag) {
 		char slave_dev[16];
@@ -1368,7 +1368,7 @@ telnet(f, p, host)
 	}
 	cleanup(0);
 }  /* end of telnet */
-	
+
 #ifndef	TCSIG
 # ifdef	TIOCSIG
 #  define TCSIG TIOCSIG
@@ -1444,7 +1444,7 @@ int readstream(p, ibuf, bufsize)
 			tp = (struct termio *) (ibuf+1 + sizeof(struct iocblk));
 			vstop = tp->c_cc[VSTOP];
 			vstart = tp->c_cc[VSTART];
-			ixon = tp->c_iflag & IXON;      
+			ixon = tp->c_iflag & IXON;
 			break;
 		default:
 			errno = EAGAIN;
diff --git a/libexec/telnetd/termstat.c b/libexec/telnetd/termstat.c
index 25124a0..3fde25a 100644
--- a/libexec/telnetd/termstat.c
+++ b/libexec/telnetd/termstat.c
@@ -301,7 +301,7 @@ localstat()
 			nfrontp += 7;
 			editmode = useeditmode;
 		}
-							
+
 
 		/*
 		 * Check for changes to special characters in use.
@@ -403,7 +403,7 @@ clientstat(code, parm1, parm2)
 					uselinemode = 1;
 				}
 			}
-		
+
 			/*
 			 * Quit now if we can't do it.
 			 */
@@ -444,7 +444,7 @@ clientstat(code, parm1, parm2)
 				send_will(TELOPT_ECHO, 1);
 		}
 		break;
-	
+
 	case LM_MODE:
 	    {
 		register int ack, changed;
@@ -493,7 +493,7 @@ clientstat(code, parm1, parm2)
  					IAC, SE);
  				nfrontp += 7;
  			}
- 		
+
 			editmode = useeditmode;
 		}
 
@@ -527,9 +527,9 @@ clientstat(code, parm1, parm2)
 		(void) ioctl(pty, TIOCSWINSZ, (char *)&ws);
 	    }
 #endif	/* TIOCSWINSZ */
-		
+
 		break;
-	
+
 	case TELOPT_TSPEED:
 	    {
 		def_tspeed = parm1;
@@ -594,7 +594,7 @@ _termstat()
  *
  * Some things should not be done until after the login process has started
  * and all the pty modes are set to what they are supposed to be.  This
- * function is called when the pty state has been processed for the first time. 
+ * function is called when the pty state has been processed for the first time.
  * It calls other functions that do things that were deferred in each module.
  */
 	void
diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c
index 1fbd7e3..4f5c2e6 100644
--- a/libexec/telnetd/utility.c
+++ b/libexec/telnetd/utility.c
@@ -679,7 +679,7 @@ printsub(direction, pointer, length)
 		    break;
 		}
 		break;
-		
+
 	    case LM_SLC:
 		sprintf(nfrontp, "SLC");
 		nfrontp += strlen(nfrontp);
@@ -829,7 +829,7 @@ printsub(direction, pointer, length)
 			nfrontp += strlen(nfrontp);
 
 			break;
-				
+
 		    default:
 			sprintf(nfrontp, " %d", pointer[i]);
 			nfrontp += strlen(nfrontp);
@@ -932,7 +932,7 @@ printsub(direction, pointer, length)
 	case TELOPT_AUTHENTICATION:
 	    sprintf(nfrontp, "AUTHENTICATION");
 	    nfrontp += strlen(nfrontp);
-	
+
 	    if (length < 2) {
 		sprintf(nfrontp, " (empty suboption??\?)");
 		nfrontp += strlen(nfrontp);
@@ -1050,13 +1050,13 @@ printdata(tag, ptr, cnt)
 		nfrontp += strlen(nfrontp);
 		for (i = 0; i < 20 && cnt; i++) {
 			sprintf(nfrontp, "%02x", *ptr);
-			nfrontp += strlen(nfrontp); 
+			nfrontp += strlen(nfrontp);
 			if (isprint(*ptr)) {
 				xbuf[i] = *ptr;
 			} else {
 				xbuf[i] = '.';
 			}
-			if (i % 2) { 
+			if (i % 2) {
 				*nfrontp = ' ';
 				nfrontp++;
 			}
@@ -1066,6 +1066,6 @@ printdata(tag, ptr, cnt)
 		xbuf[i] = '\0';
 		sprintf(nfrontp, " %s\r\n", xbuf );
 		nfrontp += strlen(nfrontp);
-	} 
+	}
 }
 #endif /* DIAGNOSTICS */
diff --git a/libexec/xtend/packet.c b/libexec/xtend/packet.c
index 19958a9..8dfad88 100644
--- a/libexec/xtend/packet.c
+++ b/libexec/xtend/packet.c
@@ -314,4 +314,4 @@ unsigned char *p;
       }
     }
   }
-}  
+}
diff --git a/libexec/xtend/status.c b/libexec/xtend/status.c
index c09ae85..2ee3812 100644
--- a/libexec/xtend/status.c
+++ b/libexec/xtend/status.c
@@ -59,7 +59,7 @@ initstatus()
  * Checkpoint status of any devices whose status has changed
  * and notify anyone monitoring those devices.
  */
-  
+
 checkpoint_status()
 {
   int h, i, k, offset;