1 files changed, 24 insertions, 26 deletions
diff --git a/src/lib/libc/string/bstring.3 b/src/lib/libc/string/bstring.3
index 12fcfb0cc1..c44c5386c6 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.9 2011/07/25 00:38:52 schwarze Exp $
-.\"     $Id: bstring.3,v 1.1.1.1 1995/10/18 08:42:21 deraadt Exp $
 .\"
-.Dd April 19, 1991
+.Dd $Mdocdate: July 25 2011 $
 .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,25 @@ and
 conform to
 .St -ansiC .
 .Sh HISTORY
-The functions
+The
-.Fn bzero
-and
-.Fn memccpy
-appeared in
-.Bx 4.3 ;
-the functions
 .Fn bcmp ,
 .Fn bcopy ,
-appeared in
+and
+.Fn bzero
+functions first appeared in
 .Bx 4.2 .
+The
+.Fn memchr ,
+.Fn memcmp ,
+.Fn memccpy ,
+.Fn memcpy ,
+and
+.Fn memset
+functions first appeared in
+.At V
+and were reimplemented for
+.Bx 4.3 Tahoe .
+The
+.Fn memmove
+function first appeared in
+.Bx 4.3 Reno .

diff --git a/src/lib/libc/string/bstring.3 b/src/lib/libc/string/bstring.3 index 12fcfb0cc1..c44c5386c6 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.9 2011/07/25 00:38:52 schwarze 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 $Mdocdate: July 25 2011 $
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,25 @@ 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
102	and
103	.Fn memccpy
104	appeared in
105	.Bx 4.3 ;
106	the functions
107	.Fn bcmp ,	88	.Fn bcmp ,
108	.Fn bcopy ,	89	.Fn bcopy ,
109	appeared in	90	and
		91	.Fn bzero
		92	functions first appeared in
110	.Bx 4.2 .	93	.Bx 4.2 .
		94	The
		95	.Fn memchr ,
		96	.Fn memcmp ,
		97	.Fn memccpy ,
		98	.Fn memcpy ,
		99	and
		100	.Fn memset
		101	functions first appeared in
		102	.At V
		103	and were reimplemented for
		104	.Bx 4.3 Tahoe .
		105	The
		106	.Fn memmove
		107	function first appeared in
		108	.Bx 4.3 Reno .