commit 0dd7ddaa36a2cf37490dc166ebc21818364130a7
author Brian Carlstrom <bdc@google.com> Tue Oct 25 15:47:53 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 25 20:28:07 2011 -0700
tree e381ae0cc965d2135ad99f07826333ccd03dfe90
parent ed6d78ed93c9b5b1988af6ca502a7e2eee0f2aaf

Several fixes for proper creation and use of vmap tables

Change-Id: I7696115af4263df18ede0777ae14de7a3a7ada3b

src/zip_archive.cc

diff --git a/src/zip_archive.cc b/src/zip_archive.cc
index 550d04a..69bc85b 100644
--- a/src/zip_archive.cc
+++ b/src/zip_archive.cc
@@ -126,9 +126,11 @@
     size_t bytes_to_read = (count > kBufSize) ? kBufSize : count;
     ssize_t actual = TEMP_FAILURE_RETRY(read(in, &buf[0], bytes_to_read));
     if (actual != static_cast<ssize_t>(bytes_to_read)) {
+      PLOG(WARNING) << "Zip: short read writing to file " << file.name();
       return false;
     }
     if (!file.WriteFully(&buf[0], bytes_to_read)) {
+      PLOG(WARNING) << "Zip: failed to write to file " << file.name();
       return false;
     }
     count -= bytes_to_read;
@@ -166,6 +168,7 @@
   UniquePtr<uint8_t[]> read_buf(new uint8_t[kBufSize]);
   UniquePtr<uint8_t[]> write_buf(new uint8_t[kBufSize]);
   if (read_buf.get() == NULL || write_buf.get() == NULL) {
+    LOG(WARNING) << "Zip: failed to alloctate buffer to inflate to file " << out.name();
     return false;
   }
 
@@ -216,6 +219,7 @@
         (zerr == Z_STREAM_END && zstream->Get().avail_out != kBufSize)) {
       size_t bytes_to_write = zstream->Get().next_out - write_buf.get();
       if (!out.WriteFully(write_buf.get(), bytes_to_write)) {
+        PLOG(WARNING) << "Zip: failed to write to file " << out.name();
         return false;
       }
       zstream->Get().next_out = write_buf.get();
@@ -238,6 +242,7 @@
 bool ZipEntry::Extract(File& file) {
   off_t data_offset = GetDataOffset();
   if (data_offset == -1) {
+    LOG(WARNING) << "Zip: data_offset=" << data_offset;
     return false;
   }
   if (lseek(zip_archive_->fd_, data_offset, SEEK_SET) != data_offset) {
@@ -253,6 +258,7 @@
     case kCompressDeflated:
       return InflateToFile(file, zip_archive_->fd_, GetUncompressedLength(), GetCompressedLength());
     default:
+      LOG(WARNING) << "Zip: unknown compression method " << std::hex << GetCompressionMethod();
       return false;
   }
 }