From nobody Mon Feb 23 07:10:11 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 4fKBnh3gDsz6Sy8C for ; Mon, 23 Feb 2026 07:10:16 +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 4fKBnh37yDz3YtN for ; Mon, 23 Feb 2026 07:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771830616; 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=VxdwHs1ttlAb238nBLlRhattcl7IrhFYG2irSigs1Oy8BSfKsWhFRV5Cc3PIRe1N+C5hN5 JgEzqT2jE9eu/0mffMey06eerI4YZiEBkGPzGv56hMhY3rgCF3yTKKbfnEeHr2Y+c8MbBr MJS/ClHwPV4In5nfecWZ8m2HQewzM1lLu04r6Tc0lEyA9lNMrbJUcV8cKPfezlEBf7uPje GDOxSVocQsjWNL+1p4I3u0diNQBI1EeHo+E+pQ9wO1T1ZbYCyCOzXTlHfUsvE7HqrZ6EEI u1zSJcu92+YwExo8YzQYSgLNvI34mbd6hlvIf1q+Y40E7d/5v3YcrRdeo+J1mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771830616; a=rsa-sha256; cv=none; b=ooJlQjPJeEIiTiHep0GuhwJuBzA+vzPuaBAYDRVvTWhw9SnBlYIBLzJTBsW8JA9Pjjdqi6 TiJ474otEFErIGqm+HkxuorlLKK+Or0QS00VQTgMhcHzKjKKGDmFLpBMrJaWf32GPKWK6b /q7A9McHIyQ58XHwo/Mv84taYl0rbge2VPkigFZyCSG3xY4ChWhcl8C5oI9dEjqvjYLjWL W3pzDE5R5wZEHqXq7uQzBTACnTgE6O2DvwN+Fwoc85ACmeBqLNcwyTDlsINZOEfL/Md+uc TkIQNALIbLVS53v/30cfX1JSz1cGf+MLdmL5Cqnl1ZWg90k85KBPdnaZzdschw== 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=1771830616; 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=Dj8weN3+AytoOwMloPaSMxKMq5Ebq4bshQSrwO0OtHH9ZIdKX38zA1XfubV0cszebTBoxV url4ncEW1C93R6WG6cVVpuNmHXOt95oNr9xeRUySLDT2uBBz0e4Z7qy5nOJ2bcD2nqURtY eYKJO6mnt/UJxcBzvK+WWtKpBnnS3Yyq8OtBG4SxcveZK6/3lpmLPFIhvlFQ/qfmJSxhlW EwBZQW6dD61D/u2xseXWqO7UAoUu0E/IU0Hoym80NxP/YyYOLZaMyRs8HD/6xLfEfj/81K C/b54zOS85A51k5z8jsgCPlGIm0PShl4j2SZjtIzXoGWrDDRKWCg/rXwI2003w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKBnh2lNsz4L7 for ; Mon, 23 Feb 2026 07:10:16 +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: 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: 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); }