From nobody Sun Jan 11 17:56:22 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 4dq39324PXz6NJF5 for ; Sun, 11 Jan 2026 17:56:23 +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 4dq39274Cxz3YTg for ; Sun, 11 Jan 2026 17:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768154183; 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=b/gjTLegSzvw7i9WPtOHh8udu37nhb2hsGwLlP41kWA=; b=MrMbW9APk8qNkuwKcZ0YOZKuYoIsRNWq7uUuckleL+OfHzPB3XNceOCaBole4vwFwxYGvK kAuGzv2sm/RlB63CK6Oar2GgHRLLodQpzPynNTjrQ8hroGaIimT69vOWZfj3wPoFI7ZD1s uuVdH+wHtnHw7XaTMP3QvvwFLk2aP6U5R8fiQVdRiRZnxNT/c/BuG4lcN2WkbbEphZXhmP m/h+T/TlcZgCoJC4EPMTx7y+T7QcO46ostGYNJvVRnxHMvBMcPjexZcBZ64NSmPPTqebAH jP0d3RQjHbc7K6FNf/TjWEOwMdnnHruZiullMork+chuCfE/6v2lDMEEYybQbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768154183; 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=b/gjTLegSzvw7i9WPtOHh8udu37nhb2hsGwLlP41kWA=; b=nZciTij+2pJJDLWMj5IP7PKsZbuNBzwqAOtoDdDjGPlUnwzifVmV79A32uxF6vtaYHkhEL OcpQf4meyrSbXbMUaPEHJgWJ2TiO6zr1nXHdrvWMY5NHMOawWxBtfI5LtR9k5itbCcmKaV MUNYeWKyWqx+CaWaB1MvejmSzT+zuX1yL5FlMq5HMGo68vj/9fa+FoPzT3C7xClKr1k2T0 8kH8ATS7WVSj0GorATayQVCAht+8IQ1z21fwJVc4E4/q+HgKvALk0UVJXY0TC2zTGI0OiM Aj1z2rv7ga/cf30Mh3WbNZMyjk+/XdBGjmQgv+4Xs7K2oYn0Jqrgu7DkGbm1+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768154183; a=rsa-sha256; cv=none; b=pm/2Efioba2QDr/SnYaaWmpIYWfFgZysyZbiD/D36UK9t8HiIJhm49IMBIqKmHExbZ5235 l4NlHyWskpPdDIqOE1+a24bI3+M73fF2y9vIfmkg15qrPDUL8fKa5t0YQ4YBx5PRFc3zBJ +DaEO8T9RnW7rN1mPlztBjVlKQEcjwbS9j17NNzQ6wvlCDNCFyCckWRT+QGISgw92LTWdO ACio3s7WWp++l/ucWDEWB4UXf3lQHUvJxS7dbP0ZBESR88uDdV6cMn1DLYrhDE7DpdCcGp AIbVgAU7uE2zKXLOHLaDzxNEMUxegpUCQ05IE280K226WIX6cmzrfd/TimV86w== 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 4dq3926RjdzrpR for ; Sun, 11 Jan 2026 17:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36049 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Jan 2026 17:56:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Craig Leres Subject: git: da5d94d29a5e - main - Remove obsolete BUGS section from zgrep(1) man page, add test 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: leres X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da5d94d29a5ec29817476c39ae2b2ad1666c3f06 Auto-Submitted: auto-generated Date: Sun, 11 Jan 2026 17:56:22 +0000 Message-Id: <6963e446.36049.308ac183@gitrepo.freebsd.org> The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=da5d94d29a5ec29817476c39ae2b2ad1666c3f06 commit da5d94d29a5ec29817476c39ae2b2ad1666c3f06 Author: Craig Leres AuthorDate: 2026-01-10 00:34:39 +0000 Commit: Craig Leres CommitDate: 2026-01-11 17:53:55 +0000 Remove obsolete BUGS section from zgrep(1) man page, add test I forgot to check/update the man page with D54217. While here add a test for multiple -e flags. Reviewed by: markj Approved by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54632 --- usr.bin/grep/tests/grep_freebsd_test.sh | 11 +++++++++++ usr.bin/grep/zgrep.1 | 18 ------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index eaf3694c2b1e..ae9a9c1274f3 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -126,6 +126,16 @@ qflag_body() atf_check zgrep -q '1 2' in } +atf_test_case eflags +eflags_body() +{ + # Test use with more than one -e expression + printf "aaa bbb ccc\n111 222 333\ndon't match this line" > in + + atf_check -o 'inline:aaa bbb ccc\n111 222 333\n' \ + /tmp/zgrep.sh -eaaa -e333 in +} + atf_init_test_cases() { atf_add_test_case grep_r_implied @@ -134,4 +144,5 @@ atf_init_test_cases() atf_add_test_case zflag atf_add_test_case color_dupe atf_add_test_case qflag + atf_add_test_case eflags } diff --git a/usr.bin/grep/zgrep.1 b/usr.bin/grep/zgrep.1 index 76eb145db82d..7fa42c916002 100644 --- a/usr.bin/grep/zgrep.1 +++ b/usr.bin/grep/zgrep.1 @@ -92,21 +92,3 @@ This version of the .Nm utility was written by .An Thomas Klausner Aq Mt wiz@NetBSD.org . -.Sh BUGS -.Xr zgrep 1 -does not handle flags that take arguments if there is no whitespace -between the flag and the argument, for example: -.Pp -.Dl "zgrep -enfs /etc/rpc" -.Pp -When more than one -.Fl e -flag is used matching -should occur for any of the patterns (similar to multiple patterns -supplied in a file with the -.Fl f -flag). -.Xr zgrep 1 -only matches the last -.Fl e -pattern.