From nobody Tue Apr 30 00:50:22 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 4VT1np2J97z5HkBF; Tue, 30 Apr 2024 00:50:22 +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 4VT1np1Xxsz4Nrg; Tue, 30 Apr 2024 00:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438222; 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=2IJsOZJwolqGSodJuMklcNsMGRQAFoTGxUmbsOnW7k8=; b=rOl9LIgieBSKrOk4OjF4WrWCE4wLVnTmeij6worxCedt2VVGIzKBxlxjINJviKKXVAdbH8 0k0QJPFri9oOqwuX21OswlTrKV50617daCQqF080UwpCVop8gcuXnFH8eid9OEFDfDo79T HgsZGBmqxquUbh28a7EAeMct9POkTbSI7vLMysN9AlqGP4tTGKUL5ZRvD/wo5RHqkVMWSl vS7XSXYvVW1UICz9Csrs46gMb1TjuHp9k0KUkoD3DlsuOJyr6jcp/2Z2bVwU+3xE7w3lIP prevWN47P/1VzHShFDt4p2vwXAserMsQhSzOV+VDJFoki2tR64q+ozDoq3D/jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438222; a=rsa-sha256; cv=none; b=MvQto1Ld3HEMrMUw7DwrFV2KepKnsuUIkrSQ1AiQ3IrOgJfd7qQh/yo14seR/1hdgOWj7l 4TqRe4xlBVZqxaL2nVgn67liW1FRnoaA8Pj8ahF8Z2hdZPsTzUpDOkckdiDRHjRZsPrF2v ASjwRErqEobyJSMw2aLBn6mV/TB8FkNjFyhEc850HO+Ow3qAr2Nzs4YjVXWAnsOfJEW0R0 x7/r5y7I82uuIK00bnRkcmUKG7fp4jmRFiggx7TS4ji6ycodYKrbx+ZPwoDccVsbD5/x64 abI5lb3Trwo3Cz4ZRg+1ga4JFqfMX5r42ziu2HybGkMsOR99YYpHb2auLva1rw== 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=1714438222; 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=2IJsOZJwolqGSodJuMklcNsMGRQAFoTGxUmbsOnW7k8=; b=uWN4YNwuf86zGJpJp6DRnVGTsbyLWD31qSczDCUzThbr9WxwW0vBRDt4+L/4DELKiFFgEO haT3XQKZaasWmYKgJntV3GnVyiWAHE7hgS3w/rQr20pUneawkIg0Y5N7EfA14nlvAsuXmN 640PFCPnl5EupNQbwOgjMlYv/wuIF7cmcjbrsjWUj5z00ZXQe+325f3hSf+Dw36u89NIdh NGTWtBDejzNYFKX/dBkTgSqK7rePMhk9t/kMQoa9k1vRzz0wdkn/QMz0pbu5nntzwTyHKU JGCoOZy9FZVLqO9GsfpUP/h5XBzgS6/oocgcfrp5DbuoHHbosAXwvBoWfPqeCg== 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 4VT1np17btz1STj; Tue, 30 Apr 2024 00:50:22 +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 43U0oM8X022166; Tue, 30 Apr 2024 00:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0oM92022163; Tue, 30 Apr 2024 00:50:22 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:50:22 GMT Message-Id: <202404300050.43U0oM92022163@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: 27e54c9f1628 - stable/13 - __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/13 X-Git-Reftype: branch X-Git-Commit: 27e54c9f162879fcbf6f1d9dc221b98c8180f012 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=27e54c9f162879fcbf6f1d9dc221b98c8180f012 commit 27e54c9f162879fcbf6f1d9dc221b98c8180f012 Author: Konstantin Belousov AuthorDate: 2024-04-23 17:10:30 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:49:53 +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 ad655c5d78d4..e656a2707d3a 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -316,6 +316,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 */ @@ -777,7 +779,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;