From nobody Sat Nov 30 21:24:47 2024 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 4Y133M75h3z5fh8D; Sat, 30 Nov 2024 21:24:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y133M314mz4bSv; Sat, 30 Nov 2024 21:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733001887; 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=7NAVssmbzqT71GuLRA8cP8kYNc381LF8fcWvYUPYl9w=; b=nuN6XXsIWasbksIzBjuLPk8Xa4wBwcoTShpZ4Xhk6l8qLN3WU/IqJ2WGT07Tnk4rqvCRsx +OsK3Pu06vrh7H1EMId0uc6OMKB31n99DINdTIwYAERn2pcOi2L9s3u3mdyP7W7hm15dF0 qYENM6xlOXofTtd9xZgnsWAJqhW7jAmpbgS1xRwrxJhB35lzdPHOyobXmZTAZdX39+5ZGE kLESq+PAn01qskIOeWLotJ9qAFF7fUXSS+4cbimzemFM0ZttHCDd5iHP1KGNueHEmEGVSc hhnxp5JzhbqOVo29lWkxsfOcoUP0cK0VJiD+WiZWE/9rW4u9K6xWdvwUQMygPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733001887; 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=7NAVssmbzqT71GuLRA8cP8kYNc381LF8fcWvYUPYl9w=; b=Boc6rhfDnsLxIQb2jCphk7+gVJKKds/HSuh3qLmSY9yuFe+emiXTmkg+tCnXD4eLaXjSwM jaGXT1SWCCEMn/M1eo5Lhi42sLoylaWTmilr7mxs9hLz1/cXk2i82a96fQYiMnoPaxbH+s fMPfAUN3iS06YkMViiStV5dohpXsXMQjIr/VLRHkSEb0YEBY9b7HS44yTG+L2JLhzdPLy/ P4I5DsqDfSSNVxTqZOxWVADGOOXUaCS+N8SVg5gL3s8vVZNB7QxO8MjGQ3ZlsrqJCQpTiH pHDObnIxTevqvXcSXxyn4pJ5aWBsgjUo4Gr/kgT9YePq/IQLqQcvM9DnCTrUtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733001887; a=rsa-sha256; cv=none; b=HyX8Jb7Bk5qmllk/z58j9eaiWqlAdLLzU7z0LkkvTP3YvJYKOxS7O6zJLanqI1ZykU1XFC FxrwMXFFxLIWvkcDtR+oGWEZVvZa3GoBTHubmzUjNgOjLflSJb6vVHE5CrpGSJFSJXQheO m4VD12oyvdBc3oq/GnCSqn3TrE9dR0ab7UKu3kRyi2LT8aDaaiwipcqQTZZFOdzCjcMhUo gErA2fMgu7/ts9ETx0tJsqFFut81DJeu4xWnAkWa9vsC3FppLo+KubssdUpMRKGWyV55A3 SLEF2hPqAp1OLPicMzde3Q2S8iqrCZ8rTu9Bi0fIpA1Jk9+kjt81l+goKjfKGQ== 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 4Y133M2Z9vzQ2N; Sat, 30 Nov 2024 21:24:47 +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 4AULOlSr058049; Sat, 30 Nov 2024 21:24:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AULOlCa058046; Sat, 30 Nov 2024 21:24:47 GMT (envelope-from git) Date: Sat, 30 Nov 2024 21:24:47 GMT Message-Id: <202411302124.4AULOlCa058046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 35b193572545 - stable/13 - grep: Default to -p instead of -S. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 35b193572545e09682f56494ac445b58dd89697c Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=35b193572545e09682f56494ac445b58dd89697c commit 35b193572545e09682f56494ac445b58dd89697c Author: John Baldwin AuthorDate: 2024-09-04 19:53:22 +0000 Commit: John Baldwin CommitDate: 2024-11-30 20:43:34 +0000 grep: Default to -p instead of -S. This matches the documented behavior in the manpage as well as the default behavior on macOS. PR: 280676 Reported by: Radosław Piliszek Reviewed by: kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46256 (cherry picked from commit fc12c191c087b63e1204fee210ba76082ea40b96) --- usr.bin/grep/grep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index 8be0e662b642..e1ecd4da7999 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -112,7 +112,7 @@ int binbehave = BINFILE_BIN; /* -aIU: handling of binary files */ int filebehave = FILE_STDIO; int devbehave = DEV_READ; /* -D: handling of devices */ int dirbehave = DIR_READ; /* -dRr: handling of directories */ -int linkbehave = LINK_READ; /* -OpS: handling of symlinks */ +int linkbehave = LINK_SKIP; /* -OpS: handling of symlinks */ bool dexclude, dinclude; /* --exclude-dir and --include-dir */ bool fexclude, finclude; /* --exclude and --include */