summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/pax/ar_io.c20
-rw-r--r--bin/pax/ar_subs.c9
-rw-r--r--bin/pax/buf_subs.c8
-rw-r--r--bin/pax/cpio.c6
-rw-r--r--bin/pax/file_subs.c6
-rw-r--r--bin/pax/options.c6
-rw-r--r--bin/pax/pat_rep.c10
-rw-r--r--bin/pax/tables.c24
8 files changed, 45 insertions, 44 deletions
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 7c631058deb..c44cbafb0c6 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_io.c,v 1.31 2002/11/29 09:27:34 deraadt Exp $ */
+/* $OpenBSD: ar_io.c,v 1.32 2003/02/03 09:06:42 jmc Exp $ */
/* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.31 2002/11/29 09:27:34 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.32 2003/02/03 09:06:42 jmc Exp $";
#endif
#endif /* not lint */
@@ -209,8 +209,8 @@ ar_open(const char *name)
/*
* set default blksz on read. APPNDs writes rdblksz on the last volume
* On all new archive volumes, we shift to wrblksz (if the user
- * specified one, otherwize we will continue to use rdblksz). We
- * must to set blocksize based on what kind of device the archive is
+ * specified one, otherwise we will continue to use rdblksz). We
+ * must set blocksize based on what kind of device the archive is
* stored.
*/
switch(artyp) {
@@ -541,10 +541,10 @@ ar_read(char *buf, int cnt)
io_ok = 1;
if (res != rdblksz) {
/*
- * Record size changed. If this is happens on
+ * Record size changed. If this happens on
* any record after the first, we probably have
* a tape drive which has a fixed record size
- * we are getting multiple records in a single
+ * (we are getting multiple records in a single
* read). Watch out for record blocking that
* violates pax spec (must be a multiple of
* BLKMULT).
@@ -724,7 +724,7 @@ ar_rdsync(void)
struct mtop mb;
/*
- * Fail resync attempts at user request (done) or this is going to be
+ * Fail resync attempts at user request (done) or if this is going to be
* an update/append to a existing archive. if last i/o hit media end,
* we need to go to the next volume not try a resync
*/
@@ -906,8 +906,8 @@ ar_rev(off_t sksz)
/*
* we may try to go backwards past the start when the archive
- * is only a single record. If this hapens and we are on a
- * multi volume archive, we need to go to the end of the
+ * is only a single record. If this happens and we are on a
+ * multi-volume archive, we need to go to the end of the
* previous volume and continue our movement backwards from
* there.
*/
@@ -933,7 +933,7 @@ ar_rev(off_t sksz)
* Calculate and move the proper number of PHYSICAL tape
* blocks. If the sksz is not an even multiple of the physical
* tape size, we cannot do the move (this should never happen).
- * (We also cannot handler trailers spread over two vols).
+ * (We also cannot handle trailers spread over two vols.)
* get_phys() also makes sure we are in front of the filemark.
*/
if ((phyblk = get_phys()) <= 0) {
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index a17366f5f8d..f152ac06eeb 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_subs.c,v 1.22 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: ar_subs.c,v 1.23 2003/02/03 09:06:43 jmc Exp $ */
/* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.22 2002/10/18 15:38:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.23 2003/02/03 09:06:43 jmc Exp $";
#endif
#endif /* not lint */
@@ -228,7 +228,7 @@ extract(void)
/*
* with -u or -D only extract when the archive member is newer
- * than the file with the same name in the file system (nos
+ * than the file with the same name in the file system (no
* test of being the same type is required).
* NOTE: this test is done BEFORE name modifications as
* specified by pax. this operation can be confusing to the
@@ -413,7 +413,8 @@ wr_archive(ARCHD *arcn, int is_app)
return;
/*
- * if this not append, and there are no files, we do no write a trailer
+ * if this is not append, and there are no files, we do not write a
+ * trailer
*/
wr_one = is_app;
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index f89bdcee2c8..99256d74f7f 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_subs.c,v 1.15 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: buf_subs.c,v 1.16 2003/02/03 09:06:43 jmc Exp $ */
/* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.15 2002/10/18 15:38:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.16 2003/02/03 09:06:43 jmc Exp $";
#endif
#endif /* not lint */
@@ -205,9 +205,9 @@ cp_start(void)
* start of this record so a flush of this buffer will replace the record
* in the archive.
* A major problem is rewriting this last record. For archives stored
- * on disk files, this is trival. However, many devices are really picky
+ * on disk files, this is trivial. However, many devices are really picky
* about the conditions under which they will allow a write to occur.
- * Often devices restrict the conditions where writes can be made writes,
+ * Often devices restrict the conditions where writes can be made,
* so it may not be feasable to append archives stored on all types of
* devices.
* Return:
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 09dafaaae9f..88fb8fbbb7a 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpio.c,v 1.13 2002/10/16 19:20:02 millert Exp $ */
+/* $OpenBSD: cpio.c,v 1.14 2003/02/03 09:06:43 jmc Exp $ */
/* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: cpio.c,v 1.13 2002/10/16 19:20:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cpio.c,v 1.14 2003/02/03 09:06:43 jmc Exp $";
#endif
#endif /* not lint */
@@ -987,7 +987,7 @@ bcpio_endrd(void)
* bcpio_wr()
* 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
+ * always check the conversion is ok. nobody in their right mind
* should write an archive in this format...
* Return
* 0 if file has data to be written after the header, 1 if file has NO
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 7286def7ccd..cee93e1d0aa 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file_subs.c,v 1.21 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: file_subs.c,v 1.22 2003/02/03 09:06:43 jmc Exp $ */
/* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.21 2002/10/18 15:38:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.22 2003/02/03 09:06:43 jmc Exp $";
#endif
#endif /* not lint */
@@ -93,7 +93,7 @@ file_creat(ARCHD *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 spend the effore to
+ * If we find that the open has failed, then 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.
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 7e4f0a7f82e..d1298a7e2fd 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.55 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: options.c,v 1.56 2003/02/03 09:06:43 jmc Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: options.c,v 1.55 2002/10/18 15:38:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: options.c,v 1.56 2003/02/03 09:06:43 jmc Exp $";
#endif
#endif /* not lint */
@@ -142,7 +142,7 @@ FSUB fsub[] = {
/*
* ford is the archive search order used by get_arc() to determine what kind
- * of archive we are dealing with. This helps to properly id archive formats
+ * of archive we are dealing with. This helps to properly id archive formats
* some formats may be subsets of others....
*/
int ford[] = {5, 4, 3, 2, 1, 0, -1 };
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 91fa6b7f955..dd8ed24a614 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pat_rep.c,v 1.23 2002/11/29 20:15:43 deraadt Exp $ */
+/* $OpenBSD: pat_rep.c,v 1.24 2003/02/03 09:06:43 jmc Exp $ */
/* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.23 2002/11/29 20:15:43 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.24 2003/02/03 09:06:43 jmc Exp $";
#endif
#endif /* not lint */
@@ -294,8 +294,8 @@ pat_chk(void)
*
* NOTE: When the -c option is used, we are called when there was no match
* by pat_match() (that means we did match before the inverted sense of
- * the logic). Now this seems really strange at first, but with -c we
- * need to keep track of those patterns that cause a archive member to NOT
+ * the logic). Now this seems really strange at first, but with -c we
+ * need to keep track of those patterns that cause an archive member to NOT
* be selected (it found an archive member with a specified pattern)
* Return:
* 0 if the pattern pointed at by arcn->pat was tagged as creating a
@@ -385,7 +385,7 @@ pat_sel(ARCHD *arcn)
* we are then done with this pattern, so we delete it from the list
* because it can never be used for another match.
* Seems kind of strange to do for a -c, but the pax spec is really
- * vague on the interaction of -c -n and -d. We assume that when -c
+ * vague on the interaction of -c, -n and -d. We assume that when -c
* and the pattern rejects a member (i.e. it matched it) it is done.
* In effect we place the order of the flags as having -c last.
*/
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index f6ff451b04e..6e6b02c3951 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.c,v 1.18 2002/10/16 19:20:02 millert Exp $ */
+/* $OpenBSD: tables.c,v 1.19 2003/02/03 09:06:43 jmc Exp $ */
/* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static const char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: tables.c,v 1.18 2002/10/16 19:20:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: tables.c,v 1.19 2003/02/03 09:06:43 jmc Exp $";
#endif
#endif /* not lint */
@@ -71,7 +71,7 @@ static const char rcsid[] = "$OpenBSD: tables.c,v 1.18 2002/10/16 19:20:02 mille
* 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 database routines was not considered
* time well spent.
*/
@@ -313,14 +313,14 @@ lnk_end(void)
* An append with an -u must read the archive and store the modification time
* for every file on that archive before starting the write phase. It is clear
* that this is one HUGE database. To save memory space, the actual file names
- * are stored in a scatch file and indexed by an in memory hash table. The
+ * are stored in a scratch file and indexed by an in-memory hash table. The
* hash table is indexed by hashing the file path. The nodes in the table store
* the length of the filename and the lseek offset within the scratch file
- * where the actual name is stored. Since there are never any deletions to this
- * table, fragmentation of the scratch file is never a issue. Lookups seem to
- * not exhibit any locality at all (files in the database are rarely
- * looked up more than once...). So caching is just a waste of memory. The
- * only limitation is the amount of scatch file space available to store the
+ * where the actual name is stored. Since there are never any deletions from
+ * this table, fragmentation of the scratch file is never a issue. Lookups
+ * seem to not exhibit any locality at all (files in the database are rarely
+ * looked up more than once...), so caching is just a waste of memory. The
+ * only limitation is the amount of scratch file space available to store the
* path names.
*/
@@ -884,14 +884,14 @@ map_dev(ARCHD *arcn, u_long dev_mask, u_long ino_mask)
/*
* directory access/mod time reset table routines (for directories READ by pax)
*
- * The pax -t flag requires that access times of archive files to be the same
+ * The pax -t flag requires that access times of archive files be the same
* before being read by pax. For regular files, access time is restored after
* the file has been copied. This database provides the same functionality for
* directories read during file tree traversal. Restoring directory access time
* is more complex than files since directories may be read several times until
* all the descendants in their subtree are visited by fts. Directory access
* and modification times are stored during the fts pre-order visit (done
- * before any descendants in the subtree is visited) and restored after the
+ * before any descendants in the subtree are visited) and restored after the
* fts post-order visit (after all the descendants have been visited). In the
* case of premature exit from a subtree (like from the effects of -n), any
* directory entries left in this database are reset during final cleanup
@@ -970,7 +970,7 @@ add_atdir(char *fname, dev_t dev, ino_t ino, time_t mtime, time_t atime)
* return (the older entry always has the correct time). The only
* way this will happen is when the same subtree can be traversed by
* different args to pax and the -n option is aborting fts out of a
- * subtree before all the post-order visits have been made).
+ * subtree before all the post-order visits have been made.
*/
indx = ((unsigned)ino) % A_TAB_SZ;
if ((pt = atab[indx]) != NULL) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 14:21:40 +0000