ebsd.org (Postfix) with ESMTP id 4dZMdy1FYDz6M0PV for ; Mon, 22 Dec 2025 02:33:58 +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 4dZMdx5cddz3V97 for ; Mon, 22 Dec 2025 02:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370837; 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=D1LXE/GkKG8NolGIU7p8W38T5FexF/2lZMQClSXkTKM=; b=tAxsGoJlxdLblU1oRIriCo5nR7yhMC4rz99hjekJvgOkxmukdJpnqbPHklpat1CowTiez8 39ECdRezqnGGiTKVkksvMLt2V0h3/PFUYyu/VpLZ3KiB50GCQsWOmi3YXKzIEljnTyEeJB 5stTaUhmg+FoaLUGryLKpY5uXTVO8BqeO8Fq9DdycYOKke4g2Iu5WRXgv6KEJGspJ9d2yB +cm12QEv4M4tbQENl5ZZpr6Iu2TFAZkKf+uOI1rv+7nIvS8spIGj3lL6F2uixhGYX3Ya8B Tx1L0iNxILLQc0YSDOwWlymKNA4QM08NzadasGBQaz3Vt7WF5X7ACu0lURy55w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370837; 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=D1LXE/GkKG8NolGIU7p8W38T5FexF/2lZMQClSXkTKM=; b=FD3eC3CNvwLXzhB5ZD2m4wRP9bFs3/RFjFJWTQIpefR0rxcDnsU0V+AS0kqmhDpxaEnOq4 f9jpxKir4VCtY0DZW2CaamqvApFY3NFqsksy7YI7vMXnzgV/OlpRMBj3kzIZRSuNutbDgH IbviW7ULih8G5S4V8ACghSnVZAVWYXK3eTKsPTHyrz9NsiLrimXHbaHoAXfDtnS/qFgp2/ C5BUC/1mkXjXvvcABCKLJkj97dQYc+ZRW0tb0Q+wKR7MG8Nirj9XvWD3kzzL/IIKZW9ieY NrsjGhCzxNlQTSc0IlAtZ/RxP3ExexCe1A5WA+r3V+pozhziECq7AbI29pIGCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370837; a=rsa-sha256; cv=none; b=V0kOvFhxxnBdgpHKfVawcLKA6Tjf9c0mYfxO1DKJKRZ2qPfB9WWNyXhXvrbDNsiPhyTle8 2lXT3Tr7xVmjeOeUI1Yo0fy9edhuN3GH1606otgXiUY/awjJvEMBoskz5artLBrnVRk1AV I77KaUOCdAdFj2W3q5aaX8z5S+95E55Sgp0AgOcx4bKmA4rQ6AR0Jtd13dmYawT0a0rbdI F005fotYCUiOHx5ypN2KcekoGbK84B+XNtqdQ58fgmjaYZ4Qg6oRqAhBkzr4G/HfaI3mfr W0it42omjd6EITC9ackiRMvSJWqw01a8hobfNqdPNP6hmZ9vysn5m/Gq2Ou1uA== 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 4dZMdx4VpDz16FN for ; Mon, 22 Dec 2025 02:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 388a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:33:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: c8282c0dc36f - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: c8282c0dc36faefc3c5273daca6b85e3d1912d7b Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:33:57 +0000 Message-Id: <6948ae15.388a8.6f57feb@gitrepo.freebsd.org> The branch stable/14 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=c8282c0dc36faefc3c5273daca6b85e3d1912d7b commit c8282c0dc36faefc3c5273daca6b85e3d1912d7b Author: Craig Leres AuthorDate: 2025-12-13 23:43:02 +0000 Commit: Craig Leres CommitDate: 2025-12-22 02:33:24 +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 ]