The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=15de7baddcb43398c209860d463757852bd04331
commit 15de7baddcb43398c209860d463757852bd04331 Author: Dag-Erling Smørgrav <[email protected]> AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav <[email protected]> CommitDate: 2023-09-14 08:59:38 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans Approved by: re (delphij) (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) (cherry picked from commit 24b741db5fc907d35e51c97f8ef8ad595474e6b9) --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index cd2764811776..3349b72842ca 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1);
