git: 35b193572545 - stable/13 - grep: Default to -p instead of -S.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Nov 2024 21:24:47 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=35b193572545e09682f56494ac445b58dd89697c
commit 35b193572545e09682f56494ac445b58dd89697c
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-09-04 19:53:22 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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 <radoslaw.piliszek@gmail.com>
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 */