From nobody Tue Apr 30 00:49:06 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 4VT1mL4lP4z5Hk5T; Tue, 30 Apr 2024 00:49:06 +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 4VT1mL2wzqz4Kxk; Tue, 30 Apr 2024 00:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438146; 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=CICRjSEchDdoKTGTHlA0oTT5ZZ9f23GuFz+DOTcKKfI=; b=ImketwvpetgxMME5GCsY4vmliU6DRBitLlXFSH0jZQ2+KTC9IO1kOx37ifXMgQQgLbChrm oaF+7LzT7lot3NCdWkVoDtSr4oM0BTN0pOrV8hQ3eo5rHfC0NyJFDfhrvIKjtzRASWyuTS D1YYowK1HiPZaxbReG7nfAM9NfRcjxdhy2+F7L+wVecIJd7GBYB+dm5hZqD8MSLLqeFpOW uKhLO+lEf9+mLRZn1K56kyrBJR1TwfN09yFqJUKUIDVjxcFGfJmDIYndTx9iilAjtZDAEn aNn0NRnsZcMyk4UxMZWhE72mHpQIONd0yUVi7IGjI1mOLKRy3dR8Tz4MvcgEmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438146; a=rsa-sha256; cv=none; b=i5ZrED2hwdHJJ2tMU6lKs663MiPPPwuWpY6kkSFTgQf3lQV7Y/Azl/BF93kFWo5wmWq9zM ZLo2z5hLXE8vqpxv3hSNeh60pAmkX5Q9Td9eWvrcrY2oyA19pmeSJFX4pVn/RacxxxM8dP XswRio0CE7RBjkac6n173uXJwV8Q8Pq+kvCXHDAK2uNldXU3o3EeSwQbYoEXmV960PXeTO Nli8Oye7CU7VrOg70byuui39WA4FQTOHJicXwm3+5XYpm5q4SlcFZHezmCDQA5yaLTaxsi znpwxS3yQCyVPRF7grxGDEVwBwY8lxlBuvgK7lfzBqYZ8t8Gs5QMtwk8KkkJ+A== 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=1714438146; 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=CICRjSEchDdoKTGTHlA0oTT5ZZ9f23GuFz+DOTcKKfI=; b=y2UESKLNzWSA0ouIhxofWDjh7BQ0llgy25Nv5cNJPpcG7wV2LdY05Vka5/uQRbvgo/SPrV QPEIE4Ql/oBz7DiODT6Vxoy55VTb3MJLJ09kFuj/IaBUysyGigxfx4TL+3mbVMxLFbKjbt ucK8PaTK1t42YLWz+eeDTxmpfJrekr6dRfFT/0tY7oQ3RQO8EeVMwwenSJD6xSs3mai3vP 4CgfQcUVNsDnasCGqYcW0mNFBTjCG3WKghutL9r968ehuj/0e9s9I064S/79de1lZDe0wk ujw61eq/9jvFwz0mzh0h44eiT2UsSZVB7WUWnlqKtZtivnMlcqS5NYD6u9UjaQ== 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 4VT1mL2WYPz1STZ; Tue, 30 Apr 2024 00:49:06 +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 43U0n6k0013088; Tue, 30 Apr 2024 00:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0n6xX013085; Tue, 30 Apr 2024 00:49:06 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:49:06 GMT Message-Id: <202404300049.43U0n6xX013085@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: ade62d406239 - stable/14 - __vprintf(): switch from strerror() to strerror_rl() 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: ade62d406239b728a1c74974bbb57ed493c733e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ade62d406239b728a1c74974bbb57ed493c733e0 commit ade62d406239b728a1c74974bbb57ed493c733e0 Author: Konstantin Belousov AuthorDate: 2024-04-23 17:10:30 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:48:10 +0000 __vprintf(): switch from strerror() to strerror_rl() PR: 278556 (cherry picked from commit f887667694632c829b0599b54ff86a072e93df87) --- lib/libc/stdio/vfprintf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 38c77aebf316..0ce9d6f37569 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -315,6 +315,8 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) int width; /* width from format (%8d), or 0 */ int prec; /* precision from format; <0 for N/A */ int saved_errno; + int error; + char errnomsg[NL_TEXTMAX]; char sign; /* sign prefix (' ', '+', '-', or \0) */ struct grouping_state gs; /* thousands' grouping info */ @@ -832,7 +834,9 @@ fp_common: break; #endif /* !NO_FLOATING_POINT */ case 'm': - cp = strerror(saved_errno); + error = __strerror_rl(saved_errno, errnomsg, + sizeof(errnomsg), locale); + cp = error == 0 ? errnomsg : ""; size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp); sign = '\0'; break;