From nobody Sat Nov 30 21:24:40 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 4Y133F4MRTz5fhHk; Sat, 30 Nov 2024 21:24:41 +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 4Y133F0h7rz4b8P; Sat, 30 Nov 2024 21:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733001881; 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=d9bweqfAa28mH26Y1IDe4pY3bIyBua3nDw23rxwLxtI=; b=bqujXdRjSFCxcmd7k8uIX9o92W6dGHFZvUO23uwdXOqB0dpzWXk64wHP7T+85aEgaUniZT voJA5o8Q4aEuzngkRYeKgiQlmDHlTlGs5HMgsh4at9Zqf+XwX1VEAuCN29O0gLVliGMwwU RCudB+nLzjPp2sa+/zLvEbzhUVJ8bF5eYiObBeemtp8i1EoF61UGFnK8BJXWjQ5nDptc/I HTWfWMajwjoClak09mmRYVi1lq8oNGvLtCl7H8xuV/G/PaXUNjpJF+SPz6CjXbGp5Uw5kp MxQUCERO0oFvztZ5AvJuwNBMHbftvM0OIvKWUSq6/G3cYCE039xgZcir9UDjKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733001881; 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=d9bweqfAa28mH26Y1IDe4pY3bIyBua3nDw23rxwLxtI=; b=cmYZi/fYdID0BnXXfGua5P1eApfX4QWuKk93tDgvfMsFtwYCfs7YIkYZjUuRimJIMAmBQj WKu61Rc/ak3CCjmrkYjyrzl5WPOprHMawbwjrUonTWU5DCpRXTlK2cZoyU190sgbKok102 zUU2XfMRsjzo24c9sBPbQAELKcZPiujrVfW+YlzH3rShrYr7vHpk8Vp9WbWtzf2vt2oU75 AXHjyhqI6Ks/uNCS2Q26zyJ7NvcHo/CTzViDOSSMJeidnfZX1ifriMCK7jqDVnl4EX12yW pi7FjWYqfAdC1nSNuK7pBA2sGhJKmKgEI3VtdY5cW8d7c66fPQVVQoavjMzyPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733001881; a=rsa-sha256; cv=none; b=yNKaUCqtUPQ2uazZdg0xB75w8Cs4KHNlCgPIwDn7ygcJpU06317IcpzXfaKzJS3rTyMBqr quJxEBpduohqN2bYZKOTf3NnsVNxCDohVqrUJj+YPJEaMxG7wL2qk68/eKOltUgQDK3CNu N/xqSswaV4BOPLQYsBJTTl4HBB6yxfPi/iPf0dC8fJ/Q9pg47p6KukIIqKgmpAMWVNYWxB pfsY3PpgAzZs+E5xj/g8zL4zxhY9PewKBsaL2Ix//j85bAX63iVWiQC0T6yOH2B0ggls7L FL5iQEaEcNddRw85JRBpKQ3jtRAmoTsyxH6Ym5JRnGOxuQUuK26cwqtjmF3NVA== 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 4Y133F079ZzQ0B; Sat, 30 Nov 2024 21:24:41 +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 4AULOec6057718; Sat, 30 Nov 2024 21:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AULOeAb057715; Sat, 30 Nov 2024 21:24:40 GMT (envelope-from git) Date: Sat, 30 Nov 2024 21:24:40 GMT Message-Id: <202411302124.4AULOeAb057715@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: 83f1b98d8227 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 83f1b98d822704f87e28f8e0016c3169d75ae87f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=83f1b98d822704f87e28f8e0016c3169d75ae87f commit 83f1b98d822704f87e28f8e0016c3169d75ae87f Author: John Baldwin AuthorDate: 2024-09-04 19:53:22 +0000 Commit: John Baldwin CommitDate: 2024-11-30 20:43:28 +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 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 */