Various spelling/formatting changes.

Submitted by: Philippe Charnier <charnier@xp11.frmug.org>

18 files changed, 71 insertions, 71 deletions

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 5289aa7..50551a2 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: ar_io.c,v 1.10 1998/05/15 06:27:34 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -65,8 +65,8 @@ static const char rcsid[] =
 #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 */
@@ -263,7 +263,7 @@ ar_open(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;
@@ -690,7 +690,7 @@ ar_write(buf, 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).
@@ -763,7 +763,7 @@ ar_rdsync()
 		 * 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.
 		 */
@@ -870,7 +870,7 @@ ar_fow(sksz, skipped)
 		if (lseek(arfd, mpos, SEEK_SET) >= 0)
 			return(0);
 	}
-	sys_warn(1, errno, "Foward positioning operation on archive failed");
+	sys_warn(1, errno, "Forward positioning operation on archive failed");
 	lstrval = -1;
 	return(-1);
 }
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index e94cc19..e4bc37b 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: ar_subs.c,v 1.11 1998/05/15 06:27:36 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -254,7 +254,7 @@ extract()
 		}
 
 		/*
-		 * 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))) {
@@ -510,7 +510,7 @@ wr_archive(arcn, 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
@@ -543,7 +543,7 @@ wr_archive(arcn, is_app)
  *	It is really difficult to splice in members without either re-writing
  *	the entire archive (from the point were the old version was), or having
  *	assistance of the format specification in terms of a special update
- *	header that invalidates a previous archive record. The posix spec left
+ *	header that invalidates a previous archive record. The POSIX spec left
  *	the method used to implement -u unspecified. This pax is able to
  *	over write existing files that it creates.
  */
@@ -568,7 +568,7 @@ append()
 
 	/*
 	 * 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;
@@ -664,7 +664,7 @@ append()
 	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)
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 73cc058..cd11bae 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: buf_subs.c,v 1.10 1998/05/15 06:27:37 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -102,7 +102,7 @@ wr_start()
 	if (!wrblksz)
 		wrblksz = frmt->bsz;
 	if (wrblksz > MAXBLK) {
-		pax_warn(1, "Write block size of %d too large, maximium is: %d",
+		pax_warn(1, "Write block size of %d too large, maximum is: %d",
 			wrblksz, MAXBLK);
 		return(-1);
 	}
@@ -147,7 +147,7 @@ rd_start()
 	buf = &(bufmem[BLKMULT]);
 	if ((act == APPND) && wrblksz) {
 		if (wrblksz > MAXBLK) {
-			pax_warn(1,"Write block size %d too large, maximium is: %d",
+			pax_warn(1,"Write block size %d too large, maximum is: %d",
 				wrblksz, MAXBLK);
 			return(-1);
 		}
@@ -609,7 +609,7 @@ rd_wrbuf(in, 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
@@ -799,7 +799,7 @@ rd_wrfile(arcn, ofd, 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))
@@ -899,7 +899,7 @@ cp_file(arcn, fd1, 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/cache.c b/bin/pax/cache.c
index 36a1e87..9c9d95d 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: cache.c,v 1.10 1998/05/15 06:27:37 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -235,7 +235,7 @@ name_uid(uid, frc)
 	if ((pw = getpwuid(uid)) == NULL) {
 		/*
 		 * no match for this uid in the local password file
-		 * a string that is the uid in numberic format
+		 * a string that is the uid in numeric format
 		 */
 		if (ptr == NULL)
 			return("");
