Re: [patch(es)] fix a few typos in /src

[Paul Tagliamonte]

On Wed, Dec 28, 2022 at 09:35:52PM +, Jason McIntyre wrote:
> i've finished with this diff. the usr.sbin parts i didn;t take are
> listed below, along with any explanation.

I *think* by my count and by watching the logs this is all of the diffs
on this thread! Kudos for your steadfast review, thank you very much for
your work applying the diff. I'm very appreciative!

   paultag

-- 
:wq

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Fri, Dec 23, 2022 at 10:33:43AM -0500, Paul Tagliamonte wrote:

i've finished with this diff. the usr.sbin parts i didn;t take are
listed below, along with any explanation.

jmc

Index: usr.sbin/smtpd/crypto.c
===
RCS file: /cvs/src/usr.sbin/smtpd/crypto.c,v
retrieving revision 1.10
diff -u -p -r1.10 crypto.c
--- usr.sbin/smtpd/crypto.c 14 Jun 2021 17:58:15 -  1.10
+++ usr.sbin/smtpd/crypto.c 23 Dec 2022 15:20:51 -
@@ -375,7 +375,7 @@ main(int argc, char *argv[])
/* uncomment below to provoke integrity check failure */
/*
 * fpin = fopen("/tmp/passwd.enc", "a");
-* fprintf(fpin, "borken");
+* fprintf(fpin, "broken");
 * fclose(fpin);
 */
fpin = fopen("/tmp/passwd.enc", "r");

i think it was noted already, but "bork" is a thing. i didn;t touch
this.

