From 6057d0d78872a308a8c6df9aa128c54c63186688 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Wed, 16 Oct 2002 18:40:31 +0000
Subject: Fix comment typos; most from NetBSD and FreeBSD

---
 bin/pax/ar_io.c     | 24 ++++++++++++------------
 bin/pax/ar_subs.c   | 14 +++++++-------
 bin/pax/buf_subs.c  | 20 ++++++++++----------
 bin/pax/cpio.c      | 12 ++++++------
 bin/pax/file_subs.c | 28 ++++++++++++++--------------
 bin/pax/ftree.c     |  6 +++---
 bin/pax/getoldopt.c |  6 +++---
 bin/pax/options.c   |  8 ++++----
 bin/pax/pax.c       | 16 ++++++++--------
 bin/pax/pax.h       |  4 ++--
 bin/pax/sel_subs.c  | 10 +++++-----
 bin/pax/tables.c    |  8 ++++----
 bin/pax/tables.h    |  4 ++--
 bin/pax/tar.c       | 10 +++++-----
 14 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 341e0ec0b52..bbd39360434 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_io.c,v 1.27 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: ar_io.c,v 1.28 2002/10/16 18:40:30 millert 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.27 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: ar_io.c,v 1.28 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -73,8 +73,8 @@ static char rcsid[] = "$OpenBSD: ar_io.c,v 1.27 2002/10/16 17:43:10 millert Exp
 #define EXT_MODE	O_RDONLY	/* open mode for list/extract */
 #define AR_MODE		(O_WRONLY | O_CREAT | O_TRUNC)	/* mode for archive */
 #define APP_MODE	O_RDWR		/* mode for append */
-#define STDO		"<STDOUT>"	/* psuedo name for stdout */
-#define STDN		"<STDIN>"	/* psuedo name for stdin */
+#define STDO		"<STDOUT>"	/* pseudo name for stdout */
+#define STDN		"<STDIN>"	/* pseudo name for stdin */
 static int arfd = -1;			/* archive file descriptor */
 static int artyp = ISREG;		/* archive type: file/FIFO/tape */
 static int arvol = 1;			/* archive volume number */
@@ -275,7 +275,7 @@ ar_open(char *name)
 			if ((arsb.st_size % rdblksz) == 0)
 				break;
 		/*
-		 * When we cannont find a match, we may have a flawed archive.
+		 * When we cannot find a match, we may have a flawed archive.
 		 */
 		if (rdblksz <= 0)
 			rdblksz = FILEBLK;
@@ -289,7 +289,7 @@ ar_open(char *name)
 		break;
 	default:
 		/*
-		 * should never happen, worse case, slow...
+		 * should never happen, worst case, slow...
 		 */
 		blksz = rdblksz = BLKMULT;
 		break;
@@ -675,7 +675,7 @@ ar_write(char *buf, int bsz)
 	/*
 	 * Better tell the user the bad news...
 	 * if this is a block aligned archive format, we may have a bad archive
-	 * if the format wants the header to start at a BLKMULT boundry. While
+	 * if the format wants the header to start at a BLKMULT boundary.. While
 	 * we can deal with the mis-aligned data, it violates spec and other
 	 * archive readers will likely fail. if the format is not block
 	 * aligned, the user may be lucky (and the archive is ok).
@@ -743,7 +743,7 @@ ar_rdsync(void)
 		 * if the last i/o was a successful data transfer, we assume
 		 * the fault is just a bad record on the tape that we are now
 		 * past. If we did not get any data since the last resync try
-		 * to move the tape foward one PHYSICAL record past any
+		 * to move the tape forward one PHYSICAL record past any
 		 * damaged tape section. Some tape drives are stubborn and need
 		 * to be pushed.
 		 */
@@ -792,7 +792,7 @@ ar_rdsync(void)
 
 /*
  * ar_fow()
- *	Move the I/O position within the archive foward the specified number of
+ *	Move the I/O position within the archive forward the specified number of
  *	bytes as supported by the device. If we cannot move the requested
  *	number of bytes, return the actual number of bytes moved in skipped.
  * Return:
@@ -811,7 +811,7 @@ ar_fow(off_t sksz, off_t *skipped)
 		return(0);
 
 	/*
-	 * we cannot move foward at EOF or error
+	 * we cannot move forward at EOF or error
 	 */
 	if (lstrval <= 0)
 		return(lstrval);
