From nobody Thu Feb 5 21:53:49 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 4f6WFT3K2hz6RGkY for ; Thu, 05 Feb 2026 21:53:49 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6WFT1yf9z3R5P for ; Thu, 05 Feb 2026 21:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770328429; 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=2jfvI/bUDcBTTFJAv0oQbegaydDVfm3JRqodPNxF2Uw=; b=mM6ckPNSV4cglIfn6bBBrFvKe82/wPVeFMNVhQsqeCdTCZNvZ7GwmqC/nPHk5sG7rGnBed xrIVCNvbUsJUb0XFmWANrXXuK0BCpLS9QLsCVxS25hcXkRvXW481Jk98NIk9lu/qF6gHnp b+DOzveR4n/ypcyERiPIrUzlqJVVCOHqHkkuModqqPFLtU8LDT1EPku54iuLItQQNtoMew /MxasLcNcERATq5A9SfghkLfPBEo8mD/ANkG/5RHPePU0D5ONL1NmQSEhRZUcVWw28sAMA welkVndxxq/333hqEKTdXNZgWQcfABltwjuZ25/FgJYKJTTE8VKAV7UOnBgU/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770328429; a=rsa-sha256; cv=none; b=V3K8g6c3TpWl6xe8Oo9kN3ogOU7wcdhFdoU8/UByvqN+Y4X9HYpPy6W0INGHvjW8CMCLp2 DIKCH+xHhYNzackMI2gmPakndTFsePI7dEFy33rwo/tTrKyBGjL/3IsFrngqUjjzwWHfKn x07AXNm6iVs7ey2QsJnyX9GE03zPZeS7sJcl+bJEO/BzNSfHaQqaBam1k5YXjuLfMB/ZLi 7u6nQY/ln603NPZsmX/7AJx8llTIG1Vhmz5aXyHdxOo682tU0ZPY4G2JeAgVHzz+2zGRTQ imGifaSTNEQWa4PjL/tG+eNGeMtTSAxOQE+smv6GS6HqY+yUScSXNS1UbEg2ag== 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=1770328429; 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=2jfvI/bUDcBTTFJAv0oQbegaydDVfm3JRqodPNxF2Uw=; b=bCaT/3TrC/5k7wX/jP0MhEb7tydWd6JHJMWSn4z6ILzHVU3NbSGzphlmYDqfhsI/7Lsut2 r6s1Ld456GTt8inSgu4U9kA1mDUyNMrVV+ks5OPv0PXSe6LW2GHqx+U28mjgR6/DcxjO3C 65dE6ngY4lx9bfwcq99yzbTjXerD6uGFd49mj3IIrfVYBWPsWwIWybfZZOdCMzjWppIh6c JDtZlUYeqs1cIolj16XQ438XKiJY1uoa5mD6n3pQ0cDDu3ENGavkxXHcqQrhucQs/bThO0 /vDDCHTNgnTLS/+LeEvWxJQKXMwBFY4fREImuZV1SH/SuwyY1uwPJTeOxJNsUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6WFT11y5znkF for ; Thu, 05 Feb 2026 21:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19359 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 21:53:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: e1eb82fb1844 - stable/14 - wc: Fix usage and manual SYNOPSIS + nits 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e1eb82fb18446995359cffcb66162ec1f462ed88 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 21:53:49 +0000 Message-Id: <6985116d.19359.c701e9e@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e1eb82fb18446995359cffcb66162ec1f462ed88 commit e1eb82fb18446995359cffcb66162ec1f462ed88 Author: Alexander Ziaee AuthorDate: 2026-01-12 21:04:54 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-05 21:53:35 +0000 wc: Fix usage and manual SYNOPSIS + nits The -c and -m flags are mututally exclusive. Also minor manual fixes: + Angle quotes do not work in prose, use double quote matching extant + Align manual page options list + Tag SPDX license identifier for manual PR: 292408 MFC after: 3 days (cherry picked from commit 4cb65fde79a2412558d10fdbf3427fc0e4536d80) --- usr.bin/wc/wc.1 | 12 ++++++++---- usr.bin/wc/wc.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1 index 33d57ce31087..38a38e9f947f 100644 --- a/usr.bin/wc/wc.1 +++ b/usr.bin/wc/wc.1 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -39,7 +42,8 @@ .Sh SYNOPSIS .Nm .Op Fl -libxo -.Op Fl Lclmw +.Op Fl c | Fl m +.Op Fl Llw .Op Ar .Sh DESCRIPTION The @@ -49,10 +53,10 @@ input .Ar file , or standard input (if no file is specified) to the standard output. A line is defined as a string of characters delimited by a -.Aq newline +.Dq newline character. Characters beyond the final -.Aq newline +.Dq newline character will not be included in the line count. .Pp @@ -66,7 +70,7 @@ for all the files is displayed on a separate line after the output for the last file. .Pp The following options are available: -.Bl -tag -width indent +.Bl -tag -width "--libxo" .It Fl -libxo Generate output via .Xr libxo 3 diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 246edcaec7a8..f4d92e3eb19c 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -362,6 +362,6 @@ word: gotsp = true; static void usage(void) { - xo_error("usage: wc [-Lclmw] [file ...]\n"); + xo_error("usage: wc [-c | -m] [-Llw] [file ...]\n"); exit(EXIT_FAILURE); }