From e400e605471a5bc6571623b4446c41bfc9eb4942 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 10 Mar 2020 09:18:22 -0700 Subject: Fix Mac build. The recent re-enablement of the BLKGETSIZE64 code broke the Mac build. Use the equivalent ioctl() pair instead. --- lib/lib.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/lib.c') diff --git a/lib/lib.c b/lib/lib.c index 2a4cd8c5..2ac5c74c 100644 --- a/lib/lib.c +++ b/lib/lib.c @@ -478,14 +478,11 @@ off_t fdlength(int fd) if (!fstat(fd, &st) && S_ISREG(st.st_mode)) return st.st_size; // If the ioctl works for this, return it. - if (ioctl(fd, BLKGETSIZE64, &size) >= 0) return size<<9; + if (get_block_device_size(fd, &size)) return size<<9; // If not, do a binary search for the last location we can read. (Some // block devices don't do BLKGETSIZE right.) This should probably have // a CONFIG option... - - // If not, do a binary search for the last location we can read. - old = lseek(fd, 0, SEEK_CUR); do { char temp; -- cgit v1.2.3