From nobody Sun Dec 14 21:15:50 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 4dTww63QQmz6Ks1y for ; Sun, 14 Dec 2025 21:15:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dTww62TL6z3XlG for ; Sun, 14 Dec 2025 21:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765746950; 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=zqv6bHhLusLBzfwdLBJ6o4XPsDIdriZumUc0BhKW73k=; b=x7SZ1pcTGe0NDPO7ZDm0qNOOvbYNddMKNGAdTncwm6tOCBWQQvGoQnUcUSeCHHcBB5ylfK D2w3egbeRNfr1BuvdPixcbAC4YD114vePufTPZDWHjOwfTVwu0g3Uk7vUMeHW/2gXsqIdE HCXu8A6PTuVeQUudyPJqvh9/PfyxhWqnnJD7LpsWmU2OWC9AEVs5jYMJNqmzqxi5giRhRR XGz19qN35p9nRtocr+cZy/TxhvQoE3eK74TIQD1b+Jb0GTx30gLSlN++bOg54GOy37Duje /qPvCYStf7ipu5MeT6d3bfRHYEZp6viu2qeF7i10oB+FM497PXoglayyVDbGTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765746950; 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=zqv6bHhLusLBzfwdLBJ6o4XPsDIdriZumUc0BhKW73k=; b=kmL8QRGDDVzMqzyqClqmsR5fTO5J7TmPpgphzjUabZMeM5OL4S+f4pJC2k3tWXzhvnpriO m/2EttFBic66C21ybfuWt+gqN1cnGZOmcg4kdZ5ZuWem9xAhP6B1nucg2fbtX4F/KP2iXl tBFJXr5Z3WhSqGeXwCUsVmFW1uQb1/da0CSTd6R4izbZZ2BC5A+ergVBiAKdX0oytTvhTU EDJLNbw7LqiIJmmBf5PgE8yGVtssEUH8STC9FR/xzWcBzy2jXi1ODORzEkuI9H4OxcDSEm vyjMIrwclYe3RlNZ+EWYsNAvgHZ5ZUwkiyajcO3LY1v++a8kB+/QLeSzkdhpdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765746950; a=rsa-sha256; cv=none; b=dxFFasmeva+AJgFw7XVCj7moBCS3SuDYPQWrYrr6iri8M4QHKiFTfEgv+eEKyr4Gvc4exI zMZOrsEqdJuL7sH2r5DYcC5XYZlEjyBc3rRJBYCXbwn1ZEj0LUHFVBzFwlPr4k+/oda7y+ 5PA2bECdlpJgHh0PER6sOZDeYMkptNOE2HxLVlO2EJlU04yFilJNapBYNNKhAPOhZPSlNJ FAyJfdIXH/GkEcpCWVQ94gzilwx1d1L6TXPADx/kO9tElViNlOhHnsvCKJyTee7p2SMQX2 S+IMjzV7N2s5IY8FXUK8ACoIQ3om1tP9ME7u2Yhzt2aCZEGJTwjlUIH8CB9o4g== 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 4dTww61fCZzrBH for ; Sun, 14 Dec 2025 21:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Dec 2025 21:15:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Craig Leres Subject: git: 80726c2257e9 - main - Fix zgrep(1) wrapper regression, add test 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/main X-Git-Reftype: branch X-Git-Commit: 80726c2257e9d6d79341aac65ba22987f53619bc Auto-Submitted: auto-generated Date: Sun, 14 Dec 2025 21:15:50 +0000 Message-Id: <693f2906.38964.6123975e@gitrepo.freebsd.org> The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=80726c2257e9d6d79341aac65ba22987f53619bc commit 80726c2257e9d6d79341aac65ba22987f53619bc Author: Craig Leres AuthorDate: 2025-12-13 23:43:02 +0000 Commit: Craig Leres CommitDate: 2025-12-14 21:15:36 +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 --- 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 ]