Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/bin/pax Fix various spelling, grammar, and punctuation probl...
details: https://anonhg.NetBSD.org/src/rev/435dec917c3c
branches: trunk
changeset: 542597:435dec917c3c
user: wiz <wiz%NetBSD.org@localhost>
date: Sun Feb 02 10:21:13 2003 +0000
description:
Fix various spelling, grammar, and punctuation problems in comments, from Sergey Svishchev in PR 20164.
diffstat:
bin/pax/ar_io.c | 20 ++++++++++----------
bin/pax/ar_subs.c | 10 +++++-----
bin/pax/buf_subs.c | 10 +++++-----
bin/pax/cpio.c | 6 +++---
bin/pax/file_subs.c | 6 +++---
bin/pax/options.c | 6 +++---
bin/pax/pat_rep.c | 10 +++++-----
bin/pax/sel_subs.c | 6 +++---
bin/pax/tables.c | 18 +++++++++---------
9 files changed, 46 insertions(+), 46 deletions(-)
diffs (truncated from 379 to 300 lines):
diff -r 2133b92ef2a7 -r 435dec917c3c bin/pax/ar_io.c
--- a/bin/pax/ar_io.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/ar_io.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_io.c,v 1.30 2002/12/12 05:00:42 christos Exp $ */
+/* $NetBSD: ar_io.c,v 1.31 2003/02/02 10:21:13 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_io.c,v 1.30 2002/12/12 05:00:42 christos Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.31 2003/02/02 10:21:13 wiz Exp $");
#endif
#endif /* not lint */
@@ -257,7 +257,7 @@
* 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
+ * must set blocksize based on what kind of device the archive is
* stored.
*/
switch(artyp) {
@@ -337,7 +337,7 @@
break;
default:
/*
- * should never happen, worse case, slow...
+ * should never happen, worst case, slow...
*/
blksz = rdblksz = BLKMULT;
break;
@@ -747,10 +747,10 @@
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).
@@ -936,7 +936,7 @@
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
*/
@@ -1137,8 +1137,8 @@
/*
* 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.
*/
@@ -1168,7 +1168,7 @@
* 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 -r 2133b92ef2a7 -r 435dec917c3c bin/pax/ar_subs.c
--- a/bin/pax/ar_subs.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/ar_subs.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_subs.c,v 1.21 2002/12/10 18:33:26 christos Exp $ */
+/* $NetBSD: ar_subs.c,v 1.22 2003/02/02 10:21:13 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_subs.c,v 1.21 2002/12/10 18:33:26 christos Exp $");
+__RCSID("$NetBSD: ar_subs.c,v 1.22 2003/02/02 10:21:13 wiz Exp $");
#endif
#endif /* not lint */
@@ -79,7 +79,7 @@
/*
* list()
* list the contents of an archive which match user supplied pattern(s)
- * (no pattern matches all).
+ * (if no pattern is supplied, list entire contents).
*/
void
@@ -234,7 +234,7 @@
/*
* 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
@@ -420,7 +420,7 @@
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 no write a trailer
*/
wr_one = is_app;
diff -r 2133b92ef2a7 -r 435dec917c3c bin/pax/buf_subs.c
--- a/bin/pax/buf_subs.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/buf_subs.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf_subs.c,v 1.17 2002/01/31 19:27:53 tv Exp $ */
+/* $NetBSD: buf_subs.c,v 1.18 2003/02/02 10:21:13 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: buf_subs.c,v 1.17 2002/01/31 19:27:53 tv Exp $");
+__RCSID("$NetBSD: buf_subs.c,v 1.18 2003/02/02 10:21:13 wiz Exp $");
#endif
#endif /* not lint */
@@ -203,9 +203,9 @@
* 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:
@@ -351,7 +351,7 @@
/*
* Oh well, yet another failed read...
- * if error limit reached, ditch. o.w. poke device to move past
+ * if error limit reached, ditch. otherwise poke device to move past
* bad media and try again. if media is badly damaged, we ask
* the poor (and upset user at this point) for the next archive
* volume. remember the goal on reads is to get the most we
diff -r 2133b92ef2a7 -r 435dec917c3c bin/pax/cpio.c
--- a/bin/pax/cpio.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/cpio.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpio.c,v 1.13 2002/02/11 10:57:57 wiz Exp $ */
+/* $NetBSD: cpio.c,v 1.14 2003/02/02 10:21:13 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: cpio.c,v 1.13 2002/02/11 10:57:57 wiz Exp $");
+__RCSID("$NetBSD: cpio.c,v 1.14 2003/02/02 10:21:13 wiz Exp $");
#endif
#endif /* not lint */
@@ -967,7 +967,7 @@
* 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 -r 2133b92ef2a7 -r 435dec917c3c bin/pax/file_subs.c
--- a/bin/pax/file_subs.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/file_subs.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: file_subs.c,v 1.29 2003/01/20 05:29:54 simonb Exp $ */
+/* $NetBSD: file_subs.c,v 1.30 2003/02/02 10:21:14 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: file_subs.c,v 1.29 2003/01/20 05:29:54 simonb Exp $");
+__RCSID("$NetBSD: file_subs.c,v 1.30 2003/02/02 10:21:14 wiz Exp $");
#endif
#endif /* not lint */
@@ -94,7 +94,7 @@
* 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 effort 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 -r 2133b92ef2a7 -r 435dec917c3c bin/pax/options.c
--- a/bin/pax/options.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/options.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.60 2003/01/19 01:13:46 wiz Exp $ */
+/* $NetBSD: options.c,v 1.61 2003/02/02 10:21:14 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: options.c,v 1.60 2003/01/19 01:13:46 wiz Exp $");
+__RCSID("$NetBSD: options.c,v 1.61 2003/02/02 10:21:14 wiz Exp $");
#endif
#endif /* not lint */
@@ -168,7 +168,7 @@
/*
* 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[] = {F_USTAR, F_TAR, F_SV4CRC, F_SV4CPIO, F_CPIO, F_BCPIO, -1};
diff -r 2133b92ef2a7 -r 435dec917c3c bin/pax/pat_rep.c
--- a/bin/pax/pat_rep.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/pat_rep.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pat_rep.c,v 1.17 2002/11/29 04:54:48 rafal Exp $ */
+/* $NetBSD: pat_rep.c,v 1.18 2003/02/02 10:21:14 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: pat_rep.c,v 1.17 2002/11/29 04:54:48 rafal Exp $");
+__RCSID("$NetBSD: pat_rep.c,v 1.18 2003/02/02 10:21:14 wiz Exp $");
#endif
#endif /* not lint */
@@ -190,7 +190,7 @@
*pt2 = '\0';
- /* Make sure to dup replacement, who know where it came from! */
+ /* Make sure to dup replacement, who knows where it came from! */
if ((rep->nstr = strdup(pt1)) == NULL) {
#ifdef NET2_REGEX
(void)free((char *)rep->rcmp);
@@ -331,7 +331,7 @@
*
* 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
+ * 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
* be selected (it found an archive member with a specified pattern)
* Return:
@@ -422,7 +422,7 @@
* 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 -r 2133b92ef2a7 -r 435dec917c3c bin/pax/sel_subs.c
--- a/bin/pax/sel_subs.c Sun Feb 02 09:57:51 2003 +0000
+++ b/bin/pax/sel_subs.c Sun Feb 02 10:21:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sel_subs.c,v 1.15 2002/01/31 19:27:54 tv Exp $ */
+/* $NetBSD: sel_subs.c,v 1.16 2003/02/02 10:21:14 wiz Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
Home |
Main Index |
Thread Index |
Old Index