From b6944f88045ca1abb6ed464496726010d2002f01 Mon Sep 17 00:00:00 2001 From: rillig Date: Fri, 7 Jan 2022 21:04:50 +0000 Subject: [PATCH] make: in loadfile, use simpler magic numbers No functional change. --- usr.bin/make/parse.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 32de0c414182..ca37163d261b 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.633 2022/01/07 21:00:49 rillig Exp $ */ +/* $NetBSD: parse.c,v 1.634 2022/01/07 21:04:50 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -106,7 +106,7 @@ #include "pathnames.h" /* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: parse.c,v 1.633 2022/01/07 21:00:49 rillig Exp $"); +MAKE_RCSID("$NetBSD: parse.c,v 1.634 2022/01/07 21:04:50 rillig Exp $"); /* * A file being read. @@ -305,14 +305,13 @@ loadfile(const char *path, int fd) struct stat st; bufSize = fstat(fd, &st) == 0 && S_ISREG(st.st_mode) && - st.st_size >= 1 && st.st_size <= 0x3fffffff + st.st_size > 0 && st.st_size < 1024 * 1024 * 1024 ? (size_t)st.st_size : 1024; Buf_InitSize(&buf, bufSize); for (;;) { if (buf.len == buf.cap) { - if (buf.cap > 0x1fffffff) { - errno = EFBIG; + if (buf.cap >= 512 * 1024 * 1024) { Error("%s: file too large", path); exit(2); /* Not 1 so -q can distinguish error */ }