Add an API to unpack Zip files directly from and to file descriptors.

chrome/common/zip_reader.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/zip_reader.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 64 matching lines @@
 bool ZipReader::Open(const FilePath& zip_file_path) {
   DCHECK(!zip_file_);
 
   // Use of "Unsafe" function does not look good, but there is no way to do
   // this safely on Linux. See file_util.h for details.
   zip_file_ = internal::OpenForUnzipping(zip_file_path.AsUTF8Unsafe());
   if (!zip_file_) {
     return false;
   }
 
-  unz_global_info zip_info = {};  // Zero-clear.
-  if (unzGetGlobalInfo(zip_file_, &zip_info) != UNZ_OK) {
+  return Initialize();

[satorux1, 2011/12/12 04:54:14]

OpenInternal() may sound a bit better?

[Jorge Lucangeli Obes, 2011/12/12 23:34:35]

Done.

+}
+
+#if defined(OS_POSIX)
+bool ZipReader::OpenFd(const int zip_fd) {
+  DCHECK(!zip_file_);
+
+  zip_file_ = internal::OpenFdForUnzipping(zip_fd);
+  if (!zip_file_) {
     return false;
   }
-  num_entries_ = zip_info.number_entry;
-  if (num_entries_ < 0)
-    return false;
 
-  // We are already at the end if the zip file is empty.
-  reached_end_ = (num_entries_ == 0);
-  return true;
+  return Initialize();
 }
+#endif
 
 void ZipReader::Close() {
   if (zip_file_) {
     unzClose(zip_file_);
   }
   Reset();
 }
 
 bool ZipReader::HasMore() {
   return !reached_end_;
@@ skipping 115 matching lines @@
 
 bool ZipReader::ExtractCurrentEntryIntoDirectory(
     const FilePath& output_directory_path) {
   DCHECK(current_entry_info_.get());
 
   FilePath output_file_path = output_directory_path.Append(
       current_entry_info()->file_path());
   return ExtractCurrentEntryToFilePath(output_file_path);
 }
 
+#if defined(OS_POSIX)
+bool ZipReader::ExtractCurrentEntryToFd(const int fd) {
+  DCHECK(zip_file_);
+
+  // If this is a directory, there's nothing to extract to the file descriptor,
+  // so return false.
+  if (current_entry_info()->is_directory())
+    return false;
+
+  const int open_result = unzOpenCurrentFile(zip_file_);
+  if (open_result != UNZ_OK)
+    return false;
+
+  bool success = true;  // This becomes false when something bad happens.
+  while (true) {
+    char buf[internal::kZipBufSize];
+    const int num_bytes_read = unzReadCurrentFile(zip_file_, buf,
+                                                  internal::kZipBufSize);
+    if (num_bytes_read == 0) {
+      // Reached the end of the file.
+      break;
+    } else if (num_bytes_read < 0) {
+      // If num_bytes_read < 0, then it's a specific UNZ_* error code.
+      success = false;
+      break;
+    } else if (num_bytes_read > 0) {
+      // Some data is read. Write it to the output file descriptor.
+      if (num_bytes_read !=
+          file_util::WriteFileDescriptor(fd, buf, num_bytes_read)) {
+        success = false;
+        break;
+      }
+    }
+  }
+
+  unzCloseCurrentFile(zip_file_);
+  return success;
+}
+#endif // defined(OS_POSIX)
+
+bool ZipReader::Initialize() {
+  DCHECK(zip_file_);
+
+  unz_global_info zip_info = {};  // Zero-clear.
+  if (unzGetGlobalInfo(zip_file_, &zip_info) != UNZ_OK) {
+    return false;
+  }
+  num_entries_ = zip_info.number_entry;
+  if (num_entries_ < 0)
+    return false;
+
+  // We are already at the end if the zip file is empty.
+  reached_end_ = (num_entries_ == 0);
+  return true;
+}
+
 void ZipReader::Reset() {
   zip_file_ = NULL;
   num_entries_ = 0;
   reached_end_ = false;
   current_entry_info_.reset();
 }
 
 }  // namespace zip