1 files changed, 31 insertions, 19 deletions
diff --git a/src/lib/libc/string/strspn.3 b/src/lib/libc/string/strspn.3
index 4de03aa58b..b1a2ae3014 100644
--- a/src/lib/libc/string/strspn.3
+++ b/src/lib/libc/string/strspn.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: strspn.3,v 1.10 2011/07/25 00:38:53 schwarze Exp $
+.\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -13,11 +15,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -33,10 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strspn.3      5.3 (Berkeley) 6/29/91
+.Dd $Mdocdate: July 25 2011 $
-.\"     $Id: strspn.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
-.\"
-.Dd June 29, 1991
 .Dt STRSPN 3
 .Os
 .Sh NAME
@@ -48,9 +43,8 @@
 .Fn strspn "const char *s" "const char *charset"
 .Sh DESCRIPTION
 The
-.Xr strcspn
+.Fn strspn
-function
+function spans the initial part of the NUL-terminated string
-spans the initial part of the null-terminated string
 .Fa s
 as long as the characters from
 .Fa s
@@ -59,22 +53,40 @@ occur in string
 .Sh RETURN VALUES
 The
 .Fn strspn
-function
+function returns the number of characters spanned.
-returns the number of characters spanned.
+.Sh EXAMPLES
+The following call to
+.Fn strspn
+will return 3, since the first three characters of string
+.Fa s
+are part of string
+.Fa charset :
+.Bd -literal -offset indent
+char *s = "foobar";
+char *charset = "of";
+size_t span;
+span = strspn(s, charset);
+.Ed
 .Sh SEE ALSO
-.Xr index 3 ,
 .Xr memchr 3 ,
-.Xr rindex 3 ,
 .Xr strchr 3 ,
 .Xr strcspn 3 ,
 .Xr strpbrk 3 ,
 .Xr strrchr 3 ,
 .Xr strsep 3 ,
 .Xr strstr 3 ,
-.Xr strtok 3
+.Xr strtok 3 ,
+.Xr wcsspn 3
 .Sh STANDARDS
 The
 .Fn strspn
-function
+function conforms to
-conforms to
 .St -ansiC .
+.Sh HISTORY
+The
+.Fn strspn
+function first appeared in
+.At III
+and was reimplemented for
+.Bx 4.3 Tahoe .

diff --git a/src/lib/libc/string/strspn.3 b/src/lib/libc/string/strspn.3 index 4de03aa58b..b1a2ae3014 100644 --- a/src/lib/libc/string/strspn.3 +++ b/src/lib/libc/string/strspn.3
@@ -1,3 +1,5 @@
		1	.\" $OpenBSD: strspn.3,v 1.10 2011/07/25 00:38:53 schwarze Exp $
		2	.\"
1	.\" Copyright (c) 1990, 1991 The Regents of the University of California.	3	.\" Copyright (c) 1990, 1991 The Regents of the University of California.
2	.\" All rights reserved.	4	.\" All rights reserved.
3	.\"	5	.\"
@@ -13,11 +15,7 @@
13	.\" 2. Redistributions in binary form must reproduce the above copyright	15	.\" 2. Redistributions in binary form must reproduce the above copyright
14	.\" notice, this list of conditions and the following disclaimer in the	16	.\" notice, this list of conditions and the following disclaimer in the
15	.\" documentation and/or other materials provided with the distribution.	17	.\" documentation and/or other materials provided with the distribution.
16	.\" 3. All advertising materials mentioning features or use of this software	18	.\" 3. Neither the name of the University nor the names of its contributors
17	.\" must display the following acknowledgement:
18	.\" This product includes software developed by the University of
19	.\" California, Berkeley and its contributors.
20	.\" 4. Neither the name of the University nor the names of its contributors
21	.\" may be used to endorse or promote products derived from this software	19	.\" may be used to endorse or promote products derived from this software
22	.\" without specific prior written permission.	20	.\" without specific prior written permission.
23	.\"	21	.\"
@@ -33,10 +31,7 @@
33	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	31	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34	.\" SUCH DAMAGE.	32	.\" SUCH DAMAGE.
35	.\"	33	.\"
36	.\" from: @(#)strspn.3 5.3 (Berkeley) 6/29/91	34	.Dd $Mdocdate: July 25 2011 $
37	.\" $Id: strspn.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
38	.\"
39	.Dd June 29, 1991
40	.Dt STRSPN 3	35	.Dt STRSPN 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
@@ -48,9 +43,8 @@
48	.Fn strspn "const char s" "const char charset"	43	.Fn strspn "const char s" "const char charset"
49	.Sh DESCRIPTION	44	.Sh DESCRIPTION
50	The	45	The
51	.Xr strcspn	46	.Fn strspn
52	function	47	function spans the initial part of the NUL-terminated string
53	spans the initial part of the null-terminated string
54	.Fa s	48	.Fa s
55	as long as the characters from	49	as long as the characters from
56	.Fa s	50	.Fa s
@@ -59,22 +53,40 @@ occur in string
59	.Sh RETURN VALUES	53	.Sh RETURN VALUES
60	The	54	The
61	.Fn strspn	55	.Fn strspn
62	function	56	function returns the number of characters spanned.
63	returns the number of characters spanned.	57	.Sh EXAMPLES
		58	The following call to
		59	.Fn strspn
		60	will return 3, since the first three characters of string
		61	.Fa s
		62	are part of string
		63	.Fa charset :
		64	.Bd -literal -offset indent
		65	char *s = "foobar";
		66	char *charset = "of";
		67	size_t span;
		68
		69	span = strspn(s, charset);
		70	.Ed
64	.Sh SEE ALSO	71	.Sh SEE ALSO
65	.Xr index 3 ,
66	.Xr memchr 3 ,	72	.Xr memchr 3 ,
67	.Xr rindex 3 ,
68	.Xr strchr 3 ,	73	.Xr strchr 3 ,
69	.Xr strcspn 3 ,	74	.Xr strcspn 3 ,
70	.Xr strpbrk 3 ,	75	.Xr strpbrk 3 ,
71	.Xr strrchr 3 ,	76	.Xr strrchr 3 ,
72	.Xr strsep 3 ,	77	.Xr strsep 3 ,
73	.Xr strstr 3 ,	78	.Xr strstr 3 ,
74	.Xr strtok 3	79	.Xr strtok 3 ,
		80	.Xr wcsspn 3
75	.Sh STANDARDS	81	.Sh STANDARDS
76	The	82	The
77	.Fn strspn	83	.Fn strspn
78	function	84	function conforms to
79	conforms to
80	.St -ansiC .	85	.St -ansiC .
		86	.Sh HISTORY
		87	The
		88	.Fn strspn
		89	function first appeared in
		90	.At III
		91	and was reimplemented for
		92	.Bx 4.3 Tahoe .