git: 8f19af4b0955 - stable/14 - libc: make strerror_rl() usable for libc

The branch stable/14 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=8f19af4b0955dc3f4309a41d6aeb7514f6884848

commit 8f19af4b0955dc3f4309a41d6aeb7514f6884848
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-04-23 17:04:29 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-04-30 00:48:10 +0000

    libc: make strerror_rl() usable for libc
    
    (cherry picked from commit 92771bc00ad0f567b27876c34450bef7a0ee61d0)
---
 lib/libc/include/libc_private.h |  2 ++
 lib/libc/string/strerror.c      | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index bfeada696538..22467a211df6 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -444,5 +444,7 @@ struct __nl_cat_d;
 struct _xlocale;
 struct __nl_cat_d *__catopen_l(const char *name, int type,
 	    struct _xlocale *locale);
+int __strerror_rl(int errnum, char *strerrbuf, size_t buflen,
+	    struct _xlocale *locale);
 
 #endif /* _LIBC_PRIVATE_H_ */
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index d5f8a5193ac1..0eb36424cb24 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -77,8 +77,8 @@ errstr(int num, const char *uprefix, char *buf, size_t len)
 	strlcat(buf, t, len);
 }
 
-static int
-strerror_rl(int errnum, char *strerrbuf, size_t buflen, locale_t locale)
+int
+__strerror_rl(int errnum, char *strerrbuf, size_t buflen, locale_t locale)
 {
 	int retval = 0;
 #if defined(NLS)
@@ -119,7 +119,7 @@ strerror_rl(int errnum, char *strerrbuf, size_t buflen, locale_t locale)
 int
 strerror_r(int errnum, char *strerrbuf, size_t buflen)
 {
-	return (strerror_rl(errnum, strerrbuf, buflen, __get_locale()));
+	return (__strerror_rl(errnum, strerrbuf, buflen, __get_locale()));
 }
 
 char *
@@ -127,7 +127,7 @@ strerror_l(int num, locale_t locale)
 {
 	static _Thread_local char ebuf[NL_TEXTMAX];
 
-	if (strerror_rl(num, ebuf, sizeof(ebuf), locale) != 0)
+	if (__strerror_rl(num, ebuf, sizeof(ebuf), locale) != 0)
 		errno = EINVAL;
 	return (ebuf);
 }
@@ -137,7 +137,7 @@ strerror(int num)
 {
 	static char ebuf[NL_TEXTMAX];
 
-	if (strerror_rl(num, ebuf, sizeof(ebuf), __get_locale()) != 0)
+	if (__strerror_rl(num, ebuf, sizeof(ebuf), __get_locale()) != 0)
 		errno = EINVAL;
 	return (ebuf);
 }