From nobody Thu Feb 5 21:51:26 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 4f6WBk4sF7z6RGKv for ; Thu, 05 Feb 2026 21:51:26 +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 4f6WBk1rNfz3KVG for ; Thu, 05 Feb 2026 21:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770328286; 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=erfYsnfbdB34tiNKwvNvd+QBQZzZuSHE5ZsHn5MhOCE=; b=QwchCUxMMaPZl2PiNKP+lQDZkDWsvzm3jnqt/NuZBT0lNT4seIo/n/Y4D4mPY4ujaD6O64 LvVLo42oIztI5M8pEMluk2MnDvRNZEwIx8YYJayTevWVL58siddaWSBAt4WQxyXZq9IrHX q4W4jzVxAtLtoPFcFW7Bz4JRw5aQ1Z6eFbn5rQR6TIZ39OYB2xlSCsoAfejhpj+tqLMmcX ptPCrP6kt8R3hIsZaXrFEsFD83S19PH4H/jyqbE9qMEYumHfO97q1Vp7AHYSHwcvzkoZCr yQV6uXVhC+QTkydYS1//fL0uWIx+YcHt1Imq//53eyyAsGqQ17JBQncYCUZXYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770328286; a=rsa-sha256; cv=none; b=LSHwGxo5DKTM+jkrnVKohIzXvgoslbUMsx9Q6KphTViI6SIGgqb+m5+6PJWn1jB37cjOEe 1JegzemL1v1YwfUBgt7Z5mPcUJCMbUKlHfXAsRAxAkSrj2PF5I7gxrLhVAcLHrUSZZqU+K BE2+awo6DiazHFwr9DdMxWOp5VsynwvAAZjYNB75N9UmLwGI7q6+jXtB6ZSEsE9BnYvV2E m5ejaqbxNJQOnSfUDVKd+HMB4eW94gmiAw3YMSLShC3De69BHlzKLFjFoAtx6eyNnIbcUx jzYBTCgm8PEVBzfoi4iEHGe9l1BDbCZkU3G2NXF6Rze+sa5LtHSb8Sz6hRb93Q== 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=1770328286; 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=erfYsnfbdB34tiNKwvNvd+QBQZzZuSHE5ZsHn5MhOCE=; b=ea9boVspSchZO9VmsnUTYgA+bJqzg4ILH/J5cUDRzCnP2Yz4xJtxnLtbcWcgeNCWcSTm35 i/j3T4BO6cOjKvNYv2grk3OzFq9NnDocIp4j8hSOzEc+zJ7BQBYpvi1VxbNW6TPzi9o/0X mpCHntHmzeoIw801dYzSL+8qgkwFKUC0xcL5XZvVd/3pIqt0LonAJ8k/RNz7lrhFmoQMEI dJ1AMiKd2jG1YTdvQfPh2fKqSbwF9/Elxq6L3WtiyuYDhseCjCNoUF6cMMwGJRl82Wcw2Z SL42uumm/4bU4/0dfAZtxzmYVSNtxDjc9beFAgk6Nvl+Qyn7tyvMRHyOpcABIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6WBk1N0kznvY for ; Thu, 05 Feb 2026 21:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1815f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 21:51:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 093b16a63674 - stable/15 - wc: Fix usage and manual SYNOPSIS + nits 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 093b16a63674a8ac3087020b92072936d15df7bf Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 21:51:26 +0000 Message-Id: <698510de.1815f.41658687@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=093b16a63674a8ac3087020b92072936d15df7bf commit 093b16a63674a8ac3087020b92072936d15df7bf Author: Alexander Ziaee AuthorDate: 2026-01-12 21:04:54 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-05 21:49:54 +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 656408794950..d41976c1e6d3 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. .\" @@ -37,7 +40,8 @@ .Sh SYNOPSIS .Nm .Op Fl -libxo -.Op Fl Lclmw +.Op Fl c | Fl m +.Op Fl Llw .Op Ar .Sh DESCRIPTION The @@ -47,10 +51,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 @@ -64,7 +68,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 7b83412f3c42..d00a1a64da29 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -353,6 +353,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); }