From nobody Fri Sep 8 18:21:28 2023 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 4Rj4F45Z6fz4rx6b; Fri, 8 Sep 2023 18:21:28 +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 4Rj4F456Qlz3SlS; Fri, 8 Sep 2023 18:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694197288; 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=NLZsl9lZ4O7quiI6rFO2cvQCxcG/iOskG5nuYRmEFWI=; b=JRa7TwrByHGg/VJophm7hll720QSP0MKr3Sp8LmVtxVy6oG/3NpDLfjAeJ+TDSus9xAgum 2/SOhnrOlUQmSw+Ul+0mnClaoxWUVvSqiKnbJu3T5jQY1mYKAngl6+zMHcX7T1Rt3bCgv6 EHd1j35dnbesvFh8/u51tES1tPZwykjP1W2QvMFteEqbUdNnQwqkwRANqMBLD6FgDq4HLp wrwNW6V3QvhgM0JUMsbZuNNHDGfoZA1HyJ6peh/lolFNrHhaPyfKps5jsy1LKwHLDjd5VG IO7xJ7OIEsCsqjplyaHI9dfY9Qxk9wYKFdW3Fa9DeX2RVbs+BcT03Nt4uNmwbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694197288; a=rsa-sha256; cv=none; b=ey5nMf1MncEKxSBjDAVShLAC4S9ULQhndjsNGllRsZI/SbzM0AWyawquSg7mDpUtG9nx2F YUVVHk+WEiuMWDBqcnYKxJ+OSyRX1VhMIM04Gg322U4lwXF5f5CXqNBwAwwJb+9WSOvILm 74IcrNogS9rNGOucdpTAnrAfdWdRlwaRxKHcN85itJB2Ry3W1pU8cUyYD0c956UJjYncUW gMHFizvFipmcVcT/rNuYe9U7fngF7CL1Lwtp8ETMt8xf0iv6pgVeq4fyBBN0cjTV1KCuVZ zRBU7ixk6irSICl9+PiRbj9LxRoFaUIY2gPmePzv53q3lEZ0n2moi93w835SzQ== 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=1694197288; 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=NLZsl9lZ4O7quiI6rFO2cvQCxcG/iOskG5nuYRmEFWI=; b=g4ZxZNd6YUo8DEh2BXsEvKyKGppz1Ci8MFiQE361ofVqhAtZ5adKx8W4IemCIB2EhQAP3y IC4BNEwK7Hbz/OfmnTaOR20V7vwzrJDeJot/SM9sFvDCGwUt2b9ifWH3jy4I60IzLynOnJ bMA9k8Q5gorCJn5loVZqXnDVcLlTeU/s/QcYTloif2XKlrUStoVfebeJ8NsfMPOXMDJljl 3GRH3xxj49kuKFWhRAKDABDvclSmIt8W0uHDW8SBL9bWxGDlMf7OcugtJkj6vvx7WiiQWi +CIK95aXeA8Wk71wSSqPdxpZoPS+i6lwa6cuYxS4SonQboEAv3jKTnmDR2reiA== 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 4Rj4F44C4rzs6G; Fri, 8 Sep 2023 18:21:28 +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 388ILSuN055924; Fri, 8 Sep 2023 18:21:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388ILSLM055921; Fri, 8 Sep 2023 18:21:28 GMT (envelope-from git) Date: Fri, 8 Sep 2023 18:21:28 GMT Message-Id: <202309081821.388ILSLM055921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: caf5283fc92e - main - grep: Suppress EISDIR when reading. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: caf5283fc92edb83173752b1dafbc6d586e78815 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=caf5283fc92edb83173752b1dafbc6d586e78815 commit caf5283fc92edb83173752b1dafbc6d586e78815 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 18:19:46 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans --- 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);