diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libc/string/Makefile.inc | 6 | ||||
-rw-r--r-- | src/lib/libc/string/bstring.3 | 108 | ||||
-rw-r--r-- | src/lib/libc/string/string.3 | 136 |
3 files changed, 3 insertions, 247 deletions
diff --git a/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc index f684800db3..ec45da2463 100644 --- a/src/lib/libc/string/Makefile.inc +++ b/src/lib/libc/string/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.36 2014/11/30 19:43:56 deraadt Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.37 2014/12/09 07:28:46 deraadt Exp $ |
2 | 2 | ||
3 | # string sources | 3 | # string sources |
4 | .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string | 4 | .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string |
@@ -23,10 +23,10 @@ SRCS+= explicit_bzero.c memccpy.c memmem.c memrchr.c stpcpy.c stpncpy.c \ | |||
23 | 23 | ||
24 | .include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/string/Makefile.inc" | 24 | .include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/string/Makefile.inc" |
25 | 25 | ||
26 | MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 memccpy.3 memchr.3 \ | 26 | MAN+= bcmp.3 bcopy.3 bzero.3 ffs.3 memccpy.3 memchr.3 \ |
27 | memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 stpcpy.3 strcasecmp.3 \ | 27 | memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 stpcpy.3 strcasecmp.3 \ |
28 | strcat.3 strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 \ | 28 | strcat.3 strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 \ |
29 | strerror.3 string.3 strlen.3 strmode.3 strncat.3 strncpy.3 strpbrk.3 \ | 29 | strerror.3 strlen.3 strmode.3 strncat.3 strncpy.3 strpbrk.3 \ |
30 | strrchr.3 strsep.3 strsignal.3 strspn.3 strstr.3 strtok.3 strxfrm.3 \ | 30 | strrchr.3 strsep.3 strsignal.3 strspn.3 strstr.3 strtok.3 strxfrm.3 \ |
31 | swab.3 strlcpy.3 timingsafe_bcmp.3 \ | 31 | swab.3 strlcpy.3 timingsafe_bcmp.3 \ |
32 | wcscasecmp.3 wcscat.3 wcschr.3 wcscmp.3 wcscpy.3 \ | 32 | wcscasecmp.3 wcscat.3 wcschr.3 wcscmp.3 wcscpy.3 \ |
diff --git a/src/lib/libc/string/bstring.3 b/src/lib/libc/string/bstring.3 deleted file mode 100644 index d88b78f504..0000000000 --- a/src/lib/libc/string/bstring.3 +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | .\" Copyright (c) 1990, 1991 The Regents of the University of California. | ||
2 | .\" All rights reserved. | ||
3 | .\" | ||
4 | .\" This code is derived from software contributed to Berkeley by | ||
5 | .\" Chris Torek. | ||
6 | .\" Redistribution and use in source and binary forms, with or without | ||
7 | .\" modification, are permitted provided that the following conditions | ||
8 | .\" are met: | ||
9 | .\" 1. Redistributions of source code must retain the above copyright | ||
10 | .\" notice, this list of conditions and the following disclaimer. | ||
11 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer in the | ||
13 | .\" documentation and/or other materials provided with the distribution. | ||
14 | .\" 3. Neither the name of the University nor the names of its contributors | ||
15 | .\" may be used to endorse or promote products derived from this software | ||
16 | .\" without specific prior written permission. | ||
17 | .\" | ||
18 | .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
19 | .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
22 | .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
23 | .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
24 | .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
25 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
26 | .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
27 | .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
28 | .\" SUCH DAMAGE. | ||
29 | .\" | ||
30 | .\" $OpenBSD: bstring.3,v 1.10 2013/06/05 03:39:23 tedu Exp $ | ||
31 | .\" | ||
32 | .Dd $Mdocdate: June 5 2013 $ | ||
33 | .Dt BSTRING 3 | ||
34 | .Os | ||
35 | .Sh NAME | ||
36 | .Nm bstring | ||
37 | .Nd byte string operations | ||
38 | .Sh SYNOPSIS | ||
39 | .In string.h | ||
40 | .Ft int | ||
41 | .Fn bcmp "const void *b1" "const void *b2" "size_t len" | ||
42 | .Ft void | ||
43 | .Fn bcopy "const void *src" "void *dst" "size_t len" | ||
44 | .Ft void | ||
45 | .Fn bzero "void *b" "size_t len" | ||
46 | .Ft void * | ||
47 | .Fn memchr "const void *b" "int c" "size_t len" | ||
48 | .Ft int | ||
49 | .Fn memcmp "const void *b1" "const void *b2" "size_t len" | ||
50 | .Ft void * | ||
51 | .Fn memccpy "void *dst" "const void *src" "int c" "size_t len" | ||
52 | .Ft void * | ||
53 | .Fn memcpy "void *dst" "const void *src" "size_t len" | ||
54 | .Ft void * | ||
55 | .Fn memmove "void *dst" "const void *src" "size_t len" | ||
56 | .Ft void * | ||
57 | .Fn memset "void *b" "int c" "size_t len" | ||
58 | .Sh DESCRIPTION | ||
59 | These functions operate on variable length strings of bytes. | ||
60 | They do not check for terminating NUL bytes as the routines | ||
61 | listed in | ||
62 | .Xr string 3 | ||
63 | do. | ||
64 | .Pp | ||
65 | See the specific manual pages for more information. | ||
66 | .Sh SEE ALSO | ||
67 | .Xr bcmp 3 , | ||
68 | .Xr bcopy 3 , | ||
69 | .Xr bzero 3 , | ||
70 | .Xr memccpy 3 , | ||
71 | .Xr memchr 3 , | ||
72 | .Xr memcmp 3 , | ||
73 | .Xr memcpy 3 , | ||
74 | .Xr memmove 3 , | ||
75 | .Xr memset 3 | ||
76 | .Sh STANDARDS | ||
77 | The functions | ||
78 | .Fn memchr , | ||
79 | .Fn memcmp , | ||
80 | .Fn memcpy , | ||
81 | .Fn memmove , | ||
82 | and | ||
83 | .Fn memset | ||
84 | conform to | ||
85 | .St -ansiC . | ||
86 | .Sh HISTORY | ||
87 | The | ||
88 | .Fn bcmp , | ||
89 | .Fn bcopy , | ||
90 | and | ||
91 | .Fn bzero | ||
92 | functions first appeared in | ||
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 . | ||
diff --git a/src/lib/libc/string/string.3 b/src/lib/libc/string/string.3 deleted file mode 100644 index 2373d1fb9c..0000000000 --- a/src/lib/libc/string/string.3 +++ /dev/null | |||
@@ -1,136 +0,0 @@ | |||
1 | .\" Copyright (c) 1990, 1991 The Regents of the University of California. | ||
2 | .\" All rights reserved. | ||
3 | .\" | ||
4 | .\" This code is derived from software contributed to Berkeley by | ||
5 | .\" Chris Torek. | ||
6 | .\" Redistribution and use in source and binary forms, with or without | ||
7 | .\" modification, are permitted provided that the following conditions | ||
8 | .\" are met: | ||
9 | .\" 1. Redistributions of source code must retain the above copyright | ||
10 | .\" notice, this list of conditions and the following disclaimer. | ||
11 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer in the | ||
13 | .\" documentation and/or other materials provided with the distribution. | ||
14 | .\" 3. Neither the name of the University nor the names of its contributors | ||
15 | .\" may be used to endorse or promote products derived from this software | ||
16 | .\" without specific prior written permission. | ||
17 | .\" | ||
18 | .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
19 | .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
22 | .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
23 | .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
24 | .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
25 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
26 | .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
27 | .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
28 | .\" SUCH DAMAGE. | ||
29 | .\" | ||
30 | .\" $OpenBSD: string.3,v 1.13 2013/06/05 03:39:23 tedu Exp $ | ||
31 | .\" | ||
32 | .Dd $Mdocdate: June 5 2013 $ | ||
33 | .Dt STRING 3 | ||
34 | .Os | ||
35 | .Sh NAME | ||
36 | .Nm string | ||
37 | .Nd string specific functions | ||
38 | .Sh SYNOPSIS | ||
39 | .In string.h | ||
40 | .Ft char * | ||
41 | .Fn strcat "char *s" "const char *append" | ||
42 | .Ft char * | ||
43 | .Fn strlcat "char *s" "const char *append" "size_t size" | ||
44 | .Ft char * | ||
45 | .Fn strncat "char *s" "const char *append" "size_t count" | ||
46 | .Ft char * | ||
47 | .Fn strchr "const char *s" "int c" | ||
48 | .Ft char * | ||
49 | .Fn strrchr "const char *s" "int c" | ||
50 | .Ft int | ||
51 | .Fn strcmp "const char *s1" "const char *s2" | ||
52 | .Ft int | ||
53 | .Fn strncmp "const char *s1" "const char *s2" "size_t count" | ||
54 | .Ft int | ||
55 | .Fn strcasecmp "const char *s1" "const char *s2" | ||
56 | .Ft int | ||
57 | .Fn strncasecmp "const char *s1" "const char *s2" "size_t count" | ||
58 | .Ft char * | ||
59 | .Fn strcpy "char *dst" "const char *src" | ||
60 | .Ft char * | ||
61 | .Fn strlcpy "char *dst" "const char *src" "size_t size" | ||
62 | .Ft char * | ||
63 | .Fn strncpy "char *dst" "const char *src" "size_t count" | ||
64 | .Ft char * | ||
65 | .Fn strerror "int errno" | ||
66 | .Ft size_t | ||
67 | .Fn strlen "const char *s" | ||
68 | .Ft char * | ||
69 | .Fn strpbrk "const char *s" "const char *charset" | ||
70 | .Ft char * | ||
71 | .Fn strsep "char **stringp" "const char *delim" | ||
72 | .Ft size_t | ||
73 | .Fn strspn "const char *s" "const char *charset" | ||
74 | .Ft size_t | ||
75 | .Fn strcspn "const char *s" "const char *charset" | ||
76 | .Ft char * | ||
77 | .Fn strstr "const char *big" "const char *little" | ||
78 | .Ft char * | ||
79 | .Fn strtok "char *s" "const char *delim" | ||
80 | .Ft char * | ||
81 | .Fn index "const char *s" "int c" | ||
82 | .Ft char * | ||
83 | .Fn rindex "const char *s" "int c" | ||
84 | .Sh DESCRIPTION | ||
85 | The string functions | ||
86 | manipulate strings terminated by a | ||
87 | NUL byte. | ||
88 | .Pp | ||
89 | See the specific manual pages for more information. | ||
90 | For manipulating variable length generic objects as byte | ||
91 | strings (without the NUL-byte check), see | ||
92 | .Xr bstring 3 . | ||
93 | .Pp | ||
94 | Except as noted in their specific manual pages, | ||
95 | the string functions do not test the destination | ||
96 | for size limitations. | ||
97 | .Sh SEE ALSO | ||
98 | .Xr bstring 3 , | ||
99 | .Xr index 3 , | ||
100 | .Xr rindex 3 , | ||
101 | .Xr strcasecmp 3 , | ||
102 | .Xr strcat 3 , | ||
103 | .Xr strchr 3 , | ||
104 | .Xr strcmp 3 , | ||
105 | .Xr strcpy 3 , | ||
106 | .Xr strcspn 3 , | ||
107 | .Xr strerror 3 , | ||
108 | .Xr strlcat 3 , | ||
109 | .Xr strlcpy 3 , | ||
110 | .Xr strlen 3 , | ||
111 | .Xr strpbrk 3 , | ||
112 | .Xr strrchr 3 , | ||
113 | .Xr strsep 3 , | ||
114 | .Xr strspn 3 , | ||
115 | .Xr strstr 3 , | ||
116 | .Xr strtok 3 | ||
117 | .Sh STANDARDS | ||
118 | The | ||
119 | .Fn strcat , | ||
120 | .Fn strncat , | ||
121 | .Fn strchr , | ||
122 | .Fn strrchr , | ||
123 | .Fn strcmp , | ||
124 | .Fn strncmp , | ||
125 | .Fn strcpy , | ||
126 | .Fn strncpy , | ||
127 | .Fn strerror , | ||
128 | .Fn strlen , | ||
129 | .Fn strpbrk , | ||
130 | .Fn strspn , | ||
131 | .Fn strcspn , | ||
132 | .Fn strstr , | ||
133 | and | ||
134 | .Fn strtok | ||
135 | functions conform to | ||
136 | .St -ansiC . | ||