summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2003-10-20 06:22:28 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2003-10-20 06:22:28 +0000
commit6fc855659d4e17c040b0029728fd1c1eb9c1fccd (patch)
treef3f97d3a63192b4cf281035c580d4006094991e1
parent848f115f2011b4a30f47fc093e6f530cb4fbd9d9 (diff)
typos from Jared Yanovich;
-rw-r--r--bin/pax/buf_subs.c8
-rw-r--r--bin/pax/cache.c6
-rw-r--r--bin/pax/cache.h4
-rw-r--r--bin/pax/file_subs.c8
-rw-r--r--bin/pax/ftree.c6
-rw-r--r--bin/pax/pax.c12
-rw-r--r--bin/pax/pax.h8
-rw-r--r--bin/pax/sel_subs.c6
-rw-r--r--bin/pax/tables.h4
9 files changed, 31 insertions, 31 deletions
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 8d7edb9db96..ab8794e9d96 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_subs.c,v 1.17 2003/06/02 23:32:08 millert Exp $ */
+/* $OpenBSD: buf_subs.c,v 1.18 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */
/*-
@@ -38,7 +38,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.17 2003/06/02 23:32:08 millert Exp $";
+static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.18 2003/10/20 06:22:27 jmc Exp $";
#endif
#endif /* not lint */
@@ -204,7 +204,7 @@ cp_start(void)
* 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,
- * so it may not be feasable to append archives stored on all types of
+ * so it may not be feasible to append archives stored on all types of
* devices.
* Return:
* 0 for success, -1 for failure
@@ -458,7 +458,7 @@ rd_skip(off_t skcnt)
* wr_fin()
* flush out any data (and pad if required) the last block. We always pad
* with zero (even though we do not have to). Padding with 0 makes it a
- * lot easier to recover if the archive is damaged. zero paddding SHOULD
+ * lot easier to recover if the archive is damaged. zero padding SHOULD
* BE a requirement....
*/
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 3508267caa4..aa2170edebc 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cache.c,v 1.15 2003/08/08 01:39:52 millert Exp $ */
+/* $OpenBSD: cache.c,v 1.16 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: cache.c,v 1.15 2003/08/08 01:39:52 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cache.c,v 1.16 2003/10/20 06:22:27 jmc Exp $";
#endif
#endif /* not lint */
@@ -209,7 +209,7 @@ name_uid(uid_t uid, int 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("");
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index a5b1314bbdc..5c7b9b8b5f3 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cache.h,v 1.3 2003/06/02 23:32:08 millert Exp $ */
+/* $OpenBSD: cache.h,v 1.4 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: cache.h,v 1.3 1995/03/21 09:07:12 cgd Exp $ */
/*-
@@ -41,7 +41,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/file_subs.c b/bin/pax/file_subs.c
index 1464a9e4151..f1765f0f5c2 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file_subs.c,v 1.24 2003/08/06 21:08:05 millert Exp $ */
+/* $OpenBSD: file_subs.c,v 1.25 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */
/*-
@@ -38,7 +38,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.24 2003/08/06 21:08:05 millert Exp $";
+static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.25 2003/10/20 06:22:27 jmc Exp $";
#endif
#endif /* not lint */
@@ -211,7 +211,7 @@ int
cross_lnk(ARCHD *arcn)
{
/*
- * try to make a link to orginal file (-l flag in copy mode). make
+ * 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).
*/
@@ -996,7 +996,7 @@ set_crc(ARCHD *arcn, int fd)
/*
* safety check. we want to avoid archiving files that are active as
- * they can create inconsistant archive copies.
+ * they can create inconsistent archive copies.
*/
if (cpcnt != arcn->sb.st_size)
paxwarn(1, "File changed size %s", arcn->org_name);
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 3107867934c..44828263153 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftree.c,v 1.23 2003/06/13 17:51:14 millert Exp $ */
+/* $OpenBSD: ftree.c,v 1.24 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: ftree.c,v 1.23 2003/06/13 17:51:14 millert Exp $";
+static const char rcsid[] = "$OpenBSD: ftree.c,v 1.24 2003/10/20 06:22:27 jmc Exp $";
#endif
#endif /* not lint */
@@ -70,7 +70,7 @@ static const char rcsid[] = "$OpenBSD: ftree.c,v 1.23 2003/06/13 17:51:14 miller
* 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 */
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 098b10ad18c..12c81c6a029 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.c,v 1.24 2003/06/13 17:51:14 millert Exp $ */
+/* $OpenBSD: pax.c,v 1.25 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */
/*-
@@ -44,7 +44,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: pax.c,v 1.24 2003/06/13 17:51:14 millert Exp $";
+static const char rcsid[] = "$OpenBSD: pax.c,v 1.25 2003/10/20 06:22:27 jmc Exp $";
#endif
#endif /* not lint */
@@ -89,8 +89,8 @@ int Dflag; /* same as uflag except inode change time */
int Hflag; /* follow command line symlinks (write only) */
int Lflag; /* follow symlinks when writing */
int Xflag; /* archive files with same device id only */
-int Yflag; /* same as Dflg except after name mode */
-int Zflag; /* same as uflg except after name mode */
+int Yflag; /* same as Dflag except after name mode */
+int Zflag; /* same as uflag except after name mode */
int zeroflag; /* use \0 as pathname terminator */
int vfpart; /* is partial verbose output in progress */
int patime = 1; /* preserve file access time */
@@ -160,7 +160,7 @@ char *tempbase; /* basename of tempfile to use for mkstemp(3) */
* 2.1 Write operation will stop instead of allowing a user to create a flawed
* flawed archive (due to any problem).
* 2.2 Archives written by pax are forced to strictly conform to both the
- * archive and pax the spceific format specifications.
+ * 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
@@ -384,7 +384,7 @@ gen_init(void)
/*
* signal handling to reset stored directory times and modes. Since
* we deal with broken pipes via failed writes we ignore it. We also
- * deal with any file size limit thorugh failed writes. Cpu time
+ * deal with any file size limit through failed writes. Cpu time
* limits are caught and a cleanup is forced.
*/
if ((sigemptyset(&s_mask) < 0) || (sigaddset(&s_mask, SIGTERM) < 0) ||
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index ff0a14f961a..2b15a3c4f19 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.h,v 1.15 2003/06/26 00:10:17 deraadt Exp $ */
+/* $OpenBSD: pax.h,v 1.16 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: pax.h,v 1.3 1995/03/21 09:07:41 cgd Exp $ */
/*-
@@ -48,7 +48,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 */
/*
@@ -133,7 +133,7 @@ typedef struct {
* 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).
*/
@@ -197,7 +197,7 @@ typedef struct {
/* a flawed archive header. */
int (*end_wr)(void); /* end write. write the trailer and do any */
/* other format specific functions needed */
- /* at the ecnd of a archive write */
+ /* at the end of an archive write */
int (*trail)(ARCHD *, /* returns 0 if a valid trailer, -1 if not */
char *, int, /* For formats which encode the trailer */
int *); /* outside of a valid header, a return value */
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 4b3942bfb2e..fcf94e94df3 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sel_subs.c,v 1.16 2003/06/02 23:32:09 millert Exp $ */
+/* $OpenBSD: sel_subs.c,v 1.17 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.16 2003/06/02 23:32:09 millert Exp $";
+static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.17 2003/10/20 06:22:27 jmc Exp $";
#endif
#endif /* not lint */
@@ -74,7 +74,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
*/
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index 5ba81dec13d..bcf2826e695 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.h,v 1.5 2003/06/02 23:32:09 millert Exp $ */
+/* $OpenBSD: tables.h,v 1.6 2003/10/20 06:22:27 jmc Exp $ */
/* $NetBSD: tables.h,v 1.3 1995/03/21 09:07:47 cgd Exp $ */
/*-
@@ -78,7 +78,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;