ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use base::WriteFully in zip_archive.

Browse source 
We're already linking against libbase but we'll have to add
a libbase dependency to every target that includes libziparchive
as a STATIC_LIBRARY dependency, given that there's no way to
express that what we want (except by adding a LOCAL_WHOLE_STATIC_LIBRARY
dependency on libbase to libziparchive but that seems bad too)

Change-Id: I294ad389a9c61a1134a7bc323da25b0004a8f1e0
This commit is contained in:
Narayan Kamath 2015-04-27 16:25:53 +01:00
parent 07e07aa475
commit e97e66ea7c
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fastboot/Android.mk
View file

@ -58,7 +58,8 @@ LOCAL_STATIC_LIBRARIES := \
libsparse_host \
libutils \
liblog \
libz
libz \
libbase
ifneq ($(HOST_OS),windows)
LOCAL_STATIC_LIBRARIES += libselinux

23
libziparchive/zip_archive.cc
View file

@ -30,6 +30,7 @@
#include <memory>
#include <vector>
#include "base/file.h"
#include "base/macros.h" // TEMP_FAILURE_RETRY may or may not be in unistd
#include "base/memory.h"
#include "log/log.h"
@ -1033,24 +1034,14 @@ class FileWriter : public Writer {
return false;
}
// Keep track of the start position so we can calculate the
// total number of bytes written.
const uint8_t* const start = buf;
while (buf_size > 0) {
ssize_t bytes_written = TEMP_FAILURE_RETRY(write(fd_, buf, buf_size));
if (bytes_written == -1) {
ALOGW("Zip: unable to write " ZD " bytes to file; %s", buf_size, strerror(errno));
return false;
}
buf_size -= bytes_written;
buf += bytes_written;
const bool result = android::base::WriteFully(fd_, buf, buf_size);
if (result) {
total_bytes_written_ += buf_size;
} else {
ALOGW("Zip: unable to write " ZD " bytes to file; %s", buf_size, strerror(errno));
}
total_bytes_written_ += static_cast<size_t>(
reinterpret_cast<uintptr_t>(buf) - reinterpret_cast<uintptr_t>(start));
return true;
return result;
}
private:
FileWriter(const int fd, const size_t declared_length) :