From nobody Thu Sep 14 08:57:06 2023 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 4RmWR64nBhz4t0C9; Thu, 14 Sep 2023 08:57:06 +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 4RmWR64M34z4SRw; Thu, 14 Sep 2023 08:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681826; 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=793cgjg4EfPkjbanghP2LsbPWv/xk4dycqLb1O3Koy8=; b=k0cXgXBJ00sWbhpqUhzBIB+D73CTmECuCL7Nf8ipSbmyne84duf/cEpmqi7QDAm7SedWo/ FGs/gmveMntZk6oqUT0VoHSGLOXQNjza0MBzTQBAQKbi7sqtwaYMw64xtpcoKnNfGUaDOj K/YJfE0Ez8C/MVJedJZ4yypqq8CmvCTETwED5aLZc2sgsMQQ6xFMmyNH5Lzr6pW9pVvqwj uksU7c7fhsMoULAXWNsa8AN/WZXYSa7B9f7IXsofoOaFvq1xlOESff9fc77fRn+OMSBQ6a CpbrfbUSGY0IMnvsIwrQWC2DVJX+hkHj5zCIgEQt3ZqafqldSb0MR7hibpci6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681826; a=rsa-sha256; cv=none; b=N9tr4wAdeVJvn3CX8wTp1kf3NnMFLdm76ifc+veIjHRRzj3D5QYSCuokQEwbCLbys8k6uD n1SMXUYmrpsLkdx18zie54jgIppBXZlhTMNBBlivojmNLuCOUdOGeOl8uJ1/gZm+spM8m7 2cGNRPYOKdBQ/GJ794GbZmgOKgmvvRPeIBLX3t4d/abjl4Q54TWAjqEU28EBAOfmrfMi7f aX+Od209TD+mkOUPAIbm/oGMsSSpplxsTtP12VPqLAi2yfSoGZeSAJExTXeUQb9boJYIFZ MkW6Q2lNlWk7EngzHTzrbbiLnNx5hyEC+Q/TAne6WF72r1/jPPyKKeW0rPnyFw== 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=1694681826; 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=793cgjg4EfPkjbanghP2LsbPWv/xk4dycqLb1O3Koy8=; b=oA5b4m82xOEBsKoBB86Pvk7GAcVqFOX+qA2HfcG6FOYVu1DOQ+epLAdvXLvtJQBdMLRqoI K9CLb6xhab2vKpejDcyNgEJ17JmbmQvxdvjiwEE8azdfJgYdxAa6C02SsDK+xS/0rda2oB Iid7gs/rq80AD9kfd1YibtlHc6wXctRjDoti3wVLKKVsUKafaP4iTMU+OyAXNd6sYGQSCl 5MX5i3ggrvc6P++wxCwxOgPcabEFhCD7wdKxuoZVFMS4oMmO8maewPnD/kmu1oIcqedI8S adJbmW3KzijoLrIRwGoqACs64ujjs2C3vm59Zil3l1UrICF0KHOZ54390WQ/ZA== 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 4RmWR63Py1zqjv; Thu, 14 Sep 2023 08:57:06 +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 38E8v60D076559; Thu, 14 Sep 2023 08:57:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v6gL076556; Thu, 14 Sep 2023 08:57:06 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:06 GMT Message-Id: <202309140857.38E8v6gL076556@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: 24b741db5fc9 - stable/14 - grep: Suppress EISDIR when reading. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 24b741db5fc907d35e51c97f8ef8ad595474e6b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=24b741db5fc907d35e51c97f8ef8ad595474e6b9 commit 24b741db5fc907d35e51c97f8ef8ad595474e6b9 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) --- 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);