From b02d690336a0fb7b26338c5f663397debcbf99e2 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Thu, 23 Mar 2017 11:57:05 -0700 Subject: [PATCH] libziparchive: fix mac os breakage Add ftruncate64 to utils/Compat.h definitions for mac. Change-Id: I82cb46927be911e867b606f4f4429a5e1b1987f7 Test: builds on mac --- libutils/include/utils/Compat.h | 4 ++++ libziparchive/zip_writer.cc | 1 + libziparchive/zip_writer_test.cc | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libutils/include/utils/Compat.h b/libutils/include/utils/Compat.h index 2709e3b32..dee577e36 100644 --- a/libutils/include/utils/Compat.h +++ b/libutils/include/utils/Compat.h @@ -37,6 +37,10 @@ static inline ssize_t pwrite64(int fd, const void* buf, size_t nbytes, off64_t o return pwrite(fd, buf, nbytes, offset); } +static inline int ftruncate64(int fd, off64_t length) { + return ftruncate(fd, length); +} + #endif /* __APPLE__ */ #if defined(_WIN32) diff --git a/libziparchive/zip_writer.cc b/libziparchive/zip_writer.cc index ddd4dd5b6..760052886 100644 --- a/libziparchive/zip_writer.cc +++ b/libziparchive/zip_writer.cc @@ -25,6 +25,7 @@ #include #include "android-base/logging.h" +#include "utils/Compat.h" #include "utils/Log.h" #include "entry_name_utils-inl.h" diff --git a/libziparchive/zip_writer_test.cc b/libziparchive/zip_writer_test.cc index 259bcff54..30f49503d 100644 --- a/libziparchive/zip_writer_test.cc +++ b/libziparchive/zip_writer_test.cc @@ -377,7 +377,7 @@ TEST_F(zipwriter, TruncateFileAfterBackup) { ASSERT_EQ(0, writer.WriteBytes(data.data(), data.size())); ASSERT_EQ(0, writer.FinishEntry()); - off64_t before_len = ftello64(file_); + off_t before_len = ftello(file_); ZipWriter::FileEntry entry; ASSERT_EQ(0, writer.GetLastEntry(&entry)); @@ -385,7 +385,7 @@ TEST_F(zipwriter, TruncateFileAfterBackup) { ASSERT_EQ(0, writer.Finish()); - off64_t after_len = ftello64(file_); + off_t after_len = ftello(file_); ASSERT_GT(before_len, after_len); }