1 files changed, 21 insertions, 16 deletions
diff --git a/src/lib/libc/string/string.3 b/src/lib/libc/string/string.3
index aaf97e0321..7a67b96b53 100644
--- a/src/lib/libc/string/string.3
+++ b/src/lib/libc/string/string.3
@@ -31,27 +31,28 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)string.3      6.9 (Berkeley) 4/19/91
+.\"     $OpenBSD: string.3,v 1.8 2000/04/21 15:24:20 aaron Exp $
-.\"     $Id: string.3,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $
 .\"
 .Dd April 19, 1991
 .Dt STRING 3
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm strcat ,
+.Nm strlcat ,
 .Nm strncat ,
 .Nm strchr ,
 .Nm strrchr ,
 .Nm strcmp ,
 .Nm strncmp ,
-.Nm strcasecmp,
+.Nm strcasecmp ,
 .Nm strncasecmp ,
 .Nm strcpy ,
+.Nm strlcpy ,
 .Nm strncpy ,
 .Nm strerror ,
 .Nm strlen ,
 .Nm strpbrk ,
-.Nm strsep,
+.Nm strsep ,
 .Nm strspn ,
 .Nm strcspn ,
 .Nm strstr ,
@@ -62,7 +63,9 @@
 .Sh SYNOPSIS
 .Fd #include <string.h>
 .Ft char *
-.Fn strcat "char *s" "const char * append"
+.Fn strcat "char *s" "const char *append"
+.Ft char *
+.Fn strlcat "char *s" "const char *append" "size_t size"
 .Ft char *
 .Fn strncat "char *s" "const char *append" "size_t count"
 .Ft char *
@@ -80,6 +83,8 @@
 .Ft char *
 .Fn strcpy "char *dst" "const char *src"
 .Ft char *
+.Fn strlcpy "char *dst" "const char *src" "size_t size"
+.Ft char *
 .Fn strncpy "char *dst" "const char *src" "size_t count"
 .Ft char *
 .Fn strerror "int errno"
@@ -103,7 +108,7 @@
 .Fn rindex "const char *s" "int c"
 .Sh DESCRIPTION
 The string functions
-functions manipulate strings terminated by a
+manipulate strings terminated by a
 null byte.
 .Pp
 See the specific manual pages for more information.
@@ -115,23 +120,25 @@ Except as noted in their specific manual pages,
 the string functions do not test the destination
 for size limitations.
 .Sh SEE ALSO
+.Xr bstring 3 ,
 .Xr index 3 ,
+.Xr rindex 3 ,
+.Xr strcasecmp 3 ,
 .Xr strcat 3 ,
 .Xr strchr 3 ,
-.Xr strrchr 3 ,
 .Xr strcmp 3 ,
-.Xr strcasecmp 3 ,
 .Xr strcpy 3 ,
+.Xr strcspn 3 ,
 .Xr strerror 3 ,
+.Xr strlcat 3 ,
+.Xr strlcpy 3 ,
 .Xr strlen 3 ,
 .Xr strpbrk 3 ,
+.Xr strrchr 3 ,
 .Xr strsep 3 ,
 .Xr strspn 3 ,
-.Xr strcspn 3 ,
 .Xr strstr 3 ,
-.Xr strtok 3 ,
+.Xr strtok 3
-.Xr rindex 3
-.Xr bstring 3
 .Sh STANDARDS
 The
 .Fn strcat ,
@@ -145,12 +152,10 @@ The
 .Fn strerror ,
 .Fn strlen ,
 .Fn strpbrk ,
-.Fn strsep ,
 .Fn strspn ,
 .Fn strcspn ,
 .Fn strstr ,
 and
 .Fn strtok
-functions
+functions conform to
-conform to
 .St -ansiC .

diff --git a/src/lib/libc/string/string.3 b/src/lib/libc/string/string.3 index aaf97e0321..7a67b96b53 100644 --- a/src/lib/libc/string/string.3 +++ b/src/lib/libc/string/string.3
@@ -31,27 +31,28 @@
31	.\" 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
32	.\" SUCH DAMAGE.	32	.\" SUCH DAMAGE.
33	.\"	33	.\"
34	.\" from: @(#)string.3 6.9 (Berkeley) 4/19/91	34	.\" $OpenBSD: string.3,v 1.8 2000/04/21 15:24:20 aaron Exp $
35	.\" $Id: string.3,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $
36	.\"	35	.\"
37	.Dd April 19, 1991	36	.Dd April 19, 1991
38	.Dt STRING 3	37	.Dt STRING 3
39	.Os BSD 4	38	.Os
40	.Sh NAME	39	.Sh NAME
41	.Nm strcat ,	40	.Nm strcat ,
		41	.Nm strlcat ,
