aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2011-10-16 19:15:25 +0000
committerEd Schouten <ed@FreeBSD.org>2011-10-16 19:15:25 +0000
commitd2ea3bed5240d1fb6c1111ef6d49afa088a14588 (patch)
treea42dda20a72d9ca17ea36149e7254129e0761fdc
parentc435dafb84dda1e69160b03b426412165ac6a4b9 (diff)
downloadsrc-d2ea3bed5240d1fb6c1111ef6d49afa088a14588.tar.gz
src-d2ea3bed5240d1fb6c1111ef6d49afa088a14588.zip
Don't cast SIZE_T_MAX to off_t.
I focused so much on the 32-bits case where we have to cast SIZE_T_MAX up in size, that I forgot about the 64-bits case, where off_t and size_t are equal in size. Simply cast both numbers to uintmax_t, as we can assume st_size is never negative. Reported by: cperciva
Notes
Notes: svn path=/head/; revision=226444
-rw-r--r--usr.bin/look/look.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ac6082e6ff15..0088864c81ca 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
do {
if ((fd = open(file, O_RDONLY, 0)) < 0 || fstat(fd, &sb))
err(2, "%s", file);
- if (sb.st_size > (off_t)SIZE_T_MAX)
+ if ((uintmax_t)sb.st_size > (uintmax_t)SIZE_T_MAX)
errx(2, "%s: %s", file, strerror(EFBIG));
if (sb.st_size == 0) {
close(fd);