Module Name: src
Committed By: gutteridge
Date: Wed Mar 20 03:13:39 UTC 2019
Modified Files:
src/bin/pax: file_subs.c tar.c
Log Message:
pax: fix typos in comments in file_subs.c & tar.c
Stamp out "greengrocers' apostrophes" in various places (arguably there
are still more present, but style guides vary on that, and my energies
spent corralling wayward punctuation marks could be spent elsewhere).
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/bin/pax/file_subs.c
cvs rdiff -u -r1.74 -r1.75 src/bin/pax/tar.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/file_subs.c
diff -u src/bin/pax/file_subs.c:1.63 src/bin/pax/file_subs.c:1.64
--- src/bin/pax/file_subs.c:1.63 Mon Jul 29 17:46:36 2013
+++ src/bin/pax/file_subs.c Wed Mar 20 03:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: file_subs.c,v 1.63 2013/07/29 17:46:36 christos Exp $ */
+/* $NetBSD: file_subs.c,v 1.64 2019/03/20 03:13:39 gutteridge 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.63 2013/07/29 17:46:36 christos Exp $");
+__RCSID("$NetBSD: file_subs.c,v 1.64 2019/03/20 03:13:39 gutteridge Exp $");
#endif
#endif /* not lint */
@@ -895,7 +895,7 @@ set_chflags(char *fnm, u_int32_t flags)
* actual storage is quite small (the files are sparse). The problem is
* the holes read as all zeros so are probably stored on the archive that
* way (there is no way to determine if the file block is really a hole,
- * we only know that a file block of all zero's can be a hole).
+ * we only know that a file block of all zeros can be a hole).
* At this writing, no major archive format knows how to archive files
* with holes. However, on extraction (or during copy, -rw) we have to
* deal with these files. Without detecting the holes, the files can
@@ -968,7 +968,7 @@ file_write(int fd, char *str, int cnt, i
if (*isempt) {
/*
* have not written to this block yet, so we keep
- * looking for zero's
+ * looking for zeros
*/
pt = st;
end = st + wcnt;
Index: src/bin/pax/tar.c
diff -u src/bin/pax/tar.c:1.74 src/bin/pax/tar.c:1.75
--- src/bin/pax/tar.c:1.74 Fri Nov 30 00:53:11 2018
+++ src/bin/pax/tar.c Wed Mar 20 03:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tar.c,v 1.74 2018/11/30 00:53:11 christos Exp $ */
+/* $NetBSD: tar.c,v 1.75 2019/03/20 03:13:39 gutteridge Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: tar.c,v 1.74 2018/11/30 00:53:11 christos Exp $");
+__RCSID("$NetBSD: tar.c,v 1.75 2019/03/20 03:13:39 gutteridge Exp $");
#endif
#endif /* not lint */
@@ -351,7 +351,7 @@ tar_chksm(char *blk, int len)
* checksum field as the sum of 8 blanks (which is pre-computed as
* BLNKSUM).
* ASSUMED: len is greater than CHK_OFFSET. (len is where our 0 padding
- * starts, no point in summing zero's)
+ * starts, no point in summing zeros)
*/
pt += CHK_LEN;
stop = blk + len;
@@ -368,7 +368,7 @@ tar_chksm(char *blk, int len)
* tar_id()
* determine if a block given to us is a valid tar header (and not a USTAR
* header). We have to be on the lookout for those pesky blocks of all
- * zero's.
+ * zeros.
* Return:
* 0 if a tar header, -1 otherwise
*/
@@ -386,7 +386,7 @@ tar_id(char *blk, int size)
uhd = (HD_USTAR *)blk;
/*
- * check for block of zero's first, a simple and fast test, then make
+ * check for block of zeros first, a simple and fast test, then make
* sure this is not a ustar header by looking for the ustar magic
* cookie. We should use TMAGLEN, but some USTAR archive programs are
* wrong and create archives missing the \0. Last we check the
@@ -769,7 +769,7 @@ ustar_stwr(void)
/*
* ustar_id()
* determine if a block given to us is a valid ustar header. We have to
- * be on the lookout for those pesky blocks of all zero's
+ * be on the lookout for those pesky blocks of all zeros
* Return:
* 0 if a ustar header, -1 otherwise
*/
@@ -784,7 +784,7 @@ ustar_id(char *blk, int size)
hd = (HD_USTAR *)blk;
/*
- * check for block of zero's first, a simple and fast test then check
+ * check for block of zeros first, a simple and fast test then check
* ustar magic cookie. We should use TMAGLEN, but some USTAR archive
* programs are fouled up and create archives missing the \0. Last we
* check the checksum. If ok we have to assume it is a valid header.
@@ -1379,7 +1379,7 @@ tar_gnutar_exclude_one(const char *line,
}
/*
- * deal with GNU tar -X/--exclude-from & --exclude switchs. basically,
+ * deal with GNU tar -X/--exclude-from & --exclude switches. basically,
* we go through each line of the file, building a string from the "glob"
* lines in the file into RE lines, of the form `/^RE$//', which we pass
* to rep_add(), which will add a empty replacement (exclusion), for the