42	.Nm strncat ,	42	.Nm strncat ,
43	.Nm strchr ,	43	.Nm strchr ,
44	.Nm strrchr ,	44	.Nm strrchr ,
45	.Nm strcmp ,	45	.Nm strcmp ,
46	.Nm strncmp ,	46	.Nm strncmp ,
47	.Nm strcasecmp,	47	.Nm strcasecmp ,
48	.Nm strncasecmp ,	48	.Nm strncasecmp ,
49	.Nm strcpy ,	49	.Nm strcpy ,
		50	.Nm strlcpy ,
50	.Nm strncpy ,	51	.Nm strncpy ,
51	.Nm strerror ,	52	.Nm strerror ,
52	.Nm strlen ,	53	.Nm strlen ,
53	.Nm strpbrk ,	54	.Nm strpbrk ,
54	.Nm strsep,	55	.Nm strsep ,
55	.Nm strspn ,	56	.Nm strspn ,
56	.Nm strcspn ,	57	.Nm strcspn ,
57	.Nm strstr ,	58	.Nm strstr ,
@@ -62,7 +63,9 @@
62	.Sh SYNOPSIS	63	.Sh SYNOPSIS
63	.Fd #include <string.h>	64	.Fd #include <string.h>
64	.Ft char *	65	.Ft char *
65	.Fn strcat "char s" "const char append"	66	.Fn strcat "char s" "const char append"
		67	.Ft char *
		68	.Fn strlcat "char s" "const char append" "size_t size"
66	.Ft char *	69	.Ft char *
67	.Fn strncat "char s" "const char append" "size_t count"	70	.Fn strncat "char s" "const char append" "size_t count"
68	.Ft char *	71	.Ft char *
@@ -80,6 +83,8 @@
80	.Ft char *	83	.Ft char *
81	.Fn strcpy "char dst" "const char src"	84	.Fn strcpy "char dst" "const char src"
82	.Ft char *	85	.Ft char *
		86	.Fn strlcpy "char dst" "const char src" "size_t size"
		87	.Ft char *
83	.Fn strncpy "char dst" "const char src" "size_t count"	88	.Fn strncpy "char dst" "const char src" "size_t count"
84	.Ft char *	89	.Ft char *
85	.Fn strerror "int errno"	90	.Fn strerror "int errno"
@@ -103,7 +108,7 @@
103	.Fn rindex "const char *s" "int c"	108	.Fn rindex "const char *s" "int c"
104	.Sh DESCRIPTION	109	.Sh DESCRIPTION
105	The string functions	110	The string functions
106	functions manipulate strings terminated by a	111	manipulate strings terminated by a
107	null byte.	112	null byte.
108	.Pp	113	.Pp
109	See the specific manual pages for more information.	114	See the specific manual pages for more information.
@@ -115,23 +120,25 @@ Except as noted in their specific manual pages,
115	the string functions do not test the destination	120	the string functions do not test the destination
116	for size limitations.	121	for size limitations.
117	.Sh SEE ALSO	122	.Sh SEE ALSO
		123	.Xr bstring 3 ,
118	.Xr index 3 ,	124	.Xr index 3 ,
		125	.Xr rindex 3 ,
		126	.Xr strcasecmp 3 ,
119	.Xr strcat 3 ,	127	.Xr strcat 3 ,
120	.Xr strchr 3 ,	128	.Xr strchr 3 ,
121	.Xr strrchr 3 ,
122	.Xr strcmp 3 ,	129	.Xr strcmp 3 ,
123	.Xr strcasecmp 3 ,
124	.Xr strcpy 3 ,	130	.Xr strcpy 3 ,
		131	.Xr strcspn 3 ,
125	.Xr strerror 3 ,	132	.Xr strerror 3 ,
		133	.Xr strlcat 3 ,
		134	.Xr strlcpy 3 ,
126	.Xr strlen 3 ,	135	.Xr strlen 3 ,
127	.Xr strpbrk 3 ,	136	.Xr strpbrk 3 ,
		137	.Xr strrchr 3 ,
128	.Xr strsep 3 ,	138	.Xr strsep 3 ,
129	.Xr strspn 3 ,	139	.Xr strspn 3 ,
130	.Xr strcspn 3 ,
131	.Xr strstr 3 ,	140	.Xr strstr 3 ,
132	.Xr strtok 3 ,	141	.Xr strtok 3
133	.Xr rindex 3
134	.Xr bstring 3
135	.Sh STANDARDS	142	.Sh STANDARDS
136	The	143	The
137	.Fn strcat ,	144	.Fn strcat ,
@@ -145,12 +152,10 @@ The
145	.Fn strerror ,	152	.Fn strerror ,
146	.Fn strlen ,	153	.Fn strlen ,
147	.Fn strpbrk ,	154	.Fn strpbrk ,
148	.Fn strsep ,
149	.Fn strspn ,	155	.Fn strspn ,
150	.Fn strcspn ,	156	.Fn strcspn ,
151	.Fn strstr ,	157	.Fn strstr ,
152	and	158	and
153	.Fn strtok	159	.Fn strtok
154	functions	160	functions conform to
155	conform to
156	.St -ansiC .	161	.St -ansiC .