From nobody Thu Apr 30 05:12:01 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 4g5j2n756vz6ZTrt for ; Thu, 30 Apr 2026 05:12:01 +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 4g5j2n6MCtz3Zwj for ; Thu, 30 Apr 2026 05:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777525921; 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=u7P1QsBrfje0BShQIeupDCXIleVzylLcAeU/NyEjCdA=; b=KXGB6NzBkusYVR+o0wXQBMfHb/QAk5u6Uq24lVtTWeVfzvNMBtXQimK1iJBtPl6GFFyJae Kj1mPcqcoPVTAFcx/x9n9YeUmEBDO3n4UnBit9ON2ifksdtfW/9RCEwXzSBYQvRPWxyb7b cdLzkFFf0yqAmW/IyYA0lAMhJvEPOV3jojykQ4XVeIKr5xOApL6LMnx795nh1fOqrEHpB5 4LStN2AmpDUWX23qFMOk/QZIT/OLa+3V89H7KSrzOENJjFadr7bPMrIwhPZBbGhN3l6hzF 8PEjOzejglsGcMS0qOPDPoLfkb+Qe+In/86Az79bW3hmshqkwzgWgdikwcrILQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777525921; a=rsa-sha256; cv=none; b=YQBjQfFEwtQVVc78WBSLO/X7v7S2vM2JiXz23xhiE71EdzDBtgCxpCHYWEACkextdLZcU4 16ODxLflgd3rYyNBcn5Bbzg1PBGcdB4SLnppHfWUSi9Tx4vSFEzkNTVe+SR7HkcRf+Wc00 prlG9GxbVsUNxps4+UVkozAqOKjD/mnyyS6HrqtDDvvysyh/Sdm/OAT+qOHU6CBAnn3A7d z5fSRUuwcLBJLJi1c6nlw+WyVZTEU748ZZIxYt0VdL7hb5mk9Jr0TNXYu+z9EPqWZrtAdP wrIsEeWVqUx/u28tzkVzWdyXOWUCnlEWdJXpFW4a51iXeWRXNNge9sxP0SpR1w== 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=1777525921; 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=u7P1QsBrfje0BShQIeupDCXIleVzylLcAeU/NyEjCdA=; b=pxZioygo9O1gbbQQ6EmbOVNdzb83SVmZEgcMCOy7KOv6ZxMOhLsdOV96CV8Jwm4cKiiUiu 8W8X9M7P4f4pX3q/0VhMa6zLj0mFKgRonMDtHUj4NOXI117EoLlolZjAMncRz17RXitO1Q RVNHc+kWfjZrYbI6rdlV58e6yUExf1s52/4NfCP+2Am+B59XePeUC8yaGgfgHn2XY+0dO7 YMNE/zQtPxKUmtXRsPhYDVjhPpgxIxa2KkFAb0cgB/6OM6xBh1FrBqzOlB7JGgWZ0UTmkB qAhVrhK8YvF23k2fZbWaDaG3xvmLTBj03bO1347qYgNKq5vkwLHdr9gJd/kNbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5j2n5xBSz1Bqb for ; Thu, 30 Apr 2026 05:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 225ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 05:12:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: dcf54a11a0ef - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: dcf54a11a0efeb340528fd9dc58d01c7a0b867c1 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 05:12:01 +0000 Message-Id: <69f2e4a1.225ce.16288bcd@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=dcf54a11a0efeb340528fd9dc58d01c7a0b867c1 commit dcf54a11a0efeb340528fd9dc58d01c7a0b867c1 Author: Zhenlei Huang AuthorDate: 2026-04-20 16:59:59 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-30 05:10:38 +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) (cherry picked from commit d2bf940ec1447ca69ed605395455d07facf4d3ca) --- 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");