1 files changed, 24 insertions, 23 deletions
diff --git a/src/lib/libc/string/strcmp.3 b/src/lib/libc/string/strcmp.3
index fecaa85410..5b0794208a 100644
--- a/src/lib/libc/string/strcmp.3
+++ b/src/lib/libc/string/strcmp.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: strcmp.3,v 1.12 2011/07/25 07:51:30 jmc 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,14 +31,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strcmp.3      5.6 (Berkeley) 6/29/91
+.Dd $Mdocdate: July 25 2011 $
-.\"     $Id: strcmp.3,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $
-.\"
-.Dd June 29, 1991
 .Dt STRCMP 3
 .Os
 .Sh NAME
-.Nm strcmp
+.Nm strcmp ,
+.Nm strncmp
 .Nd compare strings
 .Sh SYNOPSIS
 .Fd #include <string.h>
@@ -53,18 +49,22 @@ The
 .Fn strcmp
 and
 .Fn strncmp
-functions
+functions lexicographically compare the NUL-terminated strings
-lexicographically compare the null-terminated strings
 .Fa s1
 and
 .Fa s2 .
+The
+.Fn strncmp
+function compares at most
+.Fa len
+characters.
 .Sh RETURN VALUES
 The
 .Fn strcmp
 and
 .Fn strncmp
-return an integer greater than, equal to, or less than 0, according
+functions return an integer greater than, equal to, or less than 0, according
-as the string
+to whether the string
 .Fa s1
 is greater than, equal to, or less than the string
 .Fa s2 .
@@ -72,23 +72,24 @@ The comparison is done using unsigned characters, so that
 .Ql \e200
 is greater than
 .Ql \e0 .
-.Pp
-The
-.Fn strncmp
-compares not more than
-.Fa len
-characters.
 .Sh SEE ALSO
 .Xr bcmp 3 ,
 .Xr memcmp 3 ,
 .Xr strcasecmp 3 ,
 .Xr strcoll 3 ,
-.Xr strxfrm 3
+.Xr strxfrm 3 ,
+.Xr wcscmp 3
 .Sh STANDARDS
 The
 .Fn strcmp
 and
 .Fn strncmp
-functions
+functions conform to
-conform to
 .St -ansiC .
+.Sh HISTORY
+The
+.Fn strcmp
+and
+.Fn strncmp
+functions first appeared in
+.At v7 .

diff --git a/src/lib/libc/string/strcmp.3 b/src/lib/libc/string/strcmp.3 index fecaa85410..5b0794208a 100644 --- a/src/lib/libc/string/strcmp.3 +++ b/src/lib/libc/string/strcmp.3
@@ -1,3 +1,5 @@
		1	.\" $OpenBSD: strcmp.3,v 1.12 2011/07/25 07:51:30 jmc 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,14 +31,12 @@
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: @(#)strcmp.3 5.6 (Berkeley) 6/29/91	34	.Dd $Mdocdate: July 25 2011 $
37	.\" $Id: strcmp.3,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $
38	.\"
39	.Dd June 29, 1991
40	.Dt STRCMP 3	35	.Dt STRCMP 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
43	.Nm strcmp	38	.Nm strcmp ,
		39	.Nm strncmp
44	.Nd compare strings	40	.Nd compare strings
45	.Sh SYNOPSIS	41	.Sh SYNOPSIS
46	.Fd #include <string.h>	42	.Fd #include <string.h>
@@ -53,18 +49,22 @@ The
53	.Fn strcmp	49	.Fn strcmp
54	and	50	and
55	.Fn strncmp	51	.Fn strncmp
56	functions	52	functions lexicographically compare the NUL-terminated strings
57	lexicographically compare the null-terminated strings
58	.Fa s1	53	.Fa s1
59	and	54	and
60	.Fa s2 .	55	.Fa s2 .
		56	The
		57	.Fn strncmp
		58	function compares at most
		59	.Fa len
		60	characters.
61	.Sh RETURN VALUES	61	.Sh RETURN VALUES
62	The	62	The
63	.Fn strcmp	63	.Fn strcmp
64	and	64	and
65	.Fn strncmp	65	.Fn strncmp
66	return an integer greater than, equal to, or less than 0, according	66	functions return an integer greater than, equal to, or less than 0, according
67	as the string	67	to whether the string
68	.Fa s1	68	.Fa s1
69	is greater than, equal to, or less than the string	69	is greater than, equal to, or less than the string
70	.Fa s2 .	70	.Fa s2 .
@@ -72,23 +72,24 @@ The comparison is done using unsigned characters, so that
72	.Ql \e200	72	.Ql \e200
73	is greater than	73	is greater than
74	.Ql \e0 .	74	.Ql \e0 .
75	.Pp
76	The
77	.Fn strncmp
78	compares not more than
79	.Fa len
80	characters.
81	.Sh SEE ALSO	75	.Sh SEE ALSO
82	.Xr bcmp 3 ,	76	.Xr bcmp 3 ,
83	.Xr memcmp 3 ,	77	.Xr memcmp 3 ,
84	.Xr strcasecmp 3 ,	78	.Xr strcasecmp 3 ,
85	.Xr strcoll 3 ,	79	.Xr strcoll 3 ,
86	.Xr strxfrm 3	80	.Xr strxfrm 3 ,
		81	.Xr wcscmp 3
87	.Sh STANDARDS	82	.Sh STANDARDS
88	The	83	The
89	.Fn strcmp	84	.Fn strcmp
90	and	85	and
91	.Fn strncmp	86	.Fn strncmp
92	functions	87	functions conform to
93	conform to
94	.St -ansiC .	88	.St -ansiC .
		89	.Sh HISTORY
		90	The
		91	.Fn strcmp
		92	and
		93	.Fn strncmp
		94	functions first appeared in
		95	.At v7 .