tabify

13 files changed, 102 insertions, 102 deletions

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index a7c886122d0..6eacd0f5cb5 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_io.c,v 1.14 1997/06/18 18:48:23 kstailey Exp $	*/
+/*	$OpenBSD: ar_io.c,v 1.15 1997/07/23 19:15:53 kstailey Exp $	*/
 /*	$NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: ar_io.c,v 1.14 1997/06/18 18:48:23 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: ar_io.c,v 1.15 1997/07/23 19:15:53 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,7 +85,7 @@ static struct stat arsb;		/* stat of archive device at open */
 static int invld_rec;			/* tape has out of spec record size */
 static int wr_trail = 1;		/* trailer was rewritten in append */
 static int can_unlnk = 0;		/* do we unlink null archives?  */
-char *arcname;                  	/* printable name of archive */
+char *arcname;				/* printable name of archive */
 char *gzip_program;			/* name of gzip program */
 
 static int get_phys __P((void));
@@ -110,7 +110,7 @@ ar_open(name)
 	char *name;
 #endif
 {
-        struct mtget mb;
+	struct mtget mb;
 
 	if (arfd != -1)
 		(void)close(arfd);
@@ -761,7 +761,7 @@ ar_rdsync()
 	long fsbz;
 	off_t cpos;
 	off_t mpos;
-        struct mtop mb;
+	struct mtop mb;
 
 	/*
 	 * Fail resync attempts at user request (done) or this is going to be
@@ -917,7 +917,7 @@ ar_rev(sksz)
 #endif
 {
 	off_t cpos;
-        struct mtop mb;
+	struct mtop mb;
 	register int phyblk; 
 
 	/*
@@ -1277,10 +1277,10 @@ ar_next()
 			tty_prnt("Empty file name, try again\n");
 			continue;
 		}
-                if (!strcmp(buf, "..")) {
-                        tty_prnt("Illegal file name: .. try again\n");
-                        continue;
-                }
+		if (!strcmp(buf, "..")) {
+			tty_prnt("Illegal file name: .. try again\n");
+			continue;
+		}
 		if (strlen(buf) > PAXPATHLEN) {
 			tty_prnt("File name too long, try again\n");
 			continue;
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 252fc41af3f..e3229427c66 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_subs.c,v 1.8 1997/06/18 18:48:24 kstailey Exp $	*/
+/*	$OpenBSD: ar_subs.c,v 1.9 1997/07/23 19:15:54 kstailey Exp $	*/
 /*	$NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.8 1997/06/18 18:48:24 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.9 1997/07/23 19:15:54 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ extern sigset_t s_mask;
  * the user: list, append, read ...
  */
 
-static char hdbuf[BLKMULT];             /* space for archive header on read */
+static char hdbuf[BLKMULT];		/* space for archive header on read */
 u_long flcnt;				/* number of files processed */
 
 /*
@@ -1049,7 +1049,7 @@ next_head(arcn)
 			if (!in_resync) {
 				if (act == APPND) {
 					paxwarn(1,
-				          "Archive I/O error, cannot continue");
+					  "Archive I/O error, cannot continue");
 					return(-1);
 				}
 				paxwarn(1,"Archive I/O error. Trying to recover.");
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 77061273412..de74c3a6a69 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf_subs.c,v 1.4 1997/04/06 06:11:10 millert Exp $	*/
+/*	$OpenBSD: buf_subs.c,v 1.5 1997/07/23 19:15:55 kstailey Exp $	*/
 /*	$NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.4 1997/04/06 06:11:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.5 1997/07/23 19:15:55 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.4 1997/04/06 06:11:10 millert Ex
  */
 
 #define MINFBSZ		512		/* default block size for hole detect */
-#define MAXFLT          10              /* default media read error limit */
+#define MAXFLT		10		/* default media read error limit */
 
 /*
  * Need to change bufmem to dynamic allocation when the upper
@@ -74,8 +74,8 @@ static char bufmem[MAXBLK+BLKMULT];	/* i/o buffer + pushback id space */
 static char *buf;			/* normal start of i/o buffer */
 static char *bufend;			/* end or last char in i/o buffer */
 static char *bufpt;			/* read/write point in i/o buffer */
-int blksz = MAXBLK;                    	/* block input/output size in bytes */
-int wrblksz;                      	/* user spec output size in bytes */
+int blksz = MAXBLK;			/* block input/output size in bytes */
+int wrblksz;				/* user spec output size in bytes */
 int maxflt = MAXFLT;			/* MAX consecutive media errors */
 int rdblksz;				/* first read blksize (tapes only) */
 off_t wrlimit;				/* # of bytes written per archive vol */
@@ -767,11 +767,11 @@ rd_wrfile(arcn, ofd, left)
 	 * pass the blocksize of the file being written to the write routine,
 	 * if the size is zero, use the default MINFBSZ
 	 */
-        if (fstat(ofd, &sb) == 0) {
+	if (fstat(ofd, &sb) == 0) {
 		if (sb.st_blksize > 0)
 			sz = (int)sb.st_blksize;
-        } else
-                syswarn(0,errno,"Unable to obtain block size for file %s",fnm);
+	} else
+		syswarn(0,errno,"Unable to obtain block size for file %s",fnm);
 	rem = sz;
 	*left = 0L;
 
@@ -870,11 +870,11 @@ cp_file(arcn, fd1, fd2)
 	 * pass the blocksize of the file being written to the write routine,
 	 * if the size is zero, use the default MINFBSZ
 	 */
-        if (fstat(fd2, &sb) == 0) {
+	if (fstat(fd2, &sb) == 0) {
 		if (sb.st_blksize > 0)
 			sz = sb.st_blksize;
-        } else
-                syswarn(0,errno,"Unable to obtain block size for file %s",fnm);
+	} else
+		syswarn(0,errno,"Unable to obtain block size for file %s",fnm);
 	rem = sz;
 
 	/*
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index c4a4fb792dc..8c4f2555c44 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpio.c,v 1.3 1996/06/23 14:20:31 deraadt Exp $	*/
+/*	$OpenBSD: cpio.c,v 1.4 1997/07/23 19:15:56 kstailey Exp $	*/
 /*	$NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: cpio.c,v 1.3 1996/06/23 14:20:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cpio.c,v 1.4 1997/07/23 19:15:56 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -513,7 +513,7 @@ cpio_wr(arcn)
 	 */
 	if (ul_asc((u_long)MAGIC, hd->c_magic, sizeof(hd->c_magic), OCT) ||
 	    ul_asc((u_long)arcn->sb.st_dev, hd->c_dev, sizeof(hd->c_dev),
-	        OCT) ||
+		OCT) ||
 	    ul_asc((u_long)arcn->sb.st_ino, hd->c_ino, sizeof(hd->c_ino),
 		OCT) ||
 	    ul_asc((u_long)arcn->sb.st_mode, hd->c_mode, sizeof(hd->c_mode),
diff --git a/bin/pax/options.c b/bin/pax/options.c
index b096011f68b..84a7feaacd5 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.27 1997/06/18 20:06:30 kstailey Exp $	*/
+/*	$OpenBSD: options.c,v 1.28 1997/07/23 19:15:57 kstailey Exp $	*/
 /*	$NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: options.c,v 1.27 1997/06/18 20:06:30 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.28 1997/07/23 19:15:57 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -197,7 +197,7 @@ pax_options(argc, argv)
 	unsigned int flg = 0;
 	unsigned int bflg = 0;
 	register char *pt;
-        FSUB tmp;
+	FSUB tmp;
 	extern char *optarg;
 	extern int optind;
 
@@ -892,7 +892,7 @@ mkpath(path)
 				return (-1);
 			}
 		} else if (!S_ISDIR(sb.st_mode)) {
-		        syswarn(1, ENOTDIR, "%s", path);
+			syswarn(1, ENOTDIR, "%s", path);
 			return (-1);
 		}
 
@@ -921,7 +921,7 @@ cpio_options(argc, argv)
 	register int c, i;
 	size_t len;
 	char *str;
-        FSUB tmp;
+	FSUB tmp;
 	FILE *fp;
 
 	kflag = 1;
@@ -1204,11 +1204,11 @@ c_frmt(const void *a, const void *b)
 #else
 static int
 c_frmt(a, b)
-        void *a;
-        void *b;
+	void *a;
+	void *b;
 #endif
 {
-        return(strcmp(((FSUB *)a)->name, ((FSUB *)b)->name));
+	return(strcmp(((FSUB *)a)->name, ((FSUB *)b)->name));
 }
 
 /*
@@ -1453,7 +1453,7 @@ pax_usage()
 	(void)fputs("       pax -r [-cdiknuvDYZ] [-E limit] ", stderr);
 	(void)fputs("[-f archive] [-o options] ... \n", stderr);
 	(void)fputs("           [-p string] ... [-s replstr] ... ", stderr);
-	(void)fputs("[-U user] ... [-G group] ...\n           ", stderr);
+	(void)fputs("[-U user] ... [-G group] ...\n	      ", stderr);
 	(void)fputs("[-T [from_date][,to_date]] ... ", stderr);
 	(void)fputs(" [pattern ...]\n", stderr);
 	(void)fputs("       pax -w [-dituvHLPX] [-b blocksize] ", stderr);
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index a8e624685d2..bdb164ea585 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pax.c,v 1.7 1997/04/05 22:36:17 millert Exp $	*/
+/*	$OpenBSD: pax.c,v 1.8 1997/07/23 19:15:58 kstailey Exp $	*/
 /*	$NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $	*/
 
 /*-
@@ -48,7 +48,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: pax.c,v 1.7 1997/04/05 22:36:17 millert Exp $";
+static char rcsid[] = "$OpenBSD: pax.c,v 1.8 1997/07/23 19:15:58 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -249,7 +249,7 @@ main(argc, argv)
 	 * parse options, determine operational mode, general init
 	 */
 	options(argc, argv);
-        if ((gen_init() < 0) || (tty_init() < 0))
+	if ((gen_init() < 0) || (tty_init() < 0))
 		return(exit_val);
 
 	/*
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 6406407ca82..bdf00a47dab 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pax.h,v 1.8 1997/04/06 06:11:14 millert Exp $	*/
+/*	$OpenBSD: pax.h,v 1.9 1997/07/23 19:15:58 kstailey Exp $	*/
 /*	$NetBSD: pax.h,v 1.3 1995/03/21 09:07:41 cgd Exp $	*/
 
 /*-
@@ -229,10 +229,10 @@ typedef struct oplist {
  * General Macros
  */
 #ifndef MIN
-#define        MIN(a,b) (((a)<(b))?(a):(b))
+#define	       MIN(a,b) (((a)<(b))?(a):(b))
 #endif
-#define MAJOR(x)        major(x)
-#define MINOR(x)        minor(x)
+#define MAJOR(x)	major(x)
+#define MINOR(x)	minor(x)
 #define TODEV(x, y)	makedev((x), (y))
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 473fe6a9c52..969c1aeeec0 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sel_subs.c,v 1.4 1997/06/18 18:48:27 kstailey Exp $	*/
+/*	$OpenBSD: sel_subs.c,v 1.5 1997/07/23 19:15:59 kstailey Exp $	*/
 /*	$NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.4 1997/06/18 18:48:27 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.5 1997/07/23 19:15:59 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -134,8 +134,8 @@ usr_add(str)
 		return(-1);
 	if ((usrtb == NULL) &&
  	    ((usrtb = (USRT **)calloc(USR_TB_SZ, sizeof(USRT *))) == NULL)) {
-                paxwarn(1, "Unable to allocate memory for user selection table");
-                return(-1);
+		paxwarn(1, "Unable to allocate memory for user selection table");
+		return(-1);
 	}
 
 	/*
@@ -148,11 +148,11 @@ usr_add(str)
 		if ((str[0] == '\\') && (str[1] == '#'))
 			++str;
 		if ((pw = getpwnam(str)) == NULL) {
-                	paxwarn(1, "Unable to find uid for user: %s", str);
-                	return(-1);
+			paxwarn(1, "Unable to find uid for user: %s", str);
+			return(-1);
 		}
 		uid = (uid_t)pw->pw_uid;
-        } else
+	} else
 #		ifdef NET2_STAT
 		uid = (uid_t)atoi(str+1);
 #		else
@@ -165,11 +165,11 @@ usr_add(str)
 	 */
 	indx = ((unsigned)uid) % USR_TB_SZ;
 	if ((pt = usrtb[indx]) != NULL) {
-                while (pt != NULL) {
-                        if (pt->uid == uid)
+		while (pt != NULL) {
+			if (pt->uid == uid)
 				return(0);
-                        pt = pt->fow;
-                }
+			pt = pt->fow;
+		}
 	}
 
 	/*
@@ -181,8 +181,8 @@ usr_add(str)
 		usrtb[indx] = pt;
 		return(0);
 	}
-        paxwarn(1, "User selection table out of memory");
-        return(-1);
+	paxwarn(1, "User selection table out of memory");
+	return(-1);
 }
 
 /*
@@ -247,8 +247,8 @@ grp_add(str)
 		return(-1);
 	if ((grptb == NULL) &&
  	    ((grptb = (GRPT **)calloc(GRP_TB_SZ, sizeof(GRPT *))) == NULL)) {
-                paxwarn(1, "Unable to allocate memory fo group selection table");
-                return(-1);
+		paxwarn(1, "Unable to allocate memory fo group selection table");
+		return(-1);
 	}
 
 	/*
@@ -261,11 +261,11 @@ grp_add(str)
 		if ((str[0] == '\\') && (str[1] == '#'))
 			++str;
 		if ((gr = getgrnam(str)) == NULL) {
-                	paxwarn(1,"Cannot determine gid for group name: %s", str);
-                	return(-1);
+			paxwarn(1,"Cannot determine gid for group name: %s", str);
+			return(-1);
 		}
 		gid = (gid_t)gr->gr_gid;
-        } else
+	} else
 #		ifdef NET2_STAT
 		gid = (gid_t)atoi(str+1);
 #		else
@@ -278,11 +278,11 @@ grp_add(str)
 	 */
 	indx = ((unsigned)gid) % GRP_TB_SZ;
 	if ((pt = grptb[indx]) != NULL) {
-                while (pt != NULL) {
-                        if (pt->gid == gid)
+		while (pt != NULL) {
+			if (pt->gid == gid)
 				return(0);
-                        pt = pt->fow;
-                }
+			pt = pt->fow;
+		}
 	}
 
 	/*
@@ -294,8 +294,8 @@ grp_add(str)
 		grptb[indx] = pt;
 		return(0);
 	}
-        paxwarn(1, "Group selection table out of memory");
-        return(-1);
+	paxwarn(1, "Group selection table out of memory");
+	return(-1);
 }
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 7e241e0ce67..2e80c78b2f2 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tables.c,v 1.6 1997/06/04 00:15:17 millert Exp $	*/
+/*	$OpenBSD: tables.c,v 1.7 1997/07/23 19:16:00 kstailey Exp $	*/
 /*	$NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: tables.c,v 1.6 1997/06/04 00:15:17 millert Exp $";
+static char rcsid[] = "$OpenBSD: tables.c,v 1.7 1997/07/23 19:16:00 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -120,9 +120,9 @@ lnk_start()
 	if (ltab != NULL)
 		return(0);
  	if ((ltab = (HRDLNK **)calloc(L_TAB_SZ, sizeof(HRDLNK *))) == NULL) {
-                paxwarn(1, "Cannot allocate memory for hard link table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for hard link table");
+		return(-1);
+	}
 	return(0);
 }
 
@@ -369,9 +369,9 @@ ftime_start()
 	if (ftab != NULL)
 		return(0);
  	if ((ftab = (FTM **)calloc(F_TAB_SZ, sizeof(FTM *))) == NULL) {
-                paxwarn(1, "Cannot allocate memory for file time table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for file time table");
+		return(-1);
+	}
 
 	/*
 	 * get random name and create temporary scratch file, unlink name
@@ -537,9 +537,9 @@ name_start()
 	if (ntab != NULL)
 		return(0);
  	if ((ntab = (NAMT **)calloc(N_TAB_SZ, sizeof(NAMT *))) == NULL) {
-                paxwarn(1, "Cannot allocate memory for interactive rename table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for interactive rename table");
+		return(-1);
+	}
 	return(0);
 }
 
@@ -731,9 +731,9 @@ dev_start()
 	if (dtab != NULL)
 		return(0);
  	if ((dtab = (DEVT **)calloc(D_TAB_SZ, sizeof(DEVT *))) == NULL) {
-                paxwarn(1, "Cannot allocate memory for device mapping table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for device mapping table");
+		return(-1);
+	}
 	return(0);
 }
 
@@ -1000,9 +1000,9 @@ atdir_start()
 	if (atab != NULL)
 		return(0);
  	if ((atab = (ATDIR **)calloc(A_TAB_SZ, sizeof(ATDIR *))) == NULL) {
-                paxwarn(1,"Cannot allocate space for directory access time table");
-                return(-1);
-        }
+		paxwarn(1,"Cannot allocate space for directory access time table");
+		return(-1);
+	}
 	return(0);
 }
 
@@ -1390,7 +1390,7 @@ st_hash(name, len, tabsz)
 	 * spread out the keys)
 	 */
 	if (len > MAXKEYLEN) {
-                pt = &(name[len - MAXKEYLEN]);
+		pt = &(name[len - MAXKEYLEN]);
 		len = MAXKEYLEN;
 	} else
 		pt = name;
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index ee84b54cf83..9de1d6f31b3 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_subs.c,v 1.3 1996/06/23 14:20:44 deraadt Exp $	*/
+/*	$OpenBSD: tty_subs.c,v 1.4 1997/07/23 19:16:00 kstailey Exp $	*/
 /*	$NetBSD: tty_subs.c,v 1.5 1995/03/21 09:07:52 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.3 1996/06/23 14:20:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.4 1997/07/23 19:16:00 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,7 +68,7 @@ static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.3 1996/06/23 14:20:44 deraadt Ex
  * routines that deal with I/O to and from the user
  */
 
-#define DEVTTY          "/dev/tty"      /* device for interactive i/o */
+#define DEVTTY		"/dev/tty"	/* device for interactive i/o */
 static FILE *ttyoutf = NULL;		/* output pointing at control tty */
 static FILE *ttyinf = NULL;		/* input pointing at control tty */
 
@@ -88,7 +88,7 @@ tty_init()
 {
 	int ttyfd;
 
-        if ((ttyfd = open(DEVTTY, O_RDWR)) >= 0) {
+	if ((ttyfd = open(DEVTTY, O_RDWR)) >= 0) {
 		if ((ttyoutf = fdopen(ttyfd, "w")) != NULL) {
 			if ((ttyinf = fdopen(ttyfd, "r")) != NULL)
 				return(0);
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index f2048eb9a7c..6cc6a19fb4f 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keyword.c,v 1.6 1997/06/18 18:54:05 kstailey Exp $	*/
+/*	$OpenBSD: keyword.c,v 1.7 1997/07/23 19:18:18 kstailey Exp $	*/
 /*	$NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: keyword.c,v 1.6 1997/06/18 18:54:05 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: keyword.c,v 1.7 1997/07/23 19:18:18 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -366,7 +366,7 @@ findvar(p)
 
 static int
 vcmp(a, b)
-        const void *a, *b;
+	const void *a, *b;
 {
-        return (strcmp(((VAR *)a)->name, ((VAR *)b)->name));
+	return (strcmp(((VAR *)a)->name, ((VAR *)b)->name));
 }
diff --git a/bin/ps/print.c b/bin/ps/print.c
index a874bf82225..2a265a3f067 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.3 1996/12/14 12:18:09 mickey Exp $	*/
+/*	$OpenBSD: print.c,v 1.4 1997/07/23 19:18:19 kstailey Exp $	*/
 /*	$NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #else
-static char rcsid[] = "$OpenBSD: print.c,v 1.3 1996/12/14 12:18:09 mickey Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.4 1997/07/23 19:18:19 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -449,7 +449,7 @@ wchan(k, ve)
 		(void)printf("%-*s", v->width, "-");
 }
 
-#define pgtok(a)        (((a)*getpagesize())/1024)
+#define pgtok(a)	(((a)*getpagesize())/1024)
 
 void
 vsize(k, ve)
@@ -462,7 +462,7 @@ vsize(k, ve)
 	(void)printf("%*d", v->width,
 #ifndef NEWVM
 	    pgtok(KI_PROC(k)->p_dsize +
-	        KI_PROC(k)->p_ssize + KI_EPROC(k)->e_xsize));
+		KI_PROC(k)->p_ssize + KI_EPROC(k)->e_xsize));
 #else
 	    pgtok(KI_EPROC(k)->e_vm.vm_dsize + KI_EPROC(k)->e_vm.vm_ssize +
 		KI_EPROC(k)->e_vm.vm_tsize));
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 4ca458ade0f..31976418d45 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $	*/
-/*	$OpenBSD: rcp.c,v 1.12 1997/06/29 11:10:28 provos Exp $	*/
+/*	$OpenBSD: rcp.c,v 1.13 1997/07/23 19:19:33 kstailey Exp $	*/
 
 /*
  * Copyright (c) 1983, 1990, 1992, 1993
@@ -399,7 +399,7 @@ source(argc, argv)
 	char *last, *name, buf[BUFSIZ];
 
 	for (indx = 0; indx < argc; ++indx) {
-                name = argv[indx];
+		name = argv[indx];
 		if ((fd = open(name, O_RDONLY, 0)) < 0)
 			goto syserr;
 		if (fstat(fd, &stb)) {
@@ -864,7 +864,7 @@ oldw(const char *fmt, ...)
 #else
 oldw(fmt, va_alist)
 	char *fmt;
-        va_dcl
+	va_dcl
 #endif
 {
 	char realm[REALM_SZ];
@@ -890,7 +890,7 @@ run_err(const char *fmt, ...)
 #else
 run_err(fmt, va_alist)
 	char *fmt;
-        va_dcl
+	va_dcl
 #endif
 {
 	static FILE *fp;