From nobody Thu Apr 30 05:06:55 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 4g5hww0qYGz6ZTD8 for ; Thu, 30 Apr 2026 05:06:56 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5hwv67nFz3Y0b for ; Thu, 30 Apr 2026 05:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777525615; 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=WpxtX+/d6+3GitepSKc3IqA7UibeM3gy9oFF8vcopo0=; b=EOkojokYG81vGSlbT+NLYpZmQETjDZNOzete2EYm29jQTj++yxdJQkFcg0vOUZHlw4uMeV AjL7Q/qM88SmIlFcscdn+VTYvLCXH2+N6Vyrdx2OUftYnEauOvBDRIyHF+VpNssRvJEgbz ggL7l0aSGPRRyIzZxlq3uRMXVXLotkC8sfmNjbOveRoTN181LZOSo221SnMTweAu7Vo9HW yVnIL5LVgiTg483JuP7ez86p1HKB1RX3pbcjDHvJUe9rEeuEIR9pr2rud9+5vylxVFvwF7 br3eLkY2EBe9/qIpXdp2E4IqtGECQ4PSWK72QoYfOjrzeDMsW369YSLLCiA4fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777525615; a=rsa-sha256; cv=none; b=at9KTz51iYWpGJbF3tCykcNIja2p8LNSLyAkmD2I8FaCQGw9c/IvthSngnxlRPpUiztqR+ aEBFRYyjoxF/n8DkHxFe8jc+cVHMUb8rDREq6F4G75p7TsfwUsjGjWodqUNTihqBE2Q/uI SENcnj0XR5G1hKco3nl0xwLR8x++Evgs/b4gej3GV6Ffh7ahuq+rdVnLhniFd81F3Uc2NV fJt8buOo4Y3U6xxT3SVsWYotlq7+VNUQOldvnlT360BnuvQ+LWgwl7qctK5MsOsTguP9Yn VAnoXt2YaMfdRe9f4g9UBdzJjHJl0e4rUCSw6gZBF65/Q9ChdJ50Wx7VfwHeEA== 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=1777525615; 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=WpxtX+/d6+3GitepSKc3IqA7UibeM3gy9oFF8vcopo0=; b=a2sQUwwE/qRtfnDcOzGH3IkuNL3wIsJzgGwDk1CZdmHqc2n46ycjlzs5lIWoGMfYo/Kp1Z ml5y8eySnTxM9I08sdmDX1vquW/RezQ/A1o/WFMwSM0fTAFnDzrXJHr3Srp2F2o3o7vY9i OeDVOx2szRFLcx69fHse5lCUn4GMeFaH6t1/n9a87jRSliwklqiiqADCEKuK5RDtdKniks dFo6tWDlcCft6psZqrYNo4qo0hcljk0PbZ5QKrBENkpKVmIbmjUfNP3dxwkrfgECapy7zg 0Dfa89C/EaMYCCjwpvg5Bz2oJr/YQWTHFlUs/H00sCR3l0VkXNypg6mt8ag9PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5hwv5V9rz1C87 for ; Thu, 30 Apr 2026 05:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20489 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 05:06:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d2bf940ec144 - stable/15 - geom_part: Restore the human readable format of size 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d2bf940ec1447ca69ed605395455d07facf4d3ca Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 05:06:55 +0000 Message-Id: <69f2e36f.20489.193b1607@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d2bf940ec1447ca69ed605395455d07facf4d3ca commit d2bf940ec1447ca69ed605395455d07facf4d3ca Author: Zhenlei Huang AuthorDate: 2026-04-20 16:59:59 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-30 05:05:12 +0000 geom_part: Restore the human readable format of size Prior to the change 4f809ffec69c, the sizes are formated by humanize_number(3) with the flag HN_DECIMAL, which displays the result using one decimal place when it is less than 10. That is more accurate and useful. Add equivalent field modifier hn-decimal to xo_emit() to restore the previous behavior. Reported by: Mark Millard Reviewed by: js Fixes: 4f809ffec69c gpart: add libxo support for "show" subcommand + man page updates MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56514 (cherry picked from commit 0d16792c6e983005581ed0176ed81e7302582196) --- lib/geom/part/geom_part.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/geom/part/geom_part.c b/lib/geom/part/geom_part.c index 852eec2d790a..f5f23443e9f6 100644 --- a/lib/geom/part/geom_part.c +++ b/lib/geom/part/geom_part.c @@ -653,7 +653,7 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) secsz = pp->lg_sectorsize; xo_open_instance("part"); xo_emit("=>{t:start/%*jd} {t:sectors/%*jd} " - "{t:name/%*s} {:scheme} ({h:size/%jd})" + "{t:name/%*s} {:scheme} ({h,hn-decimal:size/%jd})" "{t:state}\n", wblocks, (intmax_t)first, wblocks, (intmax_t)(last - first + 1), wname, gp->lg_name, scheme, (intmax_t)pp->lg_mediasize, @@ -675,7 +675,7 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) xo_emit(" {t:start/%*jd} " "{t:sectors/%*jd} " "{P:/%*s} " - "{ne:free}- free - ({h:size/%jd})\n", + "{ne:free}- free - ({h,hn-decimal:size/%jd})\n", wblocks, (intmax_t)first, wblocks, (intmax_t)(sector - first), wname, "", @@ -723,7 +723,7 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) } if (idx) xo_emit("]"); - xo_emit(" ({h:size/%jd})\n", (intmax_t)pp->lg_mediasize); + xo_emit(" ({h,hn-decimal:size/%jd})\n", (intmax_t)pp->lg_mediasize); xo_close_instance(s); first = end + 1; } @@ -732,7 +732,7 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) xo_open_instance("unallocated"); length = last - first + 1; xo_emit(" {t:start/%*jd} {t:sectors/%*jd} " - "{P:/%*s} {ne:free}- free - ({h:size/%jd})\n", + "{P:/%*s} {ne:free}- free - ({h,hn-decimal:size/%jd})\n", wblocks, (intmax_t)first, wblocks, (intmax_t)length, wname, "", "true", (intmax_t)length * secsz); xo_close_instance("unallocated");