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

chrome/common/zip_internal.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.h"
 
 #include "base/utf_string_conversions.h"
 #include "third_party/zlib/contrib/minizip/unzip.h"
 #include "third_party/zlib/contrib/minizip/zip.h"
 #if defined(OS_WIN)
 #include "third_party/zlib/contrib/minizip/iowin32.h"
+#elif defined(OS_POSIX)
+#include "third_party/zlib/contrib/minizip/ioapi.h"
 #endif
 
 namespace {
 
 #if defined(OS_WIN)
 typedef struct {
   HANDLE hf;
   int error;
 } WIN32FILE_IOWIN;
 
@@ skipping 36 matching lines @@
     ret = malloc(sizeof(WIN32FILE_IOWIN));
     if (ret == NULL)
       CloseHandle(file);
     else
       *(static_cast<WIN32FILE_IOWIN*>(ret)) = file_ret;
   }
   return ret;
 }
 #endif
 
+#if defined(OS_POSIX)
+void* FdOpenFileFunc(void* opaque, const char* filename, int mode) {

[satorux1, 2011/12/15 00:40:45]

Function comment is missing. 

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Functi...

[Jorge Lucangeli Obes, 2011/12/15 01:06:19]

Done.

+  FILE* file = NULL;
+  const char* mode_fopen = NULL;
+
+  if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
+    mode_fopen = "rb";
+  else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    mode_fopen = "r+b";
+  else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    mode_fopen = "wb";
+
+  if ((filename != NULL) && (mode_fopen != NULL))
+    file = fdopen(*static_cast<int*>(opaque), mode_fopen);
+
+  return file;
+}
+
+// We don't actually close the file stream since that would close
+// the underlying file descriptor, and we don't own it. We do free
+// |opaque| since we malloc'ed in fill_fdopen_filefunc.
+int CloseFileFunc(void* opaque, void* stream) {
+  free(opaque);
+  return 0;
+}
+
+void FillFdOpenFileFunc(zlib_filefunc_def* pzlib_filefunc_def, int fd) {

[satorux1, 2011/12/15 00:40:45]

function comment.

[Jorge Lucangeli Obes, 2011/12/15 01:06:19]

Done.

+  fill_fopen_filefunc(pzlib_filefunc_def);
+  pzlib_filefunc_def->zopen_file = FdOpenFileFunc;
+  pzlib_filefunc_def->zclose_file = CloseFileFunc;
+  int* ptr_fd = static_cast<int*>(malloc(sizeof(fd)));
+  *ptr_fd = fd;
+  pzlib_filefunc_def->opaque = ptr_fd;
+}
+#endif  // defined(OS_POSIX)
+
 }  // namespace
 
 namespace zip {
 namespace internal {
 
 unzFile OpenForUnzipping(const std::string& file_name_utf8) {
   zlib_filefunc_def* zip_func_ptrs = NULL;
 #if defined(OS_WIN)
   zlib_filefunc_def zip_funcs;
   fill_win32_filefunc(&zip_funcs);
   zip_funcs.zopen_file = ZipOpenFunc;
   zip_func_ptrs = &zip_funcs;
 #endif
   return unzOpen2(file_name_utf8.c_str(), zip_func_ptrs);
 }
 
+#if defined(OS_POSIX)
+unzFile OpenFdForUnzipping(int zip_fd) {
+  zlib_filefunc_def zip_funcs;
+  FillFdOpenFileFunc(&zip_funcs, zip_fd);
+  // Passing dummy "fd" filename to zlib.
+  return unzOpen2("fd", &zip_funcs);
+}
+#endif
+
 zipFile OpenForZipping(const std::string& file_name_utf8, int append_flag) {
   zlib_filefunc_def* zip_func_ptrs = NULL;
 #if defined(OS_WIN)
   zlib_filefunc_def zip_funcs;
   fill_win32_filefunc(&zip_funcs);
   zip_funcs.zopen_file = ZipOpenFunc;
   zip_func_ptrs = &zip_funcs;
 #endif
   return zipOpen2(file_name_utf8.c_str(),
                   append_flag,
                   NULL,  // global comment
                   zip_func_ptrs);
 }
 
 }  // namespace internal
 }  // namespace zip