From nobody Mon Jul 7 19:28:45 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 4bbZ6Q1LY9z611gl; Mon, 07 Jul 2025 19:28:46 +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 4bbZ6Q0Gd0z3pt2; Mon, 07 Jul 2025 19:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916526; 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=0u5QIhM56uSZPcOYEf+QsbdsDIWvjDZszOMxydVT72Q=; b=wsI7ixkoE+3R5WsB2cnl4J03oy8PpVjHfUNI/TsVOvZyKC6LfblAIl3lJbSSIOy+Ae55u7 xgRgwkWK4mIqPX5X5oVM0FMaAP/MbgMOO7l4l/GScU7Rvm1SflHzdrHiBMGrXMoc2BBiuQ 3A1rXV6mTz2oT6LjsSJecJ/Nh4+nOusvGzv1SgfjoWwfxJQ6PNoGXdaBNvTyr2VzqX8cVE FwCKMCbrfhnsrf2cbIjZw5UdlKplgKoKf/7xg3DFoxDM2S1Ihe1+sXU1+6xw9uaVBKJbvO zcEqXYRlMeNNN6lQ/Uhxb9xeOmc//CSIQn66y8twmKS5r1k1AwjDj7Gzp1RKuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916526; 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=0u5QIhM56uSZPcOYEf+QsbdsDIWvjDZszOMxydVT72Q=; b=hpS6MlorDg2GPvnNsw419XO1lAPBifjIIz8+TX3G2Wl5F8NSeYutX1Aq0CFvxcYsUTu3pv EQY2h1h+wl+GsK6+NyKN7kzgfUlbos8t1+Iw0Kx//hBUVfqSZ11oEoFnmM5flyrMESb7oH T/DF5kJVs665KZQ/w9nf8MwetBHvANlS+wVSKYSL5PCTZMkqZfdiEWrmcIk8JgoQJ986sh uB7ykDRQo/EUnYfTW0x/eRhq5L67mvpBxb5jJU4AlbFI3B1ZYVcZ+TcGJ24f232cmPBvka ctwTg731WsW00OufxyIYwy8jHXCAgT1dI+KTRSIBRxN6UIryeOyg3sD/dyeLFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751916526; a=rsa-sha256; cv=none; b=H8rkyEB2sXfJPyIR37gU92dBVgJhF4EEZyvuhPFu12gUI7Y2E7/WXg5N80yHxhnRxMTMyL j+Dt+KESjQGf08cf4RFggO0O/VFOKa8h1y9/G8j+g2jiX+eCS2yMgE8x9VnJiSQTsEqpK8 pgUIwLgqbv+XQMNLh9PVB550dInlzTshjJlRIVP0lM6ZqhtMQM041l00kN8T9pWZRqpqGA Bo6iackaScfCMT7qLYgsx/ORPhL6B6yIRZ+UvnT0ZI0osYyRJiW1kP35AXqbQgi2phc7du Pi7m3mL0Jd+Z6DYJsH8PN3DT0tH4IWUvVAz/AJvQlzeGtc/+grX3o7vKQVsDXg== 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 4bbZ6P6vBDz141V; Mon, 07 Jul 2025 19:28:45 +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 567JSjA8012601; Mon, 7 Jul 2025 19:28:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567JSj0r012598; Mon, 7 Jul 2025 19:28:45 GMT (envelope-from git) Date: Mon, 7 Jul 2025 19:28:45 GMT Message-Id: <202507071928.567JSj0r012598@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: 283c1bd8ceb0 - main - uexterr_format(): simplify output when ext error string is available 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: 283c1bd8ceb07cbbc5fa3f3034b2e2d9ee53d981 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=283c1bd8ceb07cbbc5fa3f3034b2e2d9ee53d981 commit 283c1bd8ceb07cbbc5fa3f3034b2e2d9ee53d981 Author: Konstantin Belousov AuthorDate: 2025-07-03 03:04:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-07 18:44:14 +0000 uexterr_format(): simplify output when ext error string is available If the extended error string is provided by kernel, return only the string, which is supposedly enough to identify exact cause of the error. If the string is not provided, print the technically looking gibberish which still allows to identify location with kernel sources. Reviewed by: asomers, brooks Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51141 --- lib/libc/gen/uexterr_format.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 32b57ffb6e1a..86ba40234ae4 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -23,9 +23,13 @@ __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) strlcpy(buf, "No error", bufsz); return (0); } - snprintf(buf, bufsz, - "errno %d category %u (src line %u) p1 %#jx p2 %#jx %s", - ue->error, ue->cat, ue->src_line, - (uintmax_t)ue->p1, (uintmax_t)ue->p2, ue->msg); + if (ue->msg[0] == '\0') { + snprintf(buf, bufsz, + "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 { + strlcpy(buf, ue->msg, bufsz); + } return (0); }