1 files changed, 12 insertions, 24 deletions
diff --git a/src/lib/libc/string/bstring.3 b/src/lib/libc/string/bstring.3
index 12fcfb0cc1..bcb5ac98fc 100644
--- a/src/lib/libc/string/bstring.3
+++ b/src/lib/libc/string/bstring.3
@@ -11,11 +11,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.
 .\"
@@ -31,22 +27,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)bstring.3     6.8 (Berkeley) 4/19/91
+.\"     $OpenBSD: bstring.3,v 1.7 2005/02/25 03:12:44 cloder Exp $
-.\"     $Id: bstring.3,v 1.1.1.1 1995/10/18 08:42:21 deraadt Exp $
 .\"
 .Dd April 19, 1991
 .Dt BSTRING 3
 .Os
 .Sh NAME
-.Nm bcmp ,
+.Nm bstring
-.Nm bcopy ,
-.Nm bzero ,
-.Nm memccpy ,
-.Nm memchr ,
-.Nm memcmp ,
-.Nm memcpy ,
-.Nm memmove,
-.Nm memset
 .Nd byte string operations
 .Sh SYNOPSIS
 .Fd #include <string.h>
@@ -70,7 +57,7 @@
 .Fn memset "void *b" "int c" "size_t len"
 .Sh DESCRIPTION
 These functions operate on variable length strings of bytes.
-They do not check for terminating null bytes as the routines
+They do not check for terminating NUL bytes as the routines
 listed in
 .Xr string 3
 do.
@@ -97,14 +84,15 @@ and
 conform to
 .St -ansiC .
 .Sh HISTORY
-The functions
+The
 .Fn bzero
 and
 .Fn memccpy
-appeared in
+functions appeared in
-.Bx 4.3 ;
+.Bx 4.3 .
-the functions
+The
-.Fn bcmp ,
+.Fn bcmp
-.Fn bcopy ,
+and
-appeared in
+.Fn bcopy
+functions appeared in
 .Bx 4.2 .

diff --git a/src/lib/libc/string/bstring.3 b/src/lib/libc/string/bstring.3 index 12fcfb0cc1..bcb5ac98fc 100644 --- a/src/lib/libc/string/bstring.3 +++ b/src/lib/libc/string/bstring.3
@@ -11,11 +11,7 @@
11	.\" 2. Redistributions in binary form must reproduce the above copyright	11	.\" 2. Redistributions in binary form must reproduce the above copyright
12	.\" notice, this list of conditions and the following disclaimer in the	12	.\" notice, this list of conditions and the following disclaimer in the
13	.\" documentation and/or other materials provided with the distribution.	13	.\" documentation and/or other materials provided with the distribution.
14	.\" 3. All advertising materials mentioning features or use of this software	14	.\" 3. Neither the name of the University nor the names of its contributors
15	.\" must display the following acknowledgement:
16	.\" This product includes software developed by the University of
17	.\" California, Berkeley and its contributors.
18	.\" 4. Neither the name of the University nor the names of its contributors
19	.\" may be used to endorse or promote products derived from this software	15	.\" may be used to endorse or promote products derived from this software
20	.\" without specific prior written permission.	16	.\" without specific prior written permission.
21	.\"	17	.\"
@@ -31,22 +27,13 @@
31	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	27	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32	.\" SUCH DAMAGE.	28	.\" SUCH DAMAGE.
33	.\"	29	.\"
34	.\" from: @(#)bstring.3 6.8 (Berkeley) 4/19/91	30	.\" $OpenBSD: bstring.3,v 1.7 2005/02/25 03:12:44 cloder Exp $
35	.\" $Id: bstring.3,v 1.1.1.1 1995/10/18 08:42:21 deraadt Exp $
36	.\"	31	.\"
37	.Dd April 19, 1991	32	.Dd April 19, 1991
38	.Dt BSTRING 3	33	.Dt BSTRING 3
39	.Os	34	.Os
40	.Sh NAME	35	.Sh NAME
41	.Nm bcmp ,	36	.Nm bstring
42	.Nm bcopy ,
43	.Nm bzero ,
44	.Nm memccpy ,
45	.Nm memchr ,
46	.Nm memcmp ,
47	.Nm memcpy ,
48	.Nm memmove,
49	.Nm memset
50	.Nd byte string operations	37	.Nd byte string operations
51	.Sh SYNOPSIS	38	.Sh SYNOPSIS
52	.Fd #include <string.h>	39	.Fd #include <string.h>
@@ -70,7 +57,7 @@
70	.Fn memset "void *b" "int c" "size_t len"	57	.Fn memset "void *b" "int c" "size_t len"
71	.Sh DESCRIPTION	58	.Sh DESCRIPTION
72	These functions operate on variable length strings of bytes.	59	These functions operate on variable length strings of bytes.
73	They do not check for terminating null bytes as the routines	60	They do not check for terminating NUL bytes as the routines
74	listed in	61	listed in
75	.Xr string 3	62	.Xr string 3
76	do.	63	do.
@@ -97,14 +84,15 @@ and
97	conform to	84	conform to
98	.St -ansiC .	85	.St -ansiC .
99	.Sh HISTORY	86	.Sh HISTORY
100	The functions	87	The
101	.Fn bzero	88	.Fn bzero
102	and	89	and
103	.Fn memccpy	90	.Fn memccpy
104	appeared in	91	functions appeared in
105	.Bx 4.3 ;	92	.Bx 4.3 .
106	the functions	93	The
107	.Fn bcmp ,	94	.Fn bcmp
108	.Fn bcopy ,	95	and
109	appeared in	96	.Fn bcopy
		97	functions appeared in
110	.Bx 4.2 .	98	.Bx 4.2 .