Zip utf-8 file names with encoding bit set.

third_party/zlib/google/zip.cc

 // Copyright (c) 2012 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 "third_party/zlib/google/zip.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
   std::string str_path =
       path.AsUTF8Unsafe().substr(root_path.AsUTF8Unsafe().length() + 1);
 #if defined(OS_WIN)
   ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/");
 #endif
 
   bool is_directory = base::DirectoryExists(path);
   if (is_directory)
     str_path += "/";
 
-  if (ZIP_OK != zipOpenNewFileInZip(
-      zip_file, str_path.c_str(),
-      NULL, NULL, 0u, NULL, 0u, NULL,  // file info, extrafield local, length,
-                                       // extrafield global, length, comment
-      Z_DEFLATED, Z_DEFAULT_COMPRESSION)) {
+  // Section 4.4.4 http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+  // Setting the Language encoding flag so the file is told to be in utf-8.
+  const unsigned long LANGUAGE_ENCODING_FLAG = 0x1 << 11;
+
+  if (ZIP_OK != zipOpenNewFileInZip4(
+                    zip_file,  //file
+                    str_path.c_str(),  // filename
+                    NULL,  // zipfi (file_info)
+                    NULL,  // extrafield_local,
+                    0u,  // size_extrafield_local
+                    NULL,  // extrafield_global
+                    0u,  // size_extrafield_global
+                    NULL,  // comment
+                    Z_DEFLATED,  // method
+                    Z_DEFAULT_COMPRESSION,  // level
+                    0,  // raw
+                    -MAX_WBITS,  // windowBits
+                    DEF_MEM_LEVEL,  // memLevel
+                    Z_DEFAULT_STRATEGY,  // strategy
+                    NULL,  //password
+                    0,  // crcForCrypting
+                    0,  // versionMadeBy
+                    LANGUAGE_ENCODING_FLAG)) {  // flagBase
     DLOG(ERROR) << "Could not open zip file entry " << str_path;
     return false;
   }
 
   bool success = true;
   if (!is_directory) {
     success = AddFileToZip(zip_file, path);
   }
 
   if (ZIP_OK != zipCloseFileInZip(zip_file)) {
@@ skipping 119 matching lines @@
   if (ZIP_OK != zipClose(zip_file, NULL)) {
     DLOG(ERROR) << "Error closing zip file for fd " << dest_fd;
     success = false;
   }
 
   return success;
 }
 #endif  // defined(OS_POSIX)
 
 }  // namespace zip