From nobody Wed Sep 04 19:53:57 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 4WzY8j1jhNz5VGn1; Wed, 04 Sep 2024 19:53:57 +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 4WzY8j19g7z47wj; Wed, 4 Sep 2024 19:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725479637; 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=zor90OcuWJX0NMDqyagalpYc8a/eJ3kfaD3XOvDRaJA=; b=XJO+PTHHq5HcLrdfm2i1w2UUbU2fYW5vx6nJ9J51hm6pVuQoupb2xyu74zz6N4TF19LK6W JgQgga8ZTnsFeuLqVbPAdynciFNJViW1JBn3plMhJ86xSutOqmZ112f86i6eoTAvbwfjmd 7lSws08phwrU2B//WwsLjSjDwO3d/W7gXHxzHzSC9733zuNGIL3tR38kSxxFQgUTuEpGbQ G7GOQ/CHEsYNTg41bo2Tyq6M29A/hSAlffeXOyZU6+oLzxNczBuucqwNi4XbVZ0orq9Jzh SqKHeJFZA4hK+UbMNwhPYGpj5PBH2klDyUmDERo8IJQfLNrJt1+bWNXCqSZxnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725479637; a=rsa-sha256; cv=none; b=X/IKFBCoKg1TrsFZNLg/UdaogTuIwyAHbIHDD6SNsgfJmYsaVQd5wPYM1M9zQVU3c5qsF1 V+c4UOICWcW86DMHDeucV/A0PA7ZuCzZIJ1DusCxC4uqbklODXpabIdPx+O3NGa/yeVowl Fd2EYpExEiQu7bsVtIkiWBn6jaIQcMRw4EsWL3G/5RVQ83ugxHTqC1THPxz6BOz/zWT8lo WpGiV0uU6H+vn7sml08/OMSvVOZ9XtRg8FzS9cELyZlOiJ8egkVN+KSxn5knFN46Idh3ZN dFhoM6ZGD1KGhEEmAspnrc9wRrWEeHeWoi85a8zld5rrKOuzWCGBCSZ/xjubsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725479637; 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=zor90OcuWJX0NMDqyagalpYc8a/eJ3kfaD3XOvDRaJA=; b=TXVODpwrS4RR0F/WzWpyzMSmHpRDHE7iTwojzOE2QdwDxQE7NWmpoABwiQZyWuAjIJJLpV grTNypMLGiyRqhJeNVDfcLpHGkETlfSdIFY08Wyzgrkt/3Hke5LmqvrCQ1GwATB0p+u4dy z/HyjEJWNW6Ch/NPPkLqK3So8pufOVD8HmHDpIBAapPbeP+CNFs5j/9wGtZECVFdlusYLH 2qiGCrlQkw8wPuQ3mQ16f6DcqCdu2q5soAxz5pY8Xsk7TyPCOWyCk7wsHpGPy2GPyTuhZ3 QJH8k7kVmSliG5Fs2dcVH0T9QGYzw9vRGzqEH+1o1ot22lA6JyRZsYWFBIDqog== 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 4WzY8j0n78zf2n; Wed, 4 Sep 2024 19:53:57 +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 484JrvHd028861; Wed, 4 Sep 2024 19:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484JrvPY028856; Wed, 4 Sep 2024 19:53:57 GMT (envelope-from git) Date: Wed, 4 Sep 2024 19:53:57 GMT Message-Id: <202409041953.484JrvPY028856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: fc12c191c087 - main - 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/main X-Git-Reftype: branch X-Git-Commit: fc12c191c087b63e1204fee210ba76082ea40b96 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fc12c191c087b63e1204fee210ba76082ea40b96 commit fc12c191c087b63e1204fee210ba76082ea40b96 Author: John Baldwin AuthorDate: 2024-09-04 19:53:22 +0000 Commit: John Baldwin CommitDate: 2024-09-04 19:53:22 +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 --- 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 9f960f74dbb6..feaf17d7c1e1 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 */