From nobody Thu Sep 14 15:00:19 2023 X-Original-To: dev-commits-src-branches@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 4RmgVC3bHdz4sb5w; Thu, 14 Sep 2023 15:00:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVC2qkfz4VMC; Thu, 14 Sep 2023 15:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703619; 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=kwoA2BKDRqQGn+bparrBjwjDOd3fOWPE3o0bnjaY6wQ=; b=sSNLCBut8TtKkrlvD+K++sivg9/unr5XN9YmWtG9W+l+k8KXyWK2OYgq3R9PttMtLqfVrG xRP6h0+GVT2YcB6EO4Ca38D6sR3pO/tHmQ7PDrXYYuZhV+ms2dxaKJWd/EnIkLwYyqmN0X 8RGgJ/P7/1mVZQLq3HTDihCv98wjw8lXOgaKkNgHCf17OEJpRsis+WZh8QXqIbmIa5iK5v sgf0TmYf/qMgbrDb0PdRbwJvTGxqsrUJH3bo60j+NuIBwnStOpLL2fUvDmll3NWuVMZzHE 6m+z4ijwv9cAU+gedMxOXPYrFXATA6P6EXPl7zvEW2Pl3SEw14C+OyaXEDGxFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703619; a=rsa-sha256; cv=none; b=pk8FNgjdDm0JWtw8V5G5v4M3F/hq4Q4oMzjNTmlJEe021OkRPaOfcfP6yZPLGRlBPs83Jt F91fW4X+nPEFH1Tk6k3cE8U3VWDU60TkrsKKIN0Kg9oqq2Qgy35zBstv4EWl7CKJ9NbEHy TfLsXFzqTuACrBoYttIzRy3slW94ZJVy0i847P7Ny+FicmThlht6dYxyCYRjw/6m0bfL2q hYHO30Qg0kT+zUMGEetp65wuGVuAeH92VR494fev+g5MrgXbTs1qnyVBBGouKSH0l7c5Di RIB7KxlLAa+S3TsAWdNg+YpNpdLBsqQMV6dcUGwkRr5kITyR26584VTLbcLyBQ== 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=1694703619; 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=kwoA2BKDRqQGn+bparrBjwjDOd3fOWPE3o0bnjaY6wQ=; b=n2/JWGFPLcrwaFe2zfypYrXo9vTlpd4UECbwmkesug9njmWbBeF94ZLZI7nOvmEbXbN3oI l3opZnRhkbFWXU5hlWLCKtKXXwkX0VKFw8L1viwgjVDD479KEZC+E5Ageyoqkla9z+/nl+ CkTcevLEljoGsbV6naKiO+LSxydChLyNvwwrCKCJoCmZPGe0Tar7WAJrIVmoUGQH7jZX+b twXmBTRZ6BXFDl0Sh5U8htUwJPHgnCqs619KvNyCwztSaPDaB/35l72nDnRy8ije78cJnx x1nS6eZz10d91iowcy7pvJ8Y9lpiVP2srj3gJ0DFQEdC97KBkG4wBbR/v3YZIQ== 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 4RmgVC1vmPz11t9; Thu, 14 Sep 2023 15:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0JoG088938; Thu, 14 Sep 2023 15:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0JgH088935; Thu, 14 Sep 2023 15:00:19 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:19 GMT Message-Id: <202309141500.38EF0JgH088935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 15de7baddcb4 - releng/14.0 - grep: Suppress EISDIR when reading. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 15de7baddcb43398c209860d463757852bd04331 Auto-Submitted: auto-generated 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 AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav 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);