From nobody Mon Feb 23 07:10:11 2026 X-Original-To: dev-commits-src-branches@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 4fKBnb4rFXz6Sxkd for ; Mon, 23 Feb 2026 07:10:11 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKBnb4Hqdz3ZJM for ; Mon, 23 Feb 2026 07:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771830611; 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=yqect+l6S7280U8vD1D3xAnHzfozoB6TrEOnHHWGlqY=; b=rlfrjWjw/aG9fPdv1LEjlnV7DipDCo671+mVIZFfmIFZJOpnZvlLVDDrD/eLlr+hwe8jzG 3cANaUbTGadAXiYn/YGCph/g8mWioI1I5Ryn7nX+zCUNH6JHqTM0X3dQU6zdO0+ko92aSh r3R7cHxF62RrYDVTdLbIA5pyUKGpIE6GQOFGqYr0Ig2w2FcBbgecrRJKF5uCmJTSBHcwqz s6QA7/ibVES/vMlQq9XZ6b025CjA2MuFsi3FkdG+1MubmEUaEfEKJOxDbwfK1MLrvab/sX T3PzqC1m8fnkkwKzP0+A9gLdrlwoqtDTLXgS12vWiR1UIBUPYSGG7wtsrdRSiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771830611; a=rsa-sha256; cv=none; b=bAUq1+2qlI9OfJs91g4yz/oAs2NWDfpdj95o9uswTIgmqti1AXABaWA5qmZ346BquIOVBx Yw33roeMlDo2RGk/P7Mv61orwjYu46G1YS/I2Tb8+wRISGFHraEEwozXBNuN8JXal1CJj9 Hic6lEoyt2PNxQMyhrZvZa5z59MbtIpLM8mOfh7yG3HJ8GBkecJezkt5jgEMSv0QWZsISJ 6omL8I0OCAd64h5+BkpbhEtT0Og8M66qU59xGPoMXCz52AZWirsWLv1JEDTe7zT0Ux4uyq vMJat0pKwGteMPO2Za1I3jO44mc6L+52TdBhE4xtuEvYPwUZhVUqzwIhCCyaoQ== 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=1771830611; 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=yqect+l6S7280U8vD1D3xAnHzfozoB6TrEOnHHWGlqY=; b=ysYCOwmwpKxW2CsZtiStIoT54/JPDquZ1c628dnCimKoymaUTaX4zJto55y6FUXCgiEZYA nKoACk84IjElOtJW9BbOANG0l+TaoXQnotpID45rJh7BvYIAMB4E4pT8ptO61fVP3kO95T Zlwupp8R+6iqO0qiMFxQemwt0Qz7ciQSzltJA3PqxYQ0AYCAm6+sAxwTWsiurS8KopkCzg L2OPJi2wz+bUT19qigy1dd4/HvuUn4jowOTRuB6TmXXiLs8ShEoqYm7wMvARbS3dt82Hrp H4hdIkMCJb63TAF4O7aKfhIgK/gUwoliqLoFge2MFUNg3vfJ9N9c91bebt9uxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKBnb3XzBz4Wy for ; Mon, 23 Feb 2026 07:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4722c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 07:10:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: f0a6e0a8dcf5 - stable/14 - trim(8): minor output correction List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0a6e0a8dcf5a49b9df1f5c9314cb2755c97f5e5 Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 07:10:11 +0000 Message-Id: <699bfd53.4722c.6933746c@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=f0a6e0a8dcf5a49b9df1f5c9314cb2755c97f5e5 commit f0a6e0a8dcf5a49b9df1f5c9314cb2755c97f5e5 Author: Eugene Grosbein AuthorDate: 2025-07-20 10:36:33 +0000 Commit: Eugene Grosbein CommitDate: 2026-02-23 07:09:24 +0000 trim(8): minor output correction "trim /dev/da*" would print the following line multiple times when given multiple agruments: dry run: add -f to actually perform the operation Print it once before looping over arguments. Also, note possible suffixes P and E after offset/length as per expand_number(3). (cherry picked from commit 5d5848648013a189fc766e4ee3a121362905b836) (cherry picked from commit f1b934c8138cfd98a70e305d54b2b431c842ec21) --- usr.sbin/trim/trim.8 | 18 ++++++++++-------- usr.sbin/trim/trim.c | 11 ++++++----- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/usr.sbin/trim/trim.8 b/usr.sbin/trim/trim.8 index b4799399e110..e7fc9da1a740 100644 --- a/usr.sbin/trim/trim.8 +++ b/usr.sbin/trim/trim.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 9, 2025 +.Dd July 20, 2025 .Dt TRIM 8 .Os .Sh NAME @@ -36,7 +36,7 @@ .Bk -words .Sm off .Ar offset -.Op Cm K | k | M | m | G | g | T | t ] +.Op Cm K | k | M | m | G | g | T | t | P | p | E | e ] .Sm on .Xc .Ek @@ -85,13 +85,13 @@ Overrides .It Fl l Xo .Sm off .Ar offset -.Op Cm K | k | M | m | G | g | T | t +.Op Cm K | k | M | m | G | g | T | t | P | p | E | e .Sm on .Xc .It Fl o Xo .Sm off .Ar offset -.Op Cm K | k | M | m | G | g | T | t +.Op Cm K | k | M | m | G | g | T | t | P | p | E | e .Sm on .Xc Specify the length @@ -105,12 +105,14 @@ unless one or both of these options are presented. The argument may be suffixed with one of .Cm K , .Cm M , -.Cm G +.Cm G , +.Cm T , +.Cm P or -.Cm T +.Cm E (either upper or lower case) to indicate a multiple of -Kilobytes, Megabytes, Gigabytes or Terabytes -respectively. +Kilobytes, Megabytes, Gigabytes, Terabytes, Petabytes or +Exabytes, respectively. .It Fl q Do not output anything except of possible error messages (quiet mode). Overrides diff --git a/usr.sbin/trim/trim.c b/usr.sbin/trim/trim.c index 3e187faa0fb3..27f57ac2fb72 100644 --- a/usr.sbin/trim/trim.c +++ b/usr.sbin/trim/trim.c @@ -114,7 +114,7 @@ main(int argc, char **argv) * * trim -f -- /dev/da0 -r rfile */ - + if (strcmp(argv[optind-1], "--") != 0) { for (ch = optind; ch < argc; ch++) if (argv[ch][0] == '-') @@ -127,6 +127,9 @@ main(int argc, char **argv) if (argc < 1) usage(name); + if (dryrun) + printf("dry run: add -f to actually perform the operation\n"); + while ((fname = *argv++) != NULL) if (trim(fname, offset, length, dryrun, verbose) < 0) error++; @@ -213,10 +216,8 @@ trim(const char *path, off_t offset, off_t length, bool dryrun, bool verbose) printf("trim %s offset %ju length %ju\n", path, (uintmax_t)offset, (uintmax_t)length); - if (dryrun) { - printf("dry run: add -f to actually perform the operation\n"); + if (dryrun) return (0); - } fd = opendev(path, O_RDWR | O_DIRECT); arg[0] = offset; @@ -237,7 +238,7 @@ static void usage(const char *name) { (void)fprintf(stderr, - "usage: %s [-[lo] offset[K|k|M|m|G|g|T|t]] [-r rfile] [-Nfqv] device ...\n", + "usage: %s [-[lo] offset[K|k|M|m|G|g|T|t|P|p|E|e]] [-r rfile] [-Nfqv] device ...\n", name); exit(EX_USAGE); }