summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguenther <>2024-08-03 20:13:23 +0000
committerguenther <>2024-08-03 20:13:23 +0000
commit172e3add77ca1afbcd9a209b8820a29ab2081c89 (patch)
treedd110aae5fa80e2f190ec575ab37ce40f1774a8b
parentae839ab833fa589a30c08d882a2c96e7bedec358 (diff)
downloadopenbsd-172e3add77ca1afbcd9a209b8820a29ab2081c89.tar.gz
openbsd-172e3add77ca1afbcd9a209b8820a29ab2081c89.tar.bz2
openbsd-172e3add77ca1afbcd9a209b8820a29ab2081c89.zip
The improbable occurred: strlcpy(3) and strlcat(3) are in POSIX-2024.
memmem(3) was also added. Update #include visibility and manpages and add restrict qualifiers. "never thought I'd see this day" millert@
-rw-r--r--src/lib/libc/string/memmem.38
-rw-r--r--src/lib/libc/string/strlcpy.315
2 files changed, 16 insertions, 7 deletions
diff --git a/src/lib/libc/string/memmem.3 b/src/lib/libc/string/memmem.3
index 3f17859083..de62d738de 100644
--- a/src/lib/libc/string/memmem.3
+++ b/src/lib/libc/string/memmem.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: memmem.3,v 1.3 2020/04/16 12:40:41 claudio Exp $ 1.\" $OpenBSD: memmem.3,v 1.4 2024/08/03 20:13:23 guenther Exp $
2.\" 2.\"
3.\" Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com> 3.\" Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
4.\" 4.\"
@@ -26,7 +26,7 @@
26.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27.\" SUCH DAMAGE. 27.\" SUCH DAMAGE.
28.\" 28.\"
29.Dd $Mdocdate: April 16 2020 $ 29.Dd $Mdocdate: August 3 2024 $
30.Dt MEMMEM 3 30.Dt MEMMEM 3
31.Os 31.Os
32.Sh NAME 32.Sh NAME
@@ -66,8 +66,10 @@ is returned.
66.Xr strchr 3 , 66.Xr strchr 3 ,
67.Xr strstr 3 67.Xr strstr 3
68.Sh STANDARDS 68.Sh STANDARDS
69The
69.Fn memmem 70.Fn memmem
70is a GNU extension. 71function conforms to
72.St -p1003.1-2024 .
71.Sh HISTORY 73.Sh HISTORY
72The 74The
73.Fn memmem 75.Fn memmem
diff --git a/src/lib/libc/string/strlcpy.3 b/src/lib/libc/string/strlcpy.3
index a14145e199..4607289883 100644
--- a/src/lib/libc/string/strlcpy.3
+++ b/src/lib/libc/string/strlcpy.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: strlcpy.3,v 1.27 2019/01/25 00:19:25 millert Exp $ 1.\" $OpenBSD: strlcpy.3,v 1.28 2024/08/03 20:13:23 guenther Exp $
2.\" 2.\"
3.\" Copyright (c) 1998, 2000 Todd C. Miller <millert@openbsd.org> 3.\" Copyright (c) 1998, 2000 Todd C. Miller <millert@openbsd.org>
4.\" 4.\"
@@ -14,7 +14,7 @@
14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16.\" 16.\"
17.Dd $Mdocdate: January 25 2019 $ 17.Dd $Mdocdate: August 3 2024 $
18.Dt STRLCPY 3 18.Dt STRLCPY 3
19.Os 19.Os
20.Sh NAME 20.Sh NAME
@@ -24,9 +24,9 @@
24.Sh SYNOPSIS 24.Sh SYNOPSIS
25.In string.h 25.In string.h
26.Ft size_t 26.Ft size_t
27.Fn strlcpy "char *dst" "const char *src" "size_t dstsize" 27.Fn strlcpy "char * restrict dst" "const char * restrict src" "size_t dstsize"
28.Ft size_t 28.Ft size_t
29.Fn strlcat "char *dst" "const char *src" "size_t dstsize" 29.Fn strlcat "char * restrict dst" "const char * restrict src" "size_t dstsize"
30.Sh DESCRIPTION 30.Sh DESCRIPTION
31The 31The
32.Fn strlcpy 32.Fn strlcpy
@@ -174,6 +174,13 @@ As a matter of fact, the first version of this manual page got it wrong.
174.Xr strncat 3 , 174.Xr strncat 3 ,
175.Xr strncpy 3 , 175.Xr strncpy 3 ,
176.Xr wcslcpy 3 176.Xr wcslcpy 3
177.Sh STANDARDS
178The
179.Fn strlcat
180and
181.Fn strlcpy
182functions conform to
183.St -p1003.1-2024 .
177.Sh HISTORY 184.Sh HISTORY
178.Fn strlcpy 185.Fn strlcpy
179and 186and