From nobody Mon Jan 19 17:47:03 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 4dvyZj0XM4z6P71f for ; Mon, 19 Jan 2026 17:47:09 +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 4dvyZh6jklz3JNd for ; Mon, 19 Jan 2026 17:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844829; 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=BufCJrxJdlNiv+MMDMZiXhKRbZuIFLrSi30J03dDKpo=; b=GCO0ybL1L7fcTpxDhd/u1awmU+xAjipWFH94hpjxNGVIOedy94At6VNWoMxEa/IYU4Trcb SIYPs6PjKS6kRF6jPoDMUR2qxMI3KUtsnsqQtxc1lKui7VZU9s1ziO+KpAEEGp0R3V7dDE JcccK7MHZsKNO6zc0L0322b9okaYSeKjVq3deAoEM1wr2yUlOGQ+nzH+FlF3iBCA82oOgw seMH/esL3i0CTQjsfhdtYe8YNOTd1FtqEQtriWbdTIWcJSnCbmD3qgIdBGkq/nwb344O72 s/baOPOJBKE8rmul9W0nFxiHBugoRNvCXUwXyJvGzS8B5LtcnKYRy++OoYkNvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844829; 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=BufCJrxJdlNiv+MMDMZiXhKRbZuIFLrSi30J03dDKpo=; b=kD9RWMR8dRd+Z/FMkrO1iWuSsx8S4PPrzMS9rNn9qteIi5hpRyzsPpKZlUKTuDqEJtXsxs loBNZRNTqtANRFqI6/CQTgp+eX1MoD/pGN1lNx5ruFrwZqPw/MvpOMUKwqtDqcBmZYKXOy 5/KOlfWCOgIsHwiocUd9hPVIrD6iGX6PGeoz4JmAiKrVfwsVoa4eNPpV8N7f19QQtZoEYY qQBq5/RQiXmOzJQUn2on4DfNlY3plqTm9t8wgEFlgr+aD88K18l/fld7Q5KIt8fh6maXYQ pE9pCDjvcwlwuqyPGvJfOPJp2H0coD2a/91XkBRZXvCvnMQEBcSQJkRLvMBxlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768844829; a=rsa-sha256; cv=none; b=HB4KJwXzKxUM0H4svR9Qi3WigsiEIIgI34eUo+t9UE6DRUj8sptW6VtPUV6SRAGyVLkNUK dUAOdY6obSiSYkYq+w6PnvMiBEJAFjGm1l5Ad23mj/+AKxD5289bgy1X9PRPr7N6jQrhd5 zpU04PFUOLfPRMqz4xJ8JwBwUuxp9YsiCFQS0jwuFKQgZpwzzB48h6chB6kotQ9DB8Ssc/ e+jGyyi3VuA+gw8Y970zQjNslZLVCT8LITw7bN1z468tE3um7SGuYRWyiDBy1Puvm+VZ8e 45/OV44gCHtT0kI5lAweoFJGlaHSeH6EjOxXjxqJTzLDYNlvGJ8BXOmtfiXVCQ== 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 4dvyZb6Ff5zj2b for ; Mon, 19 Jan 2026 17:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c20f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 17:47:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: 6aca792f6f00 - stable/15 - Remove obsolete BUGS section from zgrep(1) man page, add test 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: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6aca792f6f003dceb5ec1b50698c78c33e9b271d Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 17:47:03 +0000 Message-Id: <696e6e17.3c20f.55cf1d01@gitrepo.freebsd.org> The branch stable/15 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=6aca792f6f003dceb5ec1b50698c78c33e9b271d commit 6aca792f6f003dceb5ec1b50698c78c33e9b271d Author: Craig Leres AuthorDate: 2026-01-10 00:34:39 +0000 Commit: Craig Leres CommitDate: 2026-01-19 17:46:37 +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 (cherry picked from commit da5d94d29a5ec29817476c39ae2b2ad1666c3f06) --- 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.