From nobody Tue Aug 19 21:26:43 2025 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 4c62hg5brVz62Yw0; Tue, 19 Aug 2025 21:26:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c62hg3yFzz3D9x; Tue, 19 Aug 2025 21:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638803; 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=LRD2mfzMt3qX9/0NNp18O2p1ZR9K4gX5uLAvRHXHzLE=; b=etoKQKfKtR2sHzGgCvqKPF+miSImM7iR0UDbgfEWIXlew7DBqiG6VATXcXe7p9GSd1Vt72 ULiO68pl0aSu5TRfKMI4JKoiSnS77mAuEPS4/Jw09Ddqk/bPU5X5FhMk+/j0evJKdLeKxL JtLrKl6lEin3WHkaKZH6DMRY66RqRy6BYyIgCu5lVr3UAyXjjSTanJw1YywatIuZQUj1i0 A5xKgOzKuM67bmPHJGzsuAyC+sLsaSjIlkrfnkBFrPNb42b6Yq6apT1zQc17SLuZEHmtvG P6i3s11I2PSKNIJNvdIF7PZfjebLOeXWcr0GohtBUONn6FvtpEBeHKoL1Ng1cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755638803; 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=LRD2mfzMt3qX9/0NNp18O2p1ZR9K4gX5uLAvRHXHzLE=; b=jgxvfv9j+Ifc92SXs69mnrzZCogHjyZarjODlpmzwpsDwPqoUTOOsBOmXtm/3O6lqMTvew cZYWheWEaAsZfUmX2XsvWolnD7VOLbrJFGlf9R2DNmNueGbWt+4FmLRUeQs7C9rr0FWO1g VW1wI0HQzHY+mqdHMt2swzEFrYHPw4/wB3EonFpdQF6EBsUbO9/OJINEHpcExgDbETSFtp YJLbMO1+gvXbK0LvsZYcCnV/o5miU/k6bLyIkKB0r+NIu1sL/7nVE2aUKkfgCfF7sk7FS7 eAiiAHAhp8Sv292XSXw1NXntO18/xra/7ltp+NyzLsxIGm+XirE4CImmu342xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755638803; a=rsa-sha256; cv=none; b=MDnHF0MpVq0RzAnYiPZ+03ekR47zIJ9tXuqom8tHYsAHT8XB0Vk8c9BPSt8TeGHLnEjsAv x9GR9oazgp/cjNzYTP2r9S0pjmRJhzz1H9QcYiyob7Q71Yn8S1WrYKzxN4RrDX9ndPcUal Nc7bpYiwVqenLDRxRXOAGjURSOKF1PryvZBZgYrq5i20zt7OlXVs5r4L+g/uKC9vChDJYc dcQMaX0HzI+Zh4s6wnBvkrtqoYyK/PoatVkblIArJ8eGF7FPYr5npU0FLqbtMXxK7025rf pzO7BYLGVh4K5qDZmHFl4mYV6C9Bo1+gCQOY0KPUhbLL2ESYepwr44HynYHOWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c62hg3Vd8zl2X; Tue, 19 Aug 2025 21:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57JLQhQe048458; Tue, 19 Aug 2025 21:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JLQheA048455; Tue, 19 Aug 2025 21:26:43 GMT (envelope-from git) Date: Tue, 19 Aug 2025 21:26:43 GMT Message-Id: <202508192126.57JLQheA048455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f892e509c1a0 - main - libc: preserve errno in gai_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/main X-Git-Reftype: branch X-Git-Commit: f892e509c1a07f7116b9788a05e4ae99a06d54d0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f892e509c1a07f7116b9788a05e4ae99a06d54d0 commit f892e509c1a07f7116b9788a05e4ae99a06d54d0 Author: Konstantin Belousov AuthorDate: 2025-08-19 03:05:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-19 21:22:40 +0000 libc: preserve errno in gai_strerror() PR: 288931 Reviewed by: emaste, glebius Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52010 --- lib/libc/net/gai_strerror.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index 96bc32b593fa..23f58b763573 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -82,7 +82,9 @@ gai_strerror(int ecode) #if defined(NLS) nl_catd catd; char *buf; + int saved_errno; + saved_errno = errno; if (thr_main() != 0) buf = gai_buf; else { @@ -110,9 +112,11 @@ gai_strerror(int ecode) strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"), sizeof(gai_buf)); catclose(catd); + errno = saved_errno; return (buf); thr_err: + errno = saved_errno; #endif if (ecode >= 0 && ecode < EAI_MAX) return (ai_errlist[ecode]);