1 files changed, 51 insertions, 26 deletions
diff --git a/src/lib/libc/string/strrchr.3 b/src/lib/libc/string/strrchr.3
index 1d98cbff24..9eea08b0a9 100644
--- a/src/lib/libc/string/strrchr.3
+++ b/src/lib/libc/string/strrchr.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: strrchr.3,v 1.9 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,28 +31,29 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strrchr.3     5.3 (Berkeley) 6/29/91
+.Dd $Mdocdate: July 25 2011 $
-.\"     $Id: strrchr.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
-.\"
-.Dd June 29, 1991
 .Dt STRRCHR 3
 .Os
 .Sh NAME
-.Nm strrchr
+.Nm strrchr ,
-.Nd locate character in string
+.Nm rindex
+.Nd locate last occurrence of a character in a string
 .Sh SYNOPSIS
 .Fd #include <string.h>
 .Ft char *
 .Fn strrchr "const char *s" "int c"
+.Ft char *
+.Fn rindex "const char *s" "int c"
 .Sh DESCRIPTION
 The
 .Fn strrchr
-function
+function locates the last occurrence of the character
-locates the last occurrence of
 .Fa c
-(converted to a char)
 in the string
 .Fa s .
+The terminating
+.Tn NUL
+character is considered part of the string.
 If
 .Fa c
 is
@@ -62,30 +61,56 @@ is
 .Fn strrchr
 locates the terminating
 .Ql \e0 .
+.Pp
+The
+.Fn rindex
+function is an old synonym for
+.Fn strrchr .
 .Sh RETURN VALUES
 The
 .Fn strrchr
-function
+function returns a pointer to the located character or
-returns a pointer to the character,
+.Dv NULL
-or a null
+if the character does not appear in the string.
-pointer if
+.Sh EXAMPLES
-.Fa c
+After the following call to
-does not occur anywhere in
+.Fn strrchr ,
-.Fa s .
+.Va p
+will point to the string
+.Qq obar :
+.Bd -literal -offset indent
+char *p;
+char *s = "foobar";
+p = strrchr(s, 'o');
+.Ed
 .Sh SEE ALSO
-.Xr index 3 ,
 .Xr memchr 3 ,
-.Xr rindex 3 ,
 .Xr strchr 3 ,
 .Xr strcspn 3 ,
 .Xr strpbrk 3 ,
 .Xr strsep 3 ,
 .Xr strspn 3 ,
 .Xr strstr 3 ,
-.Xr strtok 3
+.Xr strtok 3 ,
+.Xr wcsrchr 3
 .Sh STANDARDS
 The
 .Fn strrchr
-function
+function conforms to
-conforms to
 .St -ansiC .
+.Pp
+The
+.Fn rindex
+function is deprecated and shouldn't be used in new code.
+.Sh HISTORY
+The
+.Fn rindex
+function first appeared in
+.At v7 .
+The
+.Fn strrchr
+function first appeared in
+.At III
+and was reimplemented for
+.Bx 4.3 Tahoe .

diff --git a/src/lib/libc/string/strrchr.3 b/src/lib/libc/string/strrchr.3 index 1d98cbff24..9eea08b0a9 100644 --- a/src/lib/libc/string/strrchr.3 +++ b/src/lib/libc/string/strrchr.3
@@ -1,3 +1,5 @@
		1	.\" $OpenBSD: strrchr.3,v 1.9 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,28 +31,29 @@
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: @(#)strrchr.3 5.3 (Berkeley) 6/29/91	34	.Dd $Mdocdate: July 25 2011 $
37	.\" $Id: strrchr.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
38	.\"
39	.Dd June 29, 1991
40	.Dt STRRCHR 3	35	.Dt STRRCHR 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
43	.Nm strrchr	38	.Nm strrchr ,
44	.Nd locate character in string	39	.Nm rindex
		40	.Nd locate last occurrence of a character in a string
45	.Sh SYNOPSIS	41	.Sh SYNOPSIS
46	.Fd #include <string.h>	42	.Fd #include <string.h>
47	.Ft char *	43	.Ft char *
48	.Fn strrchr "const char *s" "int c"	44	.Fn strrchr "const char *s" "int c"
		45	.Ft char *
		46	.Fn rindex "const char *s" "int c"
49	.Sh DESCRIPTION	47	.Sh DESCRIPTION
50	The	48	The
51	.Fn strrchr	49	.Fn strrchr
52	function	50	function locates the last occurrence of the character
53	locates the last occurrence of
54	.Fa c	51	.Fa c
55	(converted to a char)
56	in the string	52	in the string
57	.Fa s .	53	.Fa s .
		54	The terminating
		55	.Tn NUL
		56	character is considered part of the string.
58	If	57	If
59	.Fa c	58	.Fa c
60	is	59	is
@@ -62,30 +61,56 @@ is
62	.Fn strrchr	61	.Fn strrchr
63	locates the terminating	62	locates the terminating
64	.Ql \e0 .	63	.Ql \e0 .
		64	.Pp
		65	The
		66	.Fn rindex
		67	function is an old synonym for
		68	.Fn strrchr .
65	.Sh RETURN VALUES	69	.Sh RETURN VALUES
66	The	70	The
67	.Fn strrchr	71	.Fn strrchr
68	function	72	function returns a pointer to the located character or
69	returns a pointer to the character,	73	.Dv NULL
70	or a null	74	if the character does not appear in the string.
71	pointer if	75	.Sh EXAMPLES
72	.Fa c	76	After the following call to
73	does not occur anywhere in	77	.Fn strrchr ,
74	.Fa s .	78	.Va p
		79	will point to the string
		80	.Qq obar :
		81	.Bd -literal -offset indent
		82	char *p;
		83	char *s = "foobar";
		84
		85	p = strrchr(s, 'o');
		86	.Ed
75	.Sh SEE ALSO	87	.Sh SEE ALSO
76	.Xr index 3 ,
77	.Xr memchr 3 ,	88	.Xr memchr 3 ,
78	.Xr rindex 3 ,
79	.Xr strchr 3 ,	89	.Xr strchr 3 ,
80	.Xr strcspn 3 ,	90	.Xr strcspn 3 ,
81	.Xr strpbrk 3 ,	91	.Xr strpbrk 3 ,
82	.Xr strsep 3 ,	92	.Xr strsep 3 ,
83	.Xr strspn 3 ,	93	.Xr strspn 3 ,
84	.Xr strstr 3 ,	94	.Xr strstr 3 ,
85	.Xr strtok 3	95	.Xr strtok 3 ,
		96	.Xr wcsrchr 3
86	.Sh STANDARDS	97	.Sh STANDARDS
87	The	98	The
88	.Fn strrchr	99	.Fn strrchr
89	function	100	function conforms to
90	conforms to
91	.St -ansiC .	101	.St -ansiC .
		102	.Pp
		103	The
		104	.Fn rindex
		105	function is deprecated and shouldn't be used in new code.
		106	.Sh HISTORY
		107	The
		108	.Fn rindex
		109	function first appeared in
		110	.At v7 .
		111	The
		112	.Fn strrchr
		113	function first appeared in
		114	.At III
		115	and was reimplemented for
		116	.Bx 4.3 Tahoe .