From nobody Tue Apr 30 00:50:24 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 4VT1nr4JWPz5HkJY; Tue, 30 Apr 2024 00:50:24 +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 4VT1nr3Zqmz4NvJ; Tue, 30 Apr 2024 00:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438224; 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=zFBincSzCz6tlpBYp1f4h/it5CUvk/vtUSKiz2vAzPc=; b=UOL1d2Sn8ZZ4STYAoLSq0Cv6SL7bIvEYaCT1EuNjz3+Uq5SdImXEMC26gJN/uKu2wZVc8T nvr+ASjCkp8FYW6xJgDtGAeJJNGlk/wj+y2zW75y0WPciGC+H68FZzTqCNttPrSWhO9+wO H5+vafV50XskYJ/4oHESAcknfpB6h4Dgmvm9wxiKlO1/yTZ4A23WMsiifTOPdOCQOuNnzL cF54x88Wb5w6PBK/ANuXzEvT6bKsgGBLnnMo+Ge39Fh/sfFcIWEBX/P2bpL9EGdJgv8i2q nfsYQvXbYkVAVjSKWEvfbOHgnUQT4cB8V4JPBB7dCreBVFeXCvXHz9FoXMoWgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438224; a=rsa-sha256; cv=none; b=rlXX+cHiLU5LtJesXcRKfNhl4Gb7JK4vTd+1TrfP0KTzOB2HckqULX5oQ30E7tyxGdR9Ld IJ5tz/aVxTArSJxHuS01vnHPHn3tianf3h9Apm7un4r1MxNKTWrXsU1/dbwr+8XkBcjW9O dpS6Xrtrlc9h2dF2fqqRT+tnlvEUd74jQ3mJ0YJPCOxz198E2kzqb9SB/+1+e4J54ugpKP JTbjzRWTUtFzhhYBmr5DCfgB1rNEA0qCbwOVGzdchdPQ5aaD3Q0ipjTNSze7MjMl5Cbq5H Q46DKqOk1NhZIVbVXlFUybcL9ETslBI4grv1bh04702P8a6MN6LTI92A2AHcmA== 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=1714438224; 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=zFBincSzCz6tlpBYp1f4h/it5CUvk/vtUSKiz2vAzPc=; b=NyiWLTE30luL8nSKe8GVyX6TEEu8yp1e7VvGFj23rx+ZOnXuJamEPgmRxFZasUBLBpP/Pu 3guNDNZ9LSdg2sle8eETEiG1g+PljgFNbcRsTHm3bBj/BRIsszFZSVBMb0In2I77ZL06qa t3Vnh2pNJXgNaN2pkY4P2ie4uO2aMxL0aMoWux9X/WZNJOIRP2Uhp4gB3K7nR3OaZwWGG2 vXz8PHLWuj3cbveLBI0e5NyfhZqLtJNxWiMytMRFqNPzuzU+YnvZHLf8XmGMWTJ5XByjjZ FHZG/TRCYa5cCMT27TFAlUpnt6LzkAbyIw4KNucPw+9b1CNbNWZTFMMpM+byWg== 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 4VT1nr38Ywz1SSf; Tue, 30 Apr 2024 00:50:24 +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 43U0oOXl022258; Tue, 30 Apr 2024 00:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0oO11022255; Tue, 30 Apr 2024 00:50:24 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:50:24 GMT Message-Id: <202404300050.43U0oO11022255@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: f0e8600d71e0 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f0e8600d71e0a39480bdad08b6237c6d20ab1ae2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0e8600d71e0a39480bdad08b6237c6d20ab1ae2 commit f0e8600d71e0a39480bdad08b6237c6d20ab1ae2 Author: Konstantin Belousov AuthorDate: 2024-04-23 17:15:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:49:53 +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));