@@ -820,7 +820,7 @@ ar_fow(off_t sksz, off_t *skipped)
 	 * Safer to read forward on devices where it is hard to find the end of
 	 * the media without reading to it. With tapes we cannot be sure of the
 	 * number of physical blocks to skip (we do not know physical block
-	 * size at this point), so we must only read foward on tapes!
+	 * size at this point), so we must only read forward on tapes!
 	 */
 	if (artyp != ISREG)
 		return(0);
@@ -1044,7 +1044,7 @@ get_phys(void)
 	}
 
 	/*
-	 * read foward to the file mark, then back up in front of the filemark
+	 * read forward to the file mark, then back up in front of the filemark
 	 * (this is a bit paranoid, but should be safe to do).
 	 */
 	while ((res = read(arfd, scbuf, sizeof(scbuf))) > 0)
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 7048c1b942c..594c3db7953 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_subs.c,v 1.19 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: ar_subs.c,v 1.20 2002/10/16 18:40:30 millert 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.19 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.20 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -251,7 +251,7 @@ extract(void)
 		}
 
 		/*
-		 * Non standard -Y and -Z flag. When the exisiting file is
+		 * Non standard -Y and -Z flag. When the existing file is
 		 * same age or newer skip
 		 */
 		if ((Yflag || Zflag) && ((lstat(arcn->name, &sb) == 0))) {
@@ -527,7 +527,7 @@ wr_archive(ARCHD *arcn, int is_app)
 	}
 
 	/*
-	 * tell format to write trailer; pad to block boundry; reset directory
+	 * tell format to write trailer; pad to block boundary; reset directory
 	 * mode/access times, and check if all patterns supplied by the user
 	 * were matched. block off signals to avoid chance for multiple entry
 	 * into the cleanup code
@@ -580,7 +580,7 @@ append(void)
 
 	/*
 	 * Do not allow an append operation if the actual archive is of a
-	 * different format than the user specified foramt.
+	 * different format than the user specified format.
 	 */
 	if (get_arc() < 0)
 		return;
@@ -676,7 +676,7 @@ append(void)
 	lnk_end();
 
 	/*
-	 * try to postion for write, if this fails quit. if any error occurs,
+	 * try to position for write, if this fails quit. if any error occurs,
 	 * we will refuse to write
 	 */
 	if (appnd_start(tlen) < 0)
