From nobody Mon Dec 22 02:33:56 2025 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 4dZMf16jCTz6M0S5 for ; Mon, 22 Dec 2025 02:34:01 +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 4dZMf15FzNz3Vb0 for ; Mon, 22 Dec 2025 02:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370841; 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=auRl/VjdEzJsKrsGwyouBsanN121wAVGgYNAtwaNCEM=; b=UFxCv1TGZPGGUuHOylMZhjBK1ML57W1+97h3BkbrUYDHm1hq73Pkg2j3Ez0OZx19LBfZPY GWxKi2JKPYAgh9rmGyCp/G/bYWhnSUrTcym43qh5JibAl5zjwJ2DEJzOLmkR1ofZCIDUWu wsiXIcKn/WmUwVUD2q9giuqpvsUYhYmk8T0FJLa7lS2Y/DDiAmbHoO/k6jDkB/NMaN5bfw c2S+iT2mkEbHQtdTjCuOlbvFypbYALPPkz1zn3AGdwXvYThv03MYeJYJr9+eWCMtGsz06y 97ebGSfO4EstFvdaW4H6VACVAHsCA4pm8aqGjMPksv/smwA3pCQG5x0xStuY+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370841; 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=auRl/VjdEzJsKrsGwyouBsanN121wAVGgYNAtwaNCEM=; b=usbLE64u3ETI9aXT6x6ex8pdLkLboAzEXgJ1NUSZsu4tF8VGjnHAle0mf6iiiNjbTeRLQS SnYUVKCqhvYDELst6fRzpXLAvdQC3/aJjIhHpPQ4HWrI2mGnp7qhzCqBMKs/P+HmHWyMoM ON8qkbS+Ak6CiUDWFZj/Bo3wfCCU71f5QiI4T9VYj7ytI673evNun3YFN1gBFrTCpQQNvy oHzMVkOBfxrxa+RAFvCkuiUxYu/U+EAZvnEIhRZWOvJOkwla6T/ej3F/vrK1xFSfjlBWVb zDmlo7uX1UQEJ1fF9OklXvCgBDnryjBNFKk6AyiMbBsZV1Gi4+mU9b3ysjkoKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370841; a=rsa-sha256; cv=none; b=a4lAHkuRqV5wRFfBsiSPpRaY4c6Gk4cQ8A1M+VtGvPXJv5VzfJ8znkHuAa0HVvwf+0+yV5 CPE5n/RMoIuUkYWY5H/q3SfSE5nl0hMwRbW1EWdea3m6S2gCcCQH+1DcA9rbTtDTAfWL+o 8dDP94gXZFceTb1sPDH00n7nH7X/L3jdtBlu0pqPrEdKXnPaBeJiy7E5Q0XGUeKMNZ4kAt qvLpuzoFT3buaXikdWr3hVVBNRnwp1SL+k5sAVyj1tqu9abyeik2igycJQsVrmbBqh7Dwb 1GyLA+HlTTLB9RZP15R45VLL73jaZhdeZEEvYszaulfX2cIjsQqt8C86cXJ48Q== 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 4dZMf14dGfz16LV for ; Mon, 22 Dec 2025 02:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:33:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: 4706a2bea988 - stable/14 - Fix remaining zgrep(1) wrapper script regressions 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4706a2bea9880b6bc86a2f1e45b330de447ea91f Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:33:56 +0000 Message-Id: <6948ae14.38d0c.713f7b48@gitrepo.freebsd.org> The branch stable/14 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=4706a2bea9880b6bc86a2f1e45b330de447ea91f commit 4706a2bea9880b6bc86a2f1e45b330de447ea91f Author: Craig Leres AuthorDate: 2025-02-08 21:19:54 +0000 Commit: Craig Leres CommitDate: 2025-12-22 02:33:09 +0000 Fix remaining zgrep(1) wrapper script regressions Summary: Fix short flags without whitespace, e.g: zgrep -wefoo test Fix multiple -e flags: zgrep -e foo -e xxx test Previously only the last pattern would be used. Clean up possible leading blank in ${grep_args}. Update comment: 2.51 -> 2.6.0 Add a test case for the last known zgrep wrapper issue: recursion (-r) not implemented. Reviewed By: markj Differential Revision: https://reviews.freebsd.org/D48873 (cherry picked from commit 1070477cc8b7a88b1fd2b1ba810a1fff761799a1) --- contrib/netbsd-tests/usr.bin/grep/t_grep.sh | 24 ++++++++++--- usr.bin/grep/zgrep.sh | 52 +++++++++++++++++++++++++---- 2 files changed, 65 insertions(+), 11 deletions(-) diff --git a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh index b1412a7a0715..c4ba9a9657db 100755 --- a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh +++ b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh @@ -221,8 +221,6 @@ zgrep_combined_flags_head() } zgrep_combined_flags_body() { - atf_expect_fail "known but unsolved zgrep wrapper script regression" - echo 'foo bar' > test atf_check -o inline:"foo bar\n" zgrep -we foo test @@ -278,8 +276,6 @@ zgrep_multiple_eflags_head() } zgrep_multiple_eflags_body() { - atf_expect_fail "known but unsolved zgrep wrapper script regression" - echo foobar > test atf_check -o inline:"foobar\n" zgrep -e foo -e xxx test @@ -940,6 +936,25 @@ zgrep_multiple_files_body() echo bar > test2 atf_check -s exit:1 zgrep foo test1 test2 } + +atf_test_case zgrep_recursive +zgrep_multiple_files_head() +{ + atf_set "descr" "Checks for zgrep wrapper recursion" +} +zgrep_recursive_body() +{ + atf_expect_fail "unimplemented zgrep wrapper script functionality" + + mkdir -p tester1 + echo foobar > tester1/test + atf_check -o inline:"tester1/test:foobar\n" zgrep -r foo tester1 + + mkdir -p tester2 + echo foobar > tester2/test1 + echo foobar > tester2/test2 + atf_check -o inline:"tester2/test1:foobar\ntester2/test2:foobar\n" zgrep -r foo tester2 +} # End FreeBSD atf_init_test_cases() @@ -996,5 +1011,6 @@ atf_init_test_cases() atf_add_test_case mflag atf_add_test_case mflag_trail_ctx atf_add_test_case zgrep_multiple_files + atf_add_test_case zgrep_recursive # End FreeBSD } diff --git a/usr.bin/grep/zgrep.sh b/usr.bin/grep/zgrep.sh index d7a52dcad141..8bd630726647 100755 --- a/usr.bin/grep/zgrep.sh +++ b/usr.bin/grep/zgrep.sh @@ -74,7 +74,7 @@ esac while [ $# -gt 0 -a ${endofopts} -eq 0 ] do case $1 in - # from GNU grep-2.5.1 -- keep in sync! + # from GNU grep-2.6.0 -- keep in sync! --) shift endofopts=1 @@ -85,6 +85,9 @@ do shift ;; --regexp=*) + if [ ${pattern_found} -ne 0 ]; then + grep_args="${grep_args} -e ${pattern}" + fi pattern="${1#--regexp=}" pattern_found=1 shift @@ -100,20 +103,31 @@ do grep_args="${grep_args} $1" shift ;; - -*[ABCDXdefm]) + -[EFGHILOSUVabchilnopqsuvwxyz]*) + post="${1#-?}" + pre=${1%${post}} + grep_args="${grep_args} ${pre}" + shift + # Put back partial arg + set -- "-${post}" $* + ;; + -[ABCDdefm]) if [ $# -lt 2 ] then echo "${prg}: missing argument for $1 flag" >&2 exit 1 fi case $1 in - -*e) + -e) + if [ ${pattern_found} -ne 0 ]; then + grep_args="${grep_args} -e ${pattern}" + fi pattern="$2" pattern_found=1 shift 2 continue ;; - -*f) + -f) pattern_file=1 ;; *) @@ -122,6 +136,27 @@ do grep_args="${grep_args} $1 $2" shift 2 ;; + -[ABCDdefm]*) + post="${1#-e}" + case ${1} in + -e*) + if [ ${pattern_found} -ne 0 ]; then + grep_args="${grep_args} -e ${pattern}" + fi + pattern="${post}" + pattern_found=1 + shift + continue + ;; + -f*) + pattern_file=1 + ;; + *) + ;; + esac + grep_args="${grep_args} ${post}" + shift + ;; -) hyphen=1 shift @@ -130,7 +165,7 @@ do echo "${prg}: the ${1} flag is not currently supported" >&2 exit 1 ;; - -*) + -?) grep_args="${grep_args} $1" shift ;; @@ -156,12 +191,15 @@ then pattern_found=1 fi +# Clean up possible leading blank +grep_args="${grep_args# }" + # call grep ... if [ $# -lt 1 ] then # ... on stdin if [ ${pattern_file} -eq 0 ]; then - ${cattool} ${catargs} - | ${grep} ${grep_args} -- "${pattern}" - + ${cattool} ${catargs} - | ${grep} ${grep_args} -e "${pattern}" -- - else ${cattool} ${catargs} - | ${grep} ${grep_args} -- - fi @@ -176,7 +214,7 @@ else for file; do if [ ${pattern_file} -eq 0 ]; then ${cattool} ${catargs} -- "${file}" | - ${grep} --label="${file}" ${grep_args} -- "${pattern}" - + ${grep} --label="${file}" ${grep_args} -e "${pattern}" -- - else ${cattool} ${catargs} -- "${file}" | ${grep} --label="${file}" ${grep_args} -- -