From nobody Tue Jul 08 15:55:58 2025 X-Original-To: dev-commits-src-main@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 4bc5LR2kmWz619Xk; Tue, 08 Jul 2025 15:55:59 +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 4bc5LR20RHz3bZ2; Tue, 08 Jul 2025 15:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751990159; 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=SRxIU92VwywbsA12F4xYbWhk1UWp37GcCpLwPSlGIQI=; b=HW8Cnyz31SIyaBp4hnsKPWKdvbK7gTtQBCOX5iDieZzim8/Ai93iVciZ6E6Ohwj6ZeddJF JtDjgvEcpsRp6SMF0TM+ED+u86rPprPQbaUAZLBJ0X8iHeYT0e04D4DgHGU3VNRLrd0WbM jSL5AwM/o1N2BP4TMmDmdfGbQhxgrNJYMa9wHz0WLstBJ4wk1yefPhAGpvTaT6an84Aypq BGSbFUZTX/IIYFaMi2XddobKc3VhS83NOMxm0maFVCDDXBabuKOIWH3BrsZz4Z9hKJEMgw W2R/AXy702leFNxYxga1pqqEc+42WPFazhbxI0/XK/HiY1CGHoxC4VCUJOEqMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751990159; 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=SRxIU92VwywbsA12F4xYbWhk1UWp37GcCpLwPSlGIQI=; b=SisehNfWtZCDHSs49LqZZoqrjTooFOSnc7tXPwBPFWEJaftTG8oYBUnzRyNMcbV15BcsxY hU/gjILoa0Rl2UcMbxXv8r3bNCPMPH26E1ffnS9DEhmhDo5QsxBeeSRpUnShH+2EIdR7kh 1xt1+bXf8AafDhBXLfJCOlTl7Dra5GU0061QqI0k7lIC4f5mKnVEAmQhl68v2PyDIWk03V dDLeTcxN8rU+NnkUbK2XSU35agQdxWyGBwZ/1QRUXhv7yksu98gT0cbnFc4FjWsSSsCRcN 6nQKVlWFUJXdq9qD42ewarohwSblubLqMxZh++og5B3wOMRlInAr34am/yPQuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751990159; a=rsa-sha256; cv=none; b=aXuGB3DpaZvfq79MUBrnGRL0uWSLhCA12E9EtHvGSEsFRogmJdwztudnpMNoIcmwGS1oX/ ZObUovWian1LVLm91IBizbv0qb3EdKbMWpDPAstMAXgKKJ3RGYhVvNe9iWuAHZDYDrBjF2 bsaf4DFOvMjhP1GJGY4iqrbP4mlGRF4ms9iQUDQxb3NdhjrKgGTDiBgrTatsRkMjnnuP7p eucTyv6yDza2hSEI4NWMWhXLcD/N2Sc8Av+0bOjDGsyY8hr5gKGiV0b1TuV2TEL9B+YXqu O2rJ6oiUenBIVANbRvz1L6cmHQjrJXVEJeHDot0QwuGNINtLxy5Wymnl9aaCdg== 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 4bc5LR1Jmpzjpg; Tue, 08 Jul 2025 15:55:59 +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 568FtwHa024691; Tue, 8 Jul 2025 15:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568FtwIH024688; Tue, 8 Jul 2025 15:55:58 GMT (envelope-from git) Date: Tue, 8 Jul 2025 15:55:58 GMT Message-Id: <202507081555.568FtwIH024688@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: 72c848089f3b - main - libc: only append exterr herald and text if exterr was recorded List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 72c848089f3b03ee31208ca18f652a16d8fb8352 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=72c848089f3b03ee31208ca18f652a16d8fb8352 commit 72c848089f3b03ee31208ca18f652a16d8fb8352 Author: Konstantin Belousov AuthorDate: 2025-07-08 14:01:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-08 15:55:54 +0000 libc: only append exterr herald and text if exterr was recorded __uexterr_format: return empty string on no error, instead of "No error" err(): check for the first symbol of the exterr to decide if there is anything to print. Requested and reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51204 --- lib/libc/gen/err.c | 2 +- lib/libc/gen/uexterr_format.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index cdce20af5a91..16cbe27693e7 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -119,7 +119,7 @@ vexterr(bool doexterr, int code, const char *fmt, va_list ap) fprintf(err_file, ": "); } fprintf(err_file, "%s", strerror(code)); - if (doexterr && extstatus == 0) + if (doexterr && extstatus == 0 && exterr[0] != '\0') fprintf(err_file, " (extended error %s)", exterr); fprintf(err_file, "\n"); } diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 86ba40234ae4..e8ddfbd578e3 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -20,7 +20,7 @@ __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) if (bufsz > UEXTERROR_MAXLEN) bufsz = UEXTERROR_MAXLEN; if (ue->error == 0) { - strlcpy(buf, "No error", bufsz); + strlcpy(buf, "", bufsz); return (0); } if (ue->msg[0] == '\0') {