@@ -858,7 +858,7 @@ copy(void)
 		}
 
 		/*
-		 * Non standard -Y and -Z flag. When the exisiting file is
+		 * Non standard -Y and -Z flag. When the existing file is
 		 * same age or newer skip
 		 */
 		if ((Yflag || Zflag) && ((lstat(arcn->name, &sb) == 0))) {
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 40ddcb3a62f..caa5253f6b9 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf_subs.c,v 1.12 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: buf_subs.c,v 1.13 2002/10/16 18:40:30 millert 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.12 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.13 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -191,13 +191,13 @@ cp_start(void)
  *	the start of the header of the first file added to the archive. The
  *	format specific end read function tells us how many bytes to move
  *	backwards in the archive to be positioned BEFORE the trailer. Two
- *	different postions have to be adjusted, the O.S. file offset (e.g. the
+ *	different position have to be adjusted, the O.S. file offset (e.g. the
  *	position of the tape head) and the write point within the data we have
  *	stored in the read (soon to become write) buffer. We may have to move
  *	back several records (the number depends on the size of the archive
  *	record and the size of the format trailer) to read up the record where
  *	the first byte of the trailer is recorded. Trailers may span (and
- *	overlap) record boundries.
+ *	overlap) record boundaries.
  *	We first calculate which record has the first byte of the trailer. We
  *	move the OS file offset back to the start of this record and read it
  *	up. We set the buffer write pointer to be at this byte (the byte where
@@ -374,7 +374,7 @@ rd_sync(void)
  * pback()
  *	push the data used during the archive id phase back into the I/O
  *	buffer. This is required as we cannot be sure that the header does NOT
- *	overlap a block boundry (as in the case we are trying to recover a
+ *	overlap a block boundary (as in the case we are trying to recover a
  *	flawed archived). This was not designed to be used for any other
  *	purpose. (What software engineering, HA!)
  *	WARNING: do not even THINK of pback greater than BLKMULT, unless the
@@ -391,7 +391,7 @@ pback(char *pt, int cnt)
 
 /*
  * rd_skip()
- *	skip foward in the archive during a archive read. Used to get quickly
+ *	skip forward in the archive during a archive read. Used to get quickly
  *	past file data and padding for files the user did NOT select.
  * Return:
  *	0 if ok, -1 failure, and 1 when EOF on the archive volume was detected.
@@ -405,7 +405,7 @@ rd_skip(off_t skcnt)
 	off_t skipped = 0;
 
 	/*
-	 * consume what data we have in the buffer. If we have to move foward
+	 * consume what data we have in the buffer. If we have to move forward
 	 * whole records, we call the low level skip function to see if we can
 	 * move within the archive without doing the expensive reads on data we
 	 * do not want.
@@ -562,7 +562,7 @@ rd_wrbuf(char *in, int cpcnt)
 
 /*
  * wr_skip()
- *	skip foward during a write. In other words add padding to the file.
+ *	skip forward during a write. In other words add padding to the file.
  *	we add zero filled padding as it makes flawed archives much easier to
  *	recover from. the caller tells us how many bytes of padding to add
  *	This routine was not designed to add HUGE amount of padding, just small
@@ -730,7 +730,7 @@ rd_wrfile(ARCHD *arcn, int ofd, off_t *left)
 	/*
 	 * if the last block has a file hole (all zero), we must make sure this
 	 * gets updated in the file. We force the last block of zeros to be
-	 * written. just closing with the file offset moved foward may not put
+	 * written. just closing with the file offset moved forward may not put
 	 * a hole at the end of the file.
 	 */
 	if (isem && (arcn->sb.st_size > 0L))
@@ -822,7 +822,7 @@ cp_file(ARCHD *arcn, int fd1, int fd2)
 	/*
 	 * if the last block has a file hole (all zero), we must make sure this
 	 * gets updated in the file. We force the last block of zeros to be
-	 * written. just closing with the file offset moved foward may not put
+	 * written. just closing with the file offset moved forward may not put
 	 * a hole at the end of the file.
 	 */
 	if (!no_hole && isem && (arcn->sb.st_size > 0L))
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index ada80487350..616852d2372 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpio.c,v 1.11 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: cpio.c,v 1.12 2002/10/16 18:40:30 millert 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.11 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: cpio.c,v 1.12 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -625,7 +625,7 @@ vcpio_rd(ARCHD *arcn, char *buf)
 		return(-1);
 
 	/*
-	 * skip padding. header + filename is aligned to 4 byte boundries
+	 * skip padding. header + filename is aligned to 4 byte boundaries
 	 */
 	if (rd_skip((off_t)(VCPIO_PAD(sizeof(HD_VCPIO) + nsz))) < 0)
 		return(-1);
@@ -895,7 +895,7 @@ bcpio_rd(ARCHD *arcn, char *buf)
 	hd = (HD_BCPIO *)buf;
 	if (swp_head) {
 		/*
-		 * header has swapped bytes on 16 bit boundries
+		 * header has swapped bytes on 16 bit boundaries
 		 */
 		arcn->sb.st_dev = (dev_t)(RSHRT_EXT(hd->h_dev));
 		arcn->sb.st_ino = (ino_t)(RSHRT_EXT(hd->h_ino));
@@ -940,7 +940,7 @@ bcpio_rd(ARCHD *arcn, char *buf)
 		return(-1);
 
 	/*
-	 * header + file name are aligned to 2 byte boundries, skip if needed
+	 * header + file name are aligned to 2 byte boundaries, skip if needed
 	 */
 	if (rd_skip((off_t)(BCPIO_PAD(sizeof(HD_BCPIO) + nsz))) < 0)
 		return(-1);
@@ -988,7 +988,7 @@ bcpio_endrd(void)
  *	copy the data in the ARCHD to buffer in old binary cpio format
  *	There is a real chance of field overflow with this critter. So we
  *	always check the conversion is ok. nobody in his their right mind
- *	should write an achive in this format...
+ *	should write an archive in this format...
  * Return
  *      0 if file has data to be written after the header, 1 if file has NO
  *	data to write after the header, -1 if archive write failed
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index e1e760ba289..c09ad47dadc 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file_subs.c,v 1.18 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: file_subs.c,v 1.19 2002/10/16 18:40:30 millert Exp $	*/
 /*	$NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: file_subs.c,v 1.18 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: file_subs.c,v 1.19 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -88,12 +88,12 @@ file_creat(ARCHD *arcn)
 	int oerrno;
 
 	/*
-	 * assume file doesn't exist, so just try to create it, most times this
+	 * Assume file doesn't exist, so just try to create it, most times this
 	 * works. We have to take special handling when the file does exist. To
 	 * detect this, we use O_EXCL. For example when trying to create a
 	 * file and a character device or fifo exists with the same name, we
-	 * can accidently open the device by mistake (or block waiting to open)
-	 * If we find that the open has failed, then figure spend the effore to
+	 * can accidently open the device by mistake (or block waiting to open).
+	 * If we find that the open has failed, then spend the effore to
 	 * figure out why. This strategy was found to have better average
 	 * performance in common use than checking the file (and the path)
 	 * first with lstat.
@@ -215,9 +215,9 @@ int
 cross_lnk(ARCHD *arcn)
 {
 	/*
-	 * try to make a link to orginal file (-l flag in copy mode). make sure
-	 * we do not try to link to directories in case we are running as root
-	 * (and it might succeed).
+	 * try to make a link to orginal file (-l flag in copy mode). make
+	 * sure we do not try to link to directories in case we are running as
+	 * root (and it might succeed).
 	 */
 	if (arcn->type == PAX_DIR)
 		return(1);
@@ -600,7 +600,7 @@ chk_path(char *name, uid_t st_uid, gid_t st_gid)
 
 	for(;;) {
 		/*
-		 * work foward from the first / and check each part of the path
+		 * work forward from the first / and check each part of the path
 		 */
 		spt = strchr(spt, '/');
 		if (spt == NULL)
@@ -641,7 +641,7 @@ chk_path(char *name, uid_t st_uid, gid_t st_gid)
 			(void)set_ids(name, st_uid, st_gid);
 
 		/*
-		 * make sure the user doen't have some strange umask that
+		 * make sure the user doesn't have some strange umask that
 		 * causes this newly created directory to be unusable. We fix
 		 * the modes and restore them back to the creation default at
 		 * the end of pax
@@ -659,8 +659,8 @@ chk_path(char *name, uid_t st_uid, gid_t st_gid)
 
 /*
  * set_ftime()
- *	Set the access time and modification time for a named file. If frc is
- *	non-zero we force these times to be set even if the user did not
+ *	Set the access time and modification time for a named file. If frc
+ *	is non-zero we force these times to be set even if the user did not
  *	request access and/or modification time preservation (this is also
  *	used by -t to reset access times).
  *	When ign is zero, only those times the user has asked for are set, the
@@ -781,11 +781,11 @@ set_pmode(char *fnm, mode_t mode)
  *	uses lseek whenever it detects the input data is all 0 within that
  *	file block. In more detail, the strategy is as follows:
  *	While the input is all zero keep doing an lseek. Keep track of when we
- *	pass over file block boundries. Only write when we hit a non zero
+ *	pass over file block boundaries. Only write when we hit a non zero
  *	input. once we have written a file block, we continue to write it to
  *	the end (we stop looking at the input). When we reach the start of the
  *	next file block, start checking for zero blocks again. Working on file
- *	block boundries significantly reduces the overhead when copying files
+ *	block boundaries significantly reduces the overhead when copying files
  *	that are NOT very sparse. This overhead (when compared to a write) is
  *	almost below the measurement resolution on many systems. Without it,
  *	files with holes cannot be safely copied. It does has a side effect as
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index bf335d148d5..dfd317a56fd 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftree.c,v 1.19 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: ftree.c,v 1.20 2002/10/16 18:40:30 millert Exp $	*/
 /*	$NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: ftree.c,v 1.19 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: ftree.c,v 1.20 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -316,7 +316,7 @@ ftree_arg(void)
 		 * watch it, fts wants the file arg stored in a array of char
 		 * ptrs, with the last one a null. we use a two element array
 		 * and set farray[0] to point at the buffer with the file name
-		 * in it. We cannnot pass all the file args to fts at one shot
+		 * in it. We cannot pass all the file args to fts at one shot
 		 * as we need to keep a handle on which file arg generates what
 		 * files (the -n and -d flags need this). If the open is
 		 * successful, return a 0.
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index c9b29d0b29f..ba479cfe2b0 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
+/*	$OpenBSD: getoldopt.c,v 1.5 2002/10/16 18:40:30 millert Exp $	*/
 /*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
 
 /*
@@ -7,11 +7,11 @@
  * otherwise, it uses the old rules used by tar, dump, and ps.
  *
  * Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getoldopt.c,v 1.5 2002/10/16 18:40:30 millert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 93bc64c77f3..47c11597dbc 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.52 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: options.c,v 1.53 2002/10/16 18:40:30 millert 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.52 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.53 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -310,7 +310,7 @@ pax_options(int argc, char **argv)
 					break;
 				case 'p':
 					/*
-					 * preserver file mode bits
+					 * preserve file mode bits
 					 */
 					pmode = 1;
 					break;
@@ -1340,7 +1340,7 @@ bad_opt(void)
  * opt_add()
  *	breaks the value supplied to -o into a option name and value. options
  *	are given to -o in the form -o name-value,name=value
- *	mulltiple -o may be specified.
+ *	multiple -o may be specified.
  * Return:
  *	0 if format in name=value format, -1 if -o is passed junk
  */
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 142dd059c73..cab0b17726d 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pax.c,v 1.20 2002/02/19 19:39:35 millert Exp $	*/
+/*	$OpenBSD: pax.c,v 1.21 2002/10/16 18:40:30 millert 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.20 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: pax.c,v 1.21 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -156,13 +156,13 @@ char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
  *	-U options.
  * 1.10	Files can be selected based on group (group name or gid) via one o
  *	more -G options.
- * 1.11	File modification time can be checked against exisiting file after
+ * 1.11	File modification time can be checked against existing file after
  *	name modification (-Z)
  *
  * 2	WRITE ENHANCEMENTS
  * 2.1	Write operation will stop instead of allowing a user to create a flawed
  *	flawed archive (due to any problem).
- * 2.2	Archives writtens by pax are forced to strictly conform to both the
+ * 2.2	Archives written by pax are forced to strictly conform to both the
  *	archive and pax the spceific format specifications.
  * 2.3	Blocking size and format is rigidly enforced on writes.
  * 2.4	Formats which may exhibit header overflow problems (they have fields
@@ -176,7 +176,7 @@ char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
  * 2.6	A archive volume record limit allows the user to specify the number
  *	of bytes stored on an archive volume. When reached the user is
  *	prompted for the next archive volume. This is specified with the
- *	non-standard -B flag. THe limit is rounded up to the next blocksize.
+ *	non-standard -B flag. The limit is rounded up to the next blocksize.
  * 2.7	All archive padding during write use zero filled sections. This makes
  *	it much easier to pull data out of flawed archive during read
  *	operations.
@@ -211,11 +211,11 @@ char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
  *	more -G options.
  * 3.8	Symlinks which appear on the command line can be followed (without
  *	following other symlinks; -H flag)
- * 3.9  File inode change time can be checked against exisiting file before
+ * 3.9  File inode change time can be checked against existing file before
  *	name modification (-D)
- * 3.10 File inode change time can be checked against exisiting file after
+ * 3.10 File inode change time can be checked against existing file after
  *	name modification (-Y)
- * 3.11	File modification time can be checked against exisiting file after
+ * 3.11	File modification time can be checked against existing file after
  *	name modification (-Z)
  *
  * 4	GENERAL ENHANCEMENTS
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 9e80efd1102..61dea00a78e 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pax.h,v 1.11 2001/05/16 03:04:58 mickey Exp $	*/
+/*	$OpenBSD: pax.h,v 1.12 2002/10/16 18:40:30 millert Exp $	*/
 /*	$NetBSD: pax.h,v 1.3 1995/03/21 09:07:41 cgd Exp $	*/
 
 /*-
@@ -106,7 +106,7 @@ typedef struct {
 	int hlk;		/* does archive store hard links info? if */
 				/* not, we do not bother to look for them */
 				/* during archive write operations */
-	int blkalgn;		/* writes must be aligned to blkalgn boundry */
+	int blkalgn;		/* writes must be aligned to blkalgn boundary */
 	int inhead;		/* is the trailer encoded in a valid header? */
 				/* if not, trailers are assumed to be found */
 				/* in invalid headers (i.e like tar) */
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 1f1137f7718..1f58725a32a 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sel_subs.c,v 1.13 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: sel_subs.c,v 1.14 2002/10/16 18:40:30 millert 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.13 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.14 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -97,8 +97,8 @@ sel_chk(ARCHD *arcn)
  * User/group selection routines
  *
  * Routines to handle user selection of files based on the file uid/gid. To
- * add an entry, the user supplies either then name or the uid/gid starting with
- * a # on the command line. A \# will eascape the #.
+ * add an entry, the user supplies either the name or the uid/gid starting with
+ * a # on the command line. A \# will escape the #.
  */
 
 /*
@@ -528,7 +528,7 @@ trng_match(ARCHD *arcn)
 /*
  * str_sec()
  *	Convert a time string in the format of [[[[[cc]yy]mm]dd]HH]MM[.SS] to
- *	UTC seconds. Tval already has current time loaded into it at entry.
+ *	seconds UTC. Tval already has current time loaded into it at entry.
  * Return:
  *	0 if converted ok, -1 otherwise
  */
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index a5e29f99ce2..cc529be6596 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tables.c,v 1.16 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: tables.c,v 1.17 2002/10/16 18:40:30 millert 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.16 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: tables.c,v 1.17 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -475,7 +475,7 @@ chk_ftime(ARCHD *arcn)
  * Interactive rename table routines
  *
  * The interactive rename table keeps track of the new names that the user
- * assignes to files from tty input. Since this map is unique for each file
+ * assigns to files from tty input. Since this map is unique for each file
  * we must store it in case there is a reference to the file later in archive
  * (a link). Otherwise we will be unable to find the file we know was
  * extracted. The remapping of these files is stored in a memory based hash
@@ -697,7 +697,7 @@ add_dev(ARCHD *arcn)
  *	check for a device value in the device table. If not found and the add
  *	flag is set, it is added. This does NOT assign any mapping values, just
  *	adds the device number as one that need to be remapped. If this device
- *	is alread mapped, just return with a pointer to that entry.
+ *	is already mapped, just return with a pointer to that entry.
  * Return:
  *	pointer to the entry for this device in the device map table. Null
  *	if the add flag is not set and the device is not in the table (it is
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index c22945fb242..be37f3172ea 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tables.h,v 1.3 2001/05/16 03:04:58 mickey Exp $	*/
+/*	$OpenBSD: tables.h,v 1.4 2002/10/16 18:40:30 millert Exp $	*/
 /*	$NetBSD: tables.h,v 1.3 1995/03/21 09:07:47 cgd Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@
 /*
  * Hash Table Sizes MUST BE PRIME, if set too small performance suffers.
  * Probably safe to expect 500000 inodes per tape. Assuming good key
- * distribution (inodes) chains of under 50 long (worse case) is ok.
+ * distribution (inodes) chains of under 50 long (worst case) is ok.
  */
 #define L_TAB_SZ	2503		/* hard link hash table size */
 #define F_TAB_SZ	50503		/* file time hash table size */
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 6bd1bb430a8..3e0dc4e5327 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tar.c,v 1.26 2002/10/16 17:43:10 millert Exp $	*/
+/*	$OpenBSD: tar.c,v 1.27 2002/10/16 18:40:30 millert Exp $	*/
 /*	$NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: tar.c,v 1.26 2002/10/16 17:43:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: tar.c,v 1.27 2002/10/16 18:40:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -257,7 +257,7 @@ uqd_oct(u_quad_t val, char *str, int len, int term)
 /*
  * tar_chksm()
  *	calculate the checksum for a tar block counting the checksum field as
- *	all blanks (BLNKSUM is that value pre-calculated, the sume of 8 blanks).
+ *	all blanks (BLNKSUM is that value pre-calculated, the sum of 8 blanks).
  *	NOTE: we use len to short circuit summing 0's on write since we ALWAYS
  *	pad headers with 0.
  * Return:
@@ -470,7 +470,7 @@ tar_rd(ARCHD *arcn, char *buf)
 		} else {
 			/*
 			 * have a file that will be followed by data. Set the
-			 * skip value to the size field and caluculate the size
+			 * skip value to the size field and calculate the size
 			 * of the padding.
 			 */
 			arcn->type = PAX_REG;
@@ -1065,7 +1065,7 @@ name_split(char *name, int len)
 
 	/*
 	 * we start looking at the biggest sized piece that fits in the name
-	 * field. We walk foward looking for a slash to split at. The idea is
+	 * field. We walk forward looking for a slash to split at. The idea is
 	 * to find the biggest piece to fit in the name field (or the smallest
 	 * prefix we can find)
 	 */
-- 
cgit v1.2.3