From nobody Sun Feb 09 18:45:06 2025 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 4Yrc8L468lz5mqYh; Sun, 09 Feb 2025 18:45:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yrc8L3ZNYz3nYh; Sun, 09 Feb 2025 18:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739126706; 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=CTntTrQbKSKXwRlYzNCRGHVFy113/DgPqc/VDEEgq0Y=; b=mg9pwdavXb9Xqfo3VPBRKqEruHl8ARcn3QALdKChSzB69QoORvy4TUy+ojU6CYMcYa9SXg mUj7mREKL+TtVeMRzwepJ5u9IT6JcpuzTl5FtH686b1+6DWNmfKacQqt7F9RIb0PW8TWPa mqB0jBB4FEUSMaSlXgSpLehkoVpckYDGvESOCGemM55msIx+XGnI6+6kYq8rAvt06UthQL jM6LafuMPqHms9cTsyVJuWWYCmKga/sEEBN/eoDaXSvMDF4BgSYDrtEA8jmei5Qfcs8572 oW6g2S39FKvywWHED4jOpesImMpzyx5txUFmDQBE0OwQLRimZ10E8nskAU2/1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739126706; 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=CTntTrQbKSKXwRlYzNCRGHVFy113/DgPqc/VDEEgq0Y=; b=PjnZ/3NojCC7w/EZCV17JT5w81bTqezvg3zACyRMwziuc2sGKWl2FQOy5eOItPMXqQQXv1 6NvZitxAcsrT/Ave+HKLlUnlgl03g+f8z7WY0eHpi83+OkG94lTTiZaBX8Qez6AgA6iNBR 1u1pBOcot49944SWmBIY0//sxS2zuS45aCqtwYhDr2InMnVRZQyBHq4ZPMVACMQvn2Tx6x TzUC5VDaVrR9C6ZTcNg0pcoTppHJj2Rdnws7fxgEg+BKz05gHlDRUZ/KBEc4w/xr/OGaQW nWBULe8GDXsjAGZHf5IB3LowerXn3wnyA4gJCb8y/oERkKmm7PXVi0zvWmHDHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739126706; a=rsa-sha256; cv=none; b=NU2ZVHDaxpxYqbPX92r9jzn9OvK9Tj0czv5fIoObz9bHw0t6hkebNIJatb/FI+/GQ22464 oMdkNufKyvplnWafgXjWd/Y/KmFOZpkoZKuGAQq0R9vN1bsUAKppQsy/fqJRCPiPoJ1sPH uRcDUckrC4brDrde9I+MecuIaehBeqXVzlqQhXOjxPJFaMSTwektycE476jZSGDFyy3YiD dbfBPlqO7f5NPVDglL5NiJz3sSfffY9lizDJE2Lbb9KVcYkflsh2idB+IVzqEsuDRv5gHV qdXki4w40WaZwIlG7yH+MJEct7TGX56zU5GdHTq8Ys7huv1tVaC+nKDFVF/m9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yrc8L3895z17xs; Sun, 09 Feb 2025 18:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 519Ij68o063249; Sun, 9 Feb 2025 18:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 519Ij6UJ063246; Sun, 9 Feb 2025 18:45:06 GMT (envelope-from git) Date: Sun, 9 Feb 2025 18:45:06 GMT Message-Id: <202502091845.519Ij6UJ063246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Craig Leres Subject: git: 1070477cc8b7 - main - Fix remaining zgrep(1) wrapper script regressions 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: leres X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1070477cc8b7a88b1fd2b1ba810a1fff761799a1 Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=1070477cc8b7a88b1fd2b1ba810a1fff761799a1 commit 1070477cc8b7a88b1fd2b1ba810a1fff761799a1 Author: Craig Leres AuthorDate: 2025-02-08 21:19:54 +0000 Commit: Craig Leres CommitDate: 2025-02-09 18:45:03 +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. Reviewers: markj, kevans, ngie, bapt Reviewed By: markj Subscribers: imp Differential Revision: https://reviews.freebsd.org/D48873 --- 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} -- -