summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/awk/FIXES6
-rw-r--r--usr.bin/diff/diff.h4
-rw-r--r--usr.bin/diff/diffdir.c6
-rw-r--r--usr.bin/diff3/diff3prog.c10
-rw-r--r--usr.bin/fgen/fgen.l6
-rw-r--r--usr.bin/file/file.h4
-rw-r--r--usr.bin/file/magdir/images5
-rw-r--r--usr.bin/file/readelf.c4
-rw-r--r--usr.bin/last/last.c6
-rw-r--r--usr.bin/learn/src/learn.c4
-rw-r--r--usr.bin/locate/code/locate.code.c8
-rw-r--r--usr.bin/login/login.c6
-rw-r--r--usr.bin/pr/egetopt.c6
-rw-r--r--usr.bin/pr/pr.c22
-rw-r--r--usr.bin/su/su.c6
15 files changed, 51 insertions, 52 deletions
diff --git a/usr.bin/awk/FIXES b/usr.bin/awk/FIXES
index ee0f79f0660..a2901b4952a 100644
--- a/usr.bin/awk/FIXES
+++ b/usr.bin/awk/FIXES
@@ -1,4 +1,4 @@
-/* $OpenBSD: FIXES,v 1.11 2002/12/19 21:24:28 millert Exp $ */
+/* $OpenBSD: FIXES,v 1.12 2003/11/09 20:13:57 otto Exp $ */
/****************************************************************
Copyright (C) Lucent Technologies 1997
All Rights Reserved
@@ -144,7 +144,7 @@ Apr 21, 2000:
jon bentley for the test case that found it.
added test in envinit to catch environment "variables" with
- names begining with '='; thanks to Berend Hasselman.
+ names beginning with '='; thanks to Berend Hasselman.
Jul 28, 1999:
added test in defn() to catch function foo(foo), which
@@ -381,7 +381,7 @@ May 2, 1996:
some awful behaviors.)
Apr 29, 1996:
- replaced uchar by uschar everwhere; apparently some compilers
+ replaced uchar by uschar everywhere; apparently some compilers
usurp this name and this causes conflicts.
fixed call to time in run.c (bltin); arg is time_t *.
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index 17b008281da..538d67df19d 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.h,v 1.24 2003/10/07 23:37:27 millert Exp $ */
+/* $OpenBSD: diff.h,v 1.25 2003/11/09 20:13:57 otto Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -61,7 +61,7 @@
#define D_ONLY 4 /* Only exists in one directory */
#define D_MISMATCH1 5 /* path1 was a dir, path2 a file */
#define D_MISMATCH2 6 /* path1 was a file, path2 a dir */
-#define D_ERROR 7 /* An error ocurred */
+#define D_ERROR 7 /* An error occurred */
struct excludes {
char *pattern;
diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c
index dcdcf41a542..3223c75770d 100644
--- a/usr.bin/diff/diffdir.c
+++ b/usr.bin/diff/diffdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diffdir.c,v 1.25 2003/10/07 23:37:27 millert Exp $ */
+/* $OpenBSD: diffdir.c,v 1.26 2003/11/09 20:13:57 otto Exp $ */
/*
* Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -21,7 +21,7 @@
*/
#ifndef lint
-static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.25 2003/10/07 23:37:27 millert Exp $";
+static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.26 2003/11/09 20:13:57 otto Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -48,7 +48,7 @@ static void diffit(struct dirent *, char *, size_t, char *, size_t);
#define d_status d_type /* we need to store status for -l */
/*
- * Diff directory traveral. Will be called recursively if -r was specified.
+ * Diff directory traversal. Will be called recursively if -r was specified.
*/
void
diffdir(char *p1, char *p2)
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c
index c1abdc5d5f9..f0fb5c76d1a 100644
--- a/usr.bin/diff3/diff3prog.c
+++ b/usr.bin/diff3/diff3prog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $ */
+/* $OpenBSD: diff3prog.c,v 1.4 2003/11/09 20:13:57 otto Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -71,7 +71,7 @@ static const char copyright[] =
#endif /* not lint */
#ifndef lint
-static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $";
+static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.4 2003/11/09 20:13:57 otto Exp $";
#endif /* not lint */
#include <stdio.h>
@@ -200,7 +200,7 @@ main(int argc, char **argv)
}
/*
- * Pick up the line numbers of allcahnges from one change file.
+ * Pick up the line numbers of all changes from one change file.
* (This puts the numbers in a vector, which is not strictly necessary,
* since the vector is processed in one sequential pass.
* The vector could be optimized out of existence)
@@ -346,7 +346,7 @@ merge(int m1, int m2)
dup = duplicate(&d1->old,&d2->old);
/*
* dup = 0 means all files differ
- * dup = 1 meands files 1 and 2 identical
+ * dup = 1 means files 1 and 2 identical
*/
if (eflag==0) {
separate(dup ? "3" : "");
@@ -441,7 +441,7 @@ keep(int i, struct range *rnew)
}
/*
- * skip to just befor line number from in file "i". If "pr" is non-NULL,
+ * skip to just before line number from in file "i". If "pr" is non-NULL,
* print all skipped stuff with string pr as a prefix.
*/
int
diff --git a/usr.bin/fgen/fgen.l b/usr.bin/fgen/fgen.l
index 1b93e14eda6..c0acab888c8 100644
--- a/usr.bin/fgen/fgen.l
+++ b/usr.bin/fgen/fgen.l
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: fgen.l,v 1.6 2002/09/23 04:10:14 millert Exp $ */
+/* $OpenBSD: fgen.l,v 1.7 2003/11/09 20:13:57 otto Exp $ */
/* $NetBSD: fgen.l,v 1.12 2001/06/13 10:46:05 wiz Exp $ */
/* FLEX input for FORTH input file scanner */
/*
@@ -1034,7 +1034,7 @@ main(argc, argv)
/*
* Tokenize one file. This is a separate function so it can
- * be called recursively to parse mutiple levels of include files.
+ * be called recursively to parse multiple levels of include files.
*/
void
@@ -1562,7 +1562,7 @@ tokenize(input)
*/
pos = pop(); /* get position of prev link. */
push(outpos); /* save position of this link. */
- spit(pos); /* save potision of prev link. */
+ spit(pos); /* save position of prev link. */
if (offsetsize == 16) {
spit(0);
}
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index c9586b3aaaa..2e9a0ad5e63 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.h,v 1.14 2003/07/02 21:04:10 deraadt Exp $ */
+/* $OpenBSD: file.h,v 1.15 2003/11/09 20:13:57 otto Exp $ */
/*
* file.h - definitions for file(1) program
@@ -86,7 +86,7 @@ struct magic {
unsigned char hl[4]; /* 2 bytes of a fixed-endian "long" */
} value; /* either number or string */
uint32_t mask; /* mask before comparison with value */
- char nospflag; /* supress space character */
+ char nospflag; /* suppress space character */
char desc[MAXDESC]; /* description */
};
diff --git a/usr.bin/file/magdir/images b/usr.bin/file/magdir/images
index 27a38ebb4a1..bb5d98f9d3d 100644
--- a/usr.bin/file/magdir/images
+++ b/usr.bin/file/magdir/images
@@ -207,10 +207,9 @@
#>28 belong >0 colormap is %d bytes long
# SGI image file format, from Daniel Quinlan (quinlan@yggdrasil.com)
-#
-# See
+# See:
# http://reality.sgi.com/grafica/sgiimage.html
-#
+# ftp://ftp.sgi.com/graphics/SGIIMAGESPEC
0 beshort 474 SGI image data
#>2 byte 0 \b, verbatim
>2 byte 1 \b, RLE
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index db3861cff66..57a3c4aae54 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -41,7 +41,7 @@
#include "readelf.h"
#ifndef lint
-static char *RCSID = "@(#)$Id: readelf.c,v 1.6 2003/06/13 18:31:14 deraadt Exp $";
+static char *RCSID = "@(#)$Id: readelf.c,v 1.7 2003/11/09 20:13:57 otto Exp $";
#endif
#ifdef ELFCORE
@@ -513,7 +513,7 @@ dophn_core(int class, int swap, int fd, off_t off, int num, size_t size)
* is in SunOS 5.x and Linux).
*
* Unfortunately, it's at a different offset
- * in varous OSes, so try multiple offsets.
+ * in various OSes, so try multiple offsets.
* If the characters aren't all printable,
* reject it.
*/
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 690c01001fc..fcceef4c0bc 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: last.c,v 1.28 2003/08/14 21:02:09 deraadt Exp $ */
+/* $OpenBSD: last.c,v 1.29 2003/11/09 20:13:57 otto Exp $ */
/* $NetBSD: last.c,v 1.6 1994/12/24 16:49:02 cgd Exp $ */
/*
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$OpenBSD: last.c,v 1.28 2003/08/14 21:02:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: last.c,v 1.29 2003/11/09 20:13:57 otto Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -586,7 +586,7 @@ dateconv(char *arg)
t->tm_year = ATOI2(arg);
t->tm_year *= 100;
yearset = 1;
- /* FALLTHOUGH */
+ /* FALLTHROUGH */
case 10: /* YYMMDDhhmm */
if (yearset) {
yearset = ATOI2(arg);
diff --git a/usr.bin/learn/src/learn.c b/usr.bin/learn/src/learn.c
index a92fa01e8da..3ed759bb94e 100644
--- a/usr.bin/learn/src/learn.c
+++ b/usr.bin/learn/src/learn.c
@@ -2,7 +2,7 @@
* learn, from V7 UNIX: one of the earliest Computer Based Training (CBT)
* programs still in existence.
*
- * $OpenBSD: learn.c,v 1.9 2003/04/06 21:07:08 deraadt Exp $
+ * $OpenBSD: learn.c,v 1.10 2003/11/09 20:13:57 otto Exp $
*/
/****************************************************************
@@ -1041,6 +1041,6 @@ int n;
printf("Bye.\n"); /* not only does this reassure user but
it stalls for time while deleting directory */
fflush(stdout);
- /* printf("Wantd %ld got %ld val %d\n", (long)pid, (long)pidw, retval); */
+ /* printf("Wanted %ld got %ld val %d\n", (long)pid, (long)pidw, retval); */
exit(n);
}
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 1d8bd0ce3b2..88ff28a87d5 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.code.c,v 1.12 2003/09/29 16:03:16 deraadt Exp $
+ * $OpenBSD: locate.code.c,v 1.13 2003/11/09 20:13:57 otto Exp $
*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.code.c,v 1.12 2003/09/29 16:03:16 deraadt Exp $
+ * $Id: locate.code.c,v 1.13 2003/11/09 20:13:57 otto Exp $
*/
#ifndef lint
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.code.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: locate.code.c,v 1.12 2003/09/29 16:03:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: locate.code.c,v 1.13 2003/11/09 20:13:57 otto Exp $";
#endif
#endif /* not lint */
@@ -81,7 +81,7 @@ static char rcsid[] = "$OpenBSD: locate.code.c,v 1.12 2003/09/29 16:03:16 deraad
* The locate database store any character except newline ('\n')
* and NUL ('\0'). The 8-bit character support don't wast extra
* space until you have characters in file names less than 32
- * or greather than 127.
+ * or greater than 127.
*
*
* SEE ALSO: updatedb.sh, ../bigram/locate.bigram.c
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 756aa561a17..95eb83098a3 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login.c,v 1.51 2003/08/12 13:14:58 hin Exp $ */
+/* $OpenBSD: login.c,v 1.52 2003/11/09 20:13:57 otto Exp $ */
/* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */
/*-
@@ -73,7 +73,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
-static const char rcsid[] = "$OpenBSD: login.c,v 1.51 2003/08/12 13:14:58 hin Exp $";
+static const char rcsid[] = "$OpenBSD: login.c,v 1.52 2003/11/09 20:13:57 otto Exp $";
#endif /* not lint */
/*
@@ -848,7 +848,7 @@ motd(void)
void
sigint(int signo)
{
- return; /* just interupt syscall */
+ return; /* just interrupt syscall */
}
/* ARGSUSED */
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index e3b8d271a54..ce831fac12a 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: egetopt.c,v 1.6 2003/06/12 20:58:10 deraadt Exp $ */
+/* $OpenBSD: egetopt.c,v 1.7 2003/11/09 20:13:57 otto Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -35,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: egetopt.c,v 1.6 2003/06/12 20:58:10 deraadt Exp $";
+static char *rcsid = "$OpenBSD: egetopt.c,v 1.7 2003/11/09 20:13:57 otto Exp $";
#endif /* not lint */
#include <ctype.h>
@@ -70,7 +70,7 @@ egetopt(int nargc, char * const *nargv, const char *ostr)
{
static char *place = EMSG; /* option letter processing */
char *oli; /* option letter list index */
- static int delim; /* which option delimeter */
+ static int delim; /* which option delimiter */
char *p;
static char savec = '\0';
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 51f417accbf..202d2e59453 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr.c,v 1.19 2003/08/04 17:06:45 deraadt Exp $ */
+/* $OpenBSD: pr.c,v 1.20 2003/11/09 20:13:57 otto Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -41,7 +41,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)pr.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.19 2003/08/04 17:06:45 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.20 2003/11/09 20:13:57 otto Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -76,20 +76,20 @@ static char *rcsid = "$OpenBSD: pr.c,v 1.19 2003/08/04 17:06:45 deraadt Exp $";
* the original version didn't support form-feeds, while many of the ad-hoc
* pr implementations out there do. Addding this and making it work reasonably
* in all four output modes required quite a bit of hacking and a few minor
- * bugs were noted and fixed in the processs. Some implementations have this
+ * bugs were noted and fixed in the process. Some implementations have this
* as the as -f, some as -F so we accept either.
*
* The implementation of form feeds on top of the existing I/O structure is
- * a bit ideosyncratic. Basically they are treated as temporary end-of-file
+ * a bit idiosyncratic. Basically they are treated as temporary end-of-file
* conditions and an additional level of "loop on form feed" is added to each
* of the output modes to continue after such a transient end-of-file's. This
* has the general benefit of making the existing header/trailer logic work
* and provides a usable framework for rational behavior in multi-column modes.
*
- * The orginal "efficient" implementation of the "skip to page N" option was
+ * The original "efficient" implementation of the "skip to page N" option was
* bogus and I substituted the basic inhibit printing until page N approach.
* This is still fairly bogus vis-a-vis numbering pages on multiple files
- * restarting at one, but at least lets you consistantly reprint some large
+ * restarting at one, but at least lets you consistently reprint some large
* document starting in the middle, in any of the output modes.
*
* Additional support for overprinting via <back-space> or <return> would
@@ -921,7 +921,7 @@ mulfile(int argc, char *argv[])
* do not know how many columns yet. The number of operands provide an
* upper bound on the number of columns. We use the number of files
* we can open successfully to set the number of columns. The operation
- * of the merge operation (-m) in relation to unsuccesful file opens
+ * of the merge operation (-m) in relation to unsuccessful file opens
* is unspecified by posix.
*
* XXX - this seems moderately bogus, you'd think that specifying
@@ -946,7 +946,7 @@ mulfile(int argc, char *argv[])
return(1);
/*
- * calculate page boundries based on open file count
+ * calculate page boundaries based on open file count
*/
if (nmwd) {
colwd = (pgwd - clcnt - nmwd)/clcnt;
@@ -1099,7 +1099,7 @@ mulfile(int argc, char *argv[])
* buf: buffer
* lim: buffer length
* cnt: line length or -1 if no line (EOF for example)
- * cps: column positon 1st char in buffer (large line support)
+ * cps: column position 1st char in buffer (large line support)
* trnc: throw away data more than lim up to \n
* mor: set if more data in line (not truncated)
*/
@@ -1564,7 +1564,7 @@ addnum(char *buf, int wdth, int line)
* prhead() should be used carefully, we don't want to print out headers
* for null input files or orphan headers at the end of files, and also
* trailer processing is typically conditional on whether you've called
- * prhead() at least once for a file and incremented pagecnt.. Exactly
+ * prhead() at least once for a file and incremented pagecnt. Exactly
* how to determine whether to print a header is a little different in
* the context each output mode, but we let the caller figure that out.
*/
@@ -1612,7 +1612,7 @@ prhead(char *buf, char *fname, int pagcnt)
* incomp was a '\n' missing from last line output
*
* prtail() can now be invoked unconditionally, with the notion that if
- * we haven't printed a hearder, these no need for a trailer
+ * we haven't printed a header, there is no need for a trailer
*/
int
prtail(int cnt, int incomp)
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 40fee0c8142..8b4f2586d0f 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: su.c,v 1.55 2003/09/26 21:43:32 miod Exp $ */
+/* $OpenBSD: su.c,v 1.56 2003/11/09 20:13:58 otto Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -39,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91";
#else
-static const char rcsid[] = "$OpenBSD: su.c,v 1.55 2003/09/26 21:43:32 miod Exp $";
+static const char rcsid[] = "$OpenBSD: su.c,v 1.56 2003/11/09 20:13:58 otto Exp $";
#endif
#endif /* not lint */
@@ -395,7 +395,7 @@ ontty(void)
/*
* Allow for a '.' and 16 characters for any instance as well as
- * space for a ':' and 16 charcters defining the authentication type.
+ * space for a ':' and 16 characters defining the authentication type.
*/
#define NBUFSIZ (UT_NAMESIZE + 1 + 16 + 1 + 16)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 23:22:58 +0000