From nobody Tue Apr 30 00:49:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VT1mK4qqzz5Hk3V; Tue, 30 Apr 2024 00:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VT1mK2Drlz4L0S; Tue, 30 Apr 2024 00:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kbcw1SPg4WxbY8ZsN57HCKs6JfKginm02nDNPNhOT3Q=; b=JaevtrIATduxA4etAkiizJICJLYUgUZ/YRaCCVgTkbs0lLbQ5ZIAefdV7Qm9wMsTFlCI0X gwuKJ73L/+YDyITSuPpmtAVAaaWd/u01U429bs/qdLBeSM8xAhl8EXXBdA6/dUHpDeIWym xIzvOXp6ejaMoQBRXqMer81GDKMXjJa3YNcLVibZvyLNFylit+rs/1WIvp4qdDehBktniO X+hgDvP74KCJe3upajnCHxhMRCvEGlUPuHH2tGE9Ueksreqwxn1rH98d9HqKt9Hfqpa+6r 2peWhz+nXzTgoQ4P0/1/dhiNBg7OQw1DZcrb8A7LqSXDIJAZeqNuXCEKGjifmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438145; a=rsa-sha256; cv=none; b=RCYoh/yHejXBaC56xs3gEVqDigbGLf8c6T52tlsn/TAZfz27Dfy8gcOQnJja7JgOJUg3zY j5rHPvg/+iF5tYpCXhXMzzd/xgRG4t4eXIQDV7J0i8KUXWlbaHwqXXQ625CqHaUlp7Hb3S Yct4W9ZbxqKgZHeBUImonsa5XIN/scHsb0NoYjcYQs+L1J2y4OD/Z77E9Zcfmtk9hRtLoD oOjgsNWPaRVV5HthQUmbPEksO2Q1VOSg/0gAzhvqoD0LvBp90TNRStLMmGFLv1w4GnCRwb xqoaogzpisHtgwAIe43RysSo87T3wUNdsBqB7vjQsv4MySGfa7qaRLXlCSismg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kbcw1SPg4WxbY8ZsN57HCKs6JfKginm02nDNPNhOT3Q=; b=Nl3aU2nyqsGMMU4JOaVcoNodSkDQ6WNCAiShdsbIDnWS+H76yLSD61CT4iJ5i8xtK3nCEO MoSafm/VoSYLBwACQzLn6d8KJ6I519lQ6+PPo8/uTw+3GrJ4s1X0kn5Bc1XgjhtVF45hXg EgseAypdqfNOavn3/A6MtuiLoRzOTZsNWnK+yU9s0mQNfgY2kvGWLTTH4d82hN7VLrPmEw XqKntCgnSyNaiX+hy7nJ1ZZe9K1wACbSxUvGVB5RccIPQ+YHtp1guMZHq7tMrSjEWau8f4 G5nTA9HMRKvzNw4SczBhGaJCjDwVCkvtNffsqe2CO0HRKUxRwvYbVf3XA9A2ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VT1mK1VDDz1SJ4; Tue, 30 Apr 2024 00:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43U0n5On013042; Tue, 30 Apr 2024 00:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0n5Et013039; Tue, 30 Apr 2024 00:49:05 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:49:05 GMT Message-Id: <202404300049.43U0n5Et013039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8f19af4b0955 - stable/14 - libc: make strerror_rl() usable for libc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f19af4b0955dc3f4309a41d6aeb7514f6884848 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8f19af4b0955dc3f4309a41d6aeb7514f6884848 commit 8f19af4b0955dc3f4309a41d6aeb7514f6884848 Author: Konstantin Belousov AuthorDate: 2024-04-23 17:04:29 +0000 Commit: Konstantin Belousov 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); }