From nobody Wed Sep 4 19:53:55 2024
X-Original-To: dev-commits-src-main@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 4WzY8h0qSFz5VGSX;
Wed, 04 Sep 2024 19:53:56 +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 4WzY8h0CRYz47rq;
Wed, 4 Sep 2024 19:53:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725479636;
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=RALGbj6gZTd64GwIuwsjvOhQuu4N3uw+VFGGvWGiCDY=;
b=KjHq0oOH5IzK3eBwnzTWRvyFEjsubwsKKI+pUKZgAcsvIysqaqhpytnhEaTmEjAH9QUbtJ
hZBrk7z85ue/8WwqPWiJBvj6bVZthmuxrn0dVWluZ5vc8spsICOGpR0aaaANILXVgsZLnt
2M6fAfniREGPxHeAvPR6tGKY7FWRXVIp+zwqgQYTUV/typdoTLfYpX1LRXXXQvcQ+LnFgc
LqXhQEZtohAtMcTKUxKKXW4lqrFPz+j5j7ClJOaMUZrEfc0mW4AH6YsFhAUCnCVj8n/5Dz
oqpUQcOXoNFUEMSKcI2qUT4ZJaIK5tuvuufmqkX/dJiSJmGL2qrnDXV5sjMwkQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725479636; a=rsa-sha256; cv=none;
b=n545i7JWZhOfXJhaTKQljpQW2s2SR2K0WsZCf8quyiQIo/bgSY6O2x37SXJwGuhKTJiFOa
o4EO/DSKSgM1ZJS7ybeaZGWfVKACa9KJa0RIvPJ8UYrA0ZcGhjaBgU0NBbkfcFdAH84ABF
jp/vpS9Y7WjMGk25ml9j/cHf2cBOHsR05yAhCeQmMIPBbM7yVI3TCBRnQb+qbnYWfNL3Lr
bqbaDwgCUYmipOx5mUPUPtSwXQvrUD0S5MJu8teuZajnhAOKJyf8PB9s/Lkz6lut+NKXLh
eclBIBP5yfzAOPN0d8Ve9rOIKVpyrqzozjvkKZUKpd4GuKfeI83LzbItqYoPOw==
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=1725479636;
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=RALGbj6gZTd64GwIuwsjvOhQuu4N3uw+VFGGvWGiCDY=;
b=uYk+dx/hjmdYuTWx1LGKJSyLnBrFZEZ7EMfujsmXnA8CjFqTQuI/GM+9uOwZf1QbOqQ96A
eMdBtWvp6WDADihFptA2Z4XknHZH1zaYXmbb0qs+GOwDhu08+K1eAVjYaW8lffkBvo6gbB
AC3CNZ2Exi3tuctRv7J1nGztgGmr1x4yZZ1X5bCY4FRcX630pdjMw6Ez4d84LiewdZF83R
wnu4lXR41eLA7MR0sCzBbvKi0JSlFtJN5JOKdZyL9OWPYVEVEivEGh6hHdYvoU3NyeRi5M
z5UDSE4krlQrMc/UglX4kjgoXXdfAFsDN2NMLCGePOGfeJlMbbxzo6NjNtUHvg==
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 4WzY8g6wQ3zd8Y;
Wed, 4 Sep 2024 19:53:55 +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 484Jrtej028811;
Wed, 4 Sep 2024 19:53:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Jrt5E028808;
Wed, 4 Sep 2024 19:53:55 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 19:53:55 GMT
Message-Id: <202409041953.484Jrt5E028808@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 77eb877714d6 - main - grep: Fix various bugs in
recursive tree handling
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@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: 77eb877714d69ee0279d70eb3331920fba90db95
Auto-Submitted: auto-generated
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=77eb877714d69ee0279d70eb3331920fba90db95
commit 77eb877714d69ee0279d70eb3331920fba90db95
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-09-04 19:53:17 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-09-04 19:53:17 +0000
grep: Fix various bugs in recursive tree handling
The -OpS options were effectively ignored due to a collection of
bugs in the use of fts(3):
- fts_open(3) requires one of FTS_PHYSICAL or FTS_LOGICAL to be
specified, but in the -O case, only FTS_COMFOLLOW was given. Fix
this to use FTS_COMFOLLOW | FTS_PHYSICAL.
- The switch on the entry type returned by fts_read() did not check
for symbolic links, so symbolic links fell into the default case and
were always passed to procfile() even when -p was given. Fix this
by adding cases in the switch statement to explicitly ignore FTS_SL.
- FTS_NOSTAT was passed to fts_open(), so fts_open() couldn't detect
symbolic links when FTS_PHYSICAL was passed, instead both regular
files and symbolic links were returned as FTS_NSOK entries. Fix
by only using FTS_NOSTAT with FTS_LOGICAL.
While here, fix a few other nits:
- Treat FTS_NS as an error like FTS_DNR and FTS_ERR.
- Just ignore FTS_DP. The logic to skip descending into skipped
directories is only relevant when a directory is first visited, not
after the directory has been visited.
- Use warnc instead of warnx + strerror.
PR: 280676
Reviewed by: kevans
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D46255
---
usr.bin/grep/util.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 936abc41b3ef..4e1c44b442f2 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -136,16 +136,16 @@ grep_tree(char **argv)
/* This switch effectively initializes 'fts_flags' */
switch(linkbehave) {
case LINK_EXPLICIT:
- fts_flags = FTS_COMFOLLOW;
+ fts_flags = FTS_COMFOLLOW | FTS_PHYSICAL;
break;
case LINK_SKIP:
fts_flags = FTS_PHYSICAL;
break;
default:
- fts_flags = FTS_LOGICAL;
+ fts_flags = FTS_LOGICAL | FTS_NOSTAT;
}
- fts_flags |= FTS_NOSTAT | FTS_NOCHDIR;
+ fts_flags |= FTS_NOCHDIR;
fts = fts_open((argv[0] == NULL) ?
__DECONST(char * const *, wd) : argv, fts_flags, NULL);
@@ -154,15 +154,13 @@ grep_tree(char **argv)
while (errno = 0, (p = fts_read(fts)) != NULL) {
switch (p->fts_info) {
case FTS_DNR:
- /* FALLTHROUGH */
case FTS_ERR:
+ case FTS_NS:
file_err = true;
if(!sflag)
- warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
+ warnc(p->fts_errno, "%s", p->fts_path);
break;
case FTS_D:
- /* FALLTHROUGH */
- case FTS_DP:
if (dexclude || dinclude)
if (!dir_matching(p->fts_name) ||
!dir_matching(p->fts_path))
@@ -173,6 +171,17 @@ grep_tree(char **argv)
warnx("warning: %s: recursive directory loop",
p->fts_path);
break;
+ case FTS_DP:
+ break;
+ case FTS_SL:
+ /*
+ * Skip symlinks for LINK_EXPLICIT and
+ * LINK_SKIP. Note that due to FTS_COMFOLLOW,
+ * symlinks on the command line are followed
+ * for LINK_EXPLICIT and not reported as
+ * symlinks.
+ */
+ break;
default:
/* Check for file exclusion/inclusion */
ok = true;