@@ -312,7 +312,7 @@ name_gid(gid, frc)
 	if ((gr = getgrgid(gid)) == NULL) {
 		/*
 		 * no match for this gid in the local group file, put in
-		 * a string that is the gid in numberic format
+		 * a string that is the gid in numeric format
 		 */
 		if (ptr == NULL)
 			return("");
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 5c01ef4..7d682a2 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: cache.h,v 1.4 1997/02/22 14:04:22 peter Exp $
  */
 
 /*
@@ -43,7 +43,7 @@
  * caches. Traditional passwd/group cache routines perform quite poorly with
  * archives. The chances of hitting a valid lookup with an archive is quite a
  * bit worse than with files already resident on the file system. These misses
- * create a MAJOR performance cost. To adress this problem, these routines
+ * create a MAJOR performance cost. To address this problem, these routines
  * cache both hits and misses.
  *
  * NOTE:  name lengths must be as large as those stored in ANY PROTOCOL and
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index df6f3f1..96f16f8 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: cpio.c,v 1.10 1998/05/15 06:27:38 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -1012,7 +1012,7 @@ bcpio_rd(arcn, 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));
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 1ddb59d..f712c29 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: file_subs.c,v 1.10 1998/05/15 06:27:39 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -94,7 +94,7 @@ file_creat(arcn)
 	 * 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
+	 * If we find that the open has failed, then figure spend the effort 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.
@@ -235,7 +235,7 @@ cross_lnk(arcn)
 #endif
 {
 	/*
-	 * try to make a link to orginal file (-l flag in copy mode). make sure
+	 * try to make a link to original 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).
 	 */
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index b9f32e3..dde85da 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: ftree.c,v 1.10 1998/05/15 06:27:42 charnier Exp $";
+	"$Id: ftree.c,v 1.11 1998/06/09 03:38:43 imp Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -70,7 +70,7 @@ static const char rcsid[] =
  * pax, they are read from stdin
  */
 
-static FTS *ftsp = NULL;		/* curent FTS handle */
+static FTS *ftsp = NULL;		/* current FTS handle */
 static int ftsopts;			/* options to be used on fts_open */
 static char *farray[2];			/* array for passing each arg to fts */
 static FTREE *fthead = NULL;		/* head of linked list of file args */
@@ -328,7 +328,7 @@ ftree_arg()
 		 * 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.
@@ -515,7 +515,7 @@ next_file(arcn)
 			}
 			/*
 			 * set link name length, watch out readlink does not
-			 * allways NUL terminate the link path
+			 * always NUL terminate the link path
 			 */
 			arcn->ln_name[cnt] = '\0';
 			arcn->ln_nlen = cnt;
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 4022626..c34677a 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: options.c,v 1.11 1998/05/15 06:27:43 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -904,7 +904,7 @@ bad_opt()
  * 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.1 b/bin/pax/pax.1
index a54a013..a5366df 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: pax.1,v 1.7 1998/05/15 06:27:45 charnier Exp $
+.\"	$Id: pax.1,v 1.8 1998/05/31 22:43:57 steve Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -1124,7 +1124,7 @@ standard.
 .Sh AUTHORS
 .An Keith Muller
 at the University of California, San Diego
-.Sh ERRORS
+.Sh DIAGNOSTICS
 .Nm Pax
 will exit with one of the following values:
 .Bl -tag -width 2n
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 4caecf9..bfd1f3d 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -46,7 +46,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: pax.c,v 1.11 1998/05/15 06:27:45 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -143,14 +143,14 @@ sigset_t s_mask;		/* signal mask for cleanup critical sect */
  *	-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
- *	archive and pax the spceific format specifications.
+ * 2.2	Archives written by pax are forced to strictly conform to both the
+ *	archive and pax the specific 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
  *	too small for large file systems, such as inode number storage), use
@@ -163,7 +163,7 @@ sigset_t s_mask;		/* signal mask for cleanup critical sect */
  * 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.
@@ -198,11 +198,11 @@ sigset_t s_mask;		/* signal mask for cleanup critical sect */
  *	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 644f4d1..41ef0bf 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- *	$Id$
+ *	$Id: pax.h,v 1.6 1997/02/22 14:04:40 peter Exp $
  */
 
 /*
@@ -49,7 +49,7 @@
 				/* Don't even think of changing this */
 #define DEVBLK		8192	/* default read blksize for devices */
 #define FILEBLK		10240	/* default read blksize for files */
-#define PAXPATHLEN	3072	/* maximium path length for pax. MUST be */
+#define PAXPATHLEN	3072	/* maximum path length for pax. MUST be */
 				/* longer than the system MAXPATHLEN */
 
 /*
@@ -77,7 +77,7 @@
  * The format specific routine table allows new archive formats to be quickly
  * added. Overall pax operation is independent of the actual format used to
  * form the archive. Only those routines which deal directly with the archive
- * are tailored to the oddities of the specifc format. All other routines are
+ * are tailored to the oddities of the specific format. All other routines are
  * independent of the archive format. Data flow in and out of the format
  * dependent routines pass pointers to ARCHD structure (described below).
  */
