From nobody Thu Mar 9 05:53:56 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 4PXJK04fV1z3wCS6; Thu, 9 Mar 2023 05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXJK0480Dz42r2; Thu, 9 Mar 2023 05: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=1678341236; 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=yx6p2BC0XV7MMl0ZTR5kJHgjAnXSLxCkM85fBukUKdU=; b=XG3crnHQu8C0T2+KX/+BtbOIrzB0EFWFLVNt8BfzXA2czvjChoD56cePLlHUPnF+8uD8n6 gGrmQub5vxOKi24DNUsjHq6Fdc2qqR3QRIlb0UxJNOLFft4TI2DfYhzJr2VyuDDwbPAVSP PjOJ76RX2Z6+5UJf4lJsqwaRK2sk80QeiHr65BBM1ifN4JUNzACyJNOJopFAbzThTfgB5O wOnKGCa7x+dhNZ5VGq/6I2nkl5tAj+zrpCdduSmR6nPZ51ssZctSaX18aIX0GSs6HuBe5+ Xem2MDCdZHJruyq5jP9wULRjCOuSpIElmVQPhRabqq/e+DICyjlCqfX3nxDGjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678341236; 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=yx6p2BC0XV7MMl0ZTR5kJHgjAnXSLxCkM85fBukUKdU=; b=XLDg9xAGivh8z0elpQB3Kl/3pLMUi7v2eI9gBk6EcWsDU4iOgIQCFlgamiy5wjpB+g3TwV /JIzML4Q+UP7nv67JehBP4YC5AyY8palUk/BZMK3RuiJ+br7hKWUggvDHMQM3Dy8VTTMgE 0VF/rDQIzas+dEBBDAG03G93u+sAzGtAybaEipEmoWUarmmV42tZUSKKqcRGTkFSVppuOS tiM22kIlj8i9fcDejoQVu17eXvVr6Ys+8Xb1fhStme2o8HjW2OJs9Knqc6EvK0s7HXWFGb Re35rkMXh/P3Lyj56l+U3Ts24RK99TEP+n6yW31iXUbNGYVX0rMZOVhSijFc+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678341236; a=rsa-sha256; cv=none; b=stdMbN2Qig+kcws0qzASkwh76/JDlEQAG6q26XpdpCm5/KDxStAy92Ix+mHg+nFrjnIcvs CR6sJyR8dypjfbllV0fHShTnf+TbIDVyf3WdfWRB7D4RKMHPY3Smvoqke8dFimvIn7giHE vMxyOEzyZ1d0CPqmPb3/et23v8ZpKZaK0fIIVa9B0Uug7PX5xRoOWLeDzxVFmqeNA/n0HK KVfB3ffhc4ycVAnayLso6JeJ0HaDagXthDzVY/Zd70tqlh1I0Knd1UQlwtALnjfdHdqyXz xW6MDB70oVlOewkFOROYxPGWrOhDrnqjL+26Nt/SF/BUChsK40guJJNigOKr3Q== 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 4PXJK03FQpzwR0; Thu, 9 Mar 2023 05:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3295rut2077401; Thu, 9 Mar 2023 05:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3295rubU077400; Thu, 9 Mar 2023 05:53:56 GMT (envelope-from git) Date: Thu, 9 Mar 2023 05:53:56 GMT Message-Id: <202303090553.3295rubU077400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b61758494286 - main - grep: remove tautological condition 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b61758494286db075d5c6b68a5f2e7522e7be394 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b61758494286db075d5c6b68a5f2e7522e7be394 commit b61758494286db075d5c6b68a5f2e7522e7be394 Author: Kyle Evans AuthorDate: 2023-03-09 05:53:10 +0000 Commit: Kyle Evans CommitDate: 2023-03-09 05:53:10 +0000 grep: remove tautological condition st_size is an off_t, it cannot hold values larger than OFF_MAX. CID: 1008931 --- usr.bin/grep/file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index 8577572c2887..787e8fbe03bb 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -186,8 +186,7 @@ grep_open(const char *path) if (filebehave == FILE_MMAP) { struct stat st; - if ((fstat(f->fd, &st) == -1) || (st.st_size > OFF_MAX) || - (!S_ISREG(st.st_mode))) + if (fstat(f->fd, &st) == -1 || !S_ISREG(st.st_mode)) filebehave = FILE_STDIO; else { int flags = MAP_PRIVATE | MAP_NOCORE | MAP_NOSYNC;