From nobody Mon Jan 5 01:25:30 2026 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 4dkxSV45vzz6N98r for ; Mon, 05 Jan 2026 01:25:30 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkxSV24sNz3wlL for ; Mon, 05 Jan 2026 01:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767576330; 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=mV+C6uO30MGqCsT0g5/jGzLIMB4S/xyWZkhgzhutvFE=; b=taAEx7l6npG6HAuaVa+PTlK1fSWKWgmRgVNjWEFhlhV7fk/U/5ef529z9wLUbtW6AhKqTB 9fFkExl+b0xZXlPN0RFzHJF1qqIe7ZrKaAOATHUXncAm2KlJ0vp8G68QDe+H3SlBoz1UAq GFuwjOtgmAID7bLWsJofJmm7TZrGEKLgbN6sj8nxdSCjOrp5zqvUC6LD/3Y3Dl61iq/rmn oGJrBT7X/7qQpn+8WrCup2mnhemJ3xhBrcwsbUBL0y+HJlFwBlQXB+rMfA1vrsYgg2KLti w1rHFPqjQ7SJdH+I3RQ0CotVfKlddiSAc2/ZSAuEw77EAjYZUKskfuYt9sf11g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767576330; 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=mV+C6uO30MGqCsT0g5/jGzLIMB4S/xyWZkhgzhutvFE=; b=KWqdTLX1T1AwV662vOS1w+ZIuKZY//ySti0f3n4B1n+HSZyn4gNp0KHAzvQrWFeDYn71hN ScjVnWJD2HKcYMgtF073QzrnXotdFVP/PSXi9wVYHw93USLfS5pKDaBwj/02uuJ9usgjju yNwaM82HahYczAPN/49yX6n3/Ip+H5HJvUy+NFmbb+NfZCYULwKr1JoLE0p3hwmDPZyrnH f5Q4G2+GUMHFl5jhW8GV+Ak08+ApAej4EWHMAA+FiE/xFQJl5lKncsK2PMR93JwpTNl2AL eJPixa2TEN77kdb1jG0BupjcnZXbq5dahcMgU5ofe74l+a4ZfTjHp8Na2zxPKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767576330; a=rsa-sha256; cv=none; b=g10V309QhOk03AWAe+UpSL4J5IjSeIX4I/nGE+nE+MfwvIEkuNFG0OuthJ+Yxqn8KQrsw+ UtZHy+WDwGZQgR9Os47ahL16lxkMDZhaICCW8oaVODc2cXE4B+GzGLTuggYfAlxK6Whn1F aBZoinNb0WhsaBir+urTL2JGm/Y8djoXczxVqJzCrGn2nmKs2zcSbEcM8+NMRSUipq4Hn7 xAkyQ95nq7MogUTNfBbA7PDDivLxuX6YmGGnyNGZfsRbp22hg3Y/DabWLB1MDZ4h2PDhyO pFMJhyzyoApoSsYgmGoxJdTp/pRu4ES/Wvb7+rTXi/2Lj2eF/hWV9Z0ed/Fl2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkxSV1WGYz102w for ; Mon, 05 Jan 2026 01:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39828 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 01:25:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ca345aa37b80 - stable/15 - exterror: Add EXTERROR_VERBOSE env variable to control verbosity 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/15 X-Git-Reftype: branch X-Git-Commit: ca345aa37b80f3ef8338651c2328e1777b86b43f Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 01:25:30 +0000 Message-Id: <695b130a.39828.4c09e56d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca345aa37b80f3ef8338651c2328e1777b86b43f commit ca345aa37b80f3ef8338651c2328e1777b86b43f Author: Konstantin Belousov AuthorDate: 2025-12-28 00:23:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-05 00:44:20 +0000 exterror: Add EXTERROR_VERBOSE env variable to control verbosity (cherry picked from commit 42210fe8dcd4684a45e0e4db1b8194e291dc8fda) --- lib/libc/gen/uexterr_format.c | 53 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 68cd2abfe312..3321fd80616d 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -11,26 +11,69 @@ #include #include #include +#include #include +#include #include +#include + +static const char exterror_verbose_name[] = "EXTERROR_VERBOSE"; +enum exterr_verbose_state { + EXTERR_VERBOSE_UNKNOWN = 100, + EXTERR_VERBOSE_DEFAULT, + EXTERR_VERBOSE_ALLOW, +}; +static enum exterr_verbose_state exterror_verbose = EXTERR_VERBOSE_UNKNOWN; + +static void +exterr_verbose_init(void) +{ + /* + * No need to care about thread-safety, the result is + * idempotent. + */ + if (exterror_verbose != EXTERR_VERBOSE_UNKNOWN) + return; + if (issetugid()) { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } else if (getenv(exterror_verbose_name) != NULL) { + exterror_verbose = EXTERR_VERBOSE_ALLOW; + } else { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } +} int __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) { + bool has_msg; + if (bufsz > UEXTERROR_MAXLEN) bufsz = UEXTERROR_MAXLEN; if (ue->error == 0) { strlcpy(buf, "", bufsz); return (0); } - if (ue->msg[0] == '\0') { - snprintf(buf, bufsz, + exterr_verbose_init(); + has_msg = ue->msg[0] != '\0'; + + if (has_msg) { + snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, + (uintmax_t)ue->p2); + } else { + strlcpy(buf, "", bufsz); + } + + if (exterror_verbose == EXTERR_VERBOSE_ALLOW || !has_msg) { + char lbuf[128]; + + snprintf(lbuf, sizeof(lbuf), "errno %d category %u (src line %u) p1 %#jx p2 %#jx", ue->error, ue->cat, ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); - } else { - snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, - (uintmax_t)ue->p2); + if (has_msg) + strlcat(buf, " ", bufsz); + strlcat(buf, lbuf, bufsz); } return (0); }