summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/ksh/io.c4
-rw-r--r--bin/ksh/lex.h4
-rw-r--r--bin/ksh/trap.c4
-rw-r--r--bin/pax/ar_io.c6
-rw-r--r--bin/pax/buf_subs.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/bin/ksh/io.c b/bin/ksh/io.c
index 05e5490f68d..7113d6fa0b4 100644
--- a/bin/ksh/io.c
+++ b/bin/ksh/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.9 2000/08/20 22:14:32 millert Exp $ */
+/* $OpenBSD: io.c,v 1.10 2001/09/19 10:58:07 mpech Exp $ */
/*
* shell buffered IO and formatted output
@@ -15,7 +15,7 @@ static int initio_done;
*/
-/* A shell error occured (eg, syntax error, etc.) */
+/* A shell error occurred (eg, syntax error, etc.) */
void
#ifdef HAVE_PROTOTYPES
errorf(const char *fmt, ...)
diff --git a/bin/ksh/lex.h b/bin/ksh/lex.h
index 334e46ca6eb..83e9e941c6b 100644
--- a/bin/ksh/lex.h
+++ b/bin/ksh/lex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.h,v 1.5 1999/06/15 01:18:35 millert Exp $ */
+/* $OpenBSD: lex.h,v 1.6 2001/09/19 10:58:07 mpech Exp $ */
/*
* Source input, lexer and parser
@@ -22,7 +22,7 @@ struct source {
char ugbuf[2]; /* buffer for ungetsc() (SREREAD) and
* alias (SALIAS) */
int line; /* line number */
- int errline; /* line the error occured on (0 if not set) */
+ int errline; /* line the error occurred on (0 if not set) */
const char *file; /* input file name */
int flags; /* SF_* */
Area *areap;
diff --git a/bin/ksh/trap.c b/bin/ksh/trap.c
index c7df99ade92..7ed32e84e19 100644
--- a/bin/ksh/trap.c
+++ b/bin/ksh/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.10 1999/01/19 20:41:56 millert Exp $ */
+/* $OpenBSD: trap.c,v 1.11 2001/09/19 10:58:07 mpech Exp $ */
/*
* signal handling
@@ -171,7 +171,7 @@ fatal_trap_check()
}
/* Returns the signal number of any pending traps: ie, a signal which has
- * occured for which a trap has been set or for which the TF_DFL_INTR flag
+ * occurred for which a trap has been set or for which the TF_DFL_INTR flag
* is set.
*/
int
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 6a305f92ea6..23c34b4b16f 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_io.c,v 1.23 2001/07/09 07:04:26 deraadt Exp $ */
+/* $OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $ */
/* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-static char rcsid[] = "$OpenBSD: ar_io.c,v 1.23 2001/07/09 07:04:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $";
#endif
#endif /* not lint */
@@ -626,7 +626,7 @@ ar_read(buf, cnt)
* Return:
* Number of bytes written. 0 indicates end of volume reached and with no
* flaws (as best that can be detected). A -1 indicates an unrecoverable
- * error in the archive occured.
+ * error in the archive occurred.
*/
#ifdef __STDC__
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 2aa67c87375..056e3a6abcd 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_subs.c,v 1.8 2001/05/16 03:04:55 mickey Exp $ */
+/* $OpenBSD: buf_subs.c,v 1.9 2001/09/19 10:58:07 mpech Exp $ */
/* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */
/*-
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.8 2001/05/16 03:04:55 mickey Exp $";
+static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.9 2001/09/19 10:58:07 mpech Exp $";
#endif
#endif /* not lint */
@@ -597,7 +597,7 @@ rd_wrbuf(in, cpcnt)
/*
* read error, return what we got (or the error if
* no data was copied). The caller must know that an
- * error occured and has the best knowledge what to
+ * error occurred and has the best knowledge what to
* do with it
*/
if ((res = cpcnt - incnt) > 0)