summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Uwe Finck <jufi@cvs.openbsd.org>2002-07-07 08:54:51 +0000
committerJan-Uwe Finck <jufi@cvs.openbsd.org>2002-07-07 08:54:51 +0000
commitcd84c90ae341335a0ad90ba9e59a0c4043a52259 (patch)
tree815ea0f0eca446febc08efa42e540e3adc8d849d
parent7c41d8ceba7e5d71423a274227c7861beef81ea2 (diff)
typos/grammar/better words
in comments.
-rw-r--r--libexec/ftp-proxy/ftp-proxy.c6
-rw-r--r--libexec/getty/init.c8
-rw-r--r--libexec/ld.so/alpha/rtld_machine.c4
-rw-r--r--libexec/ld.so/loader.c11
-rw-r--r--libexec/ld.so/mips/rtld_machine.c4
-rw-r--r--libexec/ld.so/mips/syscall.h4
-rw-r--r--libexec/ld.so/powerpc/ldasm.S4
-rw-r--r--libexec/ld.so/powerpc/rtld_machine.c4
-rw-r--r--libexec/ld.so/powerpc/syscall.h4
-rw-r--r--libexec/ld.so/resolve.c4
-rw-r--r--libexec/ld.so/util.c4
-rw-r--r--libexec/lfs_cleanerd/library.c14
-rw-r--r--libexec/talkd/announce.c6
13 files changed, 39 insertions, 38 deletions
diff --git a/libexec/ftp-proxy/ftp-proxy.c b/libexec/ftp-proxy/ftp-proxy.c
index 99546182352..f08ac0569d7 100644
--- a/libexec/ftp-proxy/ftp-proxy.c
+++ b/libexec/ftp-proxy/ftp-proxy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftp-proxy.c,v 1.23 2002/07/03 23:39:03 deraadt Exp $ */
+/* $OpenBSD: ftp-proxy.c,v 1.24 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1996-2001
@@ -61,7 +61,7 @@
* TODO:
* Plenty, this is very basic, with the idea to get it in clean first.
*
- * - Ipv6 and EPASV support
+ * - IPv6 and EPASV support
* - Content filter support
* - filename filter support
* - per-user rules perhaps.
@@ -727,7 +727,7 @@ out:
* resorting to using a dynamic rdr rule we have to add in
* for the reply to this connection, and take away afterwards.
* so this will wait until we have the right solution for rule
- * addtions/deletions in pf.
+ * additions/deletions in pf.
*
* in the meantime we just tell the client we don't do it,
* and most clients should fall back to using PASV.
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index c00b2368cee..baa1d2d4365 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.4 2001/01/28 19:34:28 niklas Exp $ */
+/* $OpenBSD: init.c,v 1.5 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)init.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: init.c,v 1.4 2001/01/28 19:34:28 niklas Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.5 2002/07/07 08:54:50 jufi Exp $";
#endif /* not lint */
/*
@@ -57,10 +57,10 @@ struct gettystrs gettystrs[] = {
{ "lm", "login: " }, /* login message */
{ "er", &tmode.c_cc[VERASE] }, /* erase character */
{ "kl", &tmode.c_cc[VKILL] }, /* kill character */
- { "et", &tmode.c_cc[VEOF] }, /* eof chatacter (eot) */
+ { "et", &tmode.c_cc[VEOF] }, /* eof character (eot) */
{ "pc", "" }, /* pad character */
{ "tt" }, /* terminal type */
- { "ev" }, /* enviroment */
+ { "ev" }, /* environment */
{ "lo", _PATH_LOGIN }, /* login program */
{ "hn", hostname }, /* host name */
{ "he" }, /* host name edit */
diff --git a/libexec/ld.so/alpha/rtld_machine.c b/libexec/ld.so/alpha/rtld_machine.c
index 83c74885152..87186b1beeb 100644
--- a/libexec/ld.so/alpha/rtld_machine.c
+++ b/libexec/ld.so/alpha/rtld_machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld_machine.c,v 1.12 2002/06/05 23:13:55 art Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.13 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1999 Dale Rahn
@@ -80,7 +80,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz)
/*
* unprotect some segments if we need it.
- * XXX - we unprotect waay to much. only the text can have cow
+ * XXX - we unprotect way to much. only the text can have cow
* relocations.
*/
if ((rel == DT_REL || rel == DT_RELA)) {
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c
index 3309ccbaaa0..54fd97d995e 100644
--- a/libexec/ld.so/loader.c
+++ b/libexec/ld.so/loader.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loader.c,v 1.36 2002/06/05 23:13:55 art Exp $ */
+/* $OpenBSD: loader.c,v 1.37 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -69,7 +69,8 @@ _dl_debug_state(void)
}
/*
- * Routine to walk thru all of the objects except the first (main executable).
+ * Routine to walk through all of the objects except the first
+ * (main executable).
*/
void
_dl_run_dtors(elf_object_t *object)
@@ -93,7 +94,7 @@ _dl_dtors(void)
* This is the dynamic loader entrypoint. When entering here, depending
* on architecture type, the stack and registers are set up according
* to the architectures ABI specification. The first thing required
- * to do is to dig out all information we need to accomplish out task.
+ * to do is to dig out all information we need to accomplish our task.
*/
unsigned long
_dl_boot(const char **argv, char **envp, const long loff,
@@ -166,7 +167,7 @@ _dl_boot(const char **argv, char **envp, const long loff,
/*
* Now, pick up and 'load' all libraries requierd. Start
- * With the first on the list and then do whatever gets
+ * with the first on the list and then do whatever gets
* added along the tour.
*/
dynobj = _dl_objects;
@@ -215,7 +216,7 @@ _dl_boot(const char **argv, char **envp, const long loff,
/*
* Schedule a routine to be run at shutdown, by using atexit.
- * cannot call atexit directly from ld.so?
+ * Cannot call atexit directly from ld.so?
* Do not schedule destructors if run from ldd.
*/
if (_dl_traceld == NULL) {
diff --git a/libexec/ld.so/mips/rtld_machine.c b/libexec/ld.so/mips/rtld_machine.c
index 1719433ea55..19865eb154d 100644
--- a/libexec/ld.so/mips/rtld_machine.c
+++ b/libexec/ld.so/mips/rtld_machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld_machine.c,v 1.5 2002/06/05 23:13:55 art Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.6 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -113,7 +113,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz)
* is referenced by other relocations than CALL16 and 26 it
* should not be given a stub and have a zero value in the
* symbol table. By not doing so, we can't use pointers to
- * external functions and use them in comparitions...
+ * external functions and use them in comparisons...
*/
void
_dl_md_reloc_got(elf_object_t *object, int lazy)
diff --git a/libexec/ld.so/mips/syscall.h b/libexec/ld.so/mips/syscall.h
index 6af92f5f042..216c72e0da6 100644
--- a/libexec/ld.so/mips/syscall.h
+++ b/libexec/ld.so/mips/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.4 2002/05/24 04:17:00 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.5 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -48,7 +48,7 @@
/*
* Inlined system call functions that can be used before
- * any dynamic address resoving has been done.
+ * any dynamic address resolving has been done.
*/
extern inline int
diff --git a/libexec/ld.so/powerpc/ldasm.S b/libexec/ld.so/powerpc/ldasm.S
index e626587e723..caf43ea950b 100644
--- a/libexec/ld.so/powerpc/ldasm.S
+++ b/libexec/ld.so/powerpc/ldasm.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldasm.S,v 1.4 2002/05/24 04:17:01 deraadt Exp $ */
+/* $OpenBSD: ldasm.S,v 1.5 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1999 Dale Rahn
@@ -75,7 +75,7 @@ ENTRY(_dl_start)
rlwinm 18,18,0,8,30 # mask off the offset portion of the instr.
/*
- * these adds effectively calculates the value the
+ * these adds effectively calculate the value the
* bl _GLOBAL_OFFSET_TABLE_@local-4
* operation that would be below would calulate.
*/
diff --git a/libexec/ld.so/powerpc/rtld_machine.c b/libexec/ld.so/powerpc/rtld_machine.c
index 4b3ccdefac0..999818782f4 100644
--- a/libexec/ld.so/powerpc/rtld_machine.c
+++ b/libexec/ld.so/powerpc/rtld_machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld_machine.c,v 1.10 2002/06/05 23:13:55 art Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.11 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1999 Dale Rahn
@@ -398,7 +398,7 @@ _dl_printf(" found other symbol at %x size %d\n",
* is referenced by other relocations than CALL16 and 26 it
* should not be given a stub and have a zero value in the
* symbol table. By not doing so, we can't use pointers to
- * external functions and use them in comparitions...
+ * external functions and use them in comparisons...
*/
void
_dl_md_reloc_got(elf_object_t *object, int lazy)
diff --git a/libexec/ld.so/powerpc/syscall.h b/libexec/ld.so/powerpc/syscall.h
index 55916a5eddf..5abbec8a737 100644
--- a/libexec/ld.so/powerpc/syscall.h
+++ b/libexec/ld.so/powerpc/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.7 2002/05/24 04:17:01 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.8 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -48,7 +48,7 @@
/*
* Inlined system call functions that can be used before
- * any dynamic address resoving has been done.
+ * any dynamic address resolving has been done.
*/
static inline int
diff --git a/libexec/ld.so/resolve.c b/libexec/ld.so/resolve.c
index 48d7eda73e4..0a76b18e9b5 100644
--- a/libexec/ld.so/resolve.c
+++ b/libexec/ld.so/resolve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: resolve.c,v 1.10 2002/05/28 00:22:01 deraadt Exp $ */
+/* $OpenBSD: resolve.c,v 1.11 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -89,7 +89,7 @@ _dl_add_object(const char *objname, Elf_Dyn *dynp, const u_long *dl_data,
/*
* Now relocate all pointer to dynamic info, but only
- * the ones which has pointer values.
+ * the ones which have pointer values.
*/
if (object->Dyn.info[DT_PLTGOT])
object->Dyn.info[DT_PLTGOT] += loff;
diff --git a/libexec/ld.so/util.c b/libexec/ld.so/util.c
index 5313e4db2fc..a16b1d4f697 100644
--- a/libexec/ld.so/util.c
+++ b/libexec/ld.so/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.5 2002/05/28 00:22:01 deraadt Exp $ */
+/* $OpenBSD: util.c,v 1.6 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -38,7 +38,7 @@
#include "archdep.h"
/*
- * Static vars usable after bootsrapping.
+ * Static vars usable after bootstrapping.
*/
static void *_dl_malloc_base;
static void *_dl_malloc_pool = 0;
diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c
index d4d1fa6b082..3b898e46c19 100644
--- a/libexec/lfs_cleanerd/library.c
+++ b/libexec/lfs_cleanerd/library.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: library.c,v 1.8 2002/05/27 20:32:08 deraadt Exp $ */
+/* $OpenBSD: library.c,v 1.9 2002/07/07 08:54:50 jufi Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)library.c 8.3 (Berkeley) 5/24/95";*/
-static char rcsid[] = "$OpenBSD: library.c,v 1.8 2002/05/27 20:32:08 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: library.c,v 1.9 2002/07/07 08:54:50 jufi Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -66,9 +66,9 @@ int get_superblock(FS_INFO *, struct lfs *);
int pseg_valid(FS_INFO *, SEGSUM *);
/*
- * This function will get information on a a filesystem which matches
+ * This function will get information on a filesystem which matches
* the name and type given. If a "name" is in a filesystem of the given
- * type, then buf is filled with that filesystem's info, and the
+ * type, then buf is filled with that filesystem's info, and
* a non-zero value is returned.
*/
int
@@ -231,7 +231,7 @@ redo_read:
fsp->fi_ifilep = (IFILE *)((caddr_t)fsp->fi_segusep + SEGTABSIZE(fsp));
/*
- * The number of ifile entries is equal to the number of blocks
+ * The number of ifile entries is equal to the number of
* blocks in the ifile minus the ones allocated to cleaner info
* and segment usage table multiplied by the number of ifile
* entries per page.
@@ -304,7 +304,7 @@ lfs_segmapv(fsp, seg, seg_buf, blocks, bcount)
timestamp = ((SEGSUM*)s)->ss_create;
#ifdef DIAGNOSTIC
- /* Verfiy size of summary block */
+ /* Verifiy size of summary block */
sumsize = sizeof(SEGSUM) +
(sp->ss_ninos + INOPB(lfsp) - 1) / INOPB(lfsp);
for (i = 0, fip = (FINFO *)(sp + 1); i < sp->ss_nfinfo; ++i) {
@@ -362,7 +362,7 @@ add_blocks (fsp, bip, countp, sp, seg_buf, segaddr, psegaddr)
FS_INFO *fsp; /* pointer to super block */
BLOCK_INFO *bip; /* Block info array */
int *countp; /* IN/OUT: number of blocks in array */
- SEGSUM *sp; /* segment summmary pointer */
+ SEGSUM *sp; /* segment summary pointer */
caddr_t seg_buf; /* buffer containing segment */
daddr_t segaddr; /* address of this segment */
daddr_t psegaddr; /* address of this partial segment */
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 66626f7ab78..b0556fca1a6 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: announce.c,v 1.13 2002/05/21 23:51:28 deraadt Exp $ */
+/* $OpenBSD: announce.c,v 1.14 2002/07/07 08:54:50 jufi Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -35,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)announce.c 5.9 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: announce.c,v 1.13 2002/05/21 23:51:28 deraadt Exp $";
+static char rcsid[] = "$Id: announce.c,v 1.14 2002/07/07 08:54:50 jufi Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -93,7 +93,7 @@ announce(request, remote_machine)
* Build a block of characters containing the message.
* It is sent blank filled and in a single block to
* try to keep the message in one piece if the recipient
- * in in vi at the time
+ * is in vi at the time
*/
static void
print_mesg(tf, request, remote_machine)