diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index b0a49b5cea9a..fe9cefa3de42 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -663,7 +663,7 @@ ignoring request for server %s from client at %s address %s",
bp->bp_op = BOOTREPLY;
if (bp->bp_ciaddr.s_addr == 0) {
/*
- * client doesnt know his IP address,
+ * client doesn't know his IP address,
* search by hardware address.
*/
if (debug > 1) {
@@ -1119,7 +1119,7 @@ sendreply(forward, dst_override)
/*
* This call checks read access to a file. It returns 0 if the file given
- * by "path" exists and is publically readable. A value of -1 is returned if
+ * by "path" exists and is publicly readable. A value of -1 is returned if
* access is not permitted or an error occurs. Successful calls also
* return the file size in bytes using the long pointer "filesize".
*
diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c
index 120d668aca86..16bb66b2d292 100644
--- a/libexec/bootpd/bootpgw/bootpgw.c
+++ b/libexec/bootpd/bootpgw/bootpgw.c
@@ -534,7 +534,7 @@ handle_request()
/* Has this packet hopped too many times? */
hops = bp->bp_hops;
if (++hops > maxhops) {
- report(LOG_NOTICE, "reqest from %s reached hop limit",
+ report(LOG_NOTICE, "request from %s reached hop limit",
inet_ntoa(recv_addr.sin_addr));
return;
}
diff --git a/libexec/bootpd/hash.h b/libexec/bootpd/hash.h
index 22cdc04332c2..969703d04e59 100644
--- a/libexec/bootpd/hash.h
+++ b/libexec/bootpd/hash.h
@@ -81,7 +81,7 @@ SOFTWARE.
*
* A generalized hash function, hash_HashFunction(), is included
* with this package to make things a little easier. It is not
- * guarenteed to use the best hash algorithm in existence. . . .
+ * guaranteed to use the best hash algorithm in existence. . . .
*/
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index 04909878f33f..bf27470573c3 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -186,7 +186,7 @@ main(argc, argv)
break;
switch (argv[0][1]) {
- case 'f': /* File name to reqest. */
+ case 'f': /* File name to request. */
if (argc < 2)
goto error;
argc--; argv++;
diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c
index b3ddbbaee735..eb474d3bd215 100644
--- a/libexec/bootpd/tools/bootptest/print-bootp.c
+++ b/libexec/bootpd/tools/bootptest/print-bootp.c
@@ -187,7 +187,7 @@ bootp_print(bp, length, sport, dport)
/*
* Option description data follows.
- * These are decribed in: RFC-1048, RFC-1395, RFC-1497, RFC-1533
+ * These are described in: RFC-1048, RFC-1395, RFC-1497, RFC-1533
*
* The first char of each option string encodes the data format:
* ?: unknown
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 07ece341acd0..f3718eaa167d 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1718,7 +1718,7 @@ exptilde(char *s)
* Avoid expanding to a pathname including '\r' or '\n' in order to
* not disrupt the FTP protocol.
* The expansion found must be unique.
- * Return the result as a malloced string, or NULL if an error occured.
+ * Return the result as a malloced string, or NULL if an error occurred.
*
* Problem: this production is used for all pathname
* processing, but only gives a 550 error reply.
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index b832bb29fa8b..81384d94b835 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -64,7 +64,7 @@ struct gettystrs gettystrs[] = {
{ "et", &omode.c_cc[VEOF] }, /* eof chatacter (eot) */
{ "pc", nullstr }, /* pad character */
{ "tt" }, /* terminal type */
- { "ev" }, /* enviroment */
+ { "ev" }, /* environment */
{ "lo", loginprg }, /* login program */
{ "hn", hostname }, /* host name */
{ "he" }, /* host name edit */
diff --git a/libexec/lukemftpd/nbsd_pidfile.h b/libexec/lukemftpd/nbsd_pidfile.h
index 23dbe38be9cc..53487709afc9 100644
--- a/libexec/lukemftpd/nbsd_pidfile.h
+++ b/libexec/lukemftpd/nbsd_pidfile.h
@@ -10,7 +10,7 @@ pidfile(const char *basename)
pid_t otherpid, childpid;
if (basename != NULL) {
- errx(EX_USAGE, "Need to impliment NetBSD semantics.");
+ errx(EX_USAGE, "Need to implement NetBSD semantics.");
}
pfh = pidfile_open(basename, 0644, &otherpid);
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 2eb33e0a370e..7151dae9ef13 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -145,7 +145,7 @@ ParseConfig(void)
*/
if ((addr = ParseAddr(bcp)) == NULL) {
syslog(LOG_ERR,
- "ParseConfig: line %d: cant parse <%s>",
+ "ParseConfig: line %d: can't parse <%s>",
linecnt, bcp);
continue;
}
@@ -193,7 +193,7 @@ ParseConfig(void)
/*
* Restricted list of boot files were spec'd,
* however, none of them were found. Since we
- * apparently cant let them boot "just anything",
+ * apparently can't let them boot "just anything",
* the entire record is invalidated.
*/
if (i == 0) {
@@ -355,7 +355,7 @@ GetBootFiles(void)
(void) closedir(dfd); /* close BootDir */
- if (i == 0) /* cant find any boot files */
+ if (i == 0) /* can't find any boot files */
syslog(LOG_ERR, "GetBootFiles: no boot files (%s)\n", BootDir);
return(i);
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index e71b1ec53c05..e56a3e77a428 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -231,7 +231,7 @@ main(int argc, char *argv[])
r = rset;
- if (RmpConns == NULL) { /* timeout isnt necessary */
+ if (RmpConns == NULL) { /* timeout isn't necessary */
nsel = select(maxfds, &r, NULL, NULL, NULL);
} else {
timeout.tv_sec = RMP_TIMEOUT;
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 78c2488f9a84..8d51445165ad 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -401,7 +401,7 @@ SendReadRepl(RMPCONN *rconn)
int madeconn = 0;
/*
- * Find the old connection. If one doesnt exist, create one only
+ * Find the old connection. If one doesn't exist, create one only
* to return the error code.
*/
if ((oldconn = FindConn(rconn)) == NULL) {
@@ -515,7 +515,7 @@ BootDone(RMPCONN *rconn)
struct rmp_packet *rpl;
/*
- * If we cant find the connection, ignore the request.
+ * If we can't find the connection, ignore the request.
*/
if ((oldconn = FindConn(rconn)) == NULL) {
syslog(LOG_ERR, "BootDone: no existing connection (%s)",
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index 67e1b14788d8..a962e726d97d 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -199,8 +199,8 @@ parse_netgrp(char *group)
if (lp->l_parsed) {
#ifdef DEBUG
/*
- * This error message is largely superflous since the
- * code handles the error condition sucessfully, and
+ * This error message is largely superfluous since the
+ * code handles the error condition successfully, and
* spewing it out from inside libc can actually hose
* certain programs.
*/
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index bc77108b5223..cd4021a8104e 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -148,7 +148,7 @@ by
The options are as follows:
.Bl -tag -width indent
.It Fl a
-This flag is ignored, and is present for compatability purposes.
+This flag is ignored, and is present for compatibility purposes.
.It Fl D
Sets the TCP_NODELAY socket option, which improves the performance
of small back-to-back writes at the expense of additional network
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index f2c74a4e9a8c..5cfa3f3f128a 100644
--- a/libexec/rtld-aout/shlib.c
+++ b/libexec/rtld-aout/shlib.c
@@ -159,7 +159,7 @@ cmpndewey(int d1[], int n1, int d2[], int n2)
if (i == n2)
return 1;
- errx(1, "cmpndewey: cant happen");
+ errx(1, "cmpndewey: can't happen");
return 0;
}
diff --git a/libexec/rtld-elf/mips/reloc.c b/libexec/rtld-elf/mips/reloc.c
index 0f538498a621..35c732e6867e 100644
--- a/libexec/rtld-elf/mips/reloc.c
+++ b/libexec/rtld-elf/mips/reloc.c
@@ -358,7 +358,7 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, RtldLockState *lockstate)
def = find_symdef(i, obj, &defobj, false, NULL,
lockstate);
if (def == NULL) {
- dbg("Warning4, cant find symbole %d", i);
+ dbg("Warning4, can't find symbole %d", i);
return -1;
}
*got = def->st_value + (Elf_Addr)defobj->relocbase;
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index 4a752e42a285..e969d3602dee 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -238,7 +238,7 @@ typedef struct Struct_Obj_Entry {
Objlist dagmembers; /* DAG has these members (%) */
dev_t dev; /* Object's filesystem's device */
ino_t ino; /* Object's inode number */
- void *priv; /* Platform-dependant */
+ void *priv; /* Platform-dependent */
} Obj_Entry;
#define RTLD_MAGIC 0xd550b87a
diff --git a/libexec/rtld-elf/sparc64/reloc.c b/libexec/rtld-elf/sparc64/reloc.c
index 414523daf3b8..4ab0eae834a6 100644
--- a/libexec/rtld-elf/sparc64/reloc.c
+++ b/libexec/rtld-elf/sparc64/reloc.c
@@ -623,7 +623,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr target, const Obj_Entry *obj,
flush(where, 4);
} else if (target >= 0 && target < (1L<<32)) {
/*
- * We're withing 32-bits of address zero.
+ * We're within 32-bits of address zero.
*
* The resulting code in the jump slot is:
*
@@ -643,7 +643,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr target, const Obj_Entry *obj,
flush(where, 4);
} else if (target <= 0 && target > -(1L<<32)) {
/*
- * We're withing 32-bits of address -1.
+ * We're within 32-bits of address -1.
*
* The resulting code in the jump slot is:
*
@@ -665,7 +665,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr target, const Obj_Entry *obj,
flush(where, 4);
} else if (offset <= (1L<<32) && offset >= -((1L<<32) - 4)) {
/*
- * We're withing 32-bits -- we can use a direct call
+ * We're within 32-bits -- we can use a direct call
* insn
*
* The resulting code in the jump slot is:
@@ -688,7 +688,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr target, const Obj_Entry *obj,
flush(where, 4);
} else if (offset >= 0 && offset < (1L<<44)) {
/*
- * We're withing 44 bits. We can generate this
+ * We're within 44 bits. We can generate this
* pattern:
*
* The resulting code in the jump slot is:
@@ -713,7 +713,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr target, const Obj_Entry *obj,
flush(where, 4);
} else if (offset < 0 && offset > -(1L<<44)) {
/*
- * We're withing 44 bits. We can generate this
+ * We're within 44 bits. We can generate this
* pattern:
*
* The resulting code in the jump slot is:
diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c
index 17eabcb86733..b396134ac9b7 100644
--- a/libexec/tftpd/tftp-io.c
+++ b/libexec/tftpd/tftp-io.c
@@ -72,13 +72,13 @@ struct errmsg {
#define DROPPACKET(s) \
if (packetdroppercentage != 0 && \
random()%100 < packetdroppercentage) { \
- tftp_log(LOG_DEBUG, "Artifical packet drop in %s", s); \
+ tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \
return; \
}
#define DROPPACKETn(s,n) \
if (packetdroppercentage != 0 && \
random()%100 < packetdroppercentage) { \
- tftp_log(LOG_DEBUG, "Artifical packet drop in %s", s); \
+ tftp_log(LOG_DEBUG, "Artificial packet drop in %s", s); \
return (n); \
}
diff --git a/libexec/tftpd/tftp-utils.h b/libexec/tftpd/tftp-utils.h
index a789252fe4a0..0468612d9d74 100644
--- a/libexec/tftpd/tftp-utils.h
+++ b/libexec/tftpd/tftp-utils.h
@@ -36,11 +36,11 @@ __FBSDID("$FreeBSD$");
#define MAXPKTSIZE (MAXSEGSIZE + 4) /* Maximum size of the packet */
/* For the blksize option */
-#define BLKSIZE_MIN 8 /* Minumum size of the data segment */
+#define BLKSIZE_MIN 8 /* Minimum size of the data segment */
#define BLKSIZE_MAX MAXSEGSIZE /* Maximum size of the data segment */
/* For the timeout option */
-#define TIMEOUT_MIN 0 /* Minumum timeout value */
+#define TIMEOUT_MIN 0 /* Minimum timeout value */
#define TIMEOUT_MAX 255 /* Maximum timeout value */
#define MIN_TIMEOUTS 3