Index: usr.sbin/smtpd/mta_session.c
===
RCS file: /cvs/src/usr.sbin/smtpd/mta_session.c,v
retrieving revision 1.147
diff -u -p -r1.147 mta_session.c
--- usr.sbin/smtpd/mta_session.c26 Sep 2022 08:48:52 -  1.147
+++ usr.sbin/smtpd/mta_session.c23 Dec 2022 15:20:51 -
@@ -635,7 +635,7 @@ again:
else if (s->relay->secret) {
log_debug("debug: mta: %p: not using AUTH on non-TLS "
"session", s);
-   mta_error(s, "Refuse to AUTH over unsecure channel");
+   mta_error(s, "Refuse to AUTH over insecure channel");
mta_connect(s);
} else {
mta_enter_state(s, MTA_READY);

ho hum. i left this. the sense seems closer to unsecure debt than
insecure person.

Index: usr.sbin/relayd/relay_http.c
===
RCS file: /cvs/src/usr.sbin/relayd/relay_http.c,v
retrieving revision 1.83
diff -u -p -r1.83 relay_http.c
--- usr.sbin/relayd/relay_http.c23 Oct 2021 20:46:18 -  1.83
+++ usr.sbin/relayd/relay_http.c23 Dec 2022 15:20:51 -
@@ -281,7 +281,7 @@ relay_read_http(struct bufferevent *bev,
} else {
SIMPLEQ_REMOVE_HEAD(&hs->hs_methods, hmn_entry);
request_method = hmn->hmn_method;
-   DPRINTF("%s: session %d dequeing %s", __func__,
+   DPRINTF("%s: session %d dequeuing %s", __func__,
con->se_id,
relay_httpmethod_byid(request_method));
free(hmn);
@@ -335,7 +335,7 @@ relay_read_http(struct bufferevent *bev,
goto fail;
}
hmn->hmn_method = desc->http_method;
-   DPRINTF("%s: session %d enqueing %s", __func__,
+   DPRINTF("%s: session %d enqueuing %s", __func__,
con->se_id,
relay_httpmethod_byid(hmn->hmn_method));
SIMPLEQ_INSERT_TAIL(&hs->hs_methods, hmn, hmn_entry);

so "queuing" and "queueing" are both ok. on reflection, i think i will
tweak this one.

Index: usr.sbin/smtpd/smtpd.c
===
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.c,v
retrieving revision 1.343
diff -u -p -r1.343 smtpd.c
--- usr.sbin/smtpd/smtpd.c  18 Feb 2022 16:57:36 -  1.343
+++ usr.sbin/smtpd/smtpd.c  23 Dec 2022 15:20:51 -
@@ -1802,7 +1802,7 @@ parent_forward_open(char *username, char
}
 
if (!secure_file(fd, pathname, directory, uid, 1)) {
-   log_warnx("warn: smtpd: %s: unsecure file", pathname);
+   log_warnx("warn: smtpd: %s: insecure file", pathname);
close(fd);
return -1;
}

as above

jmc

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> 
> Updated patch attached with your feedback, thank you Crystal
> 

i've committed the bits of this that i though correct. i'll note below
anything rejected from the /lib parts. i've finished with this diff now.

jmc

> Index: lib/libc/sys/Makefile.inc
> ===
> RCS file: /cvs/src/lib/libc/sys/Makefile.inc,v
> retrieving revision 1.167
> diff -u -p -r1.167 Makefile.inc
> --- lib/libc/sys/Makefile.inc 19 Dec 2022 18:13:50 -  1.167
> +++ lib/libc/sys/Makefile.inc 22 Dec 2022 21:14:09 -
> @@ -23,7 +23,7 @@ SRCS+=  ptrace.c semctl.c \
>  # stack protector helper functions
>  SRCS+=   stack_protector.c
>  
> -# cancelation details
> +# cancellation details
>  SRCS+=   canceled.c
>  
>  # syscalls that would be normal...except for cancellation or SIGTHR

i've not taken cancelation->cancellation parts. US english seems to
prefer cancel/canceling, and i couldn;t convince myself that this change
was correct. so i've not taken it.

Index: lib/libagentx/ax.c
===
RCS file: /cvs/src/lib/libagentx/ax.c,v
retrieving revision 1.8
diff -u -p -r1.8 ax.c
--- lib/libagentx/ax.c  24 Oct 2021 17:43:38 -  1.8
+++ lib/libagentx/ax.c  22 Dec 2022 21:14:07 -
@@ -862,7 +862,7 @@ ax_varbind2string(struct ax_varbind *vb)
if (inet_ntop(PF_INET, vb->avb_data.avb_ostring.aos_string,
tmpbuf, sizeof(tmpbuf)) == NULL) {
snprintf(buf, sizeof(buf), "%s: (ipaddress)"
-   ": %s",
+   ": %s",
ax_oid2string(&(vb->avb_oid)),
strerror(errno));
break;

we have "parseable" all over the tree. the verb is "parse". i didn;t
take this.

Index: lib/libc/include/cancel.h
===
RCS file: /cvs/src/lib/libc/include/cancel.h,v
retrieving revision 1.5
diff -u -p -r1.5 cancel.h
--- lib/libc/include/cancel.h   5 Sep 2017 02:40:54 -   1.5
+++ lib/libc/include/cancel.h   22 Dec 2022 21:14:09 -
@@ -61,8 +61,8 @@ PROTO_NORMAL(_thread_canceled);
}
 
 /*
- * Enter or leave a cancelation point, optionally processing pending
- * cancelation requests.  Note that ENTER_CANCEL_POINT opens a block
+ * Enter or leave a cancellation point, optionally processing pending
+ * cancellation requests.  Note that ENTER_CANCEL_POINT opens a block
  * and LEAVE_CANCEL_POINT must close that same block.
  */
 #defineENTER_CANCEL_POINT(can_cancel)  
\

cancelation -> cancellation

Index: lib/libc/gen/errno.c
===
RCS file: /cvs/src/lib/libc/gen/errno.c,v
retrieving revision 1.6
diff -u -p -r1.6 errno.c
--- lib/libc/gen/errno.c7 May 2016 19:05:22 -   1.6
+++ lib/libc/gen/errno.c22 Dec 2022 21:14:08 -
@@ -27,7 +27,7 @@ DEF_STRONG(__errno);
  * syscall.  Rather than pay that cost for single-threaded programs,
  * the syscall stubs will invoke the tc_errnoptr callback to set errno
  * and other code will invoke the tc_tcb callback to get the TCB
- * for cancelation checks, etc.  The default callbacks will just
+ * for cancellation checks, etc.  The default callbacks will just
  * work from the cached location of the initial thread's TCB;
  * libpthread can override them to the necessary more expensive
  * versions that use __get_tcb().

cancelation -> cancellation

Index: lib/libutil/imsg_init.3
===
RCS file: /cvs/src/lib/libutil/imsg_init.3,v
retrieving revision 1.25
diff -u -p -r1.25 imsg_init.3
--- lib/libutil/imsg_init.3 19 May 2022 08:05:23 -  1.25
+++ lib/libutil/imsg_init.3 22 Dec 2022 21:14:14 -
@@ -348,7 +348,7 @@ On success
 returns a pointer to the buffer; on failure it returns NULL.
 .Pp
 .Fn ibuf_dynamic
-allocates a resizeable buffer of initial length
+allocates a resizable buffer of initial length
 .Fa len
 and maximum size
 .Fa max .

i'm fairly sure sizable and sizeable are both ok. did not take.

Index: lib/libc/db/mpool/mpool.c
===
RCS file: /cvs/src/lib/libc/db/mpool/mpool.c,v
retrieving revision 1.21
diff -u -p -r1.21 mpool.c
--- lib/libc/db/mpool/mpool.c   1 Nov 2015 03:45:28 -   1.21
+++ lib/libc/db/mpool/mpool.c   22 Dec 2022 21:14:08 -
@@ -449,7 +449,7 @@ mpool_stat(MPOOL *mp)
 
(void)fprintf(stderr, "%lu pages in the file\n", mp->npages);
(void)fprintf(stderr,
-   "page size %lu, cacheing %lu pages of %lu page max cache\n",
+   "page size %lu, caching %lu pages of %lu page max cache\n",
mp->pagesize, mp->curcache, mp->maxcache);
(void)fprin

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Fri, Dec 23, 2022 at 10:33:43AM -0500, Paul Tagliamonte wrote:
> On Fri, Dec 23, 2022 at 03:03:15PM +, Stuart Henderson wrote:
> 
> > A bunch of the files in your diff come from external upstream sources
> > which are still synced from upstream (or at least should be); patching
> > in the OpenBSD tree makes it harder to merge in updates. (including
> > at least curses, the "magic" files for file, nsd, unbound).
> 

ok, so stuart said it already, but i'm leaving out the parts of this
diff for nsd and unbound. submit those upstream, please.

i have already committed the parts to file(1) i think, so apologies if i
just made someone's life a bit tougher.

jmc

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> Index: include/tib.h
> ===
> RCS file: /cvs/src/include/tib.h,v
> retrieving revision 1.8
> diff -u -p -r1.8 tib.h
> --- include/tib.h 14 Jul 2020 16:48:13 -  1.8
> +++ include/tib.h 22 Dec 2022 21:14:06 -
> @@ -54,7 +54,7 @@
>   *   Short-hand for TCB_TO_TIB(TCB_GET())
>   *
>   *   TIB_EXTRA_ALIGN
> - *   On TLS varaint 2 archs, what alignment is sufficient
> + *   On TLS variant 2 archs, what alignment is sufficient
>   *   for the extra space that will be used for struct pthread?
>   *
>   * The following functions are provided by either ld.so (dynamic) or
> @@ -123,7 +123,7 @@
>   *
>   *   [pthread structure]
>   *   TIB {
> - *   ...cancelation and other int-sized info...
> + *   ...cancellation and other int-sized info...
>   *   int errno
>   *   void *locale
>   *   TCB (- TCB_OFFSET) {
> @@ -169,7 +169,7 @@ struct tib {
>   *   struct pthread *thread
>   *   void *locale
>   *   int errno
> - *   ...cancelation and other int-sized info...
> + *   ...cancellation and other int-sized info...
>   *   }
>   *   [pthread structure]
>   */

i took the first hunk of this diff, but did not commit the
cancelation->cancellation part. i know that US english prefers single
'l' (canceling/canceled). i'm not 100% sure about whether this applies
to "cancellation" but decided the gain was not worth it. the intent is
clear enough.

jmc

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Fri, Dec 23, 2022 at 10:33:43AM -0500, Paul Tagliamonte wrote:
> Index: usr.bin/mg/search.c
> ===
> RCS file: /cvs/src/usr.bin/mg/search.c,v
> retrieving revision 1.48
> diff -u -p -r1.48 search.c
> --- usr.bin/mg/search.c   20 Oct 2022 18:59:24 -  1.48
> +++ usr.bin/mg/search.c   23 Dec 2022 15:20:48 -
> @@ -872,8 +872,8 @@ zapuptochar(int f, int n)
>  }
>  
>  /*
> - * Prompt for a charcter and deletes from the point up to, optionally
> - * including, the first instance of that charcters.  Marks is cleared
> + * Prompt for a character and deletes from the point up to, optionally
> + * including, the first instance of that characters.  Marks is cleared
>   * afterwards.
>   */
>  int

i changed "characters" to "character" here.
jmc

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Fri, Dec 23, 2022 at 10:33:43AM -0500, Paul Tagliamonte wrote:
> Index: usr.bin/make/arch.c
> ===
> RCS file: /cvs/src/usr.bin/make/arch.c,v
> retrieving revision 1.91
> diff -u -p -r1.91 arch.c
> --- usr.bin/make/arch.c   13 Jan 2020 13:54:44 -  1.91
> +++ usr.bin/make/arch.c   23 Dec 2022 15:20:48 -
> @@ -62,7 +62,7 @@
>   */
>  
>  /*
> - *   Once again, cacheing/hashing comes into play in the manipulation
> + *   Once again, caching/hashing comes into play in the manipulation
>   * of archives. The first time an archive is referenced, all of its members'
>   * headers are read and hashed and the archive closed again. All hashed
>   * archives are kept in a hash (archives) which is searched each time

hi,

i'm not taking this. i can;t convince myself that one is preferrable to
the other. do we say "ka-sh" or "ka-shay"? running for cover now... 

jmc

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Fri, Dec 23, 2022 at 10:33:43AM -0500, Paul Tagliamonte wrote:
> Index: usr.bin/find/function.c
> ===
> RCS file: /cvs/src/usr.bin/find/function.c,v
> retrieving revision 1.50
> diff -u -p -r1.50 function.c
> --- usr.bin/find/function.c   23 Nov 2020 06:21:52 -  1.50
> +++ usr.bin/find/function.c   23 Dec 2022 15:20:47 -
> @@ -1396,7 +1396,7 @@ c_perm(char *perm, char ***ignored, int 
>  /*
>   * -print functions --
>   *
> - *   Always true, causes the current pathame to be written to
> + *   Always true, causes the current pathname to be written to
>   *   standard output.
>   */
>  int
> @@ -1576,7 +1576,7 @@ c_user(char *username, char ***ignored, 
>  /*
>   * -xdev functions --
>   *
> - *   Always true, causes find not to decend past directories that have a
> + *   Always true, causes find not to descend past directories that have a
>   *   different device ID (st_dev, see stat() S5.6.2 [POSIX.1])
>   */
>  PLAN *
> @@ -1679,7 +1679,7 @@ c_or(char *ignore, char ***ignored, int 
>   *
>   *   At the moment, only N_EXEC has state. Two kinds: 1)
>   *   lists of files to feed to subprocesses 2) State on exit
> - *   statusses of past subprocesses.
> + *   statuses of past subprocesses.
>   */
>  /* ARGSUSED1 */
>  int

i committed this separately as i changed "statuses" to "status".
"status" is uncountable (we don;t have a separate plural), and besides
the plural of "subprocesses" is enough.

jmc

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Fri, Dec 23, 2022 at 10:33:43AM -0500, Paul Tagliamonte wrote:
> On Fri, Dec 23, 2022 at 03:03:15PM +, Stuart Henderson wrote:
> > > -struct itype *void_it;   /* no type is emited 
> > > for void */
> > > +struct itype *void_it;   /* no type is emitted 
> > > for void */
> > 
> > style(9) issue, this exceeds 80 columns
> 
> I've reflowed the line. I shudder to think that this was done
> intentionally to make it fit
> 

doh! so without spotting this note i wondered why you'd added a fix like
this, decided i didn;t want a anything to do with it, and committed only
the emited -> emitted fix. then i get to this note ;(

i've backed it out. if any other dev wants to take ctfconv/parse.c part
of this, be my guest. i'm not touching it.

jmc

Re: [patch(es)] fix a few typos in /src

[Stuart Henderson]

On 2022/12/26 11:25, Theo Buehler wrote:
> On Mon, Dec 26, 2022 at 07:18:45AM -0300, Crystal Kolipe wrote:
> > On Mon, Dec 26, 2022 at 07:34:04AM +, Jason McIntyre wrote:
> > > On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> > > 
> > > hi. i've committed the parts of this diff relating to libssl.
> > > jmc
> > > 
> > > > ===
> > > > Index: lib/libssl/test/pkits-test.pl
> > > > ===
> > 
> > This commit contains changes to the code, it is not just a spelling fix:
> > 
> > http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libssl/test/pkits-test.pl.diff?r1=1.1&r2=1.2&f=h
> 
> No. This change was already there in 1.1.1.1

Not in 1.1.1.1 but in 1.1.1.2. cvsweb is diffing between 1.1 (equal to
1.1.1.1) and 1.2, not 1.1.1.2 which came a few days later.

Re: [patch(es)] fix a few typos in /src

[Crystal Kolipe]

On Mon, Dec 26, 2022 at 11:25:22AM +0100, Theo Buehler wrote:
> On Mon, Dec 26, 2022 at 07:18:45AM -0300, Crystal Kolipe wrote:
> > On Mon, Dec 26, 2022 at 07:34:04AM +, Jason McIntyre wrote:
> > > On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> > > 
> > > hi. i've committed the parts of this diff relating to libssl.
> > > jmc
> > > 
> > > > ===
> > > > Index: lib/libssl/test/pkits-test.pl
> > > > ===
> > 
> > This commit contains changes to the code, it is not just a spelling fix:
> > 
> > http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libssl/test/pkits-test.pl.diff?r1=1.1&r2=1.2&f=h
> 
> No. This change was already there in 1.1.1.1

Ah, OK, I'm seeing now that it's a CVS issue, sorry for the noise.

The cvsweb script doesn't deal very well with 1.1.1.1 being set as a vendor
branch.

Re: [patch(es)] fix a few typos in /src

[Theo Buehler]

On Mon, Dec 26, 2022 at 07:18:45AM -0300, Crystal Kolipe wrote:
> On Mon, Dec 26, 2022 at 07:34:04AM +, Jason McIntyre wrote:
> > On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> > 
> > hi. i've committed the parts of this diff relating to libssl.
> > jmc
> > 
> > > ===
> > > Index: lib/libssl/test/pkits-test.pl
> > > ===
> 
> This commit contains changes to the code, it is not just a spelling fix:
> 
> http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libssl/test/pkits-test.pl.diff?r1=1.1&r2=1.2&f=h

No. This change was already there in 1.1.1.1

Re: [patch(es)] fix a few typos in /src

[Crystal Kolipe]

On Mon, Dec 26, 2022 at 07:34:04AM +, Jason McIntyre wrote:
> On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> 
> hi. i've committed the parts of this diff relating to libssl.
> jmc
> 
> > ===
> > Index: lib/libssl/test/pkits-test.pl
> > ===

This commit contains changes to the code, it is not just a spelling fix:

http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libssl/test/pkits-test.pl.diff?r1=1.1&r2=1.2&f=h

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> 
> Updated patch attached with your feedback, thank you Crystal
> 

hi.

i'm rejecting these parts of this diff:

Index: lib/libcurses/term.5
Index: lib/libcurses/tinfo/comp_hash.c
Index: lib/libcurses/tty/hashmap.c
Index: lib/libedit/el.h
Index: lib/libedit/filecomplete.c
Index: lib/libedit/readline.c
Index: lib/libedit/refresh.c
Index: lib/libedit/search.c
Index: lib/libevent/buffer.c
Index: lib/libevent/event.c
Index: lib/libevent/kqueue.c
Index: lib/libexpat/Changes
Index: lib/libform/fld_info.c
Index: lib/libform/fld_user.c
Index: lib/libform/frm_post.c
Index: lib/libform/frm_user.c

for changes to curses/form i suggest you check out the latest curses
changes and mail them any relevant fixes.

for changes to libedit/libevent/libexpat i am not convinced that i
should just commit to these willy nilly. if any devs in the relevant
areas want to contact me to go ahead, fine.

jmc

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:

hi. i've committed the parts of this diff relating to libssl.
jmc

> Index: lib/libssl/d1_both.c
> ===
> Index: lib/libssl/ssl.h
> ===
> Index: lib/libssl/ssl_clnt.c
> ===
> Index: lib/libssl/ssl_local.h
> ===
> Index: lib/libssl/ssl_srvr.c
> ===
> Index: lib/libssl/doc/openssl.cnf
> ===
> Index: lib/libssl/doc/standards.txt
> ===
> Index: lib/libssl/test/CAss.cnf
> ===
> Index: lib/libssl/test/CAtsa.cnf
> ===
> Index: lib/libssl/test/pkits-test.pl
> ===

Re: [patch(es)] fix a few typos in /src

[Jason McIntyre]

On Thu, Dec 22, 2022 at 10:49:06PM -0500, Paul Tagliamonte wrote:
> 
> Updated patch attached with your feedback, thank you Crystal
> 

hi.

i know by now you have the message that diffs need to be manageable ;)
i'll try and work through your changes as best i can.

so this is a heads up that i committed all parts of this diff from
lib/libcrypto. the libcrypto/libssl parts are a large subset, so i think
changes to these can be kept separate.

within the libcrypto parts, i did not take your arithmetics->arithmetic
changes. they did not seem to me to be clearly correct/preferrable.

i'll get to the rest as time permits.

jmc

Re: [patch(es)] fix a few typos in /src

[Crystal Kolipe]

On Fri, Dec 23, 2022 at 03:03:15PM +, Stuart Henderson wrote:
> Overall imho this is too much churn to do in huge swathes across the
> tree.
> 
> Fixes for spelling/grammar in comments etc are often more usually
> done by people working on a particular part of the tree or trying to
> understand how something works, generally you do need someone in that
> sort of position to review the changes for each area. (Also they
> will have a better idea whether the diff is going to cause conflicts
> with other work in progress). I would prefer to have a misspelt comment
> than one where fixing a spelling has resulted in some incorrect
> change of meaning that hasn't been noticed because it was done as
> part of a huge diff..

I agree with Stuart here.

Re: [patch(es)] fix a few typos in /src

[Stuart Henderson]

> +++ usr.bin/ctfconv/parse.c   22 Dec 2022 21:15:27 -
> @@ -72,7 +72,7 @@ RB_HEAD(itype_tree, itype)   itypet[CTF_K
>   */
>  struct isymb_tree isymbt;
>  
> -struct itype *void_it;   /* no type is emited for void */
> +struct itype *void_it;   /* no type is emitted for void 
> */

style(9) issue, this exceeds 80 columns

> --- usr.bin/dig/lib/dns/include/dns/name.h14 Sep 2020 08:40:43 -  
> 1.12
> +++ usr.bin/dig/lib/dns/include/dns/name.h22 Dec 2022 21:15:27 -
> @@ -354,7 +354,7 @@ dns_name_equal(const dns_name_t *name1, 
>   * \li   Because it only needs to test for equality, dns_name_equal() 
> can be
>   *   significantly faster than dns_name_fullcompare() or dns_name_compare().
>   *
> - * \li   Offsets tables are not used in the comparision.
> + * \li   Offsets tables are not used in the comparison.

probably "Offset tables are..."

A bunch of the files in your diff come from external upstream sources
which are still synced from upstream (or at least should be); patching
in the OpenBSD tree makes it harder to merge in updates. (including
at least curses, the "magic" files for file, nsd, unbound).

If problems in those still exist upstream, fixes should be fed there
instead of to OpenBSD (and we'll pick them up when next updated).

Overall imho this is too much churn to do in huge swathes across the
tree.

Fixes for spelling/grammar in comments etc are often more usually
done by people working on a particular part of the tree or trying to
understand how something works, generally you do need someone in that
sort of position to review the changes for each area. (Also they
will have a better idea whether the diff is going to cause conflicts
with other work in progress). I would prefer to have a misspelt comment
than one where fixing a spelling has resulted in some incorrect
change of meaning that hasn't been noticed because it was done as
part of a huge diff..

Re: [patch(es)] fix a few typos in /src

[Crystal Kolipe]

OK, I've looked through the other 50% of the original diff, (I've not looked
at the new one).

Comments in-line:

On Thu, Dec 22, 2022 at 06:31:23PM -0500, Paul Tagliamonte wrote:
> Index: lib/libssl/test/pkits-test.pl
> ===
> RCS file: /cvs/src/lib/libssl/test/pkits-test.pl,v
> retrieving revision 1.1.1.2
> diff -u -p -r1.1.1.2 pkits-test.pl
> --- lib/libssl/test/pkits-test.pl 13 Oct 2012 21:23:50 -  1.1.1.2
> +++ lib/libssl/test/pkits-test.pl 22 Dec 2022 21:14:14 -
> @@ -124,7 +124,7 @@ my @testlists = (
>  [ "4.4.7", "Valid Two CRLs Test7",  0 ],
>  
>  # The test document suggests these should return certificate revoked...
> -# Subsquent discussion has concluded they should not due to unhandle
> +# Subsequent discussion has concluded they should not due to unhandle
>  # critical CRL extensions.
>  [ "4.4.8", "Invalid Unknown CRL Entry Extension Test8", 36 ],
>  [ "4.4.9", "Invalid Unknown CRL Extension Test9",   36 ],
> @@ -749,7 +749,7 @@ my @testlists = (
>  [ "4.14.29", "Valid cRLIssuer Test29",0 ],
>  
>  # Although this test is valid it has a circular dependency. As a result
> -# an attempt is made to reursively checks a CRL path and rejected due to
> +# an attempt is made to recursively checks a CRL path and rejected due to
>  # a CRL path validation error. PKITS notes suggest this test does not
>  # need to be run due to this issue.
>  [ "4.14.30", "Valid cRLIssuer Test30", 
> 54 ],

If we're going to change it at all, we should fix the bad grammar at the same
time, checks -> check.

> Index: usr.bin/vi/docs/USD.doc/exref/ex.summary
> ===
> RCS file: /cvs/src/usr.bin/vi/docs/USD.doc/exref/ex.summary,v
> retrieving revision 1.6
> diff -u -p -r1.6 ex.summary
> --- usr.bin/vi/docs/USD.doc/exref/ex.summary  30 Jan 2004 23:14:26 -  
> 1.6
> +++ usr.bin/vi/docs/USD.doc/exref/ex.summary  22 Dec 2022 21:15:30 -
> @@ -590,8 +590,8 @@ made; see the manual for details.
>  T}   T{
>  .nf
>  :\fB3p
> -\fRLine 3 contains a misstake
> -:\fBs/misstake/mistake/
> +\fRLine 3 contains a mistake
> +:\fBs/mistake/mistake/
>  \fRLine 3 contains a mistake
>  \*c
>  .fi

This is an entirely intentional mis-spelling, as it is documenting the
substitute function of ex.

> Index: usr.sbin/smtpd/crypto.c
> ===
> RCS file: /cvs/src/usr.sbin/smtpd/crypto.c,v
> retrieving revision 1.10
> diff -u -p -r1.10 crypto.c
> --- usr.sbin/smtpd/crypto.c   14 Jun 2021 17:58:15 -  1.10
> +++ usr.sbin/smtpd/crypto.c   22 Dec 2022 21:15:32 -
> @@ -375,7 +375,7 @@ main(int argc, char *argv[])
>   /* uncomment below to provoke integrity check failure */
>   /*
>* fpin = fopen("/tmp/passwd.enc", "a");
> -  * fprintf(fpin, "borken");
> +  * fprintf(fpin, "broken");
>* fclose(fpin);
>*/
>   fpin = fopen("/tmp/passwd.enc", "r");

Be careful.  We shouldn't change borken to broken across the tree with a
simple search and replace.

Whist in this case it seems, (to me), to be a typo, the word 'borken' is
sometimes used as a derivative of 'borked', and understood to mean very much
broken, I.E. synonymous with 'fubar'.

> Index: usr.sbin/smtpd/mta_session.c
> ===
> RCS file: /cvs/src/usr.sbin/smtpd/mta_session.c,v
> retrieving revision 1.147
> diff -u -p -r1.147 mta_session.c
> --- usr.sbin/smtpd/mta_session.c  26 Sep 2022 08:48:52 -  1.147
> +++ usr.sbin/smtpd/mta_session.c  22 Dec 2022 21:15:32 -
> @@ -635,7 +635,7 @@ again:
>   else if (s->relay->secret) {
>   log_debug("debug: mta: %p: not using AUTH on non-TLS "
>   "session", s);
> - mta_error(s, "Refuse to AUTH over unsecure channel");
> + mta_error(s, "Refuse to AUTH over insecure channel");
>   mta_connect(s);
>   } else {
>   mta_enter_state(s, MTA_READY);

This seems like change for change's sake, as 'unsecure' is a perfectly valid,
if slightly antiquated alternative.

Whilst I agree that correcting spelling and grammar is important, (especially
as it affects searching of the source tree), any changes need to be extensively
manually reviewed.

I would like to point out to the list that just because I have read through
this massive diff and highlighted some issues does not mean that I am
supporting the rest of the changes.

Re: [patch(es)] fix a few typos in /src

[Crystal Kolipe]

I've only read through 50% of this so far, but there are a few issues:

On Thu, Dec 22, 2022 at 06:31:23PM -0500, Paul Tagliamonte wrote:

> Index: lib/libcurses/base/resizeterm.c
> ===
> RCS file: /cvs/src/lib/libcurses/base/resizeterm.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 resizeterm.c
> --- lib/libcurses/base/resizeterm.c   10 Mar 2021 20:16:08 -  1.4
> +++ lib/libcurses/base/resizeterm.c   22 Dec 2022 21:14:13 -
> @@ -48,7 +48,7 @@ MODULE_ID("$Id: resizeterm.c,v 1.4 2021/
>  #define stolen_lines (screen_lines - SP->_lines_avail)
>  
>  /*
> - * If we're trying to be reentrant, do not want any local statics.
> + * If we're trying to be reentrant, do not want any local statistics.
>   */
>  #if USE_REENTRANT
>  #define EXTRA_ARGS , CurLines, CurCols

This is an incorrect change, and actually introduces a new error.

'Statics' here is entirely correct.

> Index: lib/libcrypto/objects/obj_dat.c
> ===
> RCS file: /cvs/src/lib/libcrypto/objects/obj_dat.c,v
> retrieving revision 1.50
> diff -u -p -r1.50 obj_dat.c
> --- lib/libcrypto/objects/obj_dat.c   26 Nov 2022 16:08:53 -  1.50
> +++ lib/libcrypto/objects/obj_dat.c   22 Dec 2022 21:14:12 -
> @@ -251,7 +251,7 @@ static IMPLEMENT_LHASH_DOALL_FN(cleanup2
>  static IMPLEMENT_LHASH_DOALL_FN(cleanup3, ADDED_OBJ)
>  
>  /* The purpose of obj_cleanup_defer is to avoid EVP_cleanup() attempting
> - * to use freed up OIDs. If neccessary the actual freeing up of OIDs is
> + * to use freed up OIDs. If necessary the actual freeing up of OIDs is
>   * delayed.
>   */
>  
> @@ -320,7 +320,7 @@ OBJ_add_object(const ASN1_OBJECT *obj)
>   ao[i]->type = i;
>   ao[i]->obj = o;
>   aop = lh_ADDED_OBJ_insert(added, ao[i]);
> - /* memory leak, buit should not normally matter */
> + /* memory leak, built should not normally matter */
>   free(aop);
>   }
>   }

This is wrong.  You are changing 'buit' to 'built', but the correct word
would be 'but'.

> Index: include/rpc/rpc_des.h
> ===
> RCS file: /cvs/src/include/rpc/rpc_des.h,v
> retrieving revision 1.4
> diff -u -p -r1.4 rpc_des.h
> --- include/rpc/rpc_des.h 1 Sep 2010 14:43:34 -   1.4
> +++ include/rpc/rpc_des.h 22 Dec 2022 21:14:06 -
> @@ -9,7 +9,7 @@
>   * The implementation was written so as to conform with Netscapes SSL.
>   * 
>   * This library is free for commercial and non-commercial use as long as
> - * the following conditions are aheared to.  The following conditions
> + * the following conditions are adhered to.  The following conditions
>   * apply to all code found in this distribution, be it the RC4, RSA,
>   * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
>   * included with this distribution is covered by the same copyright terms
> @@ -34,7 +34,7 @@
>   *must display the following acknowledgement:
>   *"This product includes cryptographic software written by
>   * Eric Young (e...@mincom.oz.au)"
> - *The word 'cryptographic' can be left out if the rouines from the 
> library
> + *The word 'cryptographic' can be left out if the routines from the 
> library
>   *being used are not cryptographic related :-).
>   * 4. If you include any Windows specific code (or a derivative thereof) 
> from 
>   *the apps directory (application code) you must include an 
> acknowledgement:
> @@ -52,7 +52,7 @@
>   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>   * SUCH DAMAGE.
>   * 
> - * The licence and distribution terms for any publically available version or
> + * The licence and distribution terms for any publicly available version or
>   * derivative of this code cannot be changed.  i.e. this code cannot simply 
> be
>   * copied and put under another distribution licence
>   * [including the GNU Public Licence.]

You shouldn't change license texts, even for spelling correction, as you
are changing the license itself.

> Index: lib/libcrypto/arch/aarch64/opensslconf.h
> ===
> RCS file: /cvs/src/lib/libcrypto/arch/aarch64/opensslconf.h,v
> retrieving revision 1.1
> diff -u -p -r1.1 opensslconf.h
> --- lib/libcrypto/arch/aarch64/opensslconf.h  11 Jan 2017 18:11:01 -  
> 1.1
> +++ lib/libcrypto/arch/aarch64/opensslconf.h  22 Dec 2022 21:14:10 -
> @@ -60,7 +60,7 @@
>  /* Only one for the following should be defined */
>  /* The prime number generation stuff may not work when
>   * EIGHT_BIT but I don't care since I've only used this mode
> - * for debuging the bignum libraries */
> + * for debugging the bignum libraries */
>  #define SIXTY_FOUR_BIT_LONG
>  #undef SIXTY_FOUR_BIT
>  #undef THIR

Re: two small typos

[Stuart Henderson]

thanks, committed.

On 2022/03/17 19:16, Martin Vahlensieck wrote:
> Index: if_wg.c
> ===
> RCS file: /home/reposync/cvs/src/sys/net/if_wg.c,v
> retrieving revision 1.22
> diff -u -p -r1.22 if_wg.c
> --- if_wg.c   22 Feb 2022 01:15:02 -  1.22
> +++ if_wg.c   15 Mar 2022 21:10:37 -
> @@ -2023,7 +2023,7 @@ wg_input(void *_sc, struct mbuf *m, stru
>  
>   /*
>* Ensure mbuf is contiguous over full length of packet. This is done
> -  * os we can directly read the handshake values in wg_handshake, and so
> +  * so we can directly read the handshake values in wg_handshake, and so
>* we can decrypt a transport packet by passing a single buffer to
>* noise_remote_decrypt in wg_decap.
>*/
> Index: pf.c
> ===
> RCS file: /home/reposync/cvs/src/sys/net/pf.c,v
> retrieving revision 1.1125
> diff -u -p -r1.1125 pf.c
> --- pf.c  5 Mar 2022 10:43:32 -   1.1125
> +++ pf.c  10 Mar 2022 15:53:51 -
> @@ -1340,7 +1340,7 @@ pf_state_expires(const struct pf_state *
>* this function may be called by the state purge task while
>* the state is being modified. avoid inconsistent reads of
>* state->timeout by having the caller do the read (and any
> -  * chacks it needs to do on the same variable) and then pass
> +  * checks it needs to do on the same variable) and then pass
>* their view of the timeout in here for this function to use.
>* the only consequence of using a stale timeout value is
>* that the state won't be a candidate for purging until the
> 

two small typos

[Martin Vahlensieck]

Index: if_wg.c
===
RCS file: /home/reposync/cvs/src/sys/net/if_wg.c,v
retrieving revision 1.22
diff -u -p -r1.22 if_wg.c
--- if_wg.c 22 Feb 2022 01:15:02 -  1.22
+++ if_wg.c 15 Mar 2022 21:10:37 -
@@ -2023,7 +2023,7 @@ wg_input(void *_sc, struct mbuf *m, stru
 
/*
 * Ensure mbuf is contiguous over full length of packet. This is done
-* os we can directly read the handshake values in wg_handshake, and so
+* so we can directly read the handshake values in wg_handshake, and so
 * we can decrypt a transport packet by passing a single buffer to
 * noise_remote_decrypt in wg_decap.
 */
Index: pf.c
===
RCS file: /home/reposync/cvs/src/sys/net/pf.c,v
retrieving revision 1.1125
diff -u -p -r1.1125 pf.c
--- pf.c5 Mar 2022 10:43:32 -   1.1125
+++ pf.c10 Mar 2022 15:53:51 -
@@ -1340,7 +1340,7 @@ pf_state_expires(const struct pf_state *
 * this function may be called by the state purge task while
 * the state is being modified. avoid inconsistent reads of
 * state->timeout by having the caller do the read (and any
-* chacks it needs to do on the same variable) and then pass
+* checks it needs to do on the same variable) and then pass
 * their view of the timeout in here for this function to use.
 * the only consequence of using a stale timeout value is
 * that the state won't be a candidate for purging until the

packages-specs(7): minor typos

[Maxim]

Two little fixes in packages-specs(7).

diff --git share/man/man7/packages-specs.7 share/man/man7/packages-specs.7
index 8154206c7..9b3d7b5e7 100644
--- share/man/man7/packages-specs.7
+++ share/man/man7/packages-specs.7
@@ -71,7 +71,7 @@ In case there are substantial changes in the
 package, a patch level marker should be appended, e.g.,
 .Sq p0 ,
 .Sq p1 ...
-For example, assuming that the screen package for release 2.8 was
+For example, assuming that the screen package for release 2.9.8 was
 named
 .Qq screen-2.9.8
 and that an important security patch led to a newer package,
@@ -267,7 +267,7 @@ characters trigger the transform.
 .Pp
 If the flavor specification is left blank, any flavor will do.
 Note that most default package names don't contain flavor specification,
-which means that any flavor will do
+which means that any flavor will do.
 For instance, in
 .Bd -literal -offset indent
 LIB_DEPENDS = graphics/aalib

[Patch] Fix a few typos (etc.) in 70.html

[Ross L Richardson]

Hope these are right!

Ross

Index: 70.html
===
RCS file: /cvs/www/70.html,v
retrieving revision 1.83
diff -u -p -r1.83 70.html
--- 70.html 8 Oct 2021 16:31:36 -   1.83
+++ 70.html 9 Oct 2021 11:04:41 -
@@ -483,7 +483,7 @@ to 7.0.
In https://man.openbsd.org/bgpctl.8";>bgpctl(8) print 
out both the sent "Neighbor capabilities" and the
"Negotiated capabilities" for a session. 
Print timestamps both as a formatted and a pure time in seconds
-   filed in various JSON objects.
+   field in various JSON objects.
Fixed a bug, where during https://man.openbsd.org/bgpd.8";>bgpd(8) config reloads prefixes of the
wrong address family could leak to peers resulting in session 
resets.
Added support for RFC 7313 - Enhanced Route Refresh
@@ -501,7 +501,7 @@ to 7.0.
Implemented receive side of RFC 7911 - Advertisement of Multiple 
Paths
in BGP. OpenBGPD is currently not able to send multiple paths out.
Improved checks of VRPs loaded via RTR or from the roa-set table.
-   Allowed to optionally specify an expiry time for roa-set entries to
+   Allowed optionally specifying an expiry time for roa-set entries to
mitigate BGP route decision making based on outdated RPKI data.
OpenBGPD's companion rpki-client(8) produces roa-sets with the
new 'expires' property
@@ -542,10 +542,10 @@ to 7.0.
   and CRL validity times. The 'expires' value can be used to avoid 
route
   selection based on stale data when generating VRP sets, when faced
   with loss of communication between consumer and validator, or
-  validator and CA repository,
+  validator and CA repository.
Made the runtime timeout (-s option) also trigger in
-  child proecesses.
-   Improved RRDP support and make RRDP as default protocol for
+  child processes.
+   Improved RRDP support and make RRDP the default protocol for
   synchronizing the RPKI repository data, with https://man.openbsd.org/openrsync.1";>openrsync(1) used as 
secondary.
At startup, warn if the filesystem containing the cache directory

[Patch] Typos in OpenSSH section of 69.html

[Ross L Richardson]

(Haven't finished reading it yet...)


Index: 69.html
===
RCS file: /cvs/www/69.html,v
retrieving revision 1.61
diff -u -p -r1.61 69.html
--- 69.html 19 Apr 2021 11:22:08 -  1.61
+++ 69.html 19 Apr 2021 12:11:28 -
@@ -1621,7 +1621,7 @@ to 6.9.
agent either to an account shared with a malicious user or to a host
with an attacker holding root access.
 
-Potentially incompatible changes.
+Potentially incompatible changes
 
https://man.openbsd.org/ssh.1";>ssh(1), https://man.openbsd.org/sshd.8";>sshd(8): this release
@@ -1651,8 +1651,8 @@ to 6.9.
replaced with sntrup761x25519-sha...@openssh.com. Per its designers,
the sntrup4591761 algorithm was superseded almost two years ago by
sntrup761.
-   (note this both the updated method and the one that it replaced are
-   disabled by default)
+   (Note that both the updated method and the one that it replaced are
+   disabled by default.)
 
https://man.openbsd.org/ssh.1";>ssh(1): disable
CheckHostIP by default. It provides insignificant benefits while

Re: Typos in ssh man pages

[Jason McIntyre]

On Sun, Apr 04, 2021 at 11:25:56AM +0200, Matthias Schmidt wrote:
> Hi,
> 
> in the recent commits to ssh(d)_config.5 two typos slipped in (looks like
> classic "switch vi to edit mode" typo :)).
> 
> Cheers
> 
>   Matthias
> 

fixed, thanks.
jmc

> 
> diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
> index 5202196bce5..cf7391d9ce1 100644
> --- a/usr.bin/ssh/ssh_config.5
> +++ b/usr.bin/ssh/ssh_config.5
> @@ -373,7 +373,7 @@ by certificate authorities (CAs).
>  The default is:
>  .Bd -literal -offset indent
>  ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
> -sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,i
> +sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,
>  rsa-sha2-512,rsa-sha2-256
>  .Ed
>  .Pp
> diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
> index e2509bb865f..35e9e3fdabc 100644
> --- a/usr.bin/ssh/sshd_config.5
> +++ b/usr.bin/ssh/sshd_config.5
> @@ -379,7 +379,7 @@ by certificate authorities (CAs).
>  The default is:
>  .Bd -literal -offset indent
>  ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
> -sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,i
> +sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,
>  rsa-sha2-512,rsa-sha2-256
>  .Ed
>  .Pp
> 

Typos in ssh man pages

[Matthias Schmidt]

Hi,

in the recent commits to ssh(d)_config.5 two typos slipped in (looks like
classic "switch vi to edit mode" typo :)).

Cheers

Matthias


diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 5202196bce5..cf7391d9ce1 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -373,7 +373,7 @@ by certificate authorities (CAs).
 The default is:
 .Bd -literal -offset indent
 ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
-sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,i
+sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,
 rsa-sha2-512,rsa-sha2-256
 .Ed
 .Pp
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index e2509bb865f..35e9e3fdabc 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/sshd_config.5
@@ -379,7 +379,7 @@ by certificate authorities (CAs).
 The default is:
 .Bd -literal -offset indent
 ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
-sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,i
+sk-ssh-ed25...@openssh.com,sk-ecdsa-sha2-nistp...@openssh.com,
 rsa-sha2-512,rsa-sha2-256
 .Ed
 .Pp

Re: [patch] typos in ldap.1

[Jason McIntyre]

On Tue, Feb 09, 2021 at 09:31:10PM -0500, Dave Voutila wrote:
> Three small changes:
> 
> 1. product -> produce
> 2. remove '.' from sizelimit description
> 3. remove linebreaks on statements about {size,time}limit
> 
> -Dave Voutila
> 

fixed, thanks.
jmc

> Index: usr.bin/ldap/ldap.1
> ===
> RCS file: /cvs/src/usr.bin/ldap/ldap.1,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 ldap.1
> --- usr.bin/ldap/ldap.1   1 Aug 2018 10:42:55 -   1.10
> +++ usr.bin/ldap/ldap.1   10 Feb 2021 02:26:35 -
> @@ -139,8 +139,7 @@ instead.
>  Request the server to abort the search request after
>  .Ar timelimit
>  seconds.
> -The default value is 0
> -for no limit.
> +The default value is 0 for no limit.
>  .It Fl s Ar scope
>  Specify the
>  .Ar scope
> @@ -153,7 +152,7 @@ The default is
>  .Ic sub
>  for subtree searches.
>  .It Fl v
> -Product more verbose output.
> +Produce more verbose output.
>  .It Fl W
>  Prompt for the bind secret with echo turned off.
>  .It Fl w Ar secret
> @@ -176,8 +175,7 @@ Enable TLS using the StartTLS operation.
>  Request the server to limit the search result to a maximum number of
>  .Ar sizelimit
>  entries.
> -The default value is 0.
> -for no limit.
> +The default value is 0 for no limit.
>  .El
>  .Sh FILES
>  .Bl -tag -width "/etc/ssl/cert.pemXXX" -compact
> 

[patch] typos in ldap.1

[Dave Voutila]

Three small changes:

1. product -> produce
2. remove '.' from sizelimit description
3. remove linebreaks on statements about {size,time}limit

-Dave Voutila

Index: usr.bin/ldap/ldap.1
===
RCS file: /cvs/src/usr.bin/ldap/ldap.1,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 ldap.1
--- usr.bin/ldap/ldap.1 1 Aug 2018 10:42:55 -   1.10
+++ usr.bin/ldap/ldap.1 10 Feb 2021 02:26:35 -
@@ -139,8 +139,7 @@ instead.
 Request the server to abort the search request after
 .Ar timelimit
 seconds.
-The default value is 0
-for no limit.
+The default value is 0 for no limit.
 .It Fl s Ar scope
 Specify the
 .Ar scope
@@ -153,7 +152,7 @@ The default is
 .Ic sub
 for subtree searches.
 .It Fl v
-Product more verbose output.
+Produce more verbose output.
 .It Fl W
 Prompt for the bind secret with echo turned off.
 .It Fl w Ar secret
@@ -176,8 +175,7 @@ Enable TLS using the StartTLS operation.
 Request the server to limit the search result to a maximum number of
 .Ar sizelimit
 entries.
-The default value is 0.
-for no limit.
+The default value is 0 for no limit.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/ssl/cert.pemXXX" -compact

Fix EACCESS typos

[Kris Katterjohn]

Hi,

The following diff fixes EACCESS typos (EACCESS -> EACCES) in the man
pages for crypt_checkpass(3), execve(2) and pledge(2), and also in a
comment in sys/kern/kern_unveil.c.

This diff does not mess with tftp stuff (which actually does use its
own EACCESS).

Cheers,
Kris Katterjohn

Index: lib/libc/crypt/crypt_checkpass.3
===
RCS file: /cvs/src/lib/libc/crypt/crypt_checkpass.3,v
retrieving revision 1.11
diff -u -p -r1.11 crypt_checkpass.3
--- lib/libc/crypt/crypt_checkpass.322 Jul 2017 06:39:54 -  1.11
+++ lib/libc/crypt/crypt_checkpass.329 Jul 2019 22:20:38 -
@@ -83,7 +83,7 @@ The
 function sets
 .Va errno
 to
-.Er EACCESS
+.Er EACCES
 when authentication fails.
 .Pp
 The
Index: lib/libc/sys/execve.2
===
RCS file: /cvs/src/lib/libc/sys/execve.2,v
retrieving revision 1.51
diff -u -p -r1.51 execve.2
--- lib/libc/sys/execve.2   12 Dec 2017 01:12:34 -  1.51
+++ lib/libc/sys/execve.2   29 Jul 2019 22:20:38 -
@@ -273,7 +273,7 @@ system not allowing such operations, bei
 .Xr mount 8
 .Fl o Cm wxallowed
 flag.
-.It Bq Er EACCESS
+.It Bq Er EACCES
 The parent used
 .Xr pledge 2
 to declare an
Index: lib/libc/sys/pledge.2
===
RCS file: /cvs/src/lib/libc/sys/pledge.2,v
retrieving revision 1.56
diff -u -p -r1.56 pledge.2
--- lib/libc/sys/pledge.2   25 Jul 2019 14:18:01 -  1.56
+++ lib/libc/sys/pledge.2   29 Jul 2019 22:20:38 -
@@ -466,7 +466,7 @@ If
 .Ar execpromises
 has been previously set the new program begins with those promises,
 unless setuid/setgid bits are set in which case execution is blocked with
-.Er EACCESS .
+.Er EACCES .
 Otherwise the new program starts running without pledge active,
 and hopefully makes a new pledge soon.
 .It Va prot_exec
Index: sys/kern/kern_unveil.c
===
RCS file: /cvs/src/sys/kern/kern_unveil.c,v
retrieving revision 1.28
diff -u -p -r1.28 kern_unveil.c
--- sys/kern/kern_unveil.c  25 Jul 2019 09:37:32 -  1.28
+++ sys/kern/kern_unveil.c  29 Jul 2019 22:20:38 -
@@ -864,7 +864,7 @@ unveil_check_final(struct proc *p, struc
 #endif
/*
 * If dir has user set restrictions fail with
-* EACCESS. Otherwise, use any covering match
+* EACCES. Otherwise, use any covering match
 * that we found above this dir.
 */
if (uv->uv_flags & UNVEIL_USERSET) {

Re: typos in /src/sys/dev/pci/if_jme.c

[Jason McIntyre]

On Sat, May 25, 2019 at 09:27:48AM -0500, J Sisson wrote:
> Noticed a typo in jme(4) printf output.  Found additional typos while
> browsing the code.
> 
> Yes, possibly the most useless diff ever...I freely admit it.
> 

fixed, thanks (though note your diff didn;t apply).
jmc

> Index: sys/dev/pci/if_jme.c
> ===
> RCS file: /cvs/src/sys/dev/pci/if_jme.c,v
> retrieving revision 1.51
> diff -u -p -u -r1.51 if_jme.c
> --- sys/dev/pci/if_jme.c29 Mar 2019 17:25:44 -  1.51
> +++ sys/dev/pci/if_jme.c25 May 2019 14:19:46 -
> @@ -233,7 +233,7 @@ jme_miibus_statchg(struct device *dev)
>  * Disabling Rx/Tx MACs have a side-effect of resetting
>  * JME_TXNDA/JME_RXNDA register to the first address of
>  * Tx/Rx descriptor address. So driver should reset its
> -* internal procucer/consumer pointer and reclaim any
> +* internal producer/consumer pointer and reclaim any
>  * allocated resources.  Note, just saving the value of
>  * JME_TXNDA and JME_RXNDA registers before stopping MAC
>  * and restoring JME_TXNDA/JME_RXNDA register is not
> @@ -277,7 +277,7 @@ jme_miibus_statchg(struct device *dev)
> 
> /*
>  * Reuse configured Rx descriptors and reset
> -* procuder/consumer index.
> +* producer/consumer index.
>  */
> sc->jme_cdata.jme_rx_cons = 0;
> 
> @@ -550,7 +550,7 @@ jme_attach(struct device *parent, struct
>  * JMC250 supports both memory mapped and I/O register space
>  * access.  Because I/O register access should use different
>  * BARs to access registers it's waste of time to use I/O
> -* register spce access.  JMC250 uses 16K to map entire memory
> +* register space access.  JMC250 uses 16K to map entire memory
>  * space.
>  */
> 
> @@ -984,7 +984,7 @@ jme_dma_free(struct jme_softc *sc)
>  /*
>   * Unlike other ethernet controllers, JMC250 requires
>   * explicit resetting link speed to 10/100Mbps as gigabit
> - * link will cunsume more power than 375mA.
> + * link will consume more power than 375mA.
>   * Note, we reset the link speed to 10/100Mbps with
>   * auto-negotiation but we don't know whether that operation
>   * would succeed or not as we have no control after powering
> @@ -1169,7 +1169,7 @@ jme_encap(struct jme_softc *sc, struct m
> sc->jme_cdata.jme_tx_prod = prod;
> /*
>  * Finally request interrupt and give the first descriptor
> -* owenership to hardware.
> +* ownership to hardware.
>  */
> desc = txd->tx_desc;
> desc->flags |= htole32(JME_TD_OWN | JME_TD_INTR);
> @@ -1534,7 +1534,7 @@ jme_txeof(struct jme_softc *sc)
> /*
>  * Only the first descriptor of multi-descriptor
>  * transmission is updated so driver have to skip entire
> -* chained buffers for the transmiited frame. In other
> +* chained buffers for the transmitted frame. In other
>  * words, JME_TD_OWN bit is valid only at the first
>  * descriptor of a multi-descriptor transmission.
>  */
> @@ -2110,7 +2110,7 @@ jme_stop_rx(struct jme_softc *sc)
> break;
> }
> if (i == 0)
> -   printf("%s: stopping recevier timeout!\n", 
> sc->sc_dev.dv_xname);
> +   printf("%s: stopping receiver timeout!\n", 
> sc->sc_dev.dv_xname);
>  }
> 
>  void
> 

typos in /src/sys/dev/pci/if_jme.c

[J Sisson]

Noticed a typo in jme(4) printf output.  Found additional typos while
browsing the code.

Yes, possibly the most useless diff ever...I freely admit it.

Index: sys/dev/pci/if_jme.c
===
RCS file: /cvs/src/sys/dev/pci/if_jme.c,v
retrieving revision 1.51
diff -u -p -u -r1.51 if_jme.c
--- sys/dev/pci/if_jme.c29 Mar 2019 17:25:44 -  1.51
+++ sys/dev/pci/if_jme.c25 May 2019 14:19:46 -
@@ -233,7 +233,7 @@ jme_miibus_statchg(struct device *dev)
 * Disabling Rx/Tx MACs have a side-effect of resetting
 * JME_TXNDA/JME_RXNDA register to the first address of
 * Tx/Rx descriptor address. So driver should reset its
-* internal procucer/consumer pointer and reclaim any
+* internal producer/consumer pointer and reclaim any
 * allocated resources.  Note, just saving the value of
 * JME_TXNDA and JME_RXNDA registers before stopping MAC
 * and restoring JME_TXNDA/JME_RXNDA register is not
@@ -277,7 +277,7 @@ jme_miibus_statchg(struct device *dev)

/*
 * Reuse configured Rx descriptors and reset
-* procuder/consumer index.
+* producer/consumer index.
 */
sc->jme_cdata.jme_rx_cons = 0;

@@ -550,7 +550,7 @@ jme_attach(struct device *parent, struct
 * JMC250 supports both memory mapped and I/O register space
 * access.  Because I/O register access should use different
 * BARs to access registers it's waste of time to use I/O
-* register spce access.  JMC250 uses 16K to map entire memory
+* register space access.  JMC250 uses 16K to map entire memory
 * space.
 */

@@ -984,7 +984,7 @@ jme_dma_free(struct jme_softc *sc)
 /*
  * Unlike other ethernet controllers, JMC250 requires
  * explicit resetting link speed to 10/100Mbps as gigabit
- * link will cunsume more power than 375mA.
+ * link will consume more power than 375mA.
  * Note, we reset the link speed to 10/100Mbps with
  * auto-negotiation but we don't know whether that operation
  * would succeed or not as we have no control after powering
@@ -1169,7 +1169,7 @@ jme_encap(struct jme_softc *sc, struct m
sc->jme_cdata.jme_tx_prod = prod;
/*
 * Finally request interrupt and give the first descriptor
-* owenership to hardware.
+* ownership to hardware.
 */
desc = txd->tx_desc;
desc->flags |= htole32(JME_TD_OWN | JME_TD_INTR);
@@ -1534,7 +1534,7 @@ jme_txeof(struct jme_softc *sc)
/*
 * Only the first descriptor of multi-descriptor
 * transmission is updated so driver have to skip entire
-* chained buffers for the transmiited frame. In other
+* chained buffers for the transmitted frame. In other
 * words, JME_TD_OWN bit is valid only at the first
 * descriptor of a multi-descriptor transmission.
 */
@@ -2110,7 +2110,7 @@ jme_stop_rx(struct jme_softc *sc)
break;
}
if (i == 0)
-   printf("%s: stopping recevier timeout!\n", sc->sc_dev.dv_xname);
+   printf("%s: stopping receiver timeout!\n", sc->sc_dev.dv_xname);
 }

 void

Re: if_umb.c: typos

[Gerhard Roth]

Hello Ingo,

I must apologize for my sticky fingers and lots of copy & pasting :/
Thanks for finding.

ok gerhard@


On Mon, 14 Jan 2019 14:21:37 +0100 Ingo Feinerer  wrote:
> A few messsage -> message fixes.
> 
> Index: if_umb.c
> ===
> RCS file: /cvs/src/sys/dev/usb/if_umb.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 if_umb.c
> --- if_umb.c  2 Oct 2018 19:49:10 -   1.21
> +++ if_umb.c  14 Jan 2019 13:16:50 -
> @@ -1197,7 +1197,7 @@ umb_decode_response(struct umb_softc *sc
>   umb_command_done(sc, response, len);
>   break;
>   default:
> - DPRINTF("%s: discard messsage %s\n", DEVNAM(sc),
> + DPRINTF("%s: discard message %s\n", DEVNAM(sc),
>   umb_request2str(type));
>   break;
>   }
> @@ -1211,19 +1211,19 @@ umb_handle_indicate_status_msg(struct um
>   uint32_t cid;
>  
>   if (len < sizeof (*m)) {
> - DPRINTF("%s: discard short %s messsage\n", DEVNAM(sc),
> + DPRINTF("%s: discard short %s message\n", DEVNAM(sc),
>   umb_request2str(letoh32(m->hdr.type)));
>   return;
>   }
>   if (memcmp(m->devid, umb_uuid_basic_connect, sizeof (m->devid))) {
> - DPRINTF("%s: discard %s messsage for other UUID '%s'\n",
> + DPRINTF("%s: discard %s message for other UUID '%s'\n",
>   DEVNAM(sc), umb_request2str(letoh32(m->hdr.type)),
>   umb_uuid2str(m->devid));
>   return;
>   }
>   infolen = letoh32(m->infolen);
>   if (len < sizeof (*m) + infolen) {
> - DPRINTF("%s: discard truncated %s messsage (want %d, got %d)\n",
> + DPRINTF("%s: discard truncated %s message (want %d, got %d)\n",
>   DEVNAM(sc), umb_request2str(letoh32(m->hdr.type)),
>   (int)sizeof (*m) + infolen, len);
>   return;
> @@ -2333,7 +2333,7 @@ umb_command_done(struct umb_softc *sc, v
>   int  qmimsg = 0;
>  
>   if (len < sizeof (*cmd)) {
> - DPRINTF("%s: discard short %s messsage\n", DEVNAM(sc),
> + DPRINTF("%s: discard short %s message\n", DEVNAM(sc),
>   umb_request2str(letoh32(cmd->hdr.type)));
>   return;
>   }
> @@ -2341,7 +2341,7 @@ umb_command_done(struct umb_softc *sc, v
>   if (memcmp(cmd->devid, umb_uuid_basic_connect, sizeof (cmd->devid))) {
>   if (memcmp(cmd->devid, umb_uuid_qmi_mbim,
>   sizeof (cmd->devid))) {
> - DPRINTF("%s: discard %s messsage for other UUID '%s'\n",
> + DPRINTF("%s: discard %s message for other UUID '%s'\n",
>   DEVNAM(sc), umb_request2str(letoh32(cmd->hdr.type)),
>   umb_uuid2str(cmd->devid));
>   return;
> @@ -2370,7 +2370,7 @@ umb_command_done(struct umb_softc *sc, v
>  
>   infolen = letoh32(cmd->infolen);
>   if (len < sizeof (*cmd) + infolen) {
> - DPRINTF("%s: discard truncated %s messsage (want %d, got %d)\n",
> + DPRINTF("%s: discard truncated %s message (want %d, got %d)\n",
>   DEVNAM(sc), umb_cid2str(cid),
>   (int)sizeof (*cmd) + infolen, len);
>   return;

if_umb.c: typos

[Ingo Feinerer]

A few messsage -> message fixes.

Index: if_umb.c
===
RCS file: /cvs/src/sys/dev/usb/if_umb.c,v
retrieving revision 1.21
diff -u -p -r1.21 if_umb.c
--- if_umb.c2 Oct 2018 19:49:10 -   1.21
+++ if_umb.c14 Jan 2019 13:16:50 -
@@ -1197,7 +1197,7 @@ umb_decode_response(struct umb_softc *sc
umb_command_done(sc, response, len);
break;
default:
-   DPRINTF("%s: discard messsage %s\n", DEVNAM(sc),
+   DPRINTF("%s: discard message %s\n", DEVNAM(sc),
umb_request2str(type));
break;
}
@@ -1211,19 +1211,19 @@ umb_handle_indicate_status_msg(struct um
uint32_t cid;
 
if (len < sizeof (*m)) {
-   DPRINTF("%s: discard short %s messsage\n", DEVNAM(sc),
+   DPRINTF("%s: discard short %s message\n", DEVNAM(sc),
umb_request2str(letoh32(m->hdr.type)));
return;
}
if (memcmp(m->devid, umb_uuid_basic_connect, sizeof (m->devid))) {
-   DPRINTF("%s: discard %s messsage for other UUID '%s'\n",
+   DPRINTF("%s: discard %s message for other UUID '%s'\n",
DEVNAM(sc), umb_request2str(letoh32(m->hdr.type)),
umb_uuid2str(m->devid));
return;
}
infolen = letoh32(m->infolen);
if (len < sizeof (*m) + infolen) {
-   DPRINTF("%s: discard truncated %s messsage (want %d, got %d)\n",
+   DPRINTF("%s: discard truncated %s message (want %d, got %d)\n",
DEVNAM(sc), umb_request2str(letoh32(m->hdr.type)),
(int)sizeof (*m) + infolen, len);
return;
@@ -2333,7 +2333,7 @@ umb_command_done(struct umb_softc *sc, v
int  qmimsg = 0;
 
if (len < sizeof (*cmd)) {
-   DPRINTF("%s: discard short %s messsage\n", DEVNAM(sc),
+   DPRINTF("%s: discard short %s message\n", DEVNAM(sc),
umb_request2str(letoh32(cmd->hdr.type)));
return;
}
@@ -2341,7 +2341,7 @@ umb_command_done(struct umb_softc *sc, v
if (memcmp(cmd->devid, umb_uuid_basic_connect, sizeof (cmd->devid))) {
if (memcmp(cmd->devid, umb_uuid_qmi_mbim,
sizeof (cmd->devid))) {
-   DPRINTF("%s: discard %s messsage for other UUID '%s'\n",
+   DPRINTF("%s: discard %s message for other UUID '%s'\n",
DEVNAM(sc), umb_request2str(letoh32(cmd->hdr.type)),
umb_uuid2str(cmd->devid));
return;
@@ -2370,7 +2370,7 @@ umb_command_done(struct umb_softc *sc, v
 
infolen = letoh32(cmd->infolen);
if (len < sizeof (*cmd) + infolen) {
-   DPRINTF("%s: discard truncated %s messsage (want %d, got %d)\n",
+   DPRINTF("%s: discard truncated %s message (want %d, got %d)\n",
DEVNAM(sc), umb_cid2str(cid),
(int)sizeof (*cmd) + infolen, len);
return;

Re: typos in src/distrib/miniroot/install.sub

[Theo de Raadt]

Thanks.

typos in src/distrib/miniroot/install.sub

[Claus Assmann]

This might not be worth mailing here, but maybe someone will look
at it anyway.
Notes:
- I did not reformat the first paragraph after adding the missing
'u' (the diff just shows the typo) -- the line is too long now.

- Maybe it should be
# Functions used in install.sh/upgrade.sh and their associates.
but that's for someone else to decide.

Index: install.sub
===
RCS file: /home/ca/OpenBSD/cvs/src/distrib/miniroot/install.sub,v
retrieving revision 1.1104
diff -u -r1.1104 install.sub
--- install.sub 22 Sep 2018 09:12:36 -  1.1104
+++ install.sub 13 Jan 2019 11:14:52 -
@@ -547,7 +547,7 @@
(
while :; do
lock
-   # The dmesg listener will continously check for the existence of
+   # The dmesg listener will continuously check for the existence 
of
# the update file and sends a signal to the parent process (that
# is the installer script) if the dmesg output differs from the
# contents of that file.
@@ -1244,7 +1244,7 @@
rm -f /tmp/i/mygate
 
while :; do
-   # Discover last configured vlan interface and increment it's
+   # Discover last configured vlan interface and increment its
# minor for the next offered vlan interface.
_vi=$(get_ifs vlan | sed '$!d;s/^vlan//')
[[ -n $_vi ]] && ((_vi++))
@@ -1956,7 +1956,7 @@
 
 
 # 
--
-# Functions used in install.sh/upgrade.sh and it's associates
+# Functions used in install.sh/upgrade.sh and its associates
 # 
--
 
 # Ask for terminal type if on console, otherwise ask for/set keyboard layout.
@@ -2103,7 +2103,7 @@
((${#resp} <= 31)) && break
;;
esac
-   echo "$resp is not a useable loginname."
+   echo "$resp is not a usable loginname."
done
ADMIN=$resp
while :; do


-- 
Address is valid for this mailing list only.

Re: typos in unveil(2)

[Jason McIntyre]

On Fri, Jul 13, 2018 at 06:04:29PM +0100, Ricardo Mestre wrote:
> Cool :) Just did that, now the 4th time is the charm:
> 

fine by me.
jmc

> Index: unveil.2
> ===
> RCS file: /cvs/src/lib/libc/sys/unveil.2,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 unveil.2
> --- unveil.213 Jul 2018 09:25:22 -  1.1
> +++ unveil.213 Jul 2018 17:01:20 -
> @@ -27,15 +27,15 @@
>  .Sh DESCRIPTION
>  The first call to
>  .Nm
> -removes visibility of the envire filesystem from all other
> -filesystem-related system calls (
> +removes visibility of the entire filesystem from all other
> +filesystem-related system calls (such as
>  .Xr open 2 ,
> -.Xr chmod 2 ,
> -.Xe rename 2,
> -etc).
> +.Xr chmod 2
> +and
> +.Xr rename 2 ) ,
>  except for the specified
> -.Ar path.
> -Subequent calls to
> +.Ar path .
> +Subsequent calls to
>  .Nm
>  expose additional views of the filesystem.
>  .Pp
> @@ -56,12 +56,12 @@ to remove the "unveil" permission.
>  .Pp
>  The
>  .Fa flags
> -argument points to a string consisting of the following characters.
> +argument points to a string consisting of the following characters.
>  .Pp
>  .Bl -tag -width c -offset indent -compact
>  .It Dv r
>  .Ar path
> -hould be made  be available for read operations corresponding to
> +should be made available for read operations corresponding to
>  .Xr pledge 2
>  promise
>  .Ar rpath .
> @@ -73,13 +73,13 @@ promise
>  .Ar wpath .
>  .It Dv x
>  .Ar path
> -should be available for execute operations corresponding to
> +should be available for execute operations corresponding to
>  .Xr pledge 2
>  promise
>  .Ar wpath .
>  .It Dv c
>  .Ar path
> -should be allowed to be created and removed, corresponding to
> +should be allowed to be created and removed, corresponding to
>  .Xr pledge 2
>  promise
>  .Ar cpath .
> 
> On 17:57 Fri 13 Jul , Jason McIntyre wrote:
> > On Fri, Jul 13, 2018 at 05:51:44PM +0100, Ricardo Mestre wrote:
> > > Hi Jason,
> > > 
> > > Like this? While reviewing I found another tyop
> > > 
> > 
> > yes. frankly i'd run it through mandoc -Tlint too.
> > jmc
> 

Re: typos in unveil(2)

[Ricardo Mestre]

Cool :) Just did that, now the 4th time is the charm:

Index: unveil.2
===
RCS file: /cvs/src/lib/libc/sys/unveil.2,v
retrieving revision 1.1
diff -u -p -u -r1.1 unveil.2
--- unveil.213 Jul 2018 09:25:22 -  1.1
+++ unveil.213 Jul 2018 17:01:20 -
@@ -27,15 +27,15 @@
 .Sh DESCRIPTION
 The first call to
 .Nm
-removes visibility of the envire filesystem from all other
-filesystem-related system calls (
+removes visibility of the entire filesystem from all other
+filesystem-related system calls (such as
 .Xr open 2 ,
-.Xr chmod 2 ,
-.Xe rename 2,
-etc).
+.Xr chmod 2
+and
+.Xr rename 2 ) ,
 except for the specified
-.Ar path.
-Subequent calls to
+.Ar path .
+Subsequent calls to
 .Nm
 expose additional views of the filesystem.
 .Pp
@@ -56,12 +56,12 @@ to remove the "unveil" permission.
 .Pp
 The
 .Fa flags
-argument points to a string consisting of the following characters.
+argument points to a string consisting of the following characters.
 .Pp
 .Bl -tag -width c -offset indent -compact
 .It Dv r
 .Ar path
-hould be made  be available for read operations corresponding to
+should be made available for read operations corresponding to
 .Xr pledge 2
 promise
 .Ar rpath .
@@ -73,13 +73,13 @@ promise
 .Ar wpath .
 .It Dv x
 .Ar path
-should be available for execute operations corresponding to
+should be available for execute operations corresponding to
 .Xr pledge 2
 promise
 .Ar wpath .
 .It Dv c
 .Ar path
-should be allowed to be created and removed, corresponding to
+should be allowed to be created and removed, corresponding to
 .Xr pledge 2
 promise
 .Ar cpath .

On 17:57 Fri 13 Jul , Jason McIntyre wrote:
> On Fri, Jul 13, 2018 at 05:51:44PM +0100, Ricardo Mestre wrote:
> > Hi Jason,
> > 
> > Like this? While reviewing I found another tyop
> > 
> 
> yes. frankly i'd run it through mandoc -Tlint too.
> jmc

Re: typos in unveil(2)

[Jason McIntyre]

On Fri, Jul 13, 2018 at 05:51:44PM +0100, Ricardo Mestre wrote:
> Hi Jason,
> 
> Like this? While reviewing I found another tyop
> 

yes. frankly i'd run it through mandoc -Tlint too.
jmc

> Index: unveil.2
> ===
> RCS file: /cvs/src/lib/libc/sys/unveil.2,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 unveil.2
> --- unveil.213 Jul 2018 09:25:22 -  1.1
> +++ unveil.213 Jul 2018 16:49:25 -
> @@ -27,15 +27,15 @@
>  .Sh DESCRIPTION
>  The first call to
>  .Nm
> -removes visibility of the envire filesystem from all other
> -filesystem-related system calls (
> +removes visibility of the entire filesystem from all other
> +filesystem-related system calls (such as
>  .Xr open 2 ,
> -.Xr chmod 2 ,
> -.Xe rename 2,
> -etc).
> +.Xr chmod 2
> +and
> +.Xr rename 2 ) ,
>  except for the specified
>  .Ar path.
> -Subequent calls to
> +Subsequent calls to
>  .Nm
>  expose additional views of the filesystem.
>  .Pp
> @@ -61,7 +61,7 @@ argument points to a string consisting o
>  .Bl -tag -width c -offset indent -compact
>  .It Dv r
>  .Ar path
> -hould be made  be available for read operations corresponding to
> +should be made available for read operations corresponding to
>  .Xr pledge 2
>  promise
>  .Ar rpath .
> 

Re: typos in unveil(2)

[Ricardo Mestre]

Hi Jason,

Like this? While reviewing I found another tyop

Index: unveil.2
===
RCS file: /cvs/src/lib/libc/sys/unveil.2,v
retrieving revision 1.1
diff -u -p -u -r1.1 unveil.2
--- unveil.213 Jul 2018 09:25:22 -  1.1
+++ unveil.213 Jul 2018 16:49:25 -
@@ -27,15 +27,15 @@
 .Sh DESCRIPTION
 The first call to
 .Nm
-removes visibility of the envire filesystem from all other
-filesystem-related system calls (
+removes visibility of the entire filesystem from all other
+filesystem-related system calls (such as
 .Xr open 2 ,
-.Xr chmod 2 ,
-.Xe rename 2,
-etc).
+.Xr chmod 2
+and
+.Xr rename 2 ) ,
 except for the specified
 .Ar path.
-Subequent calls to
+Subsequent calls to
 .Nm
 expose additional views of the filesystem.
 .Pp
@@ -61,7 +61,7 @@ argument points to a string consisting o
 .Bl -tag -width c -offset indent -compact
 .It Dv r
 .Ar path
-hould be made  be available for read operations corresponding to
+should be made available for read operations corresponding to
 .Xr pledge 2
 promise
 .Ar rpath .

Re: typos in unveil(2)

[Jason McIntyre]

On Fri, Jul 13, 2018 at 01:00:59PM +0100, Ricardo Mestre wrote:
> This one looks better
> 
> Index: unveil.2
> ===
> RCS file: /cvs/src/lib/libc/sys/unveil.2,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 unveil.2
> --- unveil.213 Jul 2018 09:25:22 -  1.1
> +++ unveil.213 Jul 2018 11:59:49 -
> @@ -31,11 +31,10 @@ removes visibility of the envire filesys
>  filesystem-related system calls (
>  .Xr open 2 ,
>  .Xr chmod 2 ,
> -.Xe rename 2,
> -etc).
> -except for the specified
> +.Xr rename 2 ,
> +etc) except for the specified

sth like

...system calls (such as
.Xr open 2 ,
...
and
.Xr rename 2 ) ,
except for ...

it is better not to use etc there so we don;t have to have a horrible
.), type structure.

otherwise ok

jmc

>  .Ar path.
> -Subequent calls to
> +Subsequent calls to
>  .Nm
>  expose additional views of the filesystem.
>  .Pp
> @@ -61,7 +60,7 @@ argument points to a string consisting o
>  .Bl -tag -width c -offset indent -compact
>  .It Dv r
>  .Ar path
> -hould be made  be available for read operations corresponding to
> +should be made available for read operations corresponding to
>  .Xr pledge 2
>  promise
>  .Ar rpath .
> 

Re: typos in unveil(2)

[Todd C. Miller]

On Fri, 13 Jul 2018 13:00:59 +0100, Ricardo Mestre wrote:

> This one looks better

OK millert@

 - todd

Re: typos in unveil(2)

[Ricardo Mestre]

This one looks better

Index: unveil.2
===
RCS file: /cvs/src/lib/libc/sys/unveil.2,v
retrieving revision 1.1
diff -u -p -u -r1.1 unveil.2
--- unveil.213 Jul 2018 09:25:22 -  1.1
+++ unveil.213 Jul 2018 11:59:49 -
@@ -31,11 +31,10 @@ removes visibility of the envire filesys
 filesystem-related system calls (
 .Xr open 2 ,
 .Xr chmod 2 ,
-.Xe rename 2,
-etc).
-except for the specified
+.Xr rename 2 ,
+etc) except for the specified
 .Ar path.
-Subequent calls to
+Subsequent calls to
 .Nm
 expose additional views of the filesystem.
 .Pp
@@ -61,7 +60,7 @@ argument points to a string consisting o
 .Bl -tag -width c -offset indent -compact
 .It Dv r
 .Ar path
-hould be made  be available for read operations corresponding to
+should be made available for read operations corresponding to
 .Xr pledge 2
 promise
 .Ar rpath .

typos in unveil(2)

[Ricardo Mestre]

Hi,

This one is still fresh on the tree, but here's a diff for some typos

OK?

Index: unveil.2
===
RCS file: /cvs/src/lib/libc/sys/unveil.2,v
retrieving revision 1.1
diff -u -p -u -r1.1 unveil.2
--- unveil.213 Jul 2018 09:25:22 -  1.1
+++ unveil.213 Jul 2018 11:54:27 -
@@ -31,11 +31,11 @@ removes visibility of the envire filesys
 filesystem-related system calls (
 .Xr open 2 ,
 .Xr chmod 2 ,
-.Xe rename 2,
+.Xr rename 2 ,
 etc).
 except for the specified
 .Ar path.
-Subequent calls to
+Subsequent calls to
 .Nm
 expose additional views of the filesystem.
 .Pp
@@ -61,7 +61,7 @@ argument points to a string consisting o
 .Bl -tag -width c -offset indent -compact
 .It Dv r
 .Ar path
-hould be made  be available for read operations corresponding to
+should be made available for read operations corresponding to
 .Xr pledge 2
 promise
 .Ar rpath .

Re: ksh.1: two typos

[Scott Cheloha]

> On Aug 17, 2017, at 7:47 PM, Theo Buehler  wrote:
> 
> On Fri, Aug 18, 2017 at 02:37:51AM +0200, Theo Buehler wrote:
>> On Thu, Aug 17, 2017 at 07:25:14PM -0500, Scott Cheloha wrote:
>>> Spotted these when customizing my prompt.
>>> 
>>> I think "may differ from" is better than "could be different from,"
>>> and you're free to (heh) differ, but in either case we get the
>>> 
>>> to -> from
>> 
>> I leave the first one one for jmc to decide, but I prefer the original
>> wording about the prompt: PS1 *is* either '$ ' or '# ' by default.
>> 
>> See the lines following bin/ksh/main.c:312.
>> 
> 
> Please ignore this. I looked at the wrong part of the man page.
> 
> The patch is ok tb if jmc doesn't object.

Just so everyone is clear, and for posterity, the second typo is
that the escape sequence \$ does *not* produce a space character
after the prompt character.  It only prints '$', or '#' if you
are root.

Probably should have written that out explicitly.

-Scott

[PATCH] faq13 and porter guide typos

[Arnaud]

Dear OpenBSD,
this is my first ever patch. I tried my best.
Concerning faq13.html. It mentions "three midi ports" and only lists two.
Concerning ports/index.html it's just a typo.

? faq_typos.diff
Index: faq13.html
===
RCS file: /cvs/www/faq/faq13.html,v
retrieving revision 1.200
diff -r1.200 faq13.html
462c462
< It shows three MIDI ports, known by
---
> It shows two MIDI ports, known by
Index: ports/index.html
===
RCS file: /cvs/www/faq/ports/index.html,v
retrieving revision 1.27
diff -r1.27 index.html
124c124
< patch, configure, compile and package the raw soure code.
---
> patch, configure, compile and package the raw source code.

Regards,

--
Arnaud

Re: ocspcheck typos

[Jason McIntyre]

On Fri, Jan 27, 2017 at 03:58:39AM +, Tom Cosgrove wrote:
> >>> Jason McIntyre 26-Jan-17 23:00 >>>
> >
> > On Thu, Jan 26, 2017 at 11:15:05PM +0100, Holger Mikolon wrote:
> > > Hi,
> > > 
> > > below are two minor typo fixes: s/OSCP/OCSP/
> > > 
> > > Holger
> > > ;-se
> >
> > fixed, thanks, plus one more in nc.
> > jmc
> 
> There are also these in comments and warning messages.
> 
> ok?  (Asking as these aren't any of my usual areas)
> 

yes, ok.
jmc

> 
> Index: lib/libtls/tls_ocsp.c
> ===
> RCS file: /cvs/src/lib/libtls/tls_ocsp.c,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 tls_ocsp.c
> --- lib/libtls/tls_ocsp.c 5 Nov 2016 15:13:26 -   1.9
> +++ lib/libtls/tls_ocsp.c 27 Jan 2017 03:58:11 -
> @@ -356,7 +356,7 @@ tls_ocsp_stapling_cb(SSL *ssl, void *arg
>   * Public API
>   */
>  
> -/* Retrieve OSCP URL from peer certificate, if present */
> +/* Retrieve OCSP URL from peer certificate, if present */
>  const char *
>  tls_peer_ocsp_url(struct tls *ctx)
>  {
> Index: usr.sbin/httpd/parse.y
> ===
> RCS file: /cvs/src/usr.sbin/httpd/parse.y,v
> retrieving revision 1.87
> diff -u -p -u -r1.87 parse.y
> --- usr.sbin/httpd/parse.y5 Jan 2017 13:53:09 -   1.87
> +++ usr.sbin/httpd/parse.y27 Jan 2017 03:58:11 -
> @@ -344,7 +344,7 @@ server: SERVER optmatch STRING{
>  
>   if (server_tls_load_ocsp(srv) == -1) {
>   yyerror("server \"%s\": failed to load "
> - "oscp staple", srv->srv_conf.name);
> + "ocsp staple", srv->srv_conf.name);
>   serverconfig_free(srv_conf);
>   free(srv);
>   YYERROR;
> @@ -2069,7 +2069,7 @@ server_inherit(struct server *src, struc
>   }
>  
>   if (server_tls_load_ocsp(dst) == -1) {
> - yyerror("failed to load oscp staple "
> + yyerror("failed to load ocsp staple "
>   "for server %s", dst->srv_conf.name);
>   serverconfig_free(&dst->srv_conf);
>   free(dst);
> Index: regress/usr.bin/openssl/appstest.sh
> ===
> RCS file: /cvs/src/regress/usr.bin/openssl/appstest.sh,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 appstest.sh
> --- regress/usr.bin/openssl/appstest.sh   6 Nov 2016 11:56:43 -   
> 1.1
> +++ regress/usr.bin/openssl/appstest.sh   27 Jan 2017 03:58:11 -
> @@ -847,7 +847,7 @@ ocsp_svr_pid=$!
>  echo "ocsp server pid = [ $ocsp_svr_pid ]"
>  sleep 1
>  
> -# send query to oscp server
> +# send query to ocsp server
>  start_message "ocsp ... send OCSP request to server"
>  
>  ocsp_qry=$user1_dir/ocsp_qry.der

Re: ocspcheck typos

[Tom Cosgrove]

>>> Jason McIntyre 26-Jan-17 23:00 >>>
>
> On Thu, Jan 26, 2017 at 11:15:05PM +0100, Holger Mikolon wrote:
> > Hi,
> > 
> > below are two minor typo fixes: s/OSCP/OCSP/
> > 
> > Holger
> > ;-se
>
> fixed, thanks, plus one more in nc.
> jmc

There are also these in comments and warning messages.

ok?  (Asking as these aren't any of my usual areas)


Index: lib/libtls/tls_ocsp.c
===
RCS file: /cvs/src/lib/libtls/tls_ocsp.c,v
retrieving revision 1.9
diff -u -p -u -r1.9 tls_ocsp.c
--- lib/libtls/tls_ocsp.c   5 Nov 2016 15:13:26 -   1.9
+++ lib/libtls/tls_ocsp.c   27 Jan 2017 03:58:11 -
@@ -356,7 +356,7 @@ tls_ocsp_stapling_cb(SSL *ssl, void *arg
  * Public API
  */
 
-/* Retrieve OSCP URL from peer certificate, if present */
+/* Retrieve OCSP URL from peer certificate, if present */
 const char *
 tls_peer_ocsp_url(struct tls *ctx)
 {
Index: usr.sbin/httpd/parse.y
===
RCS file: /cvs/src/usr.sbin/httpd/parse.y,v
retrieving revision 1.87
diff -u -p -u -r1.87 parse.y
--- usr.sbin/httpd/parse.y  5 Jan 2017 13:53:09 -   1.87
+++ usr.sbin/httpd/parse.y  27 Jan 2017 03:58:11 -
@@ -344,7 +344,7 @@ server  : SERVER optmatch STRING{
 
if (server_tls_load_ocsp(srv) == -1) {
yyerror("server \"%s\": failed to load "
-   "oscp staple", srv->srv_conf.name);
+   "ocsp staple", srv->srv_conf.name);
serverconfig_free(srv_conf);
free(srv);
YYERROR;
@@ -2069,7 +2069,7 @@ server_inherit(struct server *src, struc
}
 
if (server_tls_load_ocsp(dst) == -1) {
-   yyerror("failed to load oscp staple "
+   yyerror("failed to load ocsp staple "
"for server %s", dst->srv_conf.name);
serverconfig_free(&dst->srv_conf);
free(dst);
Index: regress/usr.bin/openssl/appstest.sh
===
RCS file: /cvs/src/regress/usr.bin/openssl/appstest.sh,v
retrieving revision 1.1
diff -u -p -u -r1.1 appstest.sh
--- regress/usr.bin/openssl/appstest.sh 6 Nov 2016 11:56:43 -   1.1
+++ regress/usr.bin/openssl/appstest.sh 27 Jan 2017 03:58:11 -
@@ -847,7 +847,7 @@ ocsp_svr_pid=$!
 echo "ocsp server pid = [ $ocsp_svr_pid ]"
 sleep 1
 
-# send query to oscp server
+# send query to ocsp server
 start_message "ocsp ... send OCSP request to server"
 
 ocsp_qry=$user1_dir/ocsp_qry.der

Re: ocspcheck typos

[Jason McIntyre]

On Thu, Jan 26, 2017 at 11:15:05PM +0100, Holger Mikolon wrote:
> Hi,
> 
> below are two minor typo fixes: s/OSCP/OCSP/
> 
> Holger
> ;-se
> 
> 

fixed, thanks, plus one more in nc.
jmc

> Index: ocspcheck.8
> ===
> RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.8,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 ocspcheck.8
> --- ocspcheck.8   24 Jan 2017 12:00:19 -  1.5
> +++ ocspcheck.8   26 Jan 2017 22:11:08 -
> @@ -19,7 +19,7 @@
>  .Os
>  .Sh NAME
>  .Nm ocspcheck
> -.Nd check a certificate for validity against its OSCP responder
> +.Nd check a certificate for validity against its OCSP responder
>  .Sh SYNOPSIS
>  .Nm
>  .Op Fl Nv
> Index: ocspcheck.c
> ===
> RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.c,v
> retrieving revision 1.13
> diff -u -p -u -r1.13 ocspcheck.c
> --- ocspcheck.c   26 Jan 2017 00:58:32 -  1.13
> +++ ocspcheck.c   26 Jan 2017 22:11:08 -
> @@ -556,7 +556,7 @@ main(int argc, char **argv)
>  
>   /*
>* Load our certificate and keystore, and build up an
> -  * OSCP request based on the full certificate chain
> +  * OCSP request based on the full certificate chain
>* we have been given to check.
>*/
>   if ((castore = read_cacerts(cafile)) == NULL)
> 

ocspcheck typos

[Holger Mikolon]

Hi,

below are two minor typo fixes: s/OSCP/OCSP/

Holger
;-se


Index: ocspcheck.8
===
RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.8,v
retrieving revision 1.5
diff -u -p -u -r1.5 ocspcheck.8
--- ocspcheck.8 24 Jan 2017 12:00:19 -  1.5
+++ ocspcheck.8 26 Jan 2017 22:11:08 -
@@ -19,7 +19,7 @@
 .Os
 .Sh NAME
 .Nm ocspcheck
-.Nd check a certificate for validity against its OSCP responder
+.Nd check a certificate for validity against its OCSP responder
 .Sh SYNOPSIS
 .Nm
 .Op Fl Nv
Index: ocspcheck.c
===
RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.c,v
retrieving revision 1.13
diff -u -p -u -r1.13 ocspcheck.c
--- ocspcheck.c 26 Jan 2017 00:58:32 -  1.13
+++ ocspcheck.c 26 Jan 2017 22:11:08 -
@@ -556,7 +556,7 @@ main(int argc, char **argv)
 
/*
 * Load our certificate and keystore, and build up an
-* OSCP request based on the full certificate chain
+* OCSP request based on the full certificate chain
 * we have been given to check.
 */
if ((castore = read_cacerts(cafile)) == NULL)

Re: Possible typos in find(1) man page

[Senthil Kumar M]

Hi Otto,

Thank you for the clarifications. Indeed reading the man page more 
carefully I understood the difference between option and expression, and 
using -prune.

Sorry for the noise.

Senthil

On Thu, 24 Nov 2016, Otto Moerbeek wrote:

> On Thu, Nov 24, 2016 at 04:42:37PM +0100, Senthil Kumar M wrote:
> 
> > Hello Tech,
> > 
> > In the find(1) man page, for the option `-f': 
> > 
> >  -f path
> >  Specifies a file hierarchy for find to traverse.  File
> >  hierarchies may be specified without the -f option if they are
> >  given immediately after any other options.
> > 
> > shouldn't this be `before' instead of `after'?
> 
> No, look at the synopsis. An option is not the same as an expression.
> 
> > 
> > Also, in the third listed example in EXAMPLES:
> > 
> >Print out a list of all core files on local file systems:
> > 
> >$ find / \! -fstype local -prune -o -name '*.core'
> > 
> > shouldn't this be instead:
> > $ find / -fstype local -prune -o -name '*.core'
> 
> No, look at the definition of -prune. You want to prevent find to go
> into a non-local fs. You version makes the prune active on any local
> filesystem.  Try it.
> 
>   -Otto
> 
> > 
> > The following diff incorporates these two changes.
> > 
> > Senthil
> > 
> > Index: find.1
> > ===
> > RCS file: /cvs/src/usr.bin/find/find.1,v
> > retrieving revision 1.91
> > diff -u -p -r1.91 find.1
> > --- find.1  11 Sep 2015 18:58:16 -  1.91
> > +++ find.1  24 Nov 2016 12:17:16 -
> > @@ -86,7 +86,7 @@ Specifies a file hierarchy for
> >  to traverse.
> >  File hierarchies may be specified without the
> >  .Fl f
> > -option if they are given immediately after any other options.
> > +option if they are given immediately before any other options.
> >  .It Fl H
> >  Causes the file information and file type (see
> >  .Xr stat 2 )
> > @@ -546,7 +546,7 @@ and owned by
> >  .Pp
> >  Print out a list of all core files on local file systems:
> >  .Pp
> > -.Dl "$ find / \e! -fstype local -prune -o -name '*.core'"
> > +.Dl "$ find / -fstype local -prune -o -name '*.core'"
> >  .Pp
> >  Find all files in
> >  .Pa /usr/src
> 

Re: Possible typos in find(1) man page

[Otto Moerbeek]

On Thu, Nov 24, 2016 at 04:42:37PM +0100, Senthil Kumar M wrote:

> Hello Tech,
> 
> In the find(1) man page, for the option `-f': 
> 
>  -f path
>  Specifies a file hierarchy for find to traverse.  File
>  hierarchies may be specified without the -f option if they are
>  given immediately after any other options.
> 
> shouldn't this be `before' instead of `after'?

No, look at the synopsis. An option is not the same as an expression.

> 
> Also, in the third listed example in EXAMPLES:
> 
>Print out a list of all core files on local file systems:
> 
>$ find / \! -fstype local -prune -o -name '*.core'
> 
> shouldn't this be instead:
> $ find / -fstype local -prune -o -name '*.core'

No, look at the definition of -prune. You want to prevent find to go
into a non-local fs. You version makes the prune active on any local
filesystem.  Try it.

-Otto

> 
> The following diff incorporates these two changes.
> 
> Senthil
> 
> Index: find.1
> ===
> RCS file: /cvs/src/usr.bin/find/find.1,v
> retrieving revision 1.91
> diff -u -p -r1.91 find.1
> --- find.111 Sep 2015 18:58:16 -  1.91
> +++ find.124 Nov 2016 12:17:16 -
> @@ -86,7 +86,7 @@ Specifies a file hierarchy for
>  to traverse.
>  File hierarchies may be specified without the
>  .Fl f
> -option if they are given immediately after any other options.
> +option if they are given immediately before any other options.
>  .It Fl H
>  Causes the file information and file type (see
>  .Xr stat 2 )
> @@ -546,7 +546,7 @@ and owned by
>  .Pp
>  Print out a list of all core files on local file systems:
>  .Pp
> -.Dl "$ find / \e! -fstype local -prune -o -name '*.core'"
> +.Dl "$ find / -fstype local -prune -o -name '*.core'"
>  .Pp
>  Find all files in
>  .Pa /usr/src

Possible typos in find(1) man page

[Senthil Kumar M]

Hello Tech,

In the find(1) man page, for the option `-f': 

 -f path
 Specifies a file hierarchy for find to traverse.  File
 hierarchies may be specified without the -f option if they are
 given immediately after any other options.

shouldn't this be `before' instead of `after'?

Also, in the third listed example in EXAMPLES:

   Print out a list of all core files on local file systems:

   $ find / \! -fstype local -prune -o -name '*.core'

shouldn't this be instead:
$ find / -fstype local -prune -o -name '*.core'

The following diff incorporates these two changes.

Senthil

Index: find.1
===
RCS file: /cvs/src/usr.bin/find/find.1,v
retrieving revision 1.91
diff -u -p -r1.91 find.1
--- find.1  11 Sep 2015 18:58:16 -  1.91
+++ find.1  24 Nov 2016 12:17:16 -
@@ -86,7 +86,7 @@ Specifies a file hierarchy for
 to traverse.
 File hierarchies may be specified without the
 .Fl f
-option if they are given immediately after any other options.
+option if they are given immediately before any other options.
 .It Fl H
 Causes the file information and file type (see
 .Xr stat 2 )
@@ -546,7 +546,7 @@ and owned by
 .Pp
 Print out a list of all core files on local file systems:
 .Pp
-.Dl "$ find / \e! -fstype local -prune -o -name '*.core'"
+.Dl "$ find / -fstype local -prune -o -name '*.core'"
 .Pp
 Find all files in
 .Pa /usr/src

pledge(2), *: fix [referering] typos

[Frank Schoep]

Came across two 'refer[e]ring' typos in the pledge(2) man page. The first
diff fixes those. After grepping through the source tree, there's a few
more, similar typos in unrelated files. Attached a second diff for those.

Left HTTP-related stuff alone since refe[r]er is the preferred term in that
context. There's also some gcc/binutils abi_refe[r]er mentions, but I'm not
sure if those should be renamed. Didn't include these either.


Index: pledge.2
===
RCS file: /cvs/src/lib/libc/sys/pledge.2,v
retrieving revision 1.35
diff -u -p -r1.35 pledge.2
--- pledge.25 Sep 2016 11:17:24 -   1.35
+++ pledge.213 Sep 2016 09:14:40 -
@@ -380,11 +380,11 @@ operations.
 .It Va "sendfd"
 Allows sending of file descriptors using
 .Xr sendmsg 2 .
-File descriptors referering to directories may not be passed.
+File descriptors referring to directories may not be passed.
 .It Va "recvfd"
 Allows receiving of file descriptors using
 .Xr recvmsg 2 .
-File descriptors referering to directories may not be passed.
+File descriptors referring to directories may not be passed.
 .It Va "ioctl"
 Allows a subset of
 .Xr ioctl 2


Index: gnu/llvm/include/llvm/IR/TrackingMDRef.h
===
RCS file: /cvs/src/gnu/llvm/include/llvm/IR/TrackingMDRef.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 TrackingMDRef.h
--- gnu/llvm/include/llvm/IR/TrackingMDRef.h3 Sep 2016 22:46:58 -
1.1.1.1
+++ gnu/llvm/include/llvm/IR/TrackingMDRef.h13 Sep 2016 09:26:12 -
@@ -96,7 +96,7 @@ private:

 /// \brief Typed tracking ref.
 ///
-/// Track refererences of a particular type.  It's useful to use this for \a
+/// Track references of a particular type.  It's useful to use this for \a
 /// MDNode and \a ValueAsMetadata.
 template  class TypedTrackingMDRef {
   TrackingMDRef Ref;
Index: gnu/usr.bin/binutils/gdb/doc/gdbint.texinfo
===
RCS file: /cvs/src/gnu/usr.bin/binutils/gdb/doc/gdbint.texinfo,v
retrieving revision 1.6
diff -u -p -r1.6 gdbint.texinfo
--- gnu/usr.bin/binutils/gdb/doc/gdbint.texinfo 27 Dec 2004 14:00:52 -
1.6
+++ gnu/usr.bin/binutils/gdb/doc/gdbint.texinfo 13 Sep 2016 09:26:20 -
@@ -2590,7 +2590,7 @@ Given the type flags representing an add
 its name.
 @end deftypefn
 @deftypefn {Target Macro} int ADDRESS_CLASS_NAME_to_TYPE_FLAGS (int @var{name},
 int *var{type_flags_ptr})
-Given an address qualifier name, set the @code{int} refererenced by @var{type_f
lags_ptr} to the type flags
+Given an address qualifier name, set the @code{int} referenced by @var{type_fla
gs_ptr} to the type flags
 for that address class qualifier.
 @end deftypefn

Index: sbin/isakmpd/transport.c
===
RCS file: /cvs/src/sbin/isakmpd/transport.c,v
retrieving revision 1.37
diff -u -p -r1.37 transport.c
--- sbin/isakmpd/transport.c10 Mar 2016 07:32:16 -  1.37
+++ sbin/isakmpd/transport.c13 Sep 2016 09:26:43 -
@@ -89,7 +89,7 @@ transport_setup(struct transport *t, int
t->flags = 0;
 }

-/* Add a referer to transport T.  */
+/* Add a referrer to transport T.  */
 void
 transport_reference(struct transport *t)
 {
@@ -100,7 +100,7 @@ transport_reference(struct transport *t)
 }

 /*
- * Remove a referer from transport T, removing all of T when no referers left.
+ * Remove a referrer from transport T, removing all of T when no referers left.
  */
 void
 transport_release(struct transport *t)
Index: sys/net/pipex.c
===
RCS file: /cvs/src/sys/net/pipex.c,v
retrieving revision 1.88
diff -u -p -r1.88 pipex.c
--- sys/net/pipex.c 30 Aug 2016 23:29:04 -  1.88
+++ sys/net/pipex.c 13 Sep 2016 09:26:48 -
@@ -838,7 +838,7 @@ pipex_timer(void *ignored_arg)
case PIPEX_STATE_CLOSED:
/*
 * mbuf queued in pipexinq or pipexoutq may have a
-* refererce to this session.
+* reference to this session.
 */
if (!mq_empty(&pipexinq) || !mq_empty(&pipexoutq))
continue;

Fix typos in comments in amd64/stand

[Tom Cosgrove]

Thanks

Tom


Index: sys/arch/amd64/stand/efiboot/efiboot.c
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/stand/efiboot/efiboot.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 efiboot.c
--- sys/arch/amd64/stand/efiboot/efiboot.c  15 May 2016 22:48:02 -  
1.12
+++ sys/arch/amd64/stand/efiboot/efiboot.c  10 Jun 2016 18:14:14 -
@@ -466,7 +466,7 @@ efi_cons_getshifts(dev_t dev)
return (0);
 }
 
-/* XXX: serial console is not supporte yet */
+/* XXX: serial console is not supported yet */
 int comspeed = 9600;
 int com_addr = -1;
 int com_speed = -1;
@@ -477,7 +477,7 @@ int com_speed = -1;
 /*
  * ACPI GUID is confusing in UEFI spec.
  * {EFI_,}_ACPI_20_TABLE_GUID or EFI_ACPI_TABLE_GUID means
- * ACPI 2.0 or abobe.
+ * ACPI 2.0 or above.
  */
 static EFI_GUID acpi_guid = ACPI_20_TABLE_GUID;
 static EFI_GUID smbios_guid = SMBIOS_TABLE_GUID;
Index: sys/arch/amd64/stand/libsa/cmd_i386.c
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/stand/libsa/cmd_i386.c,v
retrieving revision 1.9
diff -u -p -u -r1.9 cmd_i386.c
--- sys/arch/amd64/stand/libsa/cmd_i386.c   8 Nov 2015 00:42:39 -   
1.9
+++ sys/arch/amd64/stand/libsa/cmd_i386.c   10 Jun 2016 18:14:14 -
@@ -183,7 +183,7 @@ Xmemory(void)
p++;
}
 
-   /* Handle (possibly non-existant) address part */
+   /* Handle (possibly non-existent) address part */
switch (*p) {
case '@':
addr = strtoll(p + 1, NULL, 0);
Index: sys/arch/amd64/stand/libsa/memprobe.c
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/stand/libsa/memprobe.c,v
retrieving revision 1.16
diff -u -p -u -r1.16 memprobe.c
--- sys/arch/amd64/stand/libsa/memprobe.c   8 Oct 2015 14:46:05 -   
1.16
+++ sys/arch/amd64/stand/libsa/memprobe.c   10 Jun 2016 18:14:14 -
@@ -281,7 +281,7 @@ memprobe(void)
 * Compute compatibility values:
 * cnvmem -- is the upper boundary of conventional
 *  memory (below IOM_BEGIN (=640k))
-* extmem -- is the size of the contignous extended
+* extmem -- is the size of the contiguous extended
 *  memory segment starting at 1M
 *
 * We ignore "good" memory in the 640K-1M hole.
@@ -346,7 +346,7 @@ mem_limit(long long ml)
if (p->type != BIOS_MAP_FREE)
continue;
 
-   /* Wholy above limit, nuke it */
+   /* Wholly above limit, nuke it */
if ((sp >= ml) && (ep >= ml)) {
bcopy (p + 1, p, (char *)bios_memmap +
   sizeof(bios_memmap) - (char *)p);
Index: sys/arch/amd64/stand/libsa/pxe.h
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/stand/libsa/pxe.h,v
retrieving revision 1.6
diff -u -p -u -r1.6 pxe.h
--- sys/arch/amd64/stand/libsa/pxe.h2 Mar 2011 07:15:45 -   1.6
+++ sys/arch/amd64/stand/libsa/pxe.h10 Jun 2016 18:14:14 -
@@ -346,7 +346,7 @@ typedef struct {
 #  define PXENV_UNDI_ISR_OUT_NOT_OUTS  1
 
/*
-* one of these will bre returnd for PXEND_UNDI_ISR_IN_PROCESS
+* one of these will be returned for PXEND_UNDI_ISR_IN_PROCESS
 * and PXENV_UNDI_ISR_IN_GET_NEXT
 */
 #  define PXENV_UNDI_ISR_OUT_DONE  0

Fix typos in comments in i386/stand

[Tom Cosgrove]

Thanks

Tom


Index: sys/arch/i386/stand/libsa/apmprobe.c
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/i386/stand/libsa/apmprobe.c,v
retrieving revision 1.18
diff -u -p -u -r1.18 apmprobe.c
--- sys/arch/i386/stand/libsa/apmprobe.c8 Jul 2014 13:31:30 -   
1.18
+++ sys/arch/i386/stand/libsa/apmprobe.c10 Jun 2016 18:06:23 -
@@ -27,7 +27,7 @@
  */
 /*
  * APM derived from: apm_init.S, LP (Laptop Package)
- * wich contained this:
+ * which contained this:
  * Copyright (C) 1994 by HOSOKAWA, Tatsumi 
  *
  */
Index: sys/arch/i386/stand/libsa/cmd_i386.c
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/i386/stand/libsa/cmd_i386.c,v
retrieving revision 1.35
diff -u -p -u -r1.35 cmd_i386.c
--- sys/arch/i386/stand/libsa/cmd_i386.c18 Sep 2015 13:30:56 -  
1.35
+++ sys/arch/i386/stand/libsa/cmd_i386.c10 Jun 2016 18:06:23 -
@@ -179,7 +179,7 @@ Xmemory(void)
p++;
}
 
-   /* Handle (possibly non-existant) address part */
+   /* Handle (possibly non-existent) address part */
switch (*p) {
case '@':
addr = strtoll(p + 1, NULL, 0);
Index: sys/arch/i386/stand/libsa/memprobe.c
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/i386/stand/libsa/memprobe.c,v
retrieving revision 1.56
diff -u -p -u -r1.56 memprobe.c
--- sys/arch/i386/stand/libsa/memprobe.c8 Oct 2015 14:46:05 -   
1.56
+++ sys/arch/i386/stand/libsa/memprobe.c10 Jun 2016 18:06:23 -
@@ -286,7 +286,7 @@ memprobe(void)
 * Compute compatibility values:
 * cnvmem -- is the upper boundary of conventional
 *  memory (below IOM_BEGIN (=640k))
-* extmem -- is the size of the contignous extended
+* extmem -- is the size of the contiguous extended
 *  memory segment starting at 1M
 *
 * We ignore "good" memory in the 640K-1M hole.
@@ -338,7 +338,7 @@ mem_limit(long long ml)
if (p->type != BIOS_MAP_FREE)
continue;
 
-   /* Wholy above limit, nuke it */
+   /* Wholly above limit, nuke it */
if ((sp >= ml) && (ep >= ml)) {
bcopy (p + 1, p, (char *)bios_memmap +
   sizeof(bios_memmap) - (char *)p);
Index: sys/arch/i386/stand/libsa/pxe.h
===
RCS file: /home/OpenBSD/cvs/src/sys/arch/i386/stand/libsa/pxe.h,v
retrieving revision 1.6
diff -u -p -u -r1.6 pxe.h
--- sys/arch/i386/stand/libsa/pxe.h 2 Mar 2011 07:15:45 -   1.6
+++ sys/arch/i386/stand/libsa/pxe.h 10 Jun 2016 18:06:23 -
@@ -346,7 +346,7 @@ typedef struct {
 #  define PXENV_UNDI_ISR_OUT_NOT_OUTS  1
 
/*
-* one of these will bre returnd for PXEND_UNDI_ISR_IN_PROCESS
+* one of these will be returned for PXEND_UNDI_ISR_IN_PROCESS
 * and PXENV_UNDI_ISR_IN_GET_NEXT
 */
 #  define PXENV_UNDI_ISR_OUT_DONE  0

Re: fix typos in plus58.html

[Philip Guenther]

On Sun, Aug 9, 2015 at 9:52 AM, Markus Lude  wrote:
...
> "an" before words not beginning with a vocal occurs quite frequent.
> Should I provide a diff to fix them too?

Hmm, in a quick scan, the only 'an' that looks incorrect to me is "an
u area", which should be "a u-area", as 'u-area' is pronounced like it
starts with 'y'**.

In particular, it's correct to write "an fd" as 'fd' is pronounced as
'eff-dee' and thus starts with a vowel sound.  Ditto for "an RTS5229",
where 'RTS' is spelled out ala "an arr-tee-ess".


Philip Guenther

** to be slightly more precise, the pronunciation of 'u-area' starts
with a palatal approximant (c.f.
https://en.wikipedia.org/wiki/Palatal_approximant ) consonant, and
thus should be prefixed with 'a' instead of 'an'.  When at the start
of a word that sound is written with a 'y'.

Re: fix typos in plus58.html

[Jason McIntyre]

On Sun, Aug 09, 2015 at 11:05:26AM -0700, Philip Guenther wrote:
> On Sun, Aug 9, 2015 at 9:52 AM, Markus Lude  wrote:
> > attached is a diff to fix different typos in plus58.html.
> 
> With a few tweaks, applied.  Thanks!
> 
> 
> > "use-after-free" is sometimes written as "use after free", I didn't
> > include those. I could add a diff to unify them if wanted.
> 
> I have a mild preference for the hyphenated version, but will defer to jmc@...
> 
> 

no strong opinion, though hyphenated seems clearer. it's good if we can
use such terms consistently, but not sure how practical that is in the
plus files.

just to note that the only man page that uses this term is
malloc.conf(5), and it uses "use after free".

jmc

> > "an" before words not beginning with a vocal occurs quite frequent.
> > Should I provide a diff to fix them too?
> 
> Per my separate longer explanation, I didn't commit that part of your
> diff but rather changed
>  "an u area" --> "a u-area"
>  "a F_ISATTY" --> "an F_ISATTY"
>  "a NTP" --> "an NTP"
>  "a RTF_GATEWAY" --> "an RTF_GATEWAY"
> 
> 
> Philip Guenther
> 

Re: fix typos in plus58.html

[Philip Guenther]

On Sun, Aug 9, 2015 at 9:52 AM, Markus Lude  wrote:
> attached is a diff to fix different typos in plus58.html.

With a few tweaks, applied.  Thanks!


> "use-after-free" is sometimes written as "use after free", I didn't
> include those. I could add a diff to unify them if wanted.

I have a mild preference for the hyphenated version, but will defer to jmc@...


> "an" before words not beginning with a vocal occurs quite frequent.
> Should I provide a diff to fix them too?

Per my separate longer explanation, I didn't commit that part of your
diff but rather changed
 "an u area" --> "a u-area"
 "a F_ISATTY" --> "an F_ISATTY"
 "a NTP" --> "an NTP"
 "a RTF_GATEWAY" --> "an RTF_GATEWAY"


Philip Guenther

fix typos in plus58.html

[Markus Lude]

Hello,

attached is a diff to fix different typos in plus58.html.

"use-after-free" is sometimes written as "use after free", I didn't
include those. I could add a diff to unify them if wanted.

"an" before words not beginning with a vocal occurs quite frequent.
Should I provide a diff to fix them too?

Regards,
Markus

Index: plus58.html
===
RCS file: /cvs/www/plus58.html,v
retrieving revision 1.3
diff -u -r1.3 plus58.html
--- plus58.html 9 Aug 2015 00:39:22 -   1.3
+++ plus58.html 9 Aug 2015 16:47:27 -
@@ -87,10 +87,10 @@
 
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/sshd.8";>sshd(8),
 add getpid to sandbox (bz#2419).
 Get jumbo frames working in http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man4/oce.4";>oce(4).
-Allow to re-plug USB3 devices on the root hub withtout going through a 
suspend/resume cycle (or rebooting) with Intel ICH7 xHCI.
+Allow to re-plug USB3 devices on the root hub without going through a 
suspend/resume cycle (or rebooting) with Intel ICH7 xHCI.
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/ps.1";>ps(1),
 remove the calculation that includes the process lifetime and just use the 
p_pctcpu value as %cpu time.
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/cwm.1";>cwm(1),
 show an empty "ssh to" menu if the known_hosts file is missing.
-In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/syslogd.8";>syslogd(8),
 add the possiblity to store all syslog messages received from a specific host 
into a single log file.
+In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/syslogd.8";>syslogd(8),
 add the possibility to store all syslog messages received from a specific host 
into a single log file.
 Never cache a RTF_GATEWAY route as next hop for a gateway route. This 
prevents rtentry loops when rt→rt_gwroute points to rt leading to an 
infamous "rtentry leak" panic.
 
 Enable http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man4/armv7/vexpress.4";>vexpress(4)
 on armv7.
@@ -152,7 +152,7 @@
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/npppd.8";>npppd(8),
 properly handle zero-length 1701/udp and GRE packets.
 
 In ssh, don't count successful partial authentication as failures in 
monitor. This may have caused the monitor to refuse multiple authentications 
that would otherwise have successfully completed.
-On amd64 and i386, make it possible to create write combing mappings 
through /dev/mem.
+On amd64 and i386, make it possible to create write combining mappings 
through /dev/mem.
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man4/pf.4";>pf(4),
 increment rule counters only after successful state insertion.
 In ssh, don't call setgroups if we have zero groups; there's no guarantee 
that it won't try to deref the pointer.
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/httpd.8";>httpd(8),
 URL-encode $SERVER_NAME and $REMOTE_USER before using them in the Location 
header.
@@ -282,7 +282,7 @@
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/from.1";>from(1),
 treat a missing mail spool the same as a zero-length mail spool unless the -f 
option was specified.
 In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man4/pf.4";>pf(4),
 avoid division by 0 and using a 0 upper bound for http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/arc4random_uniform.3";>arc4random_uniform(3).
 Fix audio interrupts on U4 systems.
-In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/arp.8";>arp(8)
 and http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/ndp.8";>ndp(8),
 dont 'assume that the sockaddr_dl will be in the gateway sa. This fixes a 
regression introduced with the support of multiple connected routes.
+In http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/arp.8";>arp(8)
 and http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/ndp.8";>ndp(8),
 dont assume that the sockaddr_dl will be in the gateway sa. This fixes a 
regression introduced with the support of multiple connected routes.
 
 Rework the ppp handling in the tty layer so it has its own private pool to 
allocate packet memory out of. This fixes a long standing issue in ppp on a 
tty/serial line where it allocates mbufs at IPL_SOFTTTY, which is above the 
IPL_NET the mbuf layer protects itself at.
 Fix a memory leak in http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man8/sensorsd.8";>sensorsd(8).
@@ -294,7 +294,7 @@
 Enable secureplt by default on alpha.
 Allow http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/gcc.1";>gcc(1) 
to produce more precise relocation information on alpha. This will be necessary 
to enable secure

Re: Few typos in relayd.conf.5

[Jason McIntyre]

On Thu, Jul 23, 2015 at 07:20:06AM +, Thanos Tsouanas wrote:
> Index: relayd.conf.5
> ===

fixed, and a few more beside.
jmc

> RCS file: /cvs/src/usr.sbin/relayd/relayd.conf.5,v
> retrieving revision 1.163
> diff -u -p -r1.163 relayd.conf.5
> --- relayd.conf.5 15 May 2015 20:40:26 -  1.163
> +++ relayd.conf.5 23 Jul 2015 07:20:06 -
> @@ -358,7 +358,7 @@ SMTP, NNTP, and FTP.
>  If the
>  .Ic tls
>  keyword is present,
> -the transaction will occur in an TLS tunnel.
> +the transaction will occur in a TLS tunnel.
>  .It Ic check tcp
>  Use a simple TCP connect to check that hosts are up.
>  .It Ic check tls
> @@ -703,7 +703,7 @@ authenticated and encrypted relays.
>  TLS is the successor of the original Secure Sockets Layer (SSL) protocol,
>  but the term SSL is sometimes still used in modern TLS-based applications.
>  .Xr relayd 8
> -can operate as an TLS client or server to offer a variety of options
> +can operate as a TLS client or server to offer a variety of options
>  for different use cases related to TLS.
>  .Bl -tag -width Ds
>  .It Ic TLS client
> @@ -728,7 +728,7 @@ keyword in the relay
>  .Ic listen
>  statements,
>  .Xr relayd 8
> -will accept connections from clients as an TLS server.
> +will accept connections from clients as a TLS server.
>  This mode is also known as
>  .Dq SSL/TLS acceleration .
>  See the
> @@ -758,7 +758,7 @@ will listen for incoming connections whi
>  local socket by PF.
>  Before accepting and negotiating the incoming TLS connection as a
>  server, it will look up the original destination address on the
> -diverted socket, and pre-connect to the target server as an TLS client
> +diverted socket, and pre-connect to the target server as a TLS client
>  to obtain the remote TLS certificate.
>  It will update or patch the obtained TLS certificate by replacing the
>  included public key with its local server key because it doesn't have
> @@ -791,7 +791,7 @@ replaces these IDs with random values to
>  predictable values generated by some hosts.
>  .It Ic http protocol
>  Handle the HyperText Transfer Protocol
> -(HTTP, or "HTTPS" if encapsulated in an TLS tunnel).
> +(HTTP, or "HTTPS" if encapsulated in a TLS tunnel).
>  .It Xo
>  .Op Ic tcp
>  .Ic protocol
> @@ -1521,8 +1521,8 @@ To start, first generate a new local CA 
>   -keyout /etc/ssl/private/ca.key -out /etc/ssl/ca.crt
>  .Ed
>  .Pp
> -An TLS server key and self-signed cert for 127.0.0.1 are also required;
> -see
> +A TLS server key and a self-signed certificate for 127.0.0.1 are also
> +required; see
>  .Ic listen on
>  in the
>  .Sx RELAYS
> 

Few typos in relayd.conf.5

[Thanos Tsouanas]

Index: relayd.conf.5
===
RCS file: /cvs/src/usr.sbin/relayd/relayd.conf.5,v
retrieving revision 1.163
diff -u -p -r1.163 relayd.conf.5
--- relayd.conf.5   15 May 2015 20:40:26 -  1.163
+++ relayd.conf.5   23 Jul 2015 07:20:06 -
@@ -358,7 +358,7 @@ SMTP, NNTP, and FTP.
 If the
 .Ic tls
 keyword is present,
-the transaction will occur in an TLS tunnel.
+the transaction will occur in a TLS tunnel.
 .It Ic check tcp
 Use a simple TCP connect to check that hosts are up.
 .It Ic check tls
@@ -703,7 +703,7 @@ authenticated and encrypted relays.
 TLS is the successor of the original Secure Sockets Layer (SSL) protocol,
 but the term SSL is sometimes still used in modern TLS-based applications.
 .Xr relayd 8
-can operate as an TLS client or server to offer a variety of options
+can operate as a TLS client or server to offer a variety of options
 for different use cases related to TLS.
 .Bl -tag -width Ds
 .It Ic TLS client
@@ -728,7 +728,7 @@ keyword in the relay
 .Ic listen
 statements,
 .Xr relayd 8
-will accept connections from clients as an TLS server.
+will accept connections from clients as a TLS server.
 This mode is also known as
 .Dq SSL/TLS acceleration .
 See the
@@ -758,7 +758,7 @@ will listen for incoming connections whi
 local socket by PF.
 Before accepting and negotiating the incoming TLS connection as a
 server, it will look up the original destination address on the
-diverted socket, and pre-connect to the target server as an TLS client
+diverted socket, and pre-connect to the target server as a TLS client
 to obtain the remote TLS certificate.
 It will update or patch the obtained TLS certificate by replacing the
 included public key with its local server key because it doesn't have
@@ -791,7 +791,7 @@ replaces these IDs with random values to
 predictable values generated by some hosts.
 .It Ic http protocol
 Handle the HyperText Transfer Protocol
-(HTTP, or "HTTPS" if encapsulated in an TLS tunnel).
+(HTTP, or "HTTPS" if encapsulated in a TLS tunnel).
 .It Xo
 .Op Ic tcp
 .Ic protocol
@@ -1521,8 +1521,8 @@ To start, first generate a new local CA 
-keyout /etc/ssl/private/ca.key -out /etc/ssl/ca.crt
 .Ed
 .Pp
-An TLS server key and self-signed cert for 127.0.0.1 are also required;
-see
+A TLS server key and a self-signed certificate for 127.0.0.1 are also
+required; see
 .Ic listen on
 in the
 .Sx RELAYS

comment typos

[Jan Stary]

Comments matter the most.

Jan


--- /usr/include/sys/siginfo.h  Tue Aug 13 07:52:26 2013
+++ ./siginfo.h Tue Apr 14 17:07:06 2015
@@ -135,7 +135,7 @@ typedef struct {
int si_errno;   /* error from errno.h */
union {
int _pad[SI_PAD];   /* for future growth */
-   struct {/* kill(), SIGCLD, siqqueue() */
+   struct {/* kill(),SIGCHLD,sigqueue() */
pid_t   _pid;   /* process ID */
union {
struct {

Re: typos

[Jason McIntyre]

On Wed, Dec 10, 2014 at 12:21:21PM +0200, Kaspars Bankovskis wrote:
> Index: vfs_bio.c
> ===
> RCS file: /cvs/src/sys/kern/vfs_bio.c,v
> retrieving revision 1.163
> diff -u -p -r1.163 vfs_bio.c
> --- vfs_bio.c 8 Oct 2014 07:33:14 -   1.163
> +++ vfs_bio.c 9 Dec 2014 21:25:27 -
> @@ -86,7 +86,7 @@ long lodirtypages;  /* dirty page co
>  long hidirtypages;  /* dirty page count high water mark */
>  long targetpages;/* target number of pages for cache size */
>  long buflowpages;/* smallest size cache allowed */
> -long bufhighpages;   /* largerst size cache allowed */
> +long bufhighpages;   /* largest size cache allowed */
>  long bufbackpages;   /* minimum number of pages we shrink when asked to */
>  
>  vsize_t bufkvm;
> @@ -959,7 +959,7 @@ buf_get(struct vnode *vp, daddr_t blkno,
>* We insert the buffer into the hash with B_BUSY set
>* while we allocate pages for it. This way any getblk
>* that happens while we allocate pages will wait for
> -  * this buffer instead of starting its own guf_get.
> +  * this buffer instead of starting its own buf_get.
>*
>* But first, we check if someone beat us to it.
>*/
> 

fixed, thanks.
jmc

typos

[Kaspars Bankovskis]

Index: vfs_bio.c
===
RCS file: /cvs/src/sys/kern/vfs_bio.c,v
retrieving revision 1.163
diff -u -p -r1.163 vfs_bio.c
--- vfs_bio.c   8 Oct 2014 07:33:14 -   1.163
+++ vfs_bio.c   9 Dec 2014 21:25:27 -
@@ -86,7 +86,7 @@ long lodirtypages;  /* dirty page co
 long hidirtypages;  /* dirty page count high water mark */
 long targetpages;  /* target number of pages for cache size */
 long buflowpages;  /* smallest size cache allowed */
-long bufhighpages; /* largerst size cache allowed */
+long bufhighpages; /* largest size cache allowed */
 long bufbackpages; /* minimum number of pages we shrink when asked to */
 
 vsize_t bufkvm;
@@ -959,7 +959,7 @@ buf_get(struct vnode *vp, daddr_t blkno,
 * We insert the buffer into the hash with B_BUSY set
 * while we allocate pages for it. This way any getblk
 * that happens while we allocate pages will wait for
-* this buffer instead of starting its own guf_get.
+* this buffer instead of starting its own buf_get.
 *
 * But first, we check if someone beat us to it.
 */

Re: FAQ Part 1 typos

[Nick Holland]

On 11/06/14 09:35, Nick Permyakov wrote:
> Hi,
> 
> Some typos on http://www.openbsd.org/faq/faq1.html
> 
> Section "1.2 - On what systems does OpenBSD run?".
> "...has helped produced a higher-quality code base..." should read 
> "helped produce" (or maybe "helped to produce").
> 
> Section "1.8 - What is included with OpenBSD?".
> "Note: this will be removed for 5.6 in farvor of NSD and Unbound" should 
> read "in favor" (or did you mean "will be removed, in fervor, with NSD 
> and Unbound"? ;)).
> And, by the way, isn't it the version 5.6 FAQ? Is BIND removed or not?
> 
> Section "1.11 - Why is/isn't ProductX included?".
> "...project wishes to devote the resources needed to maintaining it..." 
> should read "needed to maintain it" (or maybe "needed for maintaining 
> it", but it sounds weird).
> "Impact on slower platforms, such as hp300 or VAX would be unacceptable" 
> - I think it needs a comma after "VAX".
> 
> Best regards,
> Nick Permyakov
> 

fixed, but please keep www/ issues off tech@
tech@ is for code with diffs.

Nick.

Re: FAQ Part 1 typos

[Adam Van Ymeren]

On Thu, Nov 6, 2014 at 9:36 AM, Nick Permyakov  wrote:
>
> Hi,
>
> Some typos on http://www.openbsd.org/faq/faq1.html
>
> Section "1.2 - On what systems does OpenBSD run?".
> "...has helped produced a higher-quality code base..." should read "helped 
> produce" (or maybe "helped to produce").
>
> Section "1.8 - What is included with OpenBSD?".
> "Note: this will be removed for 5.6 in farvor of NSD and Unbound" should read 
> "in favor" (or did you mean "will be removed, in fervor, with NSD and 
> Unbound"? ;)).
> And, by the way, isn't it the version 5.6 FAQ? Is BIND removed or not

Should really be "favour"

>
>
> Section "1.11 - Why is/isn't ProductX included?".
> "...project wishes to devote the resources needed to maintaining it..." 
> should read "needed to maintain it" (or maybe "needed for maintaining it", 
> but it sounds weird).
> "Impact on slower platforms, such as hp300 or VAX would be unacceptable" - I 
> think it needs a comma after "VAX".
>
> Best regards,
> Nick Permyakov
>

FAQ Part 1 typos

[Nick Permyakov]

Hi,

Some typos on http://www.openbsd.org/faq/faq1.html

Section "1.2 - On what systems does OpenBSD run?".
"...has helped produced a higher-quality code base..." should read 
"helped produce" (or maybe "helped to produce").


Section "1.8 - What is included with OpenBSD?".
"Note: this will be removed for 5.6 in farvor of NSD and Unbound" should 
read "in favor" (or did you mean "will be removed, in fervor, with NSD 
and Unbound"? ;)).

And, by the way, isn't it the version 5.6 FAQ? Is BIND removed or not?

Section "1.11 - Why is/isn't ProductX included?".
"...project wishes to devote the resources needed to maintaining it..." 
should read "needed to maintain it" (or maybe "needed for maintaining 
it", but it sounds weird).
"Impact on slower platforms, such as hp300 or VAX would be unacceptable" 
- I think it needs a comma after "VAX".


Best regards,
Nick Permyakov

[PATCH] Fix typos in getentropy.2

[Piotr Sikora]

Hello,
it seems that setlogin and name weren't replaced everywhere.
I also replaced ".Nm" with ".Fn getentropy" to get the ().

Best regards,
Piotr Sikora
--- lib/libc/sys/getentropy.2-orig  Fri Jun 13 10:13:05 2014
+++ lib/libc/sys/getentropy.2   Fri Jun 13 10:20:25 2014
@@ -25,20 +25,19 @@
 .Ft ssize_t
 .Fn getentropy "char *buf" "size_t buflen"
 .Sh DESCRIPTION
-.Nm
+.Fn getentropy
 returns a buffer of high-quality seed-grade entropy.
 .Pp
 This is typically used to seed a process-context generator
 like
 .Xr arc4random 3 .
 .Sh ERRORS
-.Nm
-.Fn setlogin
+.Fn getentropy
 will succeed unless:
 .Bl -tag -width Er
 .It Bq Er EFAULT
 The
-.Fa name
+.Fa buf
 parameter points to an
 invalid address.
 .El

typos in /cvs/src/sys/dev/pci/if_em.h

[Diego Casati]

hi,

while reading if_em.h i've bumped into a few typos.

ok?

# cvs diff -Nup if_em.h 
Index: if_em.h
===
RCS file: /cvs/src/sys/dev/pci/if_em.h,v
retrieving revision 1.48
diff -u -p -r1.48 if_em.h
--- if_em.h 7 Sep 2010 16:21:44 -   1.48
+++ if_em.h 16 Apr 2013 19:25:56 -
@@ -92,7 +92,7 @@ POSSIBILITY OF SUCH DAMAGE.
  *   Increasing this value allows the driver to queue more transmits. Each
  *   descriptor is 16 bytes.
  *   Since TDLEN should be multiple of 128bytes, the number of transmit
- *   desscriptors should meet the following condition.
+ *   descriptors should meet the following condition.
  *  (num_tx_desc * sizeof(struct em_tx_desc)) % 128 == 0
  */
 #define EM_MAX_TXD_82543   256
@@ -108,7 +108,7 @@ POSSIBILITY OF SUCH DAMAGE.
  *   Each descriptor is 16 bytes.  A receive buffer is also allocated for each
  *   descriptor. The maximum MTU size is 16110.
  *   Since TDLEN should be multiple of 128bytes, the number of transmit
- *   desscriptors should meet the following condition.
+ *   descriptors should meet the following condition.
  *  (num_tx_desc * sizeof(struct em_tx_desc)) % 128 == 0
  */
 #define EM_MAX_RXD_82543   256

Fix a couple of typos in rtadvd.conf.5

[Mike.]

Minor typos.



Index: rtadvd.conf.5
===
RCS file: /cvs/src/usr.sbin/rtadvd/rtadvd.conf.5,v
retrieving revision 1.31
diff -u -r1.31 rtadvd.conf.5
--- rtadvd.conf.5   26 Sep 2012 16:19:45 -  1.31
+++ rtadvd.conf.5   29 Mar 2013 16:49:40 -
@@ -204,14 +204,14 @@
 .Pq unit: seconds .
 The default value is 2592000 (30 days).
 .It Cm \&vltimedecr
-(bool) This item means the advertised valid lifetime will decrements
+(bool) This item means the advertised valid lifetime will decrement
 in real time, which is disabled by default.
 .It Cm \&pltime
 (num) Preferred lifetime field
 .Pq unit: seconds .
 The default value is 604800 (7 days).
 .It Cm \&pltimedecr
-(bool) This item means the advertised preferred lifetime will
decrements
+(bool) This item means the advertised preferred lifetime will
decrement
 in real time, which is disabled by default.
 .El
 .Pp

Re: Typos in net/bpf.h

[Creamy]

On Fri, Mar 22, 2013 at 10:38:25AM -0600, Theo de Raadt wrote:
> > On 03/22/13 17:25, Philip Guenther wrote:
> > > On Fri, Mar 22, 2013 at 7:53 AM, Gabriel Linder  
> > > wrote:
> > >> - * bpf understands a program iff kernel_major == filter_major &&
> > >> + * bpf understands a program if kernel_major == filter_major &&
> > > Not a typo: "iff" is a shorthand for "if and only if" that was
> > > inherited from the mathematics community.
> > 
> > I did not know that, thanks. Maybe it should be spelled in full letters 
> > then ?
> 
> iff is a useful technical word which avoids us typing it out in full
> every time.


iff you know what it means :-)

-- 
Creamy

Re: Typos in net/bpf.h

[Gabriel Linder]

On 03/22/13 17:38, Theo de Raadt wrote:
>> On 03/22/13 17:25, Philip Guenther wrote:
>>> On Fri, Mar 22, 2013 at 7:53 AM, Gabriel Linder  
>>> wrote:
 - * bpf understands a program iff kernel_major == filter_major &&
 + * bpf understands a program if kernel_major == filter_major &&
>>> Not a typo: "iff" is a shorthand for "if and only if" that was
>>> inherited from the mathematics community.
>> I did not know that, thanks. Maybe it should be spelled in full letters then 
>> ?
> iff is a useful technical word which avoids us typing it out in full
> every time.
>
> If we replaced such simple words everytime someone didn't understand them,
> eventually our in-line code would be full of babytalk.
>

Makes sense. What about the rest of the diff ?

Index: bpf.h
===
RCS file: /cvs/src/sys/net/bpf.h,v
retrieving revision 1.43
diff -u -r1.43 bpf.h
--- bpf.h   26 Mar 2012 19:37:42 -  1.43
+++ bpf.h   22 Mar 2013 16:44:35 -
@@ -73,12 +73,12 @@
 };
 
 /*
- * Struct return by BIOCVERSION.  This represents the version number of
+ * Struct returned by BIOCVERSION.  This represents the version number of
  * the filter language described by the instruction encodings below.
  * bpf understands a program iff kernel_major == filter_major &&
  * kernel_minor >= filter_minor, that is, if the value returned by the
  * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded.  Otherwise, the
+ * to or greater than the filter being downloaded.  Otherwise, the
  * results are undefined, meaning an error may be returned or packets
  * may be accepted haphazardly.
  * It has nothing to do with the source code version.

Re: Typos in net/bpf.h

[Theo de Raadt]

> On 03/22/13 17:25, Philip Guenther wrote:
> > On Fri, Mar 22, 2013 at 7:53 AM, Gabriel Linder  
> > wrote:
> >> - * bpf understands a program iff kernel_major == filter_major &&
> >> + * bpf understands a program if kernel_major == filter_major &&
> > Not a typo: "iff" is a shorthand for "if and only if" that was
> > inherited from the mathematics community.
> 
> I did not know that, thanks. Maybe it should be spelled in full letters then ?

iff is a useful technical word which avoids us typing it out in full
every time.

If we replaced such simple words everytime someone didn't understand them,
eventually our in-line code would be full of babytalk.

Re: Typos in net/bpf.h

[Gabriel Linder]

On 03/22/13 17:25, Philip Guenther wrote:
> On Fri, Mar 22, 2013 at 7:53 AM, Gabriel Linder  wrote:
>> - * bpf understands a program iff kernel_major == filter_major &&
>> + * bpf understands a program if kernel_major == filter_major &&
> Not a typo: "iff" is a shorthand for "if and only if" that was
> inherited from the mathematics community.

I did not know that, thanks. Maybe it should be spelled in full letters then ?

Re: Typos in net/bpf.h

[Creamy]

On Fri, Mar 22, 2013 at 03:53:07PM +0100, Gabriel Linder wrote:
> While learning how to use BPF I fumbled on this, clarification is needed imho.
> 
> ok ?
> 
> Index: sys/net/bpf.h
> ===
> RCS file: /cvs/src/sys/net/bpf.h,v
> retrieving revision 1.43
> diff -u -r1.43 bpf.h
> --- sys/net/bpf.h26 Mar 2012 19:37:42 -1.43
> +++ sys/net/bpf.h22 Mar 2013 14:48:21 -
> @@ -73,12 +73,12 @@
>  };
>  
>  /*
> - * Struct return by BIOCVERSION.  This represents the version number of
> + * Struct returned by BIOCVERSION.  This represents the version number of
>   * the filter language described by the instruction encodings below.
> - * bpf understands a program iff kernel_major == filter_major &&
> + * bpf understands a program if kernel_major == filter_major &&

This is not exactly a typo, I believe it means, 'if and only if'.

However, iff is a bad term to use precisely for this reason, so please
spell it out in full :-).

-- 
Creamy

Re: Typos in net/bpf.h

[Philip Guenther]

On Fri, Mar 22, 2013 at 7:53 AM, Gabriel Linder  wrote:
> - * bpf understands a program iff kernel_major == filter_major &&
> + * bpf understands a program if kernel_major == filter_major &&

Not a typo: "iff" is a shorthand for "if and only if" that was
inherited from the mathematics community.

Typos in net/bpf.h

[Gabriel Linder]

While learning how to use BPF I fumbled on this, clarification is needed imho.

ok ?

Index: sys/net/bpf.h
===
RCS file: /cvs/src/sys/net/bpf.h,v
retrieving revision 1.43
diff -u -r1.43 bpf.h
--- sys/net/bpf.h26 Mar 2012 19:37:42 -1.43
+++ sys/net/bpf.h22 Mar 2013 14:48:21 -
@@ -73,12 +73,12 @@
 };
 
 /*
- * Struct return by BIOCVERSION.  This represents the version number of
+ * Struct returned by BIOCVERSION.  This represents the version number of
  * the filter language described by the instruction encodings below.
- * bpf understands a program iff kernel_major == filter_major &&
+ * bpf understands a program if kernel_major == filter_major &&
  * kernel_minor >= filter_minor, that is, if the value returned by the
  * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded.  Otherwise, the
+ * to or greater than the filter being downloaded.  Otherwise, the
  * results are undefined, meaning an error may be returned or packets
  * may be accepted haphazardly.
  * It has nothing to do with the source code version.

Re: typos in stat(2)

[Otto Moerbeek]

On Wed, Jul 11, 2012 at 02:11:56PM +0200, Han Boetes wrote:

> I found these typos in the stat(2) manpage:

Really? I think it already was explained. This morning.

-Otto

> 
> 
> Index: sys/stat.2
> ===
> RCS file: /cvs/src/lib/libc/sys/stat.2,v
> retrieving revision 1.31
> diff -u -p -r1.31 stat.2
> --- sys/stat.217 Nov 2011 14:26:14 -  1.31
> +++ sys/stat.210 Jul 2012 18:45:20 -
> @@ -149,9 +149,9 @@ struct stat {
>  uid_t  st_uid;/* user ID of the file's owner */
>  gid_t  st_gid;/* group ID of the file's group */
>  dev_t  st_rdev;   /* device type */
> -struct timespec st_atim;  /* time of last access */
> -struct timespec st_mtim;  /* time of last data modification */
> -struct timespec st_ctim;  /* time of last file status change */
> +struct timespec st_atime;  /* time of last access */
> +struct timespec st_mtime;  /* time of last data modification */
> +struct timespec st_ctime;  /* time of last file status change */
>  off_t  st_size;   /* file size, in bytes */
>  int64_tst_blocks; /* blocks allocated for file */
>  u_int32_t  st_blksize;/* optimal blocksize for I/O */

typos in stat(2)

[Han Boetes]

I found these typos in the stat(2) manpage:


Index: sys/stat.2
===
RCS file: /cvs/src/lib/libc/sys/stat.2,v
retrieving revision 1.31
diff -u -p -r1.31 stat.2
--- sys/stat.2  17 Nov 2011 14:26:14 -  1.31
+++ sys/stat.2  10 Jul 2012 18:45:20 -
@@ -149,9 +149,9 @@ struct stat {
 uid_t  st_uid;/* user ID of the file's owner */
 gid_t  st_gid;/* group ID of the file's group */
 dev_t  st_rdev;   /* device type */
-struct timespec st_atim;  /* time of last access */
-struct timespec st_mtim;  /* time of last data modification */
-struct timespec st_ctim;  /* time of last file status change */
+struct timespec st_atime;  /* time of last access */
+struct timespec st_mtime;  /* time of last data modification */
+struct timespec st_ctime;  /* time of last file status change */
 off_t  st_size;   /* file size, in bytes */
 int64_tst_blocks; /* blocks allocated for file */
 u_int32_t  st_blksize;/* optimal blocksize for I/O */

Re: transferred/transferring typos

[Philip Guenther]

On Thu, Feb 23, 2012 at 5:56 PM, Tobias Ulmer  wrote:
> Anyone brave enough to commit this diff or should I put it into the
> round file? :)

Committed.  Thanks for the poke...


Philip Guenther

Re: transferred/transferring typos

[Tobias Ulmer]

Anyone brave enough to commit this diff or should I put it into the
round file? :)

Re: transferred/transferring typos

[Kenneth R Westerback]

On Sat, Jan 07, 2012 at 02:40:24PM +, Jason McIntyre wrote:
> On Sat, Jan 07, 2012 at 03:29:40PM +0100, Tobias Ulmer wrote:
> > After typing 'transferring' wrong one time too many...
> > 
> > I didn't touch gcc, binutils, bind, lynx, kerberos, openssl or perl on
> > purpose.
> > 
> 
> ok by me.
> jmc

Me too. ok krw@. Typos are very distracting when reading code.

 Ken

> 
> > Index: lib/libsndio/sio_sun.c
> > ===
> > RCS file: /home/vcs/cvs/openbsd/src/lib/libsndio/sio_sun.c,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 sio_sun.c
> > --- lib/libsndio/sio_sun.c  15 Nov 2011 08:05:22 -  1.4
> > +++ lib/libsndio/sio_sun.c  7 Jan 2012 14:11:33 -
> > @@ -48,7 +48,7 @@ struct sio_sun_hdl {
> > int fd;
> > int filling;
> > unsigned ibpf, obpf;/* bytes per frame */
> > -   unsigned ibytes, obytes;/* bytes the hw transfered */
> > +   unsigned ibytes, obytes;/* bytes the hw transferred */
> > unsigned ierr, oerr;/* frames the hw dropped */
> > int offset; /* frames play is ahead of record */
> > int idelta, odelta; /* position reported to client */
> > Index: sys/arch/macppc/dev/tpms.c
> > ===
> > RCS file: /home/vcs/cvs/openbsd/src/sys/arch/macppc/dev/tpms.c,v
> > retrieving revision 1.15
> > diff -u -p -r1.15 tpms.c
> > --- sys/arch/macppc/dev/tpms.c  9 Apr 2010 17:01:30 -   1.15
> > +++ sys/arch/macppc/dev/tpms.c  7 Jan 2012 14:11:45 -
> > @@ -128,7 +128,7 @@
> >   * Magic numbers.
> >   */
> >  
> > -/* The amount of data transfered by the USB device. */
> > +/* The amount of data transferred by the USB device. */
> >  #define TPMS_DATA_LEN 81
> >  
> >  /* The maximum number of sensors. */
> > Index: sys/arch/vax/dec/sii.c
> > ===
> > RCS file: /home/vcs/cvs/openbsd/src/sys/arch/vax/dec/sii.c,v
> > retrieving revision 1.13
> > diff -u -p -r1.13 sii.c
> > --- sys/arch/vax/dec/sii.c  17 Jul 2011 22:46:47 -  1.13
> > +++ sys/arch/vax/dec/sii.c  7 Jan 2012 14:11:51 -
> > @@ -645,7 +645,7 @@ again:
> > printf("%s: Parity error\n", sc->sc_dev.dv_xname);
> > goto abort;
> > }
> > -   /* dmalen = amount left to transfer, i = amount transfered */
> > +   /* dmalen = amount left to transfer, i = amount transferred */
> > i = state->dmalen;
> > state->dmalen = 0;
> > state->dmaCurPhase = -1;
> > @@ -899,7 +899,7 @@ again:
> >  #endif
> > }
> >  
> > -   /* read amount transfered if DMA didn't finish */
> > +   /* read amount transferred if DMA didn't finish */
> > if (state->dmalen > 0) {
> > i = state->dmalen - regs->dmlotc;
> > state->dmalen = 0;
> > Index: sys/dev/ata/wdvar.h
> > ===
> > RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ata/wdvar.h,v
> > retrieving revision 1.18
> > diff -u -p -r1.18 wdvar.h
> > --- sys/dev/ata/wdvar.h 22 Sep 2011 22:12:45 -  1.18
> > +++ sys/dev/ata/wdvar.h 7 Jan 2012 14:11:57 -
> > @@ -44,8 +44,8 @@ struct ata_bio {
> >  struct disklabel *lp; /* pointer to drive's label info */
> >  daddr64_t blkno; /* block addr */
> >  daddr64_t blkdone; /* number of blks transferred */
> > -daddr64_t nblks; /* number of block currently transfering */
> > -int nbytes; /* number of bytes currently transfering */
> > +daddr64_t nblks; /* number of block currently transferring */
> > +int nbytes; /* number of bytes currently transferring */
> >  longbcount; /* total number of bytes */
> >  char   *databuf; /* data buffer address */
> >  volatile int error;
> > Index: sys/dev/ic/aic79xx.c
> > ===
> > RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ic/aic79xx.c,v
> > retrieving revision 1.48
> > diff -u -p -r1.48 aic79xx.c
> > --- sys/dev/ic/aic79xx.c19 Apr 2011 21:59:51 -  1.48
> > +++ sys/dev/ic/aic79xx.c7 Jan 201

Re: transferred/transferring typos

[Jason McIntyre]

On Sat, Jan 07, 2012 at 03:29:40PM +0100, Tobias Ulmer wrote:
> After typing 'transferring' wrong one time too many...
> 
> I didn't touch gcc, binutils, bind, lynx, kerberos, openssl or perl on
> purpose.
> 

ok by me.
jmc

> Index: lib/libsndio/sio_sun.c
> ===
> RCS file: /home/vcs/cvs/openbsd/src/lib/libsndio/sio_sun.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 sio_sun.c
> --- lib/libsndio/sio_sun.c15 Nov 2011 08:05:22 -  1.4
> +++ lib/libsndio/sio_sun.c7 Jan 2012 14:11:33 -
> @@ -48,7 +48,7 @@ struct sio_sun_hdl {
>   int fd;
>   int filling;
>   unsigned ibpf, obpf;/* bytes per frame */
> - unsigned ibytes, obytes;/* bytes the hw transfered */
> + unsigned ibytes, obytes;/* bytes the hw transferred */
>   unsigned ierr, oerr;/* frames the hw dropped */
>   int offset; /* frames play is ahead of record */
>   int idelta, odelta; /* position reported to client */
> Index: sys/arch/macppc/dev/tpms.c
> ===
> RCS file: /home/vcs/cvs/openbsd/src/sys/arch/macppc/dev/tpms.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 tpms.c
> --- sys/arch/macppc/dev/tpms.c9 Apr 2010 17:01:30 -   1.15
> +++ sys/arch/macppc/dev/tpms.c7 Jan 2012 14:11:45 -
> @@ -128,7 +128,7 @@
>   * Magic numbers.
>   */
>  
> -/* The amount of data transfered by the USB device. */
> +/* The amount of data transferred by the USB device. */
>  #define TPMS_DATA_LEN 81
>  
>  /* The maximum number of sensors. */
> Index: sys/arch/vax/dec/sii.c
> ===
> RCS file: /home/vcs/cvs/openbsd/src/sys/arch/vax/dec/sii.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 sii.c
> --- sys/arch/vax/dec/sii.c17 Jul 2011 22:46:47 -  1.13
> +++ sys/arch/vax/dec/sii.c7 Jan 2012 14:11:51 -
> @@ -645,7 +645,7 @@ again:
>   printf("%s: Parity error\n", sc->sc_dev.dv_xname);
>   goto abort;
>   }
> - /* dmalen = amount left to transfer, i = amount transfered */
> + /* dmalen = amount left to transfer, i = amount transferred */
>   i = state->dmalen;
>   state->dmalen = 0;
>   state->dmaCurPhase = -1;
> @@ -899,7 +899,7 @@ again:
>  #endif
>   }
>  
> - /* read amount transfered if DMA didn't finish */
> + /* read amount transferred if DMA didn't finish */
>   if (state->dmalen > 0) {
>   i = state->dmalen - regs->dmlotc;
>   state->dmalen = 0;
> Index: sys/dev/ata/wdvar.h
> ===
> RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ata/wdvar.h,v
> retrieving revision 1.18
> diff -u -p -r1.18 wdvar.h
> --- sys/dev/ata/wdvar.h   22 Sep 2011 22:12:45 -  1.18
> +++ sys/dev/ata/wdvar.h   7 Jan 2012 14:11:57 -
> @@ -44,8 +44,8 @@ struct ata_bio {
>  struct disklabel *lp; /* pointer to drive's label info */
>  daddr64_t blkno; /* block addr */
>  daddr64_t blkdone; /* number of blks transferred */
> -daddr64_t nblks; /* number of block currently transfering */
> -int nbytes; /* number of bytes currently transfering */
> +daddr64_t nblks; /* number of block currently transferring */
> +int nbytes; /* number of bytes currently transferring */
>  longbcount; /* total number of bytes */
>  char   *databuf; /* data buffer address */
>  volatile int error;
> Index: sys/dev/ic/aic79xx.c
> ===
> RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ic/aic79xx.c,v
> retrieving revision 1.48
> diff -u -p -r1.48 aic79xx.c
> --- sys/dev/ic/aic79xx.c  19 Apr 2011 21:59:51 -  1.48
> +++ sys/dev/ic/aic79xx.c  7 Jan 2012 14:11:57 -
> @@ -1225,7 +1225,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
>* that requires host assistance for completion.
>* While handling the message phase(s), we will be
>* notified by the sequencer after each byte is
> -  * transfered so we can track bus phase changes.
> +  * transferred so we can track bus phase changes.
>*
>* If this is the first time we've seen a HOST_MSG_LOOP
>* interrupt, initialize the state of the host message
> Index: sys/dev/ic/aic79xx.h
> ===
> RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ic/aic79xx.h,v
> retrieving revision 1.21
> diff -u -p -r1.21 aic79xx.h
> --- sys/dev/ic/aic79xx.h  21 Dec 2006 02:28:47 -  1.21
> +++ sys/dev/ic/aic79xx.h 

transferred/transferring typos

[Tobias Ulmer]

After typing 'transferring' wrong one time too many...

I didn't touch gcc, binutils, bind, lynx, kerberos, openssl or perl on
purpose.

Index: lib/libsndio/sio_sun.c
===
RCS file: /home/vcs/cvs/openbsd/src/lib/libsndio/sio_sun.c,v
retrieving revision 1.4
diff -u -p -r1.4 sio_sun.c
--- lib/libsndio/sio_sun.c  15 Nov 2011 08:05:22 -  1.4
+++ lib/libsndio/sio_sun.c  7 Jan 2012 14:11:33 -
@@ -48,7 +48,7 @@ struct sio_sun_hdl {
int fd;
int filling;
unsigned ibpf, obpf;/* bytes per frame */
-   unsigned ibytes, obytes;/* bytes the hw transfered */
+   unsigned ibytes, obytes;/* bytes the hw transferred */
unsigned ierr, oerr;/* frames the hw dropped */
int offset; /* frames play is ahead of record */
int idelta, odelta; /* position reported to client */
Index: sys/arch/macppc/dev/tpms.c
===
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/macppc/dev/tpms.c,v
retrieving revision 1.15
diff -u -p -r1.15 tpms.c
--- sys/arch/macppc/dev/tpms.c  9 Apr 2010 17:01:30 -   1.15
+++ sys/arch/macppc/dev/tpms.c  7 Jan 2012 14:11:45 -
@@ -128,7 +128,7 @@
  * Magic numbers.
  */
 
-/* The amount of data transfered by the USB device. */
+/* The amount of data transferred by the USB device. */
 #define TPMS_DATA_LEN 81
 
 /* The maximum number of sensors. */
Index: sys/arch/vax/dec/sii.c
===
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/vax/dec/sii.c,v
retrieving revision 1.13
diff -u -p -r1.13 sii.c
--- sys/arch/vax/dec/sii.c  17 Jul 2011 22:46:47 -  1.13
+++ sys/arch/vax/dec/sii.c  7 Jan 2012 14:11:51 -
@@ -645,7 +645,7 @@ again:
printf("%s: Parity error\n", sc->sc_dev.dv_xname);
goto abort;
}
-   /* dmalen = amount left to transfer, i = amount transfered */
+   /* dmalen = amount left to transfer, i = amount transferred */
i = state->dmalen;
state->dmalen = 0;
state->dmaCurPhase = -1;
@@ -899,7 +899,7 @@ again:
 #endif
}
 
-   /* read amount transfered if DMA didn't finish */
+   /* read amount transferred if DMA didn't finish */
if (state->dmalen > 0) {
i = state->dmalen - regs->dmlotc;
state->dmalen = 0;
Index: sys/dev/ata/wdvar.h
===
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ata/wdvar.h,v
retrieving revision 1.18
diff -u -p -r1.18 wdvar.h
--- sys/dev/ata/wdvar.h 22 Sep 2011 22:12:45 -  1.18
+++ sys/dev/ata/wdvar.h 7 Jan 2012 14:11:57 -
@@ -44,8 +44,8 @@ struct ata_bio {
 struct disklabel *lp; /* pointer to drive's label info */
 daddr64_t blkno; /* block addr */
 daddr64_t blkdone; /* number of blks transferred */
-daddr64_t nblks; /* number of block currently transfering */
-int nbytes; /* number of bytes currently transfering */
+daddr64_t nblks; /* number of block currently transferring */
+int nbytes; /* number of bytes currently transferring */
 longbcount; /* total number of bytes */
 char   *databuf; /* data buffer address */
 volatile int error;
Index: sys/dev/ic/aic79xx.c
===
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ic/aic79xx.c,v
retrieving revision 1.48
diff -u -p -r1.48 aic79xx.c
--- sys/dev/ic/aic79xx.c19 Apr 2011 21:59:51 -  1.48
+++ sys/dev/ic/aic79xx.c7 Jan 2012 14:11:57 -
@@ -1225,7 +1225,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
 * that requires host assistance for completion.
 * While handling the message phase(s), we will be
 * notified by the sequencer after each byte is
-* transfered so we can track bus phase changes.
+* transferred so we can track bus phase changes.
 *
 * If this is the first time we've seen a HOST_MSG_LOOP
 * interrupt, initialize the state of the host message
Index: sys/dev/ic/aic79xx.h
===
RCS file: /home/vcs/cvs/openbsd/src/sys/dev/ic/aic79xx.h,v
retrieving revision 1.21
diff -u -p -r1.21 aic79xx.h
--- sys/dev/ic/aic79xx.h21 Dec 2006 02:28:47 -  1.21
+++ sys/dev/ic/aic79xx.h7 Jan 2012 14:11:57 -
@@ -519,7 +519,7 @@ struct hardware_scb {
  * o A residual has occurred if SG_FULL_RESID is set in sgptr,
  *   or residual_sgptr does not have SG_LIST_NULL set.
  *
- * o We are transfering th

typos in error message

[Anthony J. Bentley]

continguous -> contiguous. Or perhaps it was meant to be "continuous."

Index: usr.sbin/bgpd/kroute.c
===
RCS file: /cvs/src/usr.sbin/bgpd/kroute.c,v
retrieving revision 1.186
diff -u usr.sbin/bgpd/kroute.c
--- usr.sbin/bgpd/kroute.c  11 Oct 2010 11:45:57 -  1.186
+++ usr.sbin/bgpd/kroute.c  7 Mar 2011 06:23:44 -
@@ -2379,7 +2379,7 @@
case 0x00:
return (l);
default:
-   fatalx("non continguous inet6 netmask");
+   fatalx("non contiguous inet6 netmask");
}
}
 
Index: usr.sbin/ospf6ctl/parser.c
===
RCS file: /cvs/src/usr.sbin/ospf6ctl/parser.c,v
retrieving revision 1.10
diff -u usr.sbin/ospf6ctl/parser.c
--- usr.sbin/ospf6ctl/parser.c  4 Sep 2010 21:31:04 -   1.10
+++ usr.sbin/ospf6ctl/parser.c  7 Mar 2011 06:23:46 -
@@ -385,7 +385,7 @@
case 0x00:
return (l);
default:
-   errx(1, "non continguous inet6 netmask");
+   errx(1, "non contiguous inet6 netmask");
}
}
 
Index: usr.sbin/ospf6d/kroute.c
===
RCS file: /cvs/src/usr.sbin/ospf6d/kroute.c,v
retrieving revision 1.29
diff -u usr.sbin/ospf6d/kroute.c
--- usr.sbin/ospf6d/kroute.c14 Oct 2010 07:38:05 -  1.29
+++ usr.sbin/ospf6d/kroute.c7 Mar 2011 06:23:46 -
@@ -734,7 +734,7 @@
case 0x00:
return (l);
default:
-   fatalx("non continguous inet6 netmask");
+   fatalx("non contiguous inet6 netmask");
}
}
 
Index: usr.sbin/snmpd/kroute.c
===
RCS file: /cvs/src/usr.sbin/snmpd/kroute.c,v
retrieving revision 1.15
diff -u usr.sbin/snmpd/kroute.c
--- usr.sbin/snmpd/kroute.c 15 Oct 2010 09:27:03 -  1.15
+++ usr.sbin/snmpd/kroute.c 7 Mar 2011 06:23:47 -
@@ -780,7 +780,7 @@
case 0x00:
return (l);
default:
-   fatalx("non continguous inet6 netmask");
+   fatalx("non contiguous inet6 netmask");
}
}

typos in #ifdef DEBUG

[Fred Crowson]

Hi tech@

While building a kernel with option DEBUG to try to hunt down my issue 
with the Libretto 70CT (PR 6052) I came across the following typos which 
prevented the build:


sys/arch/i386/i386/trap.c

--- trap.c  Wed Jul 14 00:55:31 2010
+++ mytrap.cWed Jul 14 00:44:26 2010
@@ -173,7 +173,7 @@
 #ifdef DEBUG
if (trapdebug) {
printf("trap %d code %x eip %x cs %x eflags %x cr2 %x 
cpl %x\n",

-   frame->tf_trapno, frame->tf_err, frame.->f_eip,
+   frame->tf_trapno, frame->tf_err, frame->tf_eip,
frame->tf_cs, frame->tf_eflags, rcr2(), lapic_tpr);
printf("curproc %p\n", curproc);
}

and in sys/kern/dma_alloc.c

--- dma_alloc.c Wed Jul 14 01:05:14 2010
+++ my_dma_alloc.c  Wed Jul 14 00:26:56 2010
@@ -49,7 +49,7 @@
if (sz <= (1 << (b + DMA_BUCKET_OFFSET)))
return (b);
 #ifdef DEBUG
-   printf("dma_alloc/free: object %d too large\n", sz)
+   printf("dma_alloc/free: object %d too large\n", sz);
 #endif
return (-1);
 }

Thanks

Fred

typos in src/lib/libc/stdlib/getopt_long.c

[Hyjial Irldar]

Hi again !

The appended diff corrects two typos in comments.

Cheers !

hyjial.

Index: getopt_long.c
===
RCS file: /cvs/src/lib/libc/stdlib/getopt_long.c,v
retrieving revision 1.23
diff -u getopt_long.c
--- getopt_long.c   31 Oct 2007 12:34:57 -  1.23
+++ getopt_long.c   21 Apr 2010 16:01:49 -
@@ -68,7 +68,7 @@
 #define PRINT_ERROR((opterr) && (*options != ':'))

 #define FLAG_PERMUTE   0x01/* permute non-options to the end of argv */
-#define FLAG_ALLARGS   0x02/* treat non-options as args to option "-1" */
+#define FLAG_ALLARGS   0x02/* treat non-options as args to option "1" */
 #define FLAG_LONGONLY  0x04/* operate as getopt_long_only */

 /* return values */
@@ -391,7 +391,7 @@
 * Check long options if:
 *  1) we were passed some
 *  2) the arg is not just "-"
-*  3) either the arg starts with -- we are getopt_long_only()
+*  3) either the arg starts with -- or we are getopt_long_only()
 */
if (long_options != NULL && place != nargv[optind] &&
(*place == '-' || (flags & FLAG_LONGONLY))) {

typos /cvs/src/sbin/ping6/ping6.c

[Brad Tilley]

# cvs diff -Nup ping6.c
Index: ping6.c
===
RCS file: /cvs/src/sbin/ping6/ping6.c,v
retrieving revision 1.76
diff -N -u -p ping6.c
--- ping6.c 2 Nov 2009 22:31:50 -   1.76
+++ ping6.c 23 Dec 2009 01:20:03 -
@@ -566,7 +566,7 @@ main(int argc, char *argv[])
}

/*
-* let the kerel pass extension headers of incoming packets,
+* let the kernel pass extension headers of incoming packets,
 * for privileged socket options
 */
if ((options & F_VERBOSE) != 0) {
@@ -664,7 +664,7 @@ main(int argc, char *argv[])
 }
 #endif /*ICMP6_FILTER*/

-   /* let the kerel pass extension headers of incoming packets */
+   /* let the kernel pass extension headers of incoming packets */
if ((options & F_VERBOSE) != 0) {
int opton = 1;

@@ -939,7 +939,7 @@ main(int argc, char *argv[])

/*
 * receive control messages only. Process the
-* exceptions (currently the only possiblity is
+* exceptions (currently the only possibility is
 * a path MTU notification.)
 */
if ((mtu = get_pathmtu(&m)) > 0) {
@@ -1582,7 +1582,7 @@ pr_ip6opt(void *extbuf)
switch (type) {
/*
 * Note that inet6_opt_next automatically skips any
 padding
-* optins.
+* options.
 */
case IP6OPT_JUMBO:
offset = 0;
@@ -1780,7 +1780,7 @@ pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen)

/*
 * In icmp-name-lookups 05 and later, TTL of each returned
 address
-* is contained in the resposne. We try to detect the version
+* is contained in the response. We try to detect the version
 * by the length of the data, but note that the detection
 algorithm
 * is incomplete. We assume the latest draft by default.
 */

typos /cvs/src/sbin/pflogd/privsep.c

[Brad Tilley]

# cvs diff -Nup privsep.c
Index: privsep.c
===
RCS file: /cvs/src/sbin/pflogd/privsep.c,v
retrieving revision 1.16
diff -N -u -p privsep.c
--- privsep.c   25 Oct 2006 20:55:04 -  1.16
+++ privsep.c   23 Dec 2009 01:13:04 -
@@ -200,7 +200,7 @@ move_log(const char *name)
return (1);
}

-   /* lock destinanion */
+   /* lock destination */
fd = open(ren, O_CREAT|O_EXCL, 0);
if (fd >= 0) {
close(fd);
@@ -323,7 +323,7 @@ may_read(int fd, void *buf, size_t n)
 }

 /* Read data with the assertion that it all must come through, or
- * else abort the process.  Based on atomicio() from openssh. */
+ * else abort the process.  Based on atomicio() from OpenSSH. */
 static void
 must_read(int fd, void *buf, size_t n)
 {
@@ -345,7 +345,7 @@ must_read(int fd, void *buf, size_t n)
 }

 /* Write data with the assertion that it all has to be written, or
- * else abort the process.  Based on atomicio() from openssh. */
+ * else abort the process.  Based on atomicio() from OpenSSH. */
 static void
 must_write(int fd, void *buf, size_t n)
 {

typos /cvs/src/sbin/newfs/mkfs.c

[Brad Tilley]

# cvs diff -Nup mkfs.c
Index: mkfs.c
===
RCS file: /cvs/src/sbin/newfs/mkfs.c,v
retrieving revision 1.72
diff -N -u -p mkfs.c
--- mkfs.c  8 Aug 2008 23:49:53 -   1.72
+++ mkfs.c  23 Dec 2009 00:55:40 -
@@ -592,7 +592,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int
fo,
((char *)fscs) + i);

/*
-* Update information about this partion in pack label, to that
it may
+* Update information about this partition in pack label, so
that it may
 * be updated on disk.
 */
pp->p_fstype = FS_BSDFFS;

typos in /cvs/src/sbin/disklabel/editor.c

[Brad Tilley]

# cvs diff -Nup editor.c
Index: editor.c
===
RCS file: /cvs/src/sbin/disklabel/editor.c,v
retrieving revision 1.224
diff -N -u -p editor.c
--- editor.c12 Nov 2009 16:21:03 -  1.224
+++ editor.c23 Dec 2009 00:33:28 -
@@ -715,7 +715,7 @@ editor_add(struct disklabel *lp, char *p)

/*
 * Increase d_npartitions if necessary. Ensure all new
 partitions are
-* zero'ed to avoid inadvertant overlaps.
+* zero'ed to avoid inadvertent overlaps.
 */
for(; lp->d_npartitions <= partno; lp->d_npartitions++)
memset(&lp->d_partitions[lp->d_npartitions], 0,
sizeof(*pp));
@@ -1659,7 +1659,7 @@ editor_help(char *arg)
case 'D':
puts(
 "The 'D' command will set the disk label to the default values as
 reported\n"
-"by the disk itself.  This similates the case where there is no disk
label.\n");
+"by the disk itself.  This simulates the case where there is no disk
label.\n");
break;
case 'd':
puts(