OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "third_party/zlib/google/zip.h" | 5 #include "third_party/zlib/google/zip.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/files/file_enumerator.h" | 9 #include "base/files/file_enumerator.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 const base::FilePath& root_path) { | 53 const base::FilePath& root_path) { |
54 std::string str_path = | 54 std::string str_path = |
55 path.AsUTF8Unsafe().substr(root_path.AsUTF8Unsafe().length() + 1); | 55 path.AsUTF8Unsafe().substr(root_path.AsUTF8Unsafe().length() + 1); |
56 #if defined(OS_WIN) | 56 #if defined(OS_WIN) |
57 ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/"); | 57 ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/"); |
58 #endif | 58 #endif |
59 | 59 |
60 bool is_directory = base::DirectoryExists(path); | 60 bool is_directory = base::DirectoryExists(path); |
61 if (is_directory) | 61 if (is_directory) |
62 str_path += "/"; | 62 str_path += "/"; |
63 | 63 const unsigned long LANGUAGE_ENCODING_FLAG = 0x1 << 11; |
hshi1
2013/12/04 18:30:41
This flag definition seems to come out of nowhere
| |
64 if (ZIP_OK != zipOpenNewFileInZip( | 64 if (ZIP_OK != zipOpenNewFileInZip4( |
65 zip_file, str_path.c_str(), | 65 zip_file, str_path.c_str(), |
66 NULL, NULL, 0u, NULL, 0u, NULL, // file info, extrafield local, length, | 66 NULL, NULL, 0u, NULL, 0u, NULL, // file info, extrafield local, length, |
67 // extrafield global, length, comment | 67 // extrafield global, length, comment |
68 Z_DEFLATED, Z_DEFAULT_COMPRESSION)) { | 68 Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0, |
69 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, | |
70 NULL, 0, 0, LANGUAGE_ENCODING_FLAG)) { | |
69 DLOG(ERROR) << "Could not open zip file entry " << str_path; | 71 DLOG(ERROR) << "Could not open zip file entry " << str_path; |
70 return false; | 72 return false; |
71 } | 73 } |
72 | 74 |
73 bool success = true; | 75 bool success = true; |
74 if (!is_directory) { | 76 if (!is_directory) { |
75 success = AddFileToZip(zip_file, path); | 77 success = AddFileToZip(zip_file, path); |
76 } | 78 } |
77 | 79 |
78 if (ZIP_OK != zipCloseFileInZip(zip_file)) { | 80 if (ZIP_OK != zipCloseFileInZip(zip_file)) { |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
198 if (ZIP_OK != zipClose(zip_file, NULL)) { | 200 if (ZIP_OK != zipClose(zip_file, NULL)) { |
199 DLOG(ERROR) << "Error closing zip file for fd " << dest_fd; | 201 DLOG(ERROR) << "Error closing zip file for fd " << dest_fd; |
200 success = false; | 202 success = false; |
201 } | 203 } |
202 | 204 |
203 return success; | 205 return success; |
204 } | 206 } |
205 #endif // defined(OS_POSIX) | 207 #endif // defined(OS_POSIX) |
206 | 208 |
207 } // namespace zip | 209 } // namespace zip |
OLD | NEW |