From nobody Mon Dec 22 01:09:15 2025 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 4dZKmD24JFz6LnWj for ; Mon, 22 Dec 2025 01:09:16 +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 4dZKmC6Zn4z3HkK for ; Mon, 22 Dec 2025 01:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365756; 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=uQdeyGWrWPSVbuwtsD7ZfKb8GQB1r0djz9WSAfzUcgc=; b=E7weLq9bQMIyLHVjOV8Hbn2BXkzCEfElXlUFZHEKWVD6B7LsS0FA817M9o3n74CLRBIJzj 1p9Lz9D8nzdD3d3k/A0VlkgwEvPVaL56M/JE7tvSAQBUxx7qHWSO4gi4DJb+8W2L5Xajv6 QuUX+U3HAW+OCksaxNQ9GxpHiVq2v2eDFDyOtWgasas6CRTb4P/SG/E7+CbnhpLjqC/JAd NpQ05W0YvZA1VH/7pqf63p2VReqDcYo3+uXALdBqI5avvLAhjKW6qXGYJBl+6+eOcM7Saa CFtpi1F9b5e/U+2hLVwwdAhuTDB61s9otu/iq/HhjrdKrVeMNBZpREAHmruwUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766365756; 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=uQdeyGWrWPSVbuwtsD7ZfKb8GQB1r0djz9WSAfzUcgc=; b=CF17Ri/eEwo8UQ2mmbl1rfsRpUMUTP9HHPwY4TDLqF/Ee+2ioU71SyVSjBEhuGfaFU7PLU zxr44ADSP/Lsb1gjX9fHWvrwRB9Ezzndre2WyXBGZ9G9+LAQLdpk33cOQqOGeYgqBwdgqD +j79mWp2EDabcvZbsaJ8T7yZzUPGozXJgJqvSrdvAWIAY6yhFdSb+Wo+aDv3KMegc3wtZa 9Ay6FzRJ6O2nuOH5/HxtILEtwARUUiBzoYE3XzUPJoCowSpbQtAUJJ75euq90tW9Ta/dNr o8RG2hztvFbvvvZFDXptAqhHd3xDuEDk1AIzhUmyqx9BcZSP0h2QUND7xaXkeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766365756; a=rsa-sha256; cv=none; b=uAmJhAZNYLZPfXyXY00FdOdikvQosRIN0lIEtfhzcYRO0Z/+hoK7/s3o6YJy6oNXff9TsS ZTBsBcglfGiapR1/B4IRqUrY1MokhnCFJBCcN0Oo9R+AgzbhRCLHKoWBc1W57cmT+zzJN2 hImVEQhY7I6Y9NyDB0XqvQX+ZLhqowuMb/ESSpsPTM3BmUs231r1bkPGG+sdrVdkNoV6AO 3XwN1EQBn3VN4hKe3XDkSoFMGY7m7FdSP0nuBWcx3FriIWP/ZDL5/TINinWtULKBsFS7Q4 b0uLL4lPxwOY3+bcVY/K+XUJulTGxNIVK0Q/PEmFMe6MQ1ypEeTmRQM9w9cFyw== 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 4dZKmC5ty5z14JS for ; Mon, 22 Dec 2025 01:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 01:09:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: 3ab741a76a23 - stable/15 - Fix zgrep(1) wrapper regression, 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: 3ab741a76a23bb9fb7f710759ce85de99acf65b4 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 01:09:15 +0000 Message-Id: <69489a3b.27d31.3b3304b3@gitrepo.freebsd.org> The branch stable/15 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=3ab741a76a23bb9fb7f710759ce85de99acf65b4 commit 3ab741a76a23bb9fb7f710759ce85de99acf65b4 Author: Craig Leres AuthorDate: 2025-12-13 23:43:02 +0000 Commit: Craig Leres CommitDate: 2025-12-22 01:09:04 +0000 Fix zgrep(1) wrapper regression, add test @bdrewery reported D48873 broke "bzgrep -q '1 2' /var/log/messages.0.bz2" The mistake was in using $* instead of "$@" (I suspect $* is never right). Reported by: bdrewery Reviewed by: markj Approved by: markj Fixes: 1070477cc8b7 ("Fix remaining zgrep(1) wrapper script regressions") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54217 (cherry picked from commit 80726c2257e9d6d79341aac65ba22987f53619bc) --- usr.bin/grep/tests/grep_freebsd_test.sh | 10 ++++++++++ usr.bin/grep/zgrep.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index 906b70645151..eaf3694c2b1e 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -117,6 +117,15 @@ color_dupe_body() atf_check -o match:"^ +1 color.out" wc -l color.out } +atf_test_case qflag +qflag_body() +{ + # Test whitespace in argument + printf "1 2 3 4\n5 6 7 8\n" > in + + atf_check zgrep -q '1 2' in +} + atf_init_test_cases() { atf_add_test_case grep_r_implied @@ -124,4 +133,5 @@ atf_init_test_cases() atf_add_test_case gnuext atf_add_test_case zflag atf_add_test_case color_dupe + atf_add_test_case qflag } diff --git a/usr.bin/grep/zgrep.sh b/usr.bin/grep/zgrep.sh index 8bd630726647..474f3868db9d 100755 --- a/usr.bin/grep/zgrep.sh +++ b/usr.bin/grep/zgrep.sh @@ -109,7 +109,7 @@ do grep_args="${grep_args} ${pre}" shift # Put back partial arg - set -- "-${post}" $* + set -- "-${post}" "$@" ;; -[ABCDdefm]) if [ $# -lt 2 ]