@@ -103,7 +103,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) */
@@ -141,7 +141,7 @@ typedef struct {
 				/* a flawed archive header. */
 	int (*end_wr)();	/* end write. write the trailer and do any */
 				/* other format specific functions needed */
-				/* at the ecnd of a archive write */
+				/* at the end of a archive write */
 	int (*trail)();		/* returns 0 if a valid trailer, -1 if not */
 				/* For formats which encode the trailer */
 				/* outside of a valid header, a return value */
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 8c9642b..d707ebf 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: sel_subs.c,v 1.9 1998/05/15 06:27:46 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -73,7 +73,7 @@ static GRPT **grptb = NULL;		/* group selection table */
 
 /*
  * sel_chk()
- *	check if this file matches a specfied uid, gid or time range
+ *	check if this file matches a specified uid, gid or time range
  * Return:
  *	0 if this archive member should be processed, 1 if it should be skipped
  */
@@ -99,7 +99,7 @@ sel_chk(arcn)
  *
  * 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 #.
+ * a # on the command line. A \# will escape the #.
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 11d4d64..f711af6 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: tables.c,v 1.11 1998/05/15 06:27:46 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -61,13 +61,13 @@ static const char rcsid[] =
  * keeps. Tables are dynamically created only when they are needed. The
  * goal was speed and the ability to work with HUGE archives. The databases
  * were kept simple, but do have complex rules for when the contents change.
- * As of this writing, the posix library functions were more complex than
+ * As of this writing, the POSIX library functions were more complex than
  * needed for this application (pax databases have very short lifetimes and
  * do not survive after pax is finished). Pax is required to handle very
  * large archives. These database routines carefully combine memory usage and
  * temporary file storage in ways which will not significantly impact runtime
  * performance while allowing the largest possible archives to be handled.
- * Trying to force the fit to the posix databases routines was not considered
+ * Trying to force the fit to the POSIX databases routines was not considered
  * time well spent.
  */
 
@@ -508,7 +508,7 @@ chk_ftime(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
@@ -762,7 +762,7 @@ add_dev(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 5c20776..a7c73be 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: tables.h,v 1.5 1997/02/22 14:04:44 peter Exp $
  */
 
 /*
@@ -80,7 +80,7 @@ typedef struct hrdlnk {
 typedef struct ftm {
 	int		namelen;	/* file name length */
 	time_t		mtime;		/* files last modification time */
-	off_t		seek;		/* loacation in scratch file */
+	off_t		seek;		/* location in scratch file */
 	struct ftm	*fow;
 } FTM;
 
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index ba8c6b0..97a731a 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: tar.c,v 1.10 1998/05/15 06:27:47 charnier Exp $";
+	"$Id: tar.c,v 1.11 1998/10/20 05:52:33 msmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -289,7 +289,7 @@ uqd_oct(val, str, len, 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:
@@ -308,7 +308,7 @@ tar_chksm(blk, len)
 {
 	register char *stop;
 	register char *pt;
-	u_long chksm = BLNKSUM;	/* inital value is checksum field sum */
+	u_long chksm = BLNKSUM;	/* initial value is checksum field sum */
 
 	/*
 	 * add the part of the block before the checksum field
@@ -517,7 +517,7 @@ tar_rd(arcn, 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;
@@ -848,7 +848,7 @@ ustar_rd(arcn, buf)
 	 * If we can find the ascii names for gname and uname in the password
 	 * and group files we will use the uid's and gid they bind. Otherwise
 	 * we use the uid and gid values stored in the header. (This is what
-	 * the posix spec wants).
+	 * the POSIX spec wants).
 	 */
 	hd->gname[sizeof(hd->gname) - 1] = '\0';
 	if (gid_name(hd->gname, &(arcn->sb.st_gid)) < 0)
@@ -1161,7 +1161,7 @@ name_split(name, 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)
 	 */
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 5533a07..be24450 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- *	$Id$
+ *	$Id: tar.h,v 1.4 1997/02/22 14:04:46 peter Exp $
  */
 
 /*
@@ -45,13 +45,13 @@
 #define TNMSZ		100		/* size of name field */
 #ifdef _PAX_
 #define NULLCNT		2		/* number of null blocks in trailer */
-#define CHK_OFFSET	148		/* start of chksum field */
+#define CHK_OFFSET	148		/* start of checksum field */
 #define BLNKSUM		256L		/* sum of checksum field using ' ' */
 #endif /* _PAX_ */
 
 /*
  * Values used in typeflag field in all tar formats
- * (only REGTYPE, LNKTYPE and SYMTYPE are used in old bsd tar headers)
+ * (only REGTYPE, LNKTYPE and SYMTYPE are used in old BSD tar headers)
  */
 #define	REGTYPE		'0'		/* Regular File */
 #define	AREGTYPE	'\0'		/* Regular File */
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index c862116..53017b8 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: tty_subs.c,v 1.9 1998/05/15 06:27:48 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -68,7 +68,7 @@ static FILE *ttyinf = NULL;		/* input pointing at control tty */
 
 /*
  * tty_init()
- *	try to open the controlling termina (if any) for this process. if the
+ *	try to open the controlling terminal (if any) for this process. if the
  *	open fails, future ops that require user input will get an EOF
  */