From nobody Mon Jan 12 21:18:25 2026 X-Original-To: dev-commits-src-main@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 4dqlbk04FHz6P65T for ; Mon, 12 Jan 2026 21:18: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 4dqlbj6FP6z3k2F for ; Mon, 12 Jan 2026 21:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768252705; 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=1Y7G0o3po/hjNJv2RMyIWQWnlRAwOrVWe7Y5Q9pqiy0=; b=XREx8igPEM+NUkeVuqWNqRAHPhwzaIFONaGHKsDhEjIePDEND0P6jUDz51Z+Trw06UUXFO Hieh8rbOBtHPixi11/bJyMhFGY8sVdPE+3oEUy99oIIW4kP/JWrX2zUKu0qmkS9bkTLBCl NdhqcavWQ2f1Oa/kDx80I6QmVkMSDTEd7c7bbdXoND51Wx3cYo8A3GzxI6kHef5zmPPRgR lbtSoSW/4b8VsKtUUqWZsAcOke8TsIGHCgQvUp+mK2Egg+boYe2PG4zmWp+bPAhlFIqcyA Ox7VtobglRJFrkeLAaF4kLdsDhtCMBBJawUjXeO3xnUIWkyqhukS9TJdvIx9mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768252705; 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=1Y7G0o3po/hjNJv2RMyIWQWnlRAwOrVWe7Y5Q9pqiy0=; b=JVFFFpvGANLokcbLu2+G/yicR2BE9+4JTOa0X1/XDiBqb1aHMRZyfwDkvJlC0vSMO1AD6G CD+6f1zj6TULvBRyWusrvxmjFEs97ZPAiJMqQT49I/udXMChGeGWFzC94157DHBfzaO3o7 Rd2dolZlAGabdbpBaSg47LwaO5edpnvcIN78mral0kaGI/xFPvGFqGg0nIsbO+CvXiBqse 4Sz/RN8EoGbzerYS36IwCsat8zY9w60zxBoT/a4uYxqkfUHipeFaIZO79Px2EdYLjcJKih V8IJsa4R++zw3RSQqKhV8fwCTRN/xQH1pauD83nRNjFQqW69yACHW0FvOy6hKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768252705; a=rsa-sha256; cv=none; b=v6oJDsjDpFgBf0hEqZvte1A/gntHriUwq30DYMJA/CsLHUhlsMKWnLrKAl6gozMsXT8VBn dyNleickUmMBPhzXjFXptL9CPphqw4tpZpmYGvO7ldhWL0PsjTz5RLTX65N10olHPILes4 fHrPZijByUQDh+e5jBq3impy5pnaRjLyTSYCeEiKuVRQRRs+txamxHsiC5kiCPJdeZeYiT eZnDmrOn/OHzgUezfvIsfskN4KlQIq93ZFWi9qhBLSj+APRcFmOXxW3sP+QlBFwvUSlK9l oKPU5LpsbGLS78GRCzhA+63osttr3POE79zWPCHmKrFPlKNKHhNKNh5EVoyuFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dqlbj5m5Wzk0n for ; Mon, 12 Jan 2026 21:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ec04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 21:18:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 4cb65fde79a2 - main - wc: Fix usage and manual SYNOPSIS + nits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4cb65fde79a2412558d10fdbf3427fc0e4536d80 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 21:18:25 +0000 Message-Id: <69656521.ec04.473db396@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=4cb65fde79a2412558d10fdbf3427fc0e4536d80 commit 4cb65fde79a2412558d10fdbf3427fc0e4536d80 Author: Alexander Ziaee AuthorDate: 2026-01-12 21:04:54 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-12 21:18:04 +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 --- 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); }