Module Name: src
Committed By: nros
Date: Mon Dec 9 12:09:02 UTC 2024
Modified Files:
src/include: string.h
src/lib/libc/string: strdup.3
Log Message:
memccpy, strdup and strndup are in C23
7.26.2.2 memccpy
7.26.2.6 strdup
7.26.2.7 strndup
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/include/string.h
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/string/strdup.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/string.h
diff -u src/include/string.h:1.57 src/include/string.h:1.58
--- src/include/string.h:1.57 Sat Nov 2 02:43:48 2024
+++ src/include/string.h Mon Dec 9 12:09:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.57 2024/11/02 02:43:48 riastradh Exp $ */
+/* $NetBSD: string.h,v 1.58 2024/12/09 12:09:02 nros Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -53,9 +53,10 @@ typedef struct _locale *locale_t;
#endif /* _POSIX_C_SOURCE || _NETBSD_SOURCE */
__BEGIN_DECLS
-#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) || \
+ (__STDC_VERSION__ - 0 >= 202311L) || defined(_ISOC23_SOURCE)
void *memccpy(void *, const void *, int, size_t);
-#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */
+#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE || _ISOC23_SOURCE */
void *memchr(const void *, int, size_t);
int memcmp(const void *, const void *, size_t);
void *memcpy(void * __restrict, const void * __restrict, size_t);
@@ -82,9 +83,12 @@ int strcoll_l(const char *, const char
char *strcpy(char * __restrict, const char * __restrict);
size_t strcspn(const char *, const char *);
#if (_POSIX_C_SOURCE - 0 >= 200809L) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
+ defined(_NETBSD_SOURCE) || (__STDC_VERSION__ - 0 >= 202311L) || \
+ defined(_ISOC23_SOURCE)
char *strdup(const char *);
-#endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE */
+#endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE ||
+ * _ISOC23_SOURCE
+ */
__aconst char *strerror(int);
#if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
__aconst char *strerror_l(int, locale_t);
@@ -101,8 +105,11 @@ size_t strlen(const char *);
char *strncat(char * __restrict, const char * __restrict, size_t);
int strncmp(const char *, const char *, size_t);
char *strncpy(char * __restrict, const char * __restrict, size_t);
-#if (_POSIX_C_SOURCE - 0 >= 200809L) || defined(_NETBSD_SOURCE)
+#if (_POSIX_C_SOURCE - 0 >= 200809L) || defined(_NETBSD_SOURCE) || \
+ (__STDC_VERSION__ - 0 >= 202311L) || defined(_ISOC23_SOURCE)
char *strndup(const char *, size_t);
+#endif /* _POSIX_C_SOURCE || _NETBSD_SOURCE || _ISOC23_SOURCE */
+#if (_POSIX_C_SOURCE - 0 >= 200809L) || defined(_NETBSD_SOURCE)
size_t strnlen(const char *, size_t);
#endif /* _POSIX_C_SOURCE || _NETBSD_SOURCE */
char *strpbrk(const char *, const char *);
Index: src/lib/libc/string/strdup.3
diff -u src/lib/libc/string/strdup.3:1.18 src/lib/libc/string/strdup.3:1.19
--- src/lib/libc/string/strdup.3:1.18 Thu Jan 29 10:15:39 2009
+++ src/lib/libc/string/strdup.3 Mon Dec 9 12:09:02 2024
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)strdup.3 8.1 (Berkeley) 6/9/93
-.\" $NetBSD: strdup.3,v 1.18 2009/01/29 10:15:39 wiz Exp $
+.\" $NetBSD: strdup.3,v 1.19 2024/12/09 12:09:02 nros Exp $
.\"
-.Dd January 28, 2009
+.Dd December 9, 2024
.Dt STRDUP 3
.Os
.Sh NAME
@@ -98,6 +98,12 @@ The
.Fn strdup
function conforms to
.St -p1003.1-2001 .
+The
+.Fn strdup
+and
+.Fn strndup
+functions conform to
+.St -isoC-2023 .
.Sh HISTORY
The
.Fn strdup
