summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2014-12-09 15:37:13 +0000
committerschwarze <schwarze@openbsd.org>2014-12-09 15:37:13 +0000
commit89d38d05ea956d0681cd6e99cb34fbfdd937bbc6 (patch)
treed9268c5efbb4d28f84687461abbad4fe00335fae
parentavoid void arithmetic. from david carlier (diff)
downloadwireguard-openbsd-89d38d05ea956d0681cd6e99cb34fbfdd937bbc6.tar.xz
wireguard-openbsd-89d38d05ea956d0681cd6e99cb34fbfdd937bbc6.zip
put back some information what the character classes actually mean;
while here, remove the lie that regex(3) character classes would depend on the locale; ok jmc@
-rw-r--r--bin/csh/csh.16
-rw-r--r--bin/ksh/ksh.16
-rw-r--r--bin/ksh/sh.16
-rw-r--r--lib/libc/regex/re_format.77
-rw-r--r--share/man/man7/glob.76
-rw-r--r--usr.bin/tr/tr.18
6 files changed, 32 insertions, 7 deletions
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 59a2b8ad23f..85bf6ba5b6f 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.1,v 1.72 2014/12/09 14:39:37 jmc Exp $
+.\" $OpenBSD: csh.1,v 1.73 2014/12/09 15:37:13 schwarze Exp $
.\" $NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -1171,6 +1171,10 @@ alpha digit print upper
blank graph punct xdigit
.Ed
.Pp
+These match characters using the macros specified in
+.Xr isalnum 3 ,
+.Xr isalpha 3 ,
+and so on.
A character class may not be used as an endpoint of a range.
.Pp
The character
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 906e261a28c..fb07c222654 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ksh.1,v 1.154 2014/12/09 14:39:37 jmc Exp $
+.\" $OpenBSD: ksh.1,v 1.155 2014/12/09 15:37:13 schwarze Exp $
.\"
.\" Public Domain
.\"
@@ -1906,6 +1906,10 @@ alpha digit print upper
blank graph punct xdigit
.Ed
.Pp
+These match characters using the macros specified in
+.Xr isalnum 3 ,
+.Xr isalpha 3 ,
+and so on.
A character class may not be used as an endpoint of a range.
.It [!..]
Like [..],
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index 866adf0e51c..598ce1e0d7d 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sh.1,v 1.98 2014/12/09 14:39:37 jmc Exp $
+.\" $OpenBSD: sh.1,v 1.99 2014/12/09 15:37:13 schwarze Exp $
.\"
.\" Public Domain
.\"
@@ -1500,6 +1500,10 @@ alpha digit print upper
blank graph punct xdigit
.Ed
.Pp
+These match characters using the macros specified in
+.Xr isalnum 3 ,
+.Xr isalpha 3 ,
+and so on.
A character class may not be used as an endpoint of a range.
.It [!..]
Like [..],
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index 5d1bea489d2..0d8ce59a8b8 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: re_format.7,v 1.19 2014/12/09 14:39:37 jmc Exp $
+.\" $OpenBSD: re_format.7,v 1.20 2014/12/09 15:37:14 schwarze Exp $
.\"
.\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
.\"
@@ -280,7 +280,10 @@ blank lower upper
cntrl print xdigit
.Ed
.Pp
-A locale may provide other character classes.
+These stand for the character classes defined in
+.Xr isalnum 3 ,
+.Xr isalpha 3 ,
+and so on.
A character class may not be used as an endpoint of a range.
.Pp
There are two special cases** of bracket expressions:
diff --git a/share/man/man7/glob.7 b/share/man/man7/glob.7
index 1e8451d1eb8..d8125636bee 100644
--- a/share/man/man7/glob.7
+++ b/share/man/man7/glob.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: glob.7,v 1.4 2014/12/09 14:39:37 jmc Exp $
+.\" $OpenBSD: glob.7,v 1.5 2014/12/09 15:37:14 schwarze Exp $
.\"
.\" Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
.\"
@@ -90,6 +90,10 @@ Supported character classes:
.It Li "blank" Ta "graph" Ta "punct" Ta "xdigit"
.El
.Pp
+These match characters using the macros specified in
+.Xr isalnum 3 ,
+.Xr isalpha 3 ,
+and so on.
A character class may not be used as an endpoint of a range.
.It [!..]
Like [..],
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 9a00605b0f6..54861b59ec7 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tr.1,v 1.23 2014/12/09 14:39:37 jmc Exp $
+.\" $OpenBSD: tr.1,v 1.24 2014/12/09 15:37:14 schwarze Exp $
.\" $NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -224,6 +224,12 @@ and
.Dq lower
classes, characters are entered in
ascending order.
+.Pp
+For specific information as to which ASCII characters are included
+in these classes, see
+.Xr isalnum 3 ,
+.Xr isalpha 3 ,
+and related manual pages.
.It [=equiv=]
Represents all characters or collating (sorting) elements belonging to
the same equivalence class as