From nobody Tue Apr 30 00:49:08 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 4VT1mP0Pwgz5Hk3k; Tue, 30 Apr 2024 00:49:09 +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 4VT1mN4yghz4KyG; Tue, 30 Apr 2024 00:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438148; 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=tdGNwnO+pw9kuPwqG4n0ciMqmE1DfRqkY+UE4D025lk=; b=ElzNtxe0A8znAqZiNtK8l9gxTemlLMiJs5VraoqWBSakYdFM5e/xekfxZE0gkz5QeRcn1x VIdNG0ciqsQkVA+BGlcfNmkQtJ96AMaH6b1jhaKz5idzWsIa8N5790K0kYFdFUM+NPVVbU 70YYUP8LcGaek5DhDtb7cwBS2+p4+a5RB3KImscs8wNeCs0JtKqnfkt23H92NVdm1Ia/LI f/OvModLhrjg6QNlaAytAhzXONyhn+VmQnCKugVYvaENzrBnKC7g3djRqcpyxwVrmPK6F5 qMfsXVNzUF9P4pm95b6FuKp6eWYAqEqtFrSfsXSx9hHlx8npcNZWJro5MDrzQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438148; a=rsa-sha256; cv=none; b=nuol/jSXiBZKR6HNPrYQEHAQQfvTb6D1KxZzW/5DoEpVJaiAg6PonUDuKRxJmq5X0Dm4iu ucldkZ09KbabbQViQ1xDZWunQWRPMkQbhu1qmgYAi4WQxCC5axjJF64y2AcaDmve8nzr5U kyNBbRg+cbu57wUNxLcZsXsJlyuHP2MTP7jfreJeXbnbuzfmbxkf6zgJRcdfdo7Fiftkvp /G9RSGvUgNYdmdq9rdCGND2hIa7paFa3h0D5SXR53pud5QYU338g+7qt6kI8G1K8sV6xrA nYxpHwUjyyPNDq07kUgFWKWFL6b0kZndlam0VxkHm6qtONQf0a8/2yK3v9dNig== 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=1714438148; 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=tdGNwnO+pw9kuPwqG4n0ciMqmE1DfRqkY+UE4D025lk=; b=TkVk4ZNZE/2YegiLbhff9ePhJ8c+uaSYlLgmVHYISPFGuSbQfBwhY6O1GTu2v4g0+dn9Yv HH/xvk563dTA+xg0PXtHQaFoZqWSMgKA8OUwRemuKuZ00fVo4tu6K49bs36fJh1Xlw/bLz MCjgGGT9gIgMpH75fR/o9N5LgPgsuezLj2eyRMDXIeGoUW58SYvuUwVhhWXebH9o2XEAyM N/f1bph3UdVmOakzkL7TkycXKkbKjVTJ0qsBFL3AOk3ZvOViMjtifElYbEDczPdO+u+an6 GGC44qcnFrh/4jZc8HvDJueTQMrR9Y+EgNcjzb9BU7CTxpHIRtflIEX0MqNe1A== 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 4VT1mN4ZTzz1SSc; Tue, 30 Apr 2024 00:49:08 +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 43U0n89S013182; Tue, 30 Apr 2024 00:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0n8Q9013179; Tue, 30 Apr 2024 00:49:08 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:49:08 GMT Message-Id: <202404300049.43U0n8Q9013179@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: 09bcfbd1aede - stable/14 - libc printf_render_errno(): do not use strerror() 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: 09bcfbd1aede8f7596f14a95fd408aa79a239a9c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=09bcfbd1aede8f7596f14a95fd408aa79a239a9c commit 09bcfbd1aede8f7596f14a95fd408aa79a239a9c Author: Konstantin Belousov AuthorDate: 2024-04-23 17:15:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:48:10 +0000 libc printf_render_errno(): do not use strerror() (cherry picked from commit aa66995b4c804cbb579f71645d97fe282a798bfc) --- lib/libc/stdio/xprintf_errno.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c index c63a7afd35e0..f1e5421f60c8 100644 --- a/lib/libc/stdio/xprintf_errno.c +++ b/lib/libc/stdio/xprintf_errno.c @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -53,13 +54,13 @@ __printf_render_errno(struct __printf_io *io, const struct printf_info *pi { int ret, error; char buf[64]; - const char *p; + char errnomsg[NL_TEXTMAX]; ret = 0; error = *((const int *)arg[0]); if (error >= 0 && error < __hidden_sys_nerr) { - p = strerror(error); - return (__printf_out(io, pi, p, strlen(p))); + strerror_r(error, errnomsg, sizeof(errnomsg)); + return (__printf_out(io, pi, errnomsg, strlen(errnomsg))); } sprintf(buf, "errno=%d/0x%x", error, error); ret += __printf_out(io, pi, buf, strlen(buf));