Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 1 | /* zip.c -- Zip manipulation |
Nathan Moinvaziri | c470906 | 2018-11-06 21:12:16 -0800 | [diff] [blame] | 2 | Version 2.7.4, November 6, 2018 |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 3 | part of the MiniZip project |
| 4 | |
Nathan Moinvaziri | fee885a | 2018-01-06 08:49:03 -0800 | [diff] [blame] | 5 | Copyright (C) 2010-2018 Nathan Moinvaziri |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 6 | https://github.com/nmoinvaz/minizip |
Nathan Moinvaziri | 79cfab0 | 2018-08-17 12:21:06 -0700 | [diff] [blame] | 7 | Copyright (C) 2009-2010 Mathias Svensson |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 8 | Modifications for Zip64 support |
| 9 | http://result42.com |
Nathan Moinvaziri | 79cfab0 | 2018-08-17 12:21:06 -0700 | [diff] [blame] | 10 | Copyright (C) 2007-2008 Even Rouault |
| 11 | Modifications of Unzip for Zip64 |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 12 | Copyright (C) 1998-2010 Gilles Vollant |
Viktor Szakats | 9dea6f2 | 2018-10-17 22:39:01 +0000 | [diff] [blame] | 13 | https://www.winimage.com/zLibDll/minizip.html |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 14 | |
| 15 | This program is distributed under the terms of the same license as zlib. |
| 16 | See the accompanying LICENSE file for the full text of the license. |
| 17 | */ |
| 18 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 19 | #include <stdlib.h> |
| 20 | #include <stdint.h> |
Nathan Moinvaziri | 85d36c5 | 2018-08-31 16:43:41 -0700 | [diff] [blame] | 21 | #include <stdio.h> |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 22 | #include <string.h> |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 23 | #include <ctype.h> |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 24 | #include <time.h> |
Nathan Moinvaziri | 34eff62 | 2018-01-22 09:25:15 -0800 | [diff] [blame] | 25 | #include <limits.h> |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 26 | |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 27 | #include "mz.h" |
Nathan Moinvaziri | 5f09188 | 2018-10-24 18:06:08 -0700 | [diff] [blame] | 28 | #include "mz_crypt.h" |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 29 | #include "mz_strm.h" |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 30 | #ifdef HAVE_BZIP2 |
| 31 | # include "mz_strm_bzip.h" |
| 32 | #endif |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 33 | #ifdef HAVE_LZMA |
| 34 | # include "mz_strm_lzma.h" |
| 35 | #endif |
Nathan Moinvaziri | b47b41b | 2018-07-11 09:44:29 -0700 | [diff] [blame] | 36 | #include "mz_strm_mem.h" |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 37 | #ifdef HAVE_PKCRYPT |
| 38 | # include "mz_strm_pkcrypt.h" |
| 39 | #endif |
Nathan Moinvaziri | 21a3102 | 2018-10-24 09:50:16 -0700 | [diff] [blame] | 40 | #ifdef HAVE_AES |
| 41 | # include "mz_strm_wzaes.h" |
| 42 | #endif |
Nathan Moinvaziri | 4f6a0e3 | 2017-11-10 08:45:14 -0800 | [diff] [blame] | 43 | #ifdef HAVE_ZLIB |
| 44 | # include "mz_strm_zlib.h" |
| 45 | #endif |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 46 | |
| 47 | #include "mz_zip.h" |
| 48 | |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 49 | #if defined(_MSC_VER) && _MSC_VER < 1900 |
| 50 | # define snprintf _snprintf |
| 51 | #endif |
| 52 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 53 | /***************************************************************************/ |
| 54 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 55 | #define MZ_ZIP_MAGIC_LOCALHEADER (0x04034b50) |
| 56 | #define MZ_ZIP_MAGIC_CENTRALHEADER (0x02014b50) |
| 57 | #define MZ_ZIP_MAGIC_ENDHEADER (0x06054b50) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 58 | #define MZ_ZIP_MAGIC_ENDHEADERU8 { 0x50, 0x4b, 0x05, 0x06 } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 59 | #define MZ_ZIP_MAGIC_ENDHEADER64 (0x06064b50) |
| 60 | #define MZ_ZIP_MAGIC_ENDLOCHEADER64 (0x07064b50) |
| 61 | #define MZ_ZIP_MAGIC_DATADESCRIPTOR (0x08074b50) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 62 | #define MZ_ZIP_MAGIC_DATADESCRIPTORU8 { 0x50, 0x4b, 0x07, 0x08 } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 63 | |
Nathan Moinvaziri | 638f31f | 2018-08-27 08:17:16 -0700 | [diff] [blame] | 64 | #define MZ_ZIP_SIZE_LD_ITEM (32) |
| 65 | #define MZ_ZIP_SIZE_CD_ITEM (46) |
| 66 | #define MZ_ZIP_SIZE_CD_LOCATOR64 (20) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 67 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 68 | /***************************************************************************/ |
| 69 | |
| 70 | typedef struct mz_zip_s |
| 71 | { |
| 72 | mz_zip_file file_info; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 73 | mz_zip_file local_file_info; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 74 | |
| 75 | void *stream; // main stream |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 76 | void *cd_stream; // pointer to the stream with the cd |
| 77 | void *cd_mem_stream; // memory stream for central directory |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 78 | void *compress_stream; // compression stream |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 79 | void *crypt_stream; // encryption stream |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 80 | void *file_info_stream; // memory stream for storing file info |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 81 | void *local_file_info_stream; // memory stream for storing local file info |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 82 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 83 | int32_t open_mode; |
| 84 | |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 85 | uint32_t disk_number_with_cd; // number of the disk with the central dir |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 86 | int64_t disk_offset_shift; // correction for zips that have wrong offset start of cd |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 87 | |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 88 | int64_t cd_start_pos; // pos of the first file in the central dir stream |
| 89 | int64_t cd_current_pos; // pos of the current file in the central dir |
| 90 | int64_t cd_offset; // offset of start of central directory |
| 91 | int64_t cd_size; // size of the central directory |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 92 | |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 93 | uint8_t entry_scanned; // entry header information read ok |
| 94 | uint8_t entry_opened; // entry is open for read/write |
| 95 | uint8_t entry_raw; // entry opened with raw mode |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 96 | uint32_t entry_crc32; // entry crc32 |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 97 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 98 | uint64_t number_entry; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 99 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 100 | uint16_t version_madeby; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 101 | char *comment; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 102 | } mz_zip; |
| 103 | |
| 104 | /***************************************************************************/ |
| 105 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 106 | #if 0 |
| 107 | # define mz_zip_print printf |
| 108 | #else |
| 109 | # define mz_zip_print(fmt,...) |
| 110 | #endif |
| 111 | |
| 112 | /***************************************************************************/ |
| 113 | |
Nathan Moinvaziri | 286a817 | 2018-11-08 14:56:14 -0800 | [diff] [blame] | 114 | // Locate the end of central directory |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 115 | static int32_t mz_zip_search_eocd(void *stream, int64_t *central_pos) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 116 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 117 | int64_t file_size = 0; |
Nathan Moinvaziri | 286a817 | 2018-11-08 14:56:14 -0800 | [diff] [blame] | 118 | int64_t max_back = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 119 | uint8_t find[4] = MZ_ZIP_MAGIC_ENDHEADERU8; |
Nathan Moinvaziri | 05e03ca | 2018-10-28 16:15:13 -0700 | [diff] [blame] | 120 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 121 | |
Nathan Moinvaziri | 05e03ca | 2018-10-28 16:15:13 -0700 | [diff] [blame] | 122 | err = mz_stream_seek(stream, 0, MZ_SEEK_END); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 123 | |
| 124 | file_size = mz_stream_tell(stream); |
Nathan Moinvaziri | 286a817 | 2018-11-08 14:56:14 -0800 | [diff] [blame] | 125 | |
| 126 | // maximum seek is size of global comment + extra |
| 127 | max_back = UINT16_MAX + 128; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 128 | if (max_back > file_size) |
| 129 | max_back = file_size; |
| 130 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 131 | return mz_stream_find_reverse(stream, (const void *)find, sizeof(find), max_back, central_pos); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 132 | } |
| 133 | |
Nathan Moinvaziri | e824da8 | 2018-07-26 17:53:15 -0700 | [diff] [blame] | 134 | // Locate the end of central directory 64 of a zip file |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 135 | static int32_t mz_zip_search_zip64_eocd(void *stream, const int64_t end_central_offset, int64_t *central_pos) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 136 | { |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 137 | int64_t offset = 0; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 138 | uint32_t value32 = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 139 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 140 | |
| 141 | |
| 142 | *central_pos = 0; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 143 | |
| 144 | // Zip64 end of central directory locator |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 145 | err = mz_stream_seek(stream, end_central_offset - MZ_ZIP_SIZE_CD_LOCATOR64, MZ_SEEK_SET); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 146 | // Read locator signature |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 147 | if (err == MZ_OK) |
| 148 | { |
| 149 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 150 | if (value32 != MZ_ZIP_MAGIC_ENDLOCHEADER64) |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 151 | err = MZ_FORMAT_ERROR; |
| 152 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 153 | // Number of the disk with the start of the zip64 end of central directory |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 154 | if (err == MZ_OK) |
| 155 | err = mz_stream_read_uint32(stream, &value32); |
| 156 | // Relative offset of the zip64 end of central directory record8 |
| 157 | if (err == MZ_OK) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 158 | err = mz_stream_read_uint64(stream, (uint64_t *)&offset); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 159 | // Total number of disks |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 160 | if (err == MZ_OK) |
| 161 | err = mz_stream_read_uint32(stream, &value32); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 162 | // Goto end of central directory record |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 163 | if (err == MZ_OK) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 164 | err = mz_stream_seek(stream, (int64_t)offset, MZ_SEEK_SET); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 165 | // The signature |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 166 | if (err == MZ_OK) |
| 167 | { |
| 168 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 169 | if (value32 != MZ_ZIP_MAGIC_ENDHEADER64) |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 170 | err = MZ_FORMAT_ERROR; |
| 171 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 172 | |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 173 | if (err == MZ_OK) |
| 174 | *central_pos = offset; |
| 175 | |
| 176 | return err; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 177 | } |
| 178 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 179 | // Get info about the current file in the zip file |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 180 | static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file *file_info, void *file_extra_stream) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 181 | { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 182 | uint64_t ntfs_time = 0; |
| 183 | uint32_t reserved = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 184 | uint32_t magic = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 185 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 186 | uint32_t field_pos = 0; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 187 | uint16_t field_type = 0; |
| 188 | uint16_t field_length = 0; |
| 189 | uint32_t field_length_read = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 190 | uint16_t ntfs_attrib_id = 0; |
| 191 | uint16_t ntfs_attrib_size = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 192 | uint16_t value16 = 0; |
| 193 | uint32_t value32 = 0; |
Nathan Moinvaziri | feb86c5 | 2018-11-05 11:40:21 -0800 | [diff] [blame] | 194 | int64_t extrafield_pos = -1; |
Nathan Moinvaziri | feb86c5 | 2018-11-05 11:40:21 -0800 | [diff] [blame] | 195 | int64_t comment_pos = -1; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 196 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 197 | |
| 198 | |
| 199 | memset(file_info, 0, sizeof(mz_zip_file)); |
| 200 | |
| 201 | // Check the magic |
| 202 | err = mz_stream_read_uint32(stream, &magic); |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 203 | if (err == MZ_END_OF_STREAM) |
| 204 | err = MZ_END_OF_LIST; |
| 205 | else if (magic == MZ_ZIP_MAGIC_ENDHEADER || magic == MZ_ZIP_MAGIC_ENDHEADER64) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 206 | err = MZ_END_OF_LIST; |
| 207 | else if ((local) && (magic != MZ_ZIP_MAGIC_LOCALHEADER)) |
| 208 | err = MZ_FORMAT_ERROR; |
| 209 | else if ((!local) && (magic != MZ_ZIP_MAGIC_CENTRALHEADER)) |
| 210 | err = MZ_FORMAT_ERROR; |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 211 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 212 | // Read header fields |
| 213 | if (err == MZ_OK) |
| 214 | { |
| 215 | if (!local) |
| 216 | err = mz_stream_read_uint16(stream, &file_info->version_madeby); |
| 217 | if (err == MZ_OK) |
| 218 | err = mz_stream_read_uint16(stream, &file_info->version_needed); |
| 219 | if (err == MZ_OK) |
| 220 | err = mz_stream_read_uint16(stream, &file_info->flag); |
| 221 | if (err == MZ_OK) |
| 222 | err = mz_stream_read_uint16(stream, &file_info->compression_method); |
| 223 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 224 | { |
| 225 | err = mz_stream_read_uint32(stream, &dos_date); |
| 226 | file_info->modified_date = mz_zip_dosdate_to_time_t(dos_date); |
| 227 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 228 | if (err == MZ_OK) |
| 229 | err = mz_stream_read_uint32(stream, &file_info->crc); |
| 230 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 231 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 232 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 233 | file_info->compressed_size = value32; |
| 234 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 235 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 236 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 237 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 238 | file_info->uncompressed_size = value32; |
| 239 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 240 | if (err == MZ_OK) |
| 241 | err = mz_stream_read_uint16(stream, &file_info->filename_size); |
| 242 | if (err == MZ_OK) |
| 243 | err = mz_stream_read_uint16(stream, &file_info->extrafield_size); |
| 244 | if (!local) |
| 245 | { |
| 246 | if (err == MZ_OK) |
| 247 | err = mz_stream_read_uint16(stream, &file_info->comment_size); |
| 248 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 249 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 250 | err = mz_stream_read_uint16(stream, &value16); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 251 | file_info->disk_number = value16; |
| 252 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 253 | if (err == MZ_OK) |
| 254 | err = mz_stream_read_uint16(stream, &file_info->internal_fa); |
| 255 | if (err == MZ_OK) |
| 256 | err = mz_stream_read_uint32(stream, &file_info->external_fa); |
| 257 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 258 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 259 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 260 | file_info->disk_offset = value32; |
| 261 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 262 | } |
| 263 | } |
| 264 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 265 | if (err == MZ_OK) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 266 | err = mz_stream_seek(file_extra_stream, 0, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 267 | |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 268 | // Copy variable length data to memory stream for later retrieval |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 269 | if ((err == MZ_OK) && (file_info->filename_size > 0)) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 270 | err = mz_stream_copy(file_extra_stream, stream, file_info->filename_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 271 | mz_stream_write_uint8(file_extra_stream, 0); |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 272 | extrafield_pos = (int64_t)file_info->filename_size + 1; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 273 | |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 274 | if ((err == MZ_OK) && (file_info->extrafield_size > 0)) |
| 275 | err = mz_stream_copy(file_extra_stream, stream, file_info->extrafield_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 276 | mz_stream_write_uint8(file_extra_stream, 0); |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 277 | |
| 278 | comment_pos = extrafield_pos + (int64_t)file_info->extrafield_size + 1; |
| 279 | if ((err == MZ_OK) && (file_info->comment_size > 0)) |
| 280 | err = mz_stream_copy(file_extra_stream, stream, file_info->comment_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 281 | mz_stream_write_uint8(file_extra_stream, 0); |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 282 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 283 | if ((err == MZ_OK) && (file_info->extrafield_size > 0)) |
| 284 | { |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 285 | // Seek to and parse the extra field |
| 286 | err = mz_stream_seek(file_extra_stream, extrafield_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 287 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 288 | while ((err == MZ_OK) && (field_pos + 4 <= file_info->extrafield_size)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 289 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 290 | err = mz_zip_extrafield_read(file_extra_stream, &field_type, &field_length); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 291 | field_pos += 4; |
Nathan Moinvaziri | feb86c5 | 2018-11-05 11:40:21 -0800 | [diff] [blame] | 292 | |
| 293 | // Don't allow field length to exceed size of remaining extrafield |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 294 | if (field_length > (file_info->extrafield_size - field_pos)) |
Nathan Moinvaziri | 1d6d183 | 2018-11-10 09:03:55 -0800 | [diff] [blame] | 295 | field_length = (uint16_t)(file_info->extrafield_size - field_pos); |
Nathan Moinvaziri | feb86c5 | 2018-11-05 11:40:21 -0800 | [diff] [blame] | 296 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 297 | // Read ZIP64 extra field |
Nathan Moinvaziri | 761d28e | 2018-11-07 06:47:15 -0800 | [diff] [blame] | 298 | if ((field_type == MZ_ZIP_EXTENSION_ZIP64) && (field_length >= 8)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 299 | { |
| 300 | if ((err == MZ_OK) && (file_info->uncompressed_size == UINT32_MAX)) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 301 | err = mz_stream_read_int64(file_extra_stream, &file_info->uncompressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 302 | if ((err == MZ_OK) && (file_info->compressed_size == UINT32_MAX)) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 303 | err = mz_stream_read_int64(file_extra_stream, &file_info->compressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 304 | if ((err == MZ_OK) && (file_info->disk_offset == UINT32_MAX)) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 305 | err = mz_stream_read_int64(file_extra_stream, &file_info->disk_offset); |
juanii | 4ae7992 | 2018-02-11 14:29:36 -0300 | [diff] [blame] | 306 | if ((err == MZ_OK) && (file_info->disk_number == UINT16_MAX)) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 307 | err = mz_stream_read_uint32(file_extra_stream, &file_info->disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 308 | } |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 309 | // Read NTFS extra field |
Nathan Moinvaziri | 761d28e | 2018-11-07 06:47:15 -0800 | [diff] [blame] | 310 | else if ((field_type == MZ_ZIP_EXTENSION_NTFS) && (field_length > 4)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 311 | { |
Nathan Moinvaziri | 7a3b698 | 2018-05-09 00:45:02 -0700 | [diff] [blame] | 312 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 313 | err = mz_stream_read_uint32(file_extra_stream, &reserved); |
| 314 | field_length_read = 4; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 315 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 316 | while ((err == MZ_OK) && (field_length_read + 4 <= field_length)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 317 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 318 | err = mz_stream_read_uint16(file_extra_stream, &ntfs_attrib_id); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 319 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 320 | err = mz_stream_read_uint16(file_extra_stream, &ntfs_attrib_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 321 | field_length_read += 4; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 322 | |
Nathan Moinvaziri | 7a3b698 | 2018-05-09 00:45:02 -0700 | [diff] [blame] | 323 | if ((err == MZ_OK) && (ntfs_attrib_id == 0x01) && (ntfs_attrib_size == 24)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 324 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 325 | err = mz_stream_read_uint64(file_extra_stream, &ntfs_time); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 326 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->modified_date); |
| 327 | |
juanii | 7063b0e | 2018-02-11 13:56:21 -0300 | [diff] [blame] | 328 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 329 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 330 | err = mz_stream_read_uint64(file_extra_stream, &ntfs_time); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 331 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->accessed_date); |
| 332 | } |
juanii | 7063b0e | 2018-02-11 13:56:21 -0300 | [diff] [blame] | 333 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 334 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 335 | err = mz_stream_read_uint64(file_extra_stream, &ntfs_time); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 336 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->creation_date); |
| 337 | } |
| 338 | } |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 339 | else if ((err == MZ_OK) && (field_length_read + ntfs_attrib_size <= field_length)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 340 | { |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 341 | err = mz_stream_seek(file_extra_stream, ntfs_attrib_size, MZ_SEEK_CUR); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 342 | } |
| 343 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 344 | field_length_read += ntfs_attrib_size; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 345 | } |
| 346 | } |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 347 | // Read UNIX1 extra field |
Nathan Moinvaziri | 761d28e | 2018-11-07 06:47:15 -0800 | [diff] [blame] | 348 | else if ((field_type == MZ_ZIP_EXTENSION_UNIX1) && (field_length >= 12)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 349 | { |
| 350 | if (err == MZ_OK && file_info->accessed_date == 0) |
| 351 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 352 | err = mz_stream_read_uint32(file_extra_stream, &value32); |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 353 | if (err == MZ_OK) |
| 354 | file_info->accessed_date = value32; |
| 355 | } |
| 356 | if (err == MZ_OK && file_info->modified_date == 0) |
| 357 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 358 | err = mz_stream_read_uint32(file_extra_stream, &value32); |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 359 | if (err == MZ_OK) |
| 360 | file_info->modified_date = value32; |
| 361 | } |
| 362 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 363 | err = mz_stream_read_uint16(file_extra_stream, &value16); // User id |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 364 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 365 | err = mz_stream_read_uint16(file_extra_stream, &value16); // Group id |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 366 | |
| 367 | // Skip variable data |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 368 | mz_stream_seek(file_extra_stream, field_length - 12, MZ_SEEK_CUR); |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 369 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 370 | #ifdef HAVE_AES |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 371 | // Read AES extra field |
Nathan Moinvaziri | 761d28e | 2018-11-07 06:47:15 -0800 | [diff] [blame] | 372 | else if ((field_type == MZ_ZIP_EXTENSION_AES) && (field_length == 7)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 373 | { |
| 374 | uint8_t value8 = 0; |
| 375 | // Verify version info |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 376 | err = mz_stream_read_uint16(file_extra_stream, &value16); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 377 | // Support AE-1 and AE-2 |
| 378 | if (value16 != 1 && value16 != 2) |
| 379 | err = MZ_FORMAT_ERROR; |
| 380 | file_info->aes_version = value16; |
| 381 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 382 | err = mz_stream_read_uint8(file_extra_stream, &value8); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 383 | if ((char)value8 != 'A') |
| 384 | err = MZ_FORMAT_ERROR; |
| 385 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 386 | err = mz_stream_read_uint8(file_extra_stream, &value8); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 387 | if ((char)value8 != 'E') |
| 388 | err = MZ_FORMAT_ERROR; |
| 389 | // Get AES encryption strength and actual compression method |
| 390 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 391 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 392 | err = mz_stream_read_uint8(file_extra_stream, &value8); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 393 | file_info->aes_encryption_mode = value8; |
| 394 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 395 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 396 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 397 | err = mz_stream_read_uint16(file_extra_stream, &value16); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 398 | file_info->compression_method = value16; |
| 399 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 400 | } |
| 401 | #endif |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 402 | else if (field_length > 0) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 403 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 404 | err = mz_stream_seek(file_extra_stream, field_length, MZ_SEEK_CUR); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 405 | } |
| 406 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 407 | field_pos += field_length; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 408 | } |
| 409 | } |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 410 | |
| 411 | // Get pointers to variable length data |
| 412 | mz_stream_mem_get_buffer(file_extra_stream, (const void **)&file_info->filename); |
| 413 | if (extrafield_pos >= 0) |
| 414 | mz_stream_mem_get_buffer_at(file_extra_stream, extrafield_pos, (const void **)&file_info->extrafield); |
| 415 | if (comment_pos >= 0) |
| 416 | mz_stream_mem_get_buffer_at(file_extra_stream, comment_pos, (const void **)&file_info->comment); |
| 417 | |
| 418 | // Set to empty string just in-case |
| 419 | if (file_info->filename == NULL) |
| 420 | file_info->filename = ""; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 421 | if (file_info->extrafield == NULL) |
| 422 | file_info->extrafield_size = 0; |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 423 | if (file_info->comment == NULL) |
| 424 | file_info->comment = ""; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 425 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 426 | if (err == MZ_OK) |
| 427 | { |
| 428 | mz_zip_print("Zip - Entry - Read header - %s (local %"PRId8")\n", |
| 429 | file_info->filename, local); |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 430 | mz_zip_print("Zip - Entry - Read header compress (ucs %lld cs %lld crc 0x%08x)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 431 | file_info->uncompressed_size, file_info->compressed_size, file_info->crc); |
| 432 | if (!local) |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 433 | mz_zip_print("Zip - Entry - Read header disk (disk %d offset %lld)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 434 | file_info->disk_number, file_info->disk_offset); |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 435 | mz_zip_print("Zip - Entry - Read header variable (fnl %d efs %d cms %d)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 436 | file_info->filename_size, file_info->extrafield_size, file_info->comment_size); |
| 437 | } |
| 438 | |
| 439 | return err; |
| 440 | } |
| 441 | |
| 442 | static int32_t mz_zip_entry_read_descriptor(void *stream, uint8_t zip64, uint32_t *crc32, int64_t *compressed_size, int64_t *uncompressed_size) |
| 443 | { |
| 444 | uint32_t value32 = 0; |
| 445 | int64_t value64 = 0; |
| 446 | int32_t err = MZ_OK; |
| 447 | |
| 448 | |
| 449 | err = mz_stream_read_uint32(stream, &value32); |
| 450 | if (value32 != MZ_ZIP_MAGIC_DATADESCRIPTOR) |
| 451 | err = MZ_FORMAT_ERROR; |
| 452 | if (err == MZ_OK) |
| 453 | err = mz_stream_read_uint32(stream, &value32); |
| 454 | if ((err == MZ_OK) && (crc32 != NULL)) |
| 455 | *crc32 = value32; |
| 456 | if (err == MZ_OK) |
| 457 | { |
| 458 | // If zip 64 extension is enabled then read as 8 byte |
| 459 | if (!zip64) |
| 460 | { |
| 461 | err = mz_stream_read_uint32(stream, &value32); |
| 462 | value64 = value32; |
| 463 | } |
| 464 | else |
| 465 | err = mz_stream_read_int64(stream, &value64); |
| 466 | if ((err == MZ_OK) && (compressed_size != NULL)) |
| 467 | *compressed_size = value64; |
| 468 | } |
| 469 | if (err == MZ_OK) |
| 470 | { |
| 471 | if (!zip64) |
| 472 | { |
| 473 | err = mz_stream_read_uint32(stream, &value32); |
| 474 | value64 = value32; |
| 475 | } |
| 476 | else |
| 477 | err = mz_stream_read_int64(stream, &value64); |
| 478 | if ((err == MZ_OK) && (uncompressed_size != NULL)) |
| 479 | *uncompressed_size = value64; |
| 480 | } |
| 481 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 482 | return err; |
| 483 | } |
| 484 | |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 485 | static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_file *file_info) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 486 | { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 487 | uint64_t ntfs_time = 0; |
| 488 | uint32_t reserved = 0; |
| 489 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 490 | uint16_t extrafield_size = 0; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 491 | uint16_t field_type = 0; |
| 492 | uint16_t field_length = 0; |
| 493 | uint16_t field_length_zip64 = 0; |
| 494 | uint16_t field_length_ntfs = 0; |
| 495 | uint16_t field_length_aes = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 496 | uint16_t filename_size = 0; |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 497 | uint16_t filename_length = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 498 | uint16_t comment_size = 0; |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 499 | uint16_t version_needed = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 500 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 501 | int32_t err_mem = MZ_OK; |
| 502 | uint8_t zip64 = 0; |
| 503 | uint8_t skip_aes = 0; |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 504 | uint8_t mask = 0; |
| 505 | uint8_t write_end_slash = 0; |
| 506 | const char *filename = NULL; |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 507 | char masked_name[64]; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 508 | void *file_extra_stream = NULL; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 509 | |
| 510 | if (file_info == NULL) |
| 511 | return MZ_PARAM_ERROR; |
| 512 | |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 513 | if ((local) && (file_info->flag & MZ_ZIP_FLAG_MASK_LOCAL_INFO)) |
| 514 | mask = 1; |
| 515 | |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 516 | // Calculate extra field sizes |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 517 | if (file_info->uncompressed_size >= UINT32_MAX) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 518 | field_length_zip64 += 8; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 519 | if (file_info->compressed_size >= UINT32_MAX) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 520 | field_length_zip64 += 8; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 521 | if (file_info->disk_offset >= UINT32_MAX) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 522 | field_length_zip64 += 8; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 523 | |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 524 | if (file_info->zip64 == MZ_ZIP64_AUTO) |
Nathan Moinvaziri | 121e088 | 2018-05-03 17:57:20 -0700 | [diff] [blame] | 525 | { |
| 526 | // If uncompressed size is unknown, assume zip64 for 64-bit data descriptors |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 527 | zip64 = (local && file_info->uncompressed_size == 0) || (field_length_zip64 > 0); |
Nathan Moinvaziri | 121e088 | 2018-05-03 17:57:20 -0700 | [diff] [blame] | 528 | } |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 529 | else if (file_info->zip64 == MZ_ZIP64_FORCE) |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 530 | { |
Nathan Moinvaziri | a56a08c | 2018-05-03 09:35:37 -0700 | [diff] [blame] | 531 | zip64 = 1; |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 532 | } |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 533 | else if (file_info->zip64 == MZ_ZIP64_DISABLE) |
Nathan Moinvaziri | a56a08c | 2018-05-03 09:35:37 -0700 | [diff] [blame] | 534 | { |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 535 | // Zip64 extension is required to zip file |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 536 | if (field_length_zip64 > 0) |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 537 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | a56a08c | 2018-05-03 09:35:37 -0700 | [diff] [blame] | 538 | } |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 539 | |
| 540 | if (zip64) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 541 | { |
| 542 | extrafield_size += 4; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 543 | extrafield_size += field_length_zip64; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 544 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 545 | |
| 546 | // Calculate extra field size and check for duplicates |
| 547 | if (file_info->extrafield_size > 0) |
| 548 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 549 | mz_stream_mem_create(&file_extra_stream); |
Nathan Moinvaziri | 915c513 | 2018-10-26 20:00:52 -0700 | [diff] [blame] | 550 | mz_stream_mem_set_buffer(file_extra_stream, (void *)file_info->extrafield, |
| 551 | file_info->extrafield_size); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 552 | |
| 553 | do |
| 554 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 555 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_type); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 556 | if (err_mem == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 557 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_length); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 558 | if (err_mem != MZ_OK) |
| 559 | break; |
| 560 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 561 | // Prefer incoming aes extensions over ours |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 562 | if (field_type == MZ_ZIP_EXTENSION_AES) |
| 563 | skip_aes = 1; |
| 564 | |
| 565 | // Prefer our zip64, ntfs extension over incoming |
| 566 | if (field_type != MZ_ZIP_EXTENSION_ZIP64 && field_type != MZ_ZIP_EXTENSION_NTFS) |
| 567 | extrafield_size += 4 + field_length; |
| 568 | |
| 569 | if (err_mem == MZ_OK) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 570 | err_mem = mz_stream_seek(file_extra_stream, field_length, MZ_SEEK_CUR); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 571 | } |
| 572 | while (err_mem == MZ_OK); |
| 573 | } |
| 574 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 575 | #ifdef HAVE_AES |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 576 | if (!skip_aes) |
| 577 | { |
| 578 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 579 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 580 | field_length_aes = 1 + 1 + 1 + 2 + 2; |
| 581 | extrafield_size += 4 + field_length_aes; |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 582 | } |
| 583 | } |
Nathan Moinvaziri | a2bb08c | 2018-10-28 13:45:30 -0700 | [diff] [blame] | 584 | #else |
Nathan Moinvaziri | 4ae469a | 2018-10-28 15:32:04 -0700 | [diff] [blame] | 585 | MZ_UNUSED(skip_aes); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 586 | #endif |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 587 | // NTFS timestamps |
Nathan Moinvaziri | d9e159a | 2018-02-13 15:30:30 -0800 | [diff] [blame] | 588 | if ((file_info->modified_date != 0) && |
| 589 | (file_info->accessed_date != 0) && |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 590 | (file_info->creation_date != 0) && (!mask)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 591 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 592 | field_length_ntfs = 8 + 8 + 8 + 4 + 2 + 2; |
| 593 | extrafield_size += 4 + field_length_ntfs; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 594 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 595 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 596 | if (local) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 597 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_LOCALHEADER); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 598 | else |
| 599 | { |
| 600 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_CENTRALHEADER); |
| 601 | if (err == MZ_OK) |
| 602 | err = mz_stream_write_uint16(stream, file_info->version_madeby); |
| 603 | } |
| 604 | |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 605 | // Calculate version needed to extract |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 606 | if (err == MZ_OK) |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 607 | { |
| 608 | version_needed = file_info->version_needed; |
| 609 | if (version_needed == 0) |
| 610 | { |
| 611 | version_needed = 20; |
| 612 | if (zip64) |
| 613 | version_needed = 45; |
| 614 | #ifdef HAVE_AES |
| 615 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
| 616 | version_needed = 51; |
| 617 | #endif |
| 618 | #ifdef HAVE_LZMA |
| 619 | if (file_info->compression_method == MZ_COMPRESS_METHOD_LZMA) |
| 620 | version_needed = 63; |
| 621 | #endif |
| 622 | } |
| 623 | err = mz_stream_write_uint16(stream, version_needed); |
| 624 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 625 | if (err == MZ_OK) |
| 626 | err = mz_stream_write_uint16(stream, file_info->flag); |
| 627 | if (err == MZ_OK) |
| 628 | { |
| 629 | #ifdef HAVE_AES |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 630 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 631 | err = mz_stream_write_uint16(stream, MZ_COMPRESS_METHOD_AES); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 632 | else |
| 633 | #endif |
| 634 | err = mz_stream_write_uint16(stream, file_info->compression_method); |
| 635 | } |
| 636 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 637 | { |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 638 | if (file_info->modified_date != 0 && !mask) |
Nathan Moinvaziri | 17cdaec | 2017-10-26 10:18:41 -0700 | [diff] [blame] | 639 | dos_date = mz_zip_time_t_to_dos_date(file_info->modified_date); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 640 | err = mz_stream_write_uint32(stream, dos_date); |
| 641 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 642 | |
| 643 | if (err == MZ_OK) |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 644 | { |
| 645 | if (mask) |
| 646 | err = mz_stream_write_uint32(stream, 0); |
| 647 | else |
| 648 | err = mz_stream_write_uint32(stream, file_info->crc); // crc |
| 649 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 650 | if (err == MZ_OK) |
| 651 | { |
| 652 | if (file_info->compressed_size >= UINT32_MAX) // compr size |
| 653 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
| 654 | else |
| 655 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->compressed_size); |
| 656 | } |
| 657 | if (err == MZ_OK) |
| 658 | { |
| 659 | if (file_info->uncompressed_size >= UINT32_MAX) // uncompr size |
| 660 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 661 | else if (mask) |
| 662 | err = mz_stream_write_uint32(stream, 0); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 663 | else |
| 664 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->uncompressed_size); |
| 665 | } |
| 666 | |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 667 | if (mask) |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 668 | { |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 669 | snprintf(masked_name, sizeof(masked_name), "%x_%llx", file_info->disk_number, |
| 670 | file_info->disk_offset); |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 671 | filename = masked_name; |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 672 | } |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 673 | else |
| 674 | { |
| 675 | filename = file_info->filename; |
| 676 | |
| 677 | if ((mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK) && |
| 678 | ((filename[filename_length - 1] != '/') && (filename[filename_length - 1] != '\\'))) |
| 679 | { |
| 680 | filename_size += 1; |
| 681 | write_end_slash = 1; |
| 682 | } |
| 683 | } |
| 684 | |
| 685 | filename_length = (uint16_t)strlen(filename); |
| 686 | filename_size += filename_length; |
| 687 | |
| 688 | if (err == MZ_OK) |
| 689 | err = mz_stream_write_uint16(stream, filename_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 690 | if (err == MZ_OK) |
| 691 | err = mz_stream_write_uint16(stream, extrafield_size); |
| 692 | |
| 693 | if (!local) |
| 694 | { |
| 695 | if (file_info->comment != NULL) |
| 696 | comment_size = (uint16_t)strlen(file_info->comment); |
| 697 | if (err == MZ_OK) |
| 698 | err = mz_stream_write_uint16(stream, comment_size); |
| 699 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 700 | err = mz_stream_write_uint16(stream, (uint16_t)file_info->disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 701 | if (err == MZ_OK) |
| 702 | err = mz_stream_write_uint16(stream, file_info->internal_fa); |
| 703 | if (err == MZ_OK) |
| 704 | err = mz_stream_write_uint32(stream, file_info->external_fa); |
| 705 | if (err == MZ_OK) |
| 706 | { |
| 707 | if (file_info->disk_offset >= UINT32_MAX) |
| 708 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
| 709 | else |
| 710 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->disk_offset); |
| 711 | } |
| 712 | } |
| 713 | |
| 714 | if (err == MZ_OK) |
| 715 | { |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 716 | if (mz_stream_write(stream, filename, filename_length) != filename_length) |
Nathan Moinvaziri | 05e03ca | 2018-10-28 16:15:13 -0700 | [diff] [blame] | 717 | err = MZ_WRITE_ERROR; |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 718 | |
| 719 | // Ensure that directories have a slash appended to them for compatibility |
| 720 | if (err == MZ_OK && write_end_slash) |
| 721 | err = mz_stream_write_uint8(stream, '/'); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 722 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 723 | |
| 724 | if (file_info->extrafield_size > 0) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 725 | { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 726 | err_mem = mz_stream_mem_seek(file_extra_stream, 0, MZ_SEEK_SET); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 727 | while (err == MZ_OK && err_mem == MZ_OK) |
| 728 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 729 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_type); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 730 | if (err_mem == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 731 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_length); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 732 | if (err_mem != MZ_OK) |
| 733 | break; |
| 734 | |
| 735 | // Prefer our zip 64, ntfs extensions over incoming |
| 736 | if (field_type == MZ_ZIP_EXTENSION_ZIP64 || field_type == MZ_ZIP_EXTENSION_NTFS) |
| 737 | { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 738 | err_mem = mz_stream_seek(file_extra_stream, field_length, MZ_SEEK_CUR); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 739 | continue; |
| 740 | } |
| 741 | |
| 742 | err = mz_stream_write_uint16(stream, field_type); |
| 743 | if (err == MZ_OK) |
| 744 | err = mz_stream_write_uint16(stream, field_length); |
| 745 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 746 | err = mz_stream_copy(stream, file_extra_stream, field_length); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 747 | } |
| 748 | |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 749 | mz_stream_mem_delete(&file_extra_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 750 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 751 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 752 | // Write ZIP64 extra field |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 753 | if ((err == MZ_OK) && (zip64)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 754 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 755 | err = mz_zip_extrafield_write(stream, MZ_ZIP_EXTENSION_ZIP64, field_length_zip64); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 756 | if ((err == MZ_OK) && (file_info->uncompressed_size >= UINT32_MAX)) |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 757 | { |
| 758 | if (mask) |
| 759 | err = mz_stream_write_int64(stream, 0); |
| 760 | else |
| 761 | err = mz_stream_write_int64(stream, file_info->uncompressed_size); |
| 762 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 763 | if ((err == MZ_OK) && (file_info->compressed_size >= UINT32_MAX)) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 764 | err = mz_stream_write_int64(stream, file_info->compressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 765 | if ((err == MZ_OK) && (file_info->disk_offset >= UINT32_MAX)) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 766 | err = mz_stream_write_int64(stream, file_info->disk_offset); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 767 | } |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 768 | // Write NTFS extra field |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 769 | if ((err == MZ_OK) && (field_length_ntfs > 0)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 770 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 771 | err = mz_zip_extrafield_write(stream, MZ_ZIP_EXTENSION_NTFS, field_length_ntfs); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 772 | if (err == MZ_OK) |
| 773 | err = mz_stream_write_uint32(stream, reserved); |
| 774 | if (err == MZ_OK) |
| 775 | err = mz_stream_write_uint16(stream, 0x01); |
| 776 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 777 | err = mz_stream_write_uint16(stream, field_length_ntfs - 8); |
juanii | 3679a3d | 2018-02-11 13:55:38 -0300 | [diff] [blame] | 778 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 779 | { |
| 780 | mz_zip_unix_to_ntfs_time(file_info->modified_date, &ntfs_time); |
| 781 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 782 | } |
juanii | 3679a3d | 2018-02-11 13:55:38 -0300 | [diff] [blame] | 783 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 784 | { |
| 785 | mz_zip_unix_to_ntfs_time(file_info->accessed_date, &ntfs_time); |
| 786 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 787 | } |
juanii | 3679a3d | 2018-02-11 13:55:38 -0300 | [diff] [blame] | 788 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 789 | { |
| 790 | mz_zip_unix_to_ntfs_time(file_info->creation_date, &ntfs_time); |
| 791 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 792 | } |
| 793 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 794 | #ifdef HAVE_AES |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 795 | // Write AES extra field |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 796 | if ((err == MZ_OK) && (!skip_aes) && (file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 797 | { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 798 | err = mz_zip_extrafield_write(stream, MZ_ZIP_EXTENSION_AES, field_length_aes); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 799 | if (err == MZ_OK) |
| 800 | err = mz_stream_write_uint16(stream, file_info->aes_version); |
| 801 | if (err == MZ_OK) |
| 802 | err = mz_stream_write_uint8(stream, 'A'); |
| 803 | if (err == MZ_OK) |
| 804 | err = mz_stream_write_uint8(stream, 'E'); |
| 805 | if (err == MZ_OK) |
| 806 | err = mz_stream_write_uint8(stream, file_info->aes_encryption_mode); |
| 807 | if (err == MZ_OK) |
| 808 | err = mz_stream_write_uint16(stream, file_info->compression_method); |
| 809 | } |
| 810 | #endif |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 811 | if ((err == MZ_OK) && (!local) && (file_info->comment != NULL)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 812 | { |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 813 | if (mz_stream_write(stream, file_info->comment, file_info->comment_size) != file_info->comment_size) |
Nathan Moinvaziri | 05e03ca | 2018-10-28 16:15:13 -0700 | [diff] [blame] | 814 | err = MZ_WRITE_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 815 | } |
| 816 | |
| 817 | return err; |
| 818 | } |
| 819 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 820 | static int32_t mz_zip_entry_write_descriptor(void *stream, uint32_t crc32, int64_t compressed_size, int64_t uncompressed_size) |
| 821 | { |
| 822 | int32_t err = MZ_OK; |
| 823 | |
| 824 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_DATADESCRIPTOR); |
| 825 | if (err == MZ_OK) |
| 826 | err = mz_stream_write_uint32(stream, crc32); |
| 827 | |
| 828 | // Store data descriptor as 8 bytes if zip 64 extension enabled |
| 829 | if (err == MZ_OK) |
| 830 | { |
| 831 | // Zip 64 extension is enabled when uncompressed size is > UINT32_MAX |
| 832 | if (uncompressed_size <= UINT32_MAX) |
| 833 | err = mz_stream_write_uint32(stream, (uint32_t)compressed_size); |
| 834 | else |
| 835 | err = mz_stream_write_int64(stream, compressed_size); |
| 836 | } |
| 837 | if (err == MZ_OK) |
| 838 | { |
| 839 | if (uncompressed_size <= UINT32_MAX) |
| 840 | err = mz_stream_write_uint32(stream, (uint32_t)uncompressed_size); |
| 841 | else |
| 842 | err = mz_stream_write_int64(stream, uncompressed_size); |
| 843 | } |
| 844 | |
| 845 | return err; |
| 846 | } |
| 847 | |
| 848 | static int32_t mz_zip_read_cd(void *handle) |
| 849 | { |
| 850 | mz_zip *zip = (mz_zip *)handle; |
| 851 | uint64_t number_entry_cd64 = 0; |
| 852 | uint64_t number_entry = 0; |
| 853 | uint64_t number_entry_cd = 0; |
| 854 | int64_t eocd_pos = 0; |
| 855 | int64_t eocd_pos64 = 0; |
| 856 | int64_t value64i = 0; |
| 857 | uint16_t value16 = 0; |
| 858 | uint32_t value32 = 0; |
| 859 | uint64_t value64 = 0; |
| 860 | uint16_t comment_size = 0; |
| 861 | int32_t comment_read = 0; |
| 862 | int32_t err = MZ_OK; |
| 863 | |
| 864 | |
| 865 | if (zip == NULL) |
| 866 | return MZ_PARAM_ERROR; |
| 867 | |
| 868 | // Read and cache central directory records |
| 869 | err = mz_zip_search_eocd(zip->stream, &eocd_pos); |
| 870 | if (err == MZ_OK) |
| 871 | { |
| 872 | // The signature, already checked |
| 873 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 874 | // Number of this disk |
| 875 | if (err == MZ_OK) |
| 876 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 877 | // Number of the disk with the start of the central directory |
| 878 | if (err == MZ_OK) |
| 879 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 880 | zip->disk_number_with_cd = value16; |
| 881 | // Total number of entries in the central dir on this disk |
| 882 | if (err == MZ_OK) |
| 883 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 884 | zip->number_entry = value16; |
| 885 | // Total number of entries in the central dir |
| 886 | if (err == MZ_OK) |
| 887 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 888 | number_entry_cd = value16; |
| 889 | if (number_entry_cd != zip->number_entry) |
| 890 | err = MZ_FORMAT_ERROR; |
| 891 | // Size of the central directory |
| 892 | if (err == MZ_OK) |
| 893 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 894 | if (err == MZ_OK) |
| 895 | zip->cd_size = value32; |
| 896 | // Offset of start of central directory with respect to the starting disk number |
| 897 | if (err == MZ_OK) |
| 898 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 899 | if (err == MZ_OK) |
| 900 | zip->cd_offset = value32; |
| 901 | // Zip file global comment length |
| 902 | if (err == MZ_OK) |
| 903 | err = mz_stream_read_uint16(zip->stream, &comment_size); |
| 904 | if ((err == MZ_OK) && (comment_size > 0)) |
| 905 | { |
| 906 | zip->comment = (char *)MZ_ALLOC(comment_size + 1); |
| 907 | if (zip->comment != NULL) |
| 908 | { |
| 909 | comment_read = mz_stream_read(zip->stream, zip->comment, comment_size); |
| 910 | // Don't fail if incorrect comment length read, not critical |
| 911 | if (comment_read < 0) |
| 912 | comment_read = 0; |
| 913 | zip->comment[comment_read] = 0; |
| 914 | } |
| 915 | } |
| 916 | |
| 917 | if ((err == MZ_OK) && ((number_entry_cd == UINT16_MAX) || (zip->cd_offset == UINT32_MAX))) |
| 918 | { |
| 919 | // Format should be Zip64, as the central directory or file size is too large |
| 920 | if (mz_zip_search_zip64_eocd(zip->stream, eocd_pos, &eocd_pos64) == MZ_OK) |
| 921 | { |
| 922 | eocd_pos = eocd_pos64; |
| 923 | |
| 924 | err = mz_stream_seek(zip->stream, eocd_pos, MZ_SEEK_SET); |
| 925 | // The signature, already checked |
| 926 | if (err == MZ_OK) |
| 927 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 928 | // Size of zip64 end of central directory record |
| 929 | if (err == MZ_OK) |
| 930 | err = mz_stream_read_uint64(zip->stream, &value64); |
| 931 | // Version made by |
| 932 | if (err == MZ_OK) |
| 933 | err = mz_stream_read_uint16(zip->stream, &zip->version_madeby); |
| 934 | // Version needed to extract |
| 935 | if (err == MZ_OK) |
| 936 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 937 | // Number of this disk |
| 938 | if (err == MZ_OK) |
| 939 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 940 | // Number of the disk with the start of the central directory |
| 941 | if (err == MZ_OK) |
| 942 | err = mz_stream_read_uint32(zip->stream, &zip->disk_number_with_cd); |
| 943 | // Total number of entries in the central directory on this disk |
| 944 | if (err == MZ_OK) |
| 945 | err = mz_stream_read_uint64(zip->stream, &number_entry); |
| 946 | // Total number of entries in the central directory |
| 947 | if (err == MZ_OK) |
| 948 | err = mz_stream_read_uint64(zip->stream, &number_entry_cd64); |
| 949 | if (number_entry == UINT32_MAX) |
| 950 | zip->number_entry = number_entry_cd64; |
| 951 | // Size of the central directory |
| 952 | if (err == MZ_OK) |
| 953 | err = mz_stream_read_int64(zip->stream, &zip->cd_size); |
| 954 | // Offset of start of central directory with respect to the starting disk number |
| 955 | if (err == MZ_OK) |
| 956 | err = mz_stream_read_int64(zip->stream, &zip->cd_offset); |
| 957 | } |
| 958 | else if ((zip->number_entry == UINT16_MAX) || (number_entry_cd != zip->number_entry) || |
| 959 | (zip->cd_size == UINT16_MAX) || (zip->cd_offset == UINT32_MAX)) |
| 960 | { |
| 961 | err = MZ_FORMAT_ERROR; |
| 962 | } |
| 963 | } |
| 964 | } |
| 965 | |
| 966 | if (err == MZ_OK) |
| 967 | { |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 968 | mz_zip_print("Zip - Read cd (disk %d entries %lld offset %lld size %lld)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 969 | zip->disk_number_with_cd, zip->number_entry, zip->cd_offset, zip->cd_size); |
| 970 | |
| 971 | // Verify central directory signature exists at offset |
| 972 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 973 | if (err == MZ_OK) |
| 974 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 975 | if (value32 != MZ_ZIP_MAGIC_CENTRALHEADER) |
| 976 | { |
| 977 | // If not found attempt to seek backward to find it |
| 978 | err = mz_stream_seek(zip->stream, eocd_pos - zip->cd_size, MZ_SEEK_SET); |
| 979 | if (err == MZ_OK) |
| 980 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 981 | if (value32 == MZ_ZIP_MAGIC_CENTRALHEADER) |
| 982 | { |
| 983 | // If found compensate for incorrect locations |
| 984 | value64i = zip->cd_offset; |
| 985 | zip->cd_offset = eocd_pos - zip->cd_size; |
| 986 | // Assume disk has prepended data |
| 987 | zip->disk_offset_shift = zip->cd_offset - value64i; |
| 988 | } |
| 989 | } |
| 990 | } |
| 991 | |
| 992 | if (err == MZ_OK) |
| 993 | { |
| 994 | if (eocd_pos < zip->cd_offset) |
| 995 | { |
| 996 | // End of central dir should always come after central dir |
| 997 | err = MZ_FORMAT_ERROR; |
| 998 | } |
| 999 | else if (eocd_pos < zip->cd_offset + zip->cd_size) |
| 1000 | { |
| 1001 | // Truncate size of cd if incorrect size or offset provided |
| 1002 | zip->cd_size = eocd_pos - zip->cd_offset; |
| 1003 | } |
| 1004 | } |
| 1005 | |
| 1006 | return err; |
| 1007 | } |
| 1008 | |
| 1009 | static int32_t mz_zip_write_cd(void *handle) |
| 1010 | { |
| 1011 | mz_zip *zip = (mz_zip *)handle; |
| 1012 | int64_t zip64_eocd_pos_inzip = 0; |
| 1013 | uint16_t comment_size = 0; |
| 1014 | int64_t disk_number = 0; |
| 1015 | int64_t disk_size = 0; |
| 1016 | int32_t err = MZ_OK; |
| 1017 | |
| 1018 | |
| 1019 | if (zip == NULL) |
| 1020 | return MZ_PARAM_ERROR; |
| 1021 | |
| 1022 | if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number) == MZ_OK) |
| 1023 | zip->disk_number_with_cd = (uint32_t)disk_number; |
| 1024 | if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_SIZE, &disk_size) == MZ_OK && disk_size > 0) |
| 1025 | zip->disk_number_with_cd += 1; |
| 1026 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
| 1027 | |
| 1028 | zip->cd_offset = mz_stream_tell(zip->stream); |
| 1029 | mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_END); |
| 1030 | zip->cd_size = (uint32_t)mz_stream_tell(zip->cd_mem_stream); |
| 1031 | mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_SET); |
| 1032 | |
| 1033 | err = mz_stream_copy(zip->stream, zip->cd_mem_stream, (int32_t)zip->cd_size); |
| 1034 | |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1035 | mz_zip_print("Zip - Write cd (disk %d entries %lld offset %lld size %lld)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1036 | zip->disk_number_with_cd, zip->number_entry, zip->cd_offset, zip->cd_size); |
| 1037 | |
| 1038 | // Write the ZIP64 central directory header |
| 1039 | if (zip->cd_offset >= UINT32_MAX || zip->number_entry > UINT16_MAX) |
| 1040 | { |
| 1041 | zip64_eocd_pos_inzip = mz_stream_tell(zip->stream); |
| 1042 | |
| 1043 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDHEADER64); |
| 1044 | |
| 1045 | // Size of this 'zip64 end of central directory' |
| 1046 | if (err == MZ_OK) |
| 1047 | err = mz_stream_write_uint64(zip->stream, (uint64_t)44); |
| 1048 | // Version made by |
| 1049 | if (err == MZ_OK) |
| 1050 | err = mz_stream_write_uint16(zip->stream, zip->version_madeby); |
| 1051 | // Version needed |
| 1052 | if (err == MZ_OK) |
| 1053 | err = mz_stream_write_uint16(zip->stream, (uint16_t)45); |
| 1054 | // Number of this disk |
| 1055 | if (err == MZ_OK) |
| 1056 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
| 1057 | // Number of the disk with the start of the central directory |
| 1058 | if (err == MZ_OK) |
| 1059 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
| 1060 | // Total number of entries in the central dir on this disk |
| 1061 | if (err == MZ_OK) |
| 1062 | err = mz_stream_write_uint64(zip->stream, zip->number_entry); |
| 1063 | // Total number of entries in the central dir |
| 1064 | if (err == MZ_OK) |
| 1065 | err = mz_stream_write_uint64(zip->stream, zip->number_entry); |
| 1066 | // Size of the central directory |
| 1067 | if (err == MZ_OK) |
| 1068 | err = mz_stream_write_int64(zip->stream, zip->cd_size); |
| 1069 | // Offset of start of central directory with respect to the starting disk number |
| 1070 | if (err == MZ_OK) |
| 1071 | err = mz_stream_write_int64(zip->stream, zip->cd_offset); |
| 1072 | if (err == MZ_OK) |
| 1073 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDLOCHEADER64); |
| 1074 | |
| 1075 | // Number of the disk with the start of the central directory |
| 1076 | if (err == MZ_OK) |
| 1077 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
| 1078 | // Relative offset to the end of zip64 central directory |
| 1079 | if (err == MZ_OK) |
| 1080 | err = mz_stream_write_int64(zip->stream, zip64_eocd_pos_inzip); |
| 1081 | // Number of the disk with the start of the central directory |
| 1082 | if (err == MZ_OK) |
| 1083 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd + 1); |
| 1084 | } |
| 1085 | |
| 1086 | // Write the central directory header |
| 1087 | |
| 1088 | // Signature |
| 1089 | if (err == MZ_OK) |
| 1090 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDHEADER); |
| 1091 | // Number of this disk |
| 1092 | if (err == MZ_OK) |
| 1093 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->disk_number_with_cd); |
| 1094 | // Number of the disk with the start of the central directory |
| 1095 | if (err == MZ_OK) |
| 1096 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->disk_number_with_cd); |
| 1097 | // Total number of entries in the central dir on this disk |
| 1098 | if (err == MZ_OK) |
| 1099 | { |
| 1100 | if (zip->number_entry >= UINT16_MAX) |
| 1101 | err = mz_stream_write_uint16(zip->stream, UINT16_MAX); |
| 1102 | else |
| 1103 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->number_entry); |
| 1104 | } |
| 1105 | // Total number of entries in the central dir |
| 1106 | if (err == MZ_OK) |
| 1107 | { |
| 1108 | if (zip->number_entry >= UINT16_MAX) |
| 1109 | err = mz_stream_write_uint16(zip->stream, UINT16_MAX); |
| 1110 | else |
| 1111 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->number_entry); |
| 1112 | } |
| 1113 | // Size of the central directory |
| 1114 | if (err == MZ_OK) |
| 1115 | err = mz_stream_write_uint32(zip->stream, (uint32_t)zip->cd_size); |
| 1116 | // Offset of start of central directory with respect to the starting disk number |
| 1117 | if (err == MZ_OK) |
| 1118 | { |
| 1119 | if (zip->cd_offset >= UINT32_MAX) |
| 1120 | err = mz_stream_write_uint32(zip->stream, UINT32_MAX); |
| 1121 | else |
| 1122 | err = mz_stream_write_uint32(zip->stream, (uint32_t)zip->cd_offset); |
| 1123 | } |
| 1124 | |
| 1125 | // Write global comment |
| 1126 | if (zip->comment != NULL) |
| 1127 | comment_size = (uint16_t)strlen(zip->comment); |
| 1128 | if (err == MZ_OK) |
| 1129 | err = mz_stream_write_uint16(zip->stream, comment_size); |
| 1130 | if (err == MZ_OK) |
| 1131 | { |
| 1132 | if (mz_stream_write(zip->stream, zip->comment, comment_size) != comment_size) |
| 1133 | err = MZ_READ_ERROR; |
| 1134 | } |
| 1135 | return err; |
| 1136 | } |
| 1137 | |
| 1138 | static int32_t mz_zip_rebuild_cd(void *handle) |
| 1139 | { |
| 1140 | mz_zip *zip = (mz_zip *)handle; |
| 1141 | mz_zip_file local_file_info; |
| 1142 | void *local_file_info_stream = NULL; |
| 1143 | void *file_extra_stream = NULL; |
| 1144 | void *cd_mem_stream = NULL; |
| 1145 | uint64_t number_entry = 0; |
| 1146 | int64_t descriptor_pos = 0; |
| 1147 | int64_t disk_offset = 0; |
| 1148 | int64_t disk_number = 0; |
| 1149 | int64_t compressed_size = 0; |
| 1150 | int64_t uncompressed_size = 0; |
| 1151 | uint8_t descriptor_magic[4] = MZ_ZIP_MAGIC_DATADESCRIPTORU8; |
| 1152 | uint32_t crc32 = 0; |
| 1153 | int32_t disk_number_with_cd = 0; |
| 1154 | int32_t err = MZ_OK; |
| 1155 | uint8_t zip64 = 0; |
| 1156 | |
| 1157 | |
| 1158 | mz_zip_print("Zip - Rebuild cd\n"); |
| 1159 | |
| 1160 | mz_zip_get_cd_mem_stream(handle, &cd_mem_stream); |
| 1161 | |
| 1162 | // Determine if we are on a split disk or not |
| 1163 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, 0); |
| 1164 | if (mz_stream_tell(zip->stream) < 0) |
| 1165 | { |
| 1166 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
| 1167 | mz_stream_seek(zip->stream, 0, MZ_SEEK_SET); |
| 1168 | } |
| 1169 | else |
| 1170 | disk_number_with_cd = 1; |
| 1171 | |
| 1172 | if (mz_stream_is_open(cd_mem_stream) != MZ_OK) |
| 1173 | err = mz_stream_mem_open(cd_mem_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1174 | |
| 1175 | mz_stream_mem_create(&local_file_info_stream); |
| 1176 | mz_stream_mem_open(local_file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1177 | |
| 1178 | while (err == MZ_OK) |
| 1179 | { |
| 1180 | memset(&local_file_info, 0, sizeof(local_file_info)); |
| 1181 | |
| 1182 | // Get current offset and disk number for central dir record |
| 1183 | disk_offset = mz_stream_tell(zip->stream); |
| 1184 | mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number); |
| 1185 | |
| 1186 | // Read local headers |
| 1187 | err = mz_zip_entry_read_header(zip->stream, 1, &local_file_info, local_file_info_stream); |
| 1188 | |
| 1189 | local_file_info.disk_offset = disk_offset; |
| 1190 | if (disk_number < 0) |
| 1191 | disk_number = 0; |
| 1192 | local_file_info.disk_number = (uint32_t)disk_number; |
| 1193 | |
| 1194 | if (err == MZ_OK) |
| 1195 | { |
| 1196 | if (local_file_info.compressed_size > 0) |
| 1197 | { |
| 1198 | err = mz_stream_seek(zip->stream, local_file_info.compressed_size, MZ_SEEK_CUR); |
| 1199 | } |
| 1200 | else if (local_file_info.uncompressed_size > 0) |
| 1201 | { |
| 1202 | err = mz_stream_find(zip->stream, (const void *)descriptor_magic, sizeof(descriptor_magic), |
| 1203 | INT64_MAX, &descriptor_pos); |
| 1204 | } |
| 1205 | } |
| 1206 | |
| 1207 | // Read descriptor if it exists so we can get to the next local header |
| 1208 | if ((err == MZ_OK) && (local_file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR)) |
| 1209 | { |
| 1210 | mz_stream_mem_create(&file_extra_stream); |
| 1211 | mz_stream_mem_set_buffer(file_extra_stream, (void *)local_file_info.extrafield, |
| 1212 | local_file_info.extrafield_size); |
| 1213 | |
| 1214 | zip64 = 0; |
| 1215 | if (mz_zip_extrafield_find(file_extra_stream, MZ_ZIP_EXTENSION_ZIP64, NULL) == MZ_OK) |
| 1216 | zip64 = 1; |
| 1217 | |
| 1218 | mz_stream_mem_delete(&file_extra_stream); |
| 1219 | |
| 1220 | err = mz_zip_entry_read_descriptor(zip->stream, zip64, &crc32, |
| 1221 | &compressed_size, &uncompressed_size); |
| 1222 | |
| 1223 | if (local_file_info.crc == 0) |
| 1224 | local_file_info.crc = crc32; |
| 1225 | if (local_file_info.compressed_size == 0) |
| 1226 | local_file_info.compressed_size = compressed_size; |
| 1227 | if (local_file_info.uncompressed_size == 0) |
| 1228 | local_file_info.uncompressed_size = uncompressed_size; |
| 1229 | } |
| 1230 | |
| 1231 | // Rewrite central dir with local headers and offsets |
| 1232 | if (err == MZ_OK) |
| 1233 | err = mz_zip_entry_write_header(cd_mem_stream, 0, &local_file_info); |
| 1234 | |
| 1235 | if (err == MZ_OK) |
| 1236 | number_entry += 1; |
| 1237 | } |
| 1238 | |
| 1239 | mz_stream_mem_delete(&local_file_info_stream); |
| 1240 | |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1241 | mz_zip_print("Zip - Rebuild cd complete (cddisk %d entries %lld)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1242 | disk_number_with_cd, number_entry); |
| 1243 | |
| 1244 | if (number_entry == 0) |
| 1245 | return err; |
| 1246 | |
| 1247 | // Set new upper seek boundary for central dir mem stream |
| 1248 | disk_offset = mz_stream_tell(cd_mem_stream); |
| 1249 | mz_stream_mem_set_buffer_limit(cd_mem_stream, (int32_t)disk_offset); |
| 1250 | |
| 1251 | // Set new central directory info |
| 1252 | mz_zip_set_cd_stream(handle, 0, cd_mem_stream); |
| 1253 | mz_zip_set_number_entry(handle, number_entry); |
| 1254 | mz_zip_set_disk_number_with_cd(handle, disk_number_with_cd); |
| 1255 | |
| 1256 | return MZ_OK; |
| 1257 | } |
| 1258 | |
| 1259 | void *mz_zip_create(void **handle) |
| 1260 | { |
| 1261 | mz_zip *zip = NULL; |
| 1262 | |
| 1263 | zip = (mz_zip *)MZ_ALLOC(sizeof(mz_zip)); |
| 1264 | if (zip != NULL) |
| 1265 | memset(zip, 0, sizeof(mz_zip)); |
| 1266 | if (handle != NULL) |
| 1267 | *handle = zip; |
| 1268 | |
| 1269 | return zip; |
| 1270 | } |
| 1271 | |
| 1272 | void mz_zip_delete(void **handle) |
| 1273 | { |
| 1274 | mz_zip *zip = NULL; |
| 1275 | if (handle == NULL) |
| 1276 | return; |
| 1277 | zip = (mz_zip *)*handle; |
| 1278 | if (zip != NULL) |
| 1279 | { |
| 1280 | MZ_FREE(zip); |
| 1281 | } |
| 1282 | *handle = NULL; |
| 1283 | } |
| 1284 | |
| 1285 | int32_t mz_zip_open(void *handle, void *stream, int32_t mode) |
| 1286 | { |
| 1287 | mz_zip *zip = (mz_zip *)handle; |
| 1288 | int32_t err = MZ_OK; |
| 1289 | |
| 1290 | |
| 1291 | if (zip == NULL) |
| 1292 | return MZ_PARAM_ERROR; |
| 1293 | |
| 1294 | mz_zip_print("Zip - Open\n"); |
| 1295 | |
| 1296 | zip->stream = stream; |
| 1297 | |
| 1298 | mz_stream_mem_create(&zip->cd_mem_stream); |
| 1299 | |
| 1300 | if (mode & MZ_OPEN_MODE_WRITE) |
| 1301 | { |
| 1302 | mz_stream_mem_open(zip->cd_mem_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1303 | zip->cd_stream = zip->cd_mem_stream; |
| 1304 | } |
| 1305 | else |
| 1306 | { |
| 1307 | zip->cd_stream = stream; |
| 1308 | } |
| 1309 | |
| 1310 | if ((mode & MZ_OPEN_MODE_READ) || (mode & MZ_OPEN_MODE_APPEND)) |
| 1311 | { |
| 1312 | if ((mode & MZ_OPEN_MODE_CREATE) == 0) |
| 1313 | { |
| 1314 | err = mz_zip_read_cd(zip); |
| 1315 | if (err != MZ_OK) |
| 1316 | { |
| 1317 | #if 0 |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1318 | mz_zip_print("Zip - Error detected reading cd (%d)", err); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1319 | if (mz_zip_rebuild_cd(zip) == MZ_OK) |
| 1320 | err = MZ_OK; |
| 1321 | #endif |
| 1322 | } |
| 1323 | } |
| 1324 | |
| 1325 | if ((err == MZ_OK) && (mode & MZ_OPEN_MODE_APPEND)) |
| 1326 | { |
| 1327 | if (zip->cd_size > 0) |
| 1328 | { |
| 1329 | // Store central directory in memory |
| 1330 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 1331 | if (err == MZ_OK) |
| 1332 | err = mz_stream_copy(zip->cd_mem_stream, zip->stream, (int32_t)zip->cd_size); |
| 1333 | if (err == MZ_OK) |
| 1334 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 1335 | } |
| 1336 | else |
| 1337 | { |
| 1338 | // If no central directory, append new zip to end of file |
| 1339 | err = mz_stream_seek(zip->stream, 0, MZ_SEEK_END); |
| 1340 | } |
| 1341 | } |
| 1342 | else |
| 1343 | { |
| 1344 | zip->cd_start_pos = zip->cd_offset; |
| 1345 | } |
| 1346 | } |
| 1347 | |
| 1348 | if (err != MZ_OK) |
| 1349 | { |
| 1350 | mz_zip_close(zip); |
| 1351 | return err; |
| 1352 | } |
| 1353 | |
| 1354 | // Memory streams used to store variable length file info data |
| 1355 | mz_stream_mem_create(&zip->file_info_stream); |
| 1356 | mz_stream_mem_open(zip->file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1357 | |
| 1358 | mz_stream_mem_create(&zip->local_file_info_stream); |
| 1359 | mz_stream_mem_open(zip->local_file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1360 | |
| 1361 | zip->open_mode = mode; |
| 1362 | |
| 1363 | return err; |
| 1364 | } |
| 1365 | |
| 1366 | int32_t mz_zip_close(void *handle) |
| 1367 | { |
| 1368 | mz_zip *zip = (mz_zip *)handle; |
| 1369 | int32_t err = MZ_OK; |
| 1370 | |
| 1371 | if (zip == NULL) |
| 1372 | return MZ_PARAM_ERROR; |
| 1373 | |
| 1374 | mz_zip_print("Zip - Close\n"); |
| 1375 | |
| 1376 | if (mz_zip_entry_is_open(handle) == MZ_OK) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1377 | err = mz_zip_entry_close(handle); |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1378 | |
| 1379 | if ((err == MZ_OK) && (zip->open_mode & MZ_OPEN_MODE_WRITE)) |
| 1380 | err = mz_zip_write_cd(handle); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1381 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1382 | if (zip->cd_mem_stream != NULL) |
| 1383 | { |
| 1384 | mz_stream_close(zip->cd_mem_stream); |
| 1385 | mz_stream_delete(&zip->cd_mem_stream); |
| 1386 | } |
| 1387 | |
| 1388 | if (zip->file_info_stream != NULL) |
| 1389 | { |
| 1390 | mz_stream_mem_close(zip->file_info_stream); |
| 1391 | mz_stream_mem_delete(&zip->file_info_stream); |
| 1392 | } |
| 1393 | if (zip->local_file_info_stream != NULL) |
| 1394 | { |
| 1395 | mz_stream_mem_close(zip->local_file_info_stream); |
| 1396 | mz_stream_mem_delete(&zip->local_file_info_stream); |
| 1397 | } |
| 1398 | |
| 1399 | if (zip->comment) |
| 1400 | { |
| 1401 | MZ_FREE(zip->comment); |
| 1402 | zip->comment = NULL; |
| 1403 | } |
| 1404 | |
| 1405 | zip->stream = NULL; |
| 1406 | zip->cd_stream = NULL; |
| 1407 | |
| 1408 | return err; |
| 1409 | } |
| 1410 | |
| 1411 | int32_t mz_zip_get_comment(void *handle, const char **comment) |
| 1412 | { |
| 1413 | mz_zip *zip = (mz_zip *)handle; |
| 1414 | if (zip == NULL || comment == NULL) |
| 1415 | return MZ_PARAM_ERROR; |
| 1416 | if (zip->comment == NULL) |
| 1417 | return MZ_EXIST_ERROR; |
| 1418 | *comment = zip->comment; |
| 1419 | return MZ_OK; |
| 1420 | } |
| 1421 | |
| 1422 | int32_t mz_zip_set_comment(void *handle, const char *comment) |
| 1423 | { |
| 1424 | mz_zip *zip = (mz_zip *)handle; |
| 1425 | uint16_t comment_size = 0; |
| 1426 | if (zip == NULL || comment == NULL) |
| 1427 | return MZ_PARAM_ERROR; |
| 1428 | if (zip->comment != NULL) |
| 1429 | MZ_FREE(zip->comment); |
| 1430 | comment_size = (uint16_t)(strlen(comment) + 1); |
| 1431 | zip->comment = (char *)MZ_ALLOC(comment_size); |
| 1432 | if (zip->comment == NULL) |
| 1433 | return MZ_MEM_ERROR; |
| 1434 | strncpy(zip->comment, comment, comment_size - 1); |
| 1435 | zip->comment[comment_size - 1] = 0; |
| 1436 | return MZ_OK; |
| 1437 | } |
| 1438 | |
| 1439 | int32_t mz_zip_get_version_madeby(void *handle, uint16_t *version_madeby) |
| 1440 | { |
| 1441 | mz_zip *zip = (mz_zip *)handle; |
| 1442 | if (zip == NULL || version_madeby == NULL) |
| 1443 | return MZ_PARAM_ERROR; |
| 1444 | *version_madeby = zip->version_madeby; |
| 1445 | return MZ_OK; |
| 1446 | } |
| 1447 | |
| 1448 | int32_t mz_zip_set_version_madeby(void *handle, uint16_t version_madeby) |
| 1449 | { |
| 1450 | mz_zip *zip = (mz_zip *)handle; |
| 1451 | if (zip == NULL) |
| 1452 | return MZ_PARAM_ERROR; |
| 1453 | zip->version_madeby = version_madeby; |
| 1454 | return MZ_OK; |
| 1455 | } |
| 1456 | |
| 1457 | int32_t mz_zip_get_stream(void *handle, void **stream) |
| 1458 | { |
| 1459 | mz_zip *zip = (mz_zip *)handle; |
| 1460 | if (zip == NULL || stream == NULL) |
| 1461 | return MZ_PARAM_ERROR; |
| 1462 | *stream = zip->stream; |
| 1463 | if (*stream == NULL) |
| 1464 | return MZ_EXIST_ERROR; |
| 1465 | return MZ_OK; |
| 1466 | } |
| 1467 | |
| 1468 | int32_t mz_zip_set_cd_stream(void *handle, int64_t cd_start_pos, void *cd_stream) |
| 1469 | { |
| 1470 | mz_zip *zip = (mz_zip *)handle; |
| 1471 | if (zip == NULL || cd_stream == NULL) |
| 1472 | return MZ_PARAM_ERROR; |
| 1473 | zip->cd_stream = cd_stream; |
| 1474 | zip->cd_start_pos = cd_start_pos; |
| 1475 | return MZ_OK; |
| 1476 | } |
| 1477 | |
| 1478 | int32_t mz_zip_get_cd_mem_stream(void *handle, void **cd_mem_stream) |
| 1479 | { |
| 1480 | mz_zip *zip = (mz_zip *)handle; |
| 1481 | if (zip == NULL || cd_mem_stream == NULL) |
| 1482 | return MZ_PARAM_ERROR; |
| 1483 | *cd_mem_stream = zip->cd_mem_stream; |
| 1484 | if (*cd_mem_stream == NULL) |
| 1485 | return MZ_EXIST_ERROR; |
| 1486 | return MZ_OK; |
| 1487 | } |
| 1488 | |
| 1489 | static int32_t mz_zip_entry_close_int(void *handle) |
| 1490 | { |
| 1491 | mz_zip *zip = (mz_zip *)handle; |
| 1492 | |
| 1493 | if (zip->crypt_stream != NULL) |
| 1494 | mz_stream_delete(&zip->crypt_stream); |
| 1495 | zip->crypt_stream = NULL; |
| 1496 | if (zip->compress_stream != NULL) |
| 1497 | mz_stream_delete(&zip->compress_stream); |
| 1498 | zip->compress_stream = NULL; |
| 1499 | |
| 1500 | zip->entry_opened = 0; |
| 1501 | |
| 1502 | return MZ_OK; |
| 1503 | } |
| 1504 | |
Nathan Moinvaziri | 26308b2 | 2018-08-08 09:40:15 -0700 | [diff] [blame] | 1505 | static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress_level, const char *password) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1506 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1507 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1508 | int64_t max_total_in = 0; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1509 | int64_t header_size = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1510 | int64_t footer_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1511 | int32_t err = MZ_OK; |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1512 | uint8_t use_crypt = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1513 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1514 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1515 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1516 | |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1517 | switch (zip->file_info.compression_method) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1518 | { |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1519 | case MZ_COMPRESS_METHOD_STORE: |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1520 | case MZ_COMPRESS_METHOD_DEFLATE: |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1521 | #ifdef HAVE_BZIP2 |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1522 | case MZ_COMPRESS_METHOD_BZIP2: |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1523 | #endif |
Nathan Moinvaziri | 566dfe0 | 2018-10-26 00:36:30 -0700 | [diff] [blame] | 1524 | #ifdef HAVE_LZMA |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1525 | case MZ_COMPRESS_METHOD_LZMA: |
| 1526 | #endif |
| 1527 | err = MZ_OK; |
| 1528 | break; |
| 1529 | default: |
Nathan Moinvaziri | 829ffb5 | 2018-08-14 14:00:16 -0700 | [diff] [blame] | 1530 | return MZ_SUPPORT_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1531 | } |
| 1532 | |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1533 | zip->entry_raw = raw; |
| 1534 | |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1535 | if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password != NULL)) |
| 1536 | { |
| 1537 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
| 1538 | { |
| 1539 | // Encrypt only when we are not trying to write raw and password is supplied. |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1540 | if (!zip->entry_raw) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1541 | use_crypt = 1; |
| 1542 | } |
| 1543 | else if (zip->open_mode & MZ_OPEN_MODE_READ) |
| 1544 | { |
| 1545 | // Decrypt only when password is supplied. Don't error when password |
| 1546 | // is not supplied as we may want to read the raw encrypted data. |
| 1547 | use_crypt = 1; |
| 1548 | } |
| 1549 | } |
| 1550 | |
| 1551 | if ((err == MZ_OK) && (use_crypt)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1552 | { |
| 1553 | #ifdef HAVE_AES |
| 1554 | if (zip->file_info.aes_version) |
| 1555 | { |
Nathan Moinvaziri | 21a3102 | 2018-10-24 09:50:16 -0700 | [diff] [blame] | 1556 | mz_stream_wzaes_create(&zip->crypt_stream); |
| 1557 | mz_stream_wzaes_set_password(zip->crypt_stream, password); |
| 1558 | mz_stream_wzaes_set_encryption_mode(zip->crypt_stream, zip->file_info.aes_encryption_mode); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1559 | } |
| 1560 | else |
| 1561 | #endif |
| 1562 | { |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 1563 | #ifdef HAVE_PKCRYPT |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1564 | uint8_t verify1 = 0; |
| 1565 | uint8_t verify2 = 0; |
| 1566 | |
| 1567 | // Info-ZIP modification to ZipCrypto format: |
| 1568 | // If bit 3 of the general purpose bit flag is set, it uses high byte of 16-bit File Time. |
| 1569 | |
Nathan Moinvaziri | 18a3065 | 2017-12-07 06:59:53 -0800 | [diff] [blame] | 1570 | if (zip->file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR) |
| 1571 | { |
| 1572 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1573 | |
Nathan Moinvaziri | 18a3065 | 2017-12-07 06:59:53 -0800 | [diff] [blame] | 1574 | dos_date = mz_zip_time_t_to_dos_date(zip->file_info.modified_date); |
| 1575 | |
| 1576 | verify1 = (uint8_t)((dos_date >> 16) & 0xff); |
| 1577 | verify2 = (uint8_t)((dos_date >> 8) & 0xff); |
| 1578 | } |
| 1579 | else |
| 1580 | { |
| 1581 | verify1 = (uint8_t)((zip->file_info.crc >> 16) & 0xff); |
| 1582 | verify2 = (uint8_t)((zip->file_info.crc >> 24) & 0xff); |
| 1583 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1584 | |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 1585 | mz_stream_pkcrypt_create(&zip->crypt_stream); |
| 1586 | mz_stream_pkcrypt_set_password(zip->crypt_stream, password); |
| 1587 | mz_stream_pkcrypt_set_verify(zip->crypt_stream, verify1, verify2); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1588 | #endif |
| 1589 | } |
| 1590 | } |
| 1591 | |
| 1592 | if (err == MZ_OK) |
| 1593 | { |
| 1594 | if (zip->crypt_stream == NULL) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1595 | mz_stream_raw_create(&zip->crypt_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1596 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1597 | mz_stream_set_base(zip->crypt_stream, zip->stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1598 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1599 | err = mz_stream_open(zip->crypt_stream, NULL, zip->open_mode); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1600 | } |
| 1601 | |
| 1602 | if (err == MZ_OK) |
| 1603 | { |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1604 | if (zip->entry_raw || zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1605 | mz_stream_raw_create(&zip->compress_stream); |
Andy Maloney | 3909c23 | 2018-05-22 09:02:09 -0400 | [diff] [blame] | 1606 | #ifdef HAVE_ZLIB |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1607 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1608 | mz_stream_zlib_create(&zip->compress_stream); |
Andy Maloney | 3909c23 | 2018-05-22 09:02:09 -0400 | [diff] [blame] | 1609 | #endif |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1610 | #ifdef HAVE_BZIP2 |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1611 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_BZIP2) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1612 | mz_stream_bzip_create(&zip->compress_stream); |
| 1613 | #endif |
| 1614 | #ifdef HAVE_LZMA |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1615 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1616 | mz_stream_lzma_create(&zip->compress_stream); |
| 1617 | #endif |
| 1618 | else |
| 1619 | err = MZ_PARAM_ERROR; |
| 1620 | } |
| 1621 | |
| 1622 | if (err == MZ_OK) |
| 1623 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1624 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1625 | { |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1626 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_COMPRESS_LEVEL, compress_level); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1627 | } |
| 1628 | else |
| 1629 | { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1630 | if (zip->entry_raw || zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE || zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1631 | { |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1632 | max_total_in = zip->file_info.compressed_size; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1633 | mz_stream_set_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in); |
| 1634 | |
| 1635 | if (mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_HEADER_SIZE, &header_size) == MZ_OK) |
| 1636 | max_total_in -= header_size; |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1637 | if (mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_FOOTER_SIZE, &footer_size) == MZ_OK) |
| 1638 | max_total_in -= footer_size; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1639 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1640 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1641 | } |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1642 | if ((zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA) && (zip->file_info.flag & MZ_ZIP_FLAG_LZMA_EOS_MARKER) == 0) |
juanii | 55bcdaf | 2018-02-11 20:55:57 -0300 | [diff] [blame] | 1643 | { |
| 1644 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, zip->file_info.compressed_size); |
| 1645 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT_MAX, zip->file_info.uncompressed_size); |
| 1646 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1647 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1648 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1649 | mz_stream_set_base(zip->compress_stream, zip->crypt_stream); |
| 1650 | |
| 1651 | err = mz_stream_open(zip->compress_stream, NULL, zip->open_mode); |
| 1652 | } |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1653 | |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1654 | if (err == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1655 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1656 | zip->entry_opened = 1; |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 1657 | zip->entry_crc32 = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1658 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1659 | else |
| 1660 | { |
| 1661 | mz_zip_entry_close_int(handle); |
| 1662 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1663 | |
| 1664 | return err; |
| 1665 | } |
| 1666 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1667 | int32_t mz_zip_entry_is_open(void *handle) |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1668 | { |
| 1669 | mz_zip *zip = (mz_zip *)handle; |
| 1670 | if (zip == NULL) |
| 1671 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1672 | if (zip->entry_opened == 0) |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1673 | return MZ_EXIST_ERROR; |
| 1674 | return MZ_OK; |
| 1675 | } |
| 1676 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1677 | int32_t mz_zip_entry_is_dir(void *handle) |
Nathan Moinvaziri | 829ffb5 | 2018-08-14 14:00:16 -0700 | [diff] [blame] | 1678 | { |
| 1679 | mz_zip *zip = (mz_zip *)handle; |
| 1680 | int32_t filename_length = 0; |
| 1681 | |
| 1682 | if (zip == NULL) |
| 1683 | return MZ_PARAM_ERROR; |
| 1684 | if (zip->entry_scanned == 0) |
| 1685 | return MZ_PARAM_ERROR; |
| 1686 | if (mz_zip_attrib_is_dir(zip->file_info.external_fa, zip->file_info.version_madeby) == MZ_OK) |
| 1687 | return MZ_OK; |
| 1688 | |
| 1689 | filename_length = (int32_t )strlen(zip->file_info.filename); |
| 1690 | if (filename_length > 0) |
| 1691 | { |
| 1692 | if ((zip->file_info.filename[filename_length - 1] == '/') || |
| 1693 | (zip->file_info.filename[filename_length - 1] == '\\')) |
| 1694 | return MZ_OK; |
| 1695 | } |
| 1696 | return MZ_EXIST_ERROR; |
| 1697 | } |
| 1698 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1699 | int32_t mz_zip_entry_read_open(void *handle, uint8_t raw, const char *password) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1700 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1701 | mz_zip *zip = (mz_zip *)handle; |
| 1702 | int32_t err = MZ_OK; |
Nathan Moinvaziri | aacf873 | 2018-11-06 09:38:46 -0800 | [diff] [blame] | 1703 | int32_t err_shift = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1704 | |
Nathan Moinvaziri | 4042763 | 2018-07-22 11:12:40 -0700 | [diff] [blame] | 1705 | #if defined(MZ_ZIP_NO_ENCRYPTION) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1706 | if (password != NULL) |
| 1707 | return MZ_PARAM_ERROR; |
| 1708 | #endif |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1709 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1710 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1711 | if ((zip->open_mode & MZ_OPEN_MODE_READ) == 0) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1712 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1713 | if (zip->entry_scanned == 0) |
| 1714 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 0f09a00 | 2018-04-23 18:48:30 -0700 | [diff] [blame] | 1715 | if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password == NULL) && (!raw)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1716 | return MZ_PARAM_ERROR; |
| 1717 | |
Anand K Mistry | cf622bb | 2018-11-09 11:32:42 +1100 | [diff] [blame] | 1718 | // Guard against seek overflows. |
| 1719 | if ((zip->disk_offset_shift > 0) && |
| 1720 | (zip->file_info.disk_offset > (INT64_MAX - zip->disk_offset_shift))) |
| 1721 | return MZ_FORMAT_ERROR; |
| 1722 | |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 1723 | if (zip->file_info.disk_number == zip->disk_number_with_cd) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1724 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
| 1725 | else |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 1726 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, zip->file_info.disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1727 | |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1728 | mz_zip_print("Zip - Entry - Read open (disk %d "PRId16" offset %lld)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1729 | zip->file_info.disk_number, zip->file_info.disk_offset); |
| 1730 | |
Nathan Moinvaziri | ee614ff | 2018-07-12 12:36:33 -0700 | [diff] [blame] | 1731 | err = mz_stream_seek(zip->stream, zip->file_info.disk_offset + zip->disk_offset_shift, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1732 | if (err == MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1733 | err = mz_zip_entry_read_header(zip->stream, 1, &zip->local_file_info, zip->local_file_info_stream); |
Nathan Moinvaziri | 903b73d | 2017-10-20 08:47:19 -0700 | [diff] [blame] | 1734 | |
Nathan Moinvaziri | aacf873 | 2018-11-06 09:38:46 -0800 | [diff] [blame] | 1735 | if (err == MZ_FORMAT_ERROR && zip->disk_offset_shift > 0) |
| 1736 | { |
| 1737 | // Perhaps we didn't compensated correctly for incorrect cd offset |
| 1738 | err_shift = mz_stream_seek(zip->stream, zip->file_info.disk_offset, MZ_SEEK_SET); |
| 1739 | if (err_shift == MZ_OK) |
| 1740 | err_shift = mz_zip_entry_read_header(zip->stream, 1, &zip->local_file_info, zip->local_file_info_stream); |
| 1741 | if (err_shift == MZ_OK) |
| 1742 | { |
| 1743 | zip->disk_offset_shift = 0; |
| 1744 | err = err_shift; |
| 1745 | } |
| 1746 | } |
| 1747 | |
Nathan Moinvaziri | a6d1f66 | 2018-07-22 10:35:49 -0700 | [diff] [blame] | 1748 | #ifdef MZ_ZIP_NO_DECOMPRESSION |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1749 | if (zip->file_info.compression_method != MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1750 | err = MZ_SUPPORT_ERROR; |
Viktor Szakats | e721507 | 2018-09-04 15:06:53 +0000 | [diff] [blame] | 1751 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1752 | if (err == MZ_OK) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1753 | err = mz_zip_entry_open_int(handle, raw, 0, password); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1754 | |
| 1755 | return err; |
| 1756 | } |
| 1757 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1758 | int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info, int16_t compress_level, uint8_t raw, const char *password) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1759 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1760 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1761 | int64_t disk_number = 0; |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1762 | uint8_t is_dir = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1763 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1764 | |
Nathan Moinvaziri | 4042763 | 2018-07-22 11:12:40 -0700 | [diff] [blame] | 1765 | #if defined(MZ_ZIP_NO_ENCRYPTION) |
tz-lom | b1b2580 | 2017-11-10 15:03:02 +0300 | [diff] [blame] | 1766 | if (password != NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1767 | return MZ_PARAM_ERROR; |
| 1768 | #endif |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1769 | if (zip == NULL || file_info == NULL || file_info->filename == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1770 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1771 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1772 | if (mz_zip_entry_is_open(handle) == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1773 | { |
| 1774 | err = mz_zip_entry_close(handle); |
| 1775 | if (err != MZ_OK) |
| 1776 | return err; |
| 1777 | } |
| 1778 | |
| 1779 | memcpy(&zip->file_info, file_info, sizeof(mz_zip_file)); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1780 | |
| 1781 | mz_zip_print("Zip - Entry - Write open - %s (level %"PRId16" raw %"PRId8")\n", |
| 1782 | zip->file_info.filename, compress_level, raw); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1783 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1784 | mz_stream_seek(zip->file_info_stream, 0, MZ_SEEK_SET); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1785 | mz_stream_write(zip->file_info_stream, file_info, sizeof(mz_zip_file)); |
| 1786 | |
| 1787 | // Copy filename, extrafield, and comment internally |
| 1788 | if (file_info->filename != NULL) |
| 1789 | { |
Nathan Moinvaziri | c714ef6 | 2018-10-25 22:01:02 -0700 | [diff] [blame] | 1790 | mz_stream_mem_get_buffer_at_current(zip->file_info_stream, (const void **)&zip->file_info.filename); |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1791 | mz_stream_write_chars(zip->file_info_stream, file_info->filename, 1); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1792 | } |
| 1793 | if (file_info->extrafield != NULL) |
| 1794 | { |
Nathan Moinvaziri | 6bde034 | 2018-10-25 22:05:13 -0700 | [diff] [blame] | 1795 | mz_stream_mem_get_buffer_at_current(zip->file_info_stream, (const void **)&zip->file_info.extrafield); |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1796 | mz_stream_write(zip->file_info_stream, file_info->extrafield, file_info->extrafield_size); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1797 | } |
| 1798 | if (file_info->comment != NULL) |
| 1799 | { |
Nathan Moinvaziri | c714ef6 | 2018-10-25 22:01:02 -0700 | [diff] [blame] | 1800 | mz_stream_mem_get_buffer_at_current(zip->file_info_stream, (const void **)&zip->file_info.comment); |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1801 | mz_stream_write_chars(zip->file_info_stream, file_info->comment, 1); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1802 | } |
| 1803 | |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1804 | if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE) |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1805 | { |
| 1806 | if ((compress_level == 8) || (compress_level == 9)) |
| 1807 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_MAX; |
| 1808 | if (compress_level == 2) |
| 1809 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_FAST; |
| 1810 | if (compress_level == 1) |
| 1811 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_SUPER_FAST; |
| 1812 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1813 | #ifdef HAVE_LZMA |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1814 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA) |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1815 | zip->file_info.flag |= MZ_ZIP_FLAG_LZMA_EOS_MARKER; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1816 | #endif |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1817 | |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1818 | if (mz_zip_attrib_is_dir(zip->file_info.external_fa, zip->file_info.version_madeby) == MZ_OK) |
| 1819 | is_dir = 1; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1820 | |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1821 | if (!is_dir) |
| 1822 | { |
| 1823 | zip->file_info.flag |= MZ_ZIP_FLAG_DATA_DESCRIPTOR; |
| 1824 | if (password != NULL) |
| 1825 | zip->file_info.flag |= MZ_ZIP_FLAG_ENCRYPTED; |
| 1826 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1827 | |
juanii | b8887e9 | 2018-02-14 00:51:05 -0300 | [diff] [blame] | 1828 | mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number); |
| 1829 | zip->file_info.disk_number = (uint32_t)disk_number; |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1830 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1831 | zip->file_info.disk_offset = mz_stream_tell(zip->stream); |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1832 | zip->file_info.crc = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1833 | zip->file_info.compressed_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1834 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1835 | #ifdef HAVE_AES |
| 1836 | if (zip->file_info.aes_version && zip->file_info.aes_encryption_mode == 0) |
| 1837 | zip->file_info.aes_encryption_mode = MZ_AES_ENCRYPTION_MODE_256; |
| 1838 | #endif |
| 1839 | |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1840 | if ((compress_level == 0) || (is_dir)) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1841 | zip->file_info.compression_method = MZ_COMPRESS_METHOD_STORE; |
Viktor Szakats | 2884e67 | 2018-04-30 08:12:13 +0000 | [diff] [blame] | 1842 | |
Nathan Moinvaziri | a6d1f66 | 2018-07-22 10:35:49 -0700 | [diff] [blame] | 1843 | #ifdef MZ_ZIP_NO_COMPRESSION |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1844 | if (zip->file_info.compression_method != MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1845 | err = MZ_SUPPORT_ERROR; |
| 1846 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1847 | if (err == MZ_OK) |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1848 | err = mz_zip_entry_write_header(zip->stream, 1, &zip->file_info); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1849 | if (err == MZ_OK) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1850 | err = mz_zip_entry_open_int(handle, raw, compress_level, password); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1851 | |
| 1852 | return err; |
| 1853 | } |
| 1854 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1855 | int32_t mz_zip_entry_read(void *handle, void *buf, int32_t len) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1856 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1857 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1858 | int32_t read = 0; |
| 1859 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1860 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1861 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1862 | if (UINT_MAX == UINT16_MAX && len > UINT16_MAX) // zlib limitation |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1863 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | d7814e9 | 2018-07-11 14:54:14 -0700 | [diff] [blame] | 1864 | if (len == 0) |
| 1865 | return MZ_PARAM_ERROR; |
| 1866 | |
Nathan Moinvaziri | eb80cd9 | 2018-07-11 16:45:09 -0700 | [diff] [blame] | 1867 | if (zip->file_info.compressed_size == 0) |
| 1868 | return 0; |
| 1869 | |
Nathan Moinvaziri | d7814e9 | 2018-07-11 14:54:14 -0700 | [diff] [blame] | 1870 | // Read entire entry even if uncompressed_size = 0, otherwise |
| 1871 | // aes encryption validation will fail if compressed_size > 0 |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 1872 | read = mz_stream_read(zip->compress_stream, buf, len); |
| 1873 | if (read > 0) |
| 1874 | zip->entry_crc32 = mz_crypt_crc32_update(zip->entry_crc32, buf, read); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1875 | |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1876 | mz_zip_print("Zip - Entry - Read - %d (max %d)\n", read, len); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1877 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1878 | return read; |
| 1879 | } |
| 1880 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1881 | int32_t mz_zip_entry_write(void *handle, const void *buf, int32_t len) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1882 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1883 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1884 | int32_t written = 0; |
| 1885 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1886 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1887 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 1888 | written = mz_stream_write(zip->compress_stream, buf, len); |
| 1889 | if (written > 0) |
| 1890 | zip->entry_crc32 = mz_crypt_crc32_update(zip->entry_crc32, buf, written); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1891 | |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1892 | mz_zip_print("Zip - Entry - Write - %d (max %d)\n", written, len); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1893 | |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1894 | return written; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1895 | } |
| 1896 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1897 | int32_t mz_zip_entry_get_info(void *handle, mz_zip_file **file_info) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1898 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1899 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 1900 | |
| 1901 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1902 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 1903 | |
| 1904 | if ((zip->open_mode & MZ_OPEN_MODE_WRITE) == 0) |
| 1905 | { |
| 1906 | if (!zip->entry_scanned) |
| 1907 | return MZ_PARAM_ERROR; |
| 1908 | } |
| 1909 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1910 | *file_info = &zip->file_info; |
| 1911 | return MZ_OK; |
| 1912 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1913 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1914 | int32_t mz_zip_entry_get_local_info(void *handle, mz_zip_file **local_file_info) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1915 | { |
| 1916 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1917 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1918 | return MZ_PARAM_ERROR; |
| 1919 | *local_file_info = &zip->local_file_info; |
| 1920 | return MZ_OK; |
| 1921 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1922 | |
Nathan Moinvaziri | 915c513 | 2018-10-26 20:00:52 -0700 | [diff] [blame] | 1923 | int32_t mz_zip_entry_set_extrafield(void *handle, const uint8_t *extrafield, uint16_t extrafield_size) |
| 1924 | { |
| 1925 | mz_zip *zip = (mz_zip *)handle; |
| 1926 | |
| 1927 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
| 1928 | return MZ_PARAM_ERROR; |
| 1929 | |
| 1930 | zip->file_info.extrafield = extrafield; |
| 1931 | zip->file_info.extrafield_size = extrafield_size; |
| 1932 | return MZ_OK; |
| 1933 | } |
| 1934 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1935 | int32_t mz_zip_entry_close(void *handle) |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 1936 | { |
| 1937 | return mz_zip_entry_close_raw(handle, 0, 0); |
| 1938 | } |
| 1939 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 1940 | int32_t mz_zip_entry_close_raw(void *handle, int64_t uncompressed_size, uint32_t crc32) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1941 | { |
| 1942 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 1943 | int64_t compressed_size = 0; |
Nathan Moinvaziri | 8871f6c | 2018-07-08 19:23:56 -0700 | [diff] [blame] | 1944 | int64_t total_in = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1945 | int32_t err = MZ_OK; |
| 1946 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1947 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1948 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 915c513 | 2018-10-26 20:00:52 -0700 | [diff] [blame] | 1949 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1950 | mz_stream_close(zip->compress_stream); |
Nathan Moinvaziri | 6ac2ff4 | 2018-07-21 14:29:29 -0700 | [diff] [blame] | 1951 | |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 1952 | if (!zip->entry_raw) |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 1953 | crc32 = zip->entry_crc32; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1954 | |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1955 | mz_zip_print("Zip - Entry - Close (ucs %lld crc 0x%08x)\n", compressed_size, crc32); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1956 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1957 | if ((zip->open_mode & MZ_OPEN_MODE_WRITE) == 0) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1958 | { |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 1959 | mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN, &total_in); |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 1960 | |
| 1961 | // If entire entry was not read verification will fail |
| 1962 | if ((total_in > 0) && (!zip->entry_raw)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1963 | { |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 1964 | #ifdef HAVE_AES |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 1965 | // AES zip version AE-1 will expect a valid crc as well |
| 1966 | if (zip->file_info.aes_version <= 0x0001) |
| 1967 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1968 | { |
| 1969 | if (crc32 != zip->file_info.crc) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1970 | { |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1971 | mz_zip_print("Zip - Entry - Crc failed (actual 0x%08x expected 0x%08x)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1972 | crc32, zip->file_info.crc); |
| 1973 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1974 | err = MZ_CRC_ERROR; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1975 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1976 | } |
| 1977 | } |
| 1978 | } |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1979 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 1980 | mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT, &compressed_size); |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 1981 | if (!zip->entry_raw) |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 1982 | mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN, &uncompressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1983 | |
| 1984 | if (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) |
| 1985 | { |
| 1986 | mz_stream_set_base(zip->crypt_stream, zip->stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1987 | err = mz_stream_close(zip->crypt_stream); |
| 1988 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1989 | mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_TOTAL_OUT, (int64_t *)&compressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1990 | } |
| 1991 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1992 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1993 | { |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 1994 | if ((err == MZ_OK) && (zip->file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1995 | { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1996 | if (zip->file_info.flag & MZ_ZIP_FLAG_MASK_LOCAL_INFO) |
| 1997 | err = mz_zip_entry_write_descriptor(zip->stream, 0, compressed_size, 0); |
| 1998 | else |
| 1999 | err = mz_zip_entry_write_descriptor(zip->stream, crc32, compressed_size, uncompressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2000 | } |
| 2001 | |
| 2002 | zip->file_info.crc = crc32; |
| 2003 | zip->file_info.compressed_size = compressed_size; |
| 2004 | zip->file_info.uncompressed_size = uncompressed_size; |
| 2005 | |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 2006 | mz_zip_print("Zip - Entry - Write cd (ucs %lld cs %lld crc 0x%08x)\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2007 | uncompressed_size, compressed_size, crc32); |
| 2008 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2009 | if (err == MZ_OK) |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 2010 | err = mz_zip_entry_write_header(zip->cd_mem_stream, 0, &zip->file_info); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2011 | |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 2012 | zip->number_entry += 1; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2013 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2014 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2015 | mz_zip_entry_close_int(handle); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2016 | |
| 2017 | return err; |
| 2018 | } |
| 2019 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2020 | static int32_t mz_zip_goto_next_entry_int(void *handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2021 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2022 | mz_zip *zip = (mz_zip *)handle; |
| 2023 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2024 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2025 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2026 | return MZ_PARAM_ERROR; |
| 2027 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2028 | zip->entry_scanned = 0; |
| 2029 | |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2030 | mz_stream_set_prop_int64(zip->cd_stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 2031 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 2032 | err = mz_stream_seek(zip->cd_stream, zip->cd_current_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2033 | if (err == MZ_OK) |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 2034 | err = mz_zip_entry_read_header(zip->cd_stream, 0, &zip->file_info, zip->file_info_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2035 | if (err == MZ_OK) |
| 2036 | zip->entry_scanned = 1; |
| 2037 | return err; |
| 2038 | } |
| 2039 | |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 2040 | int32_t mz_zip_set_number_entry(void *handle, uint64_t number_entry) |
| 2041 | { |
| 2042 | mz_zip *zip = (mz_zip *)handle; |
| 2043 | if (zip == NULL) |
| 2044 | return MZ_PARAM_ERROR; |
| 2045 | zip->number_entry = number_entry; |
| 2046 | return MZ_OK; |
| 2047 | } |
| 2048 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2049 | int32_t mz_zip_get_number_entry(void *handle, uint64_t *number_entry) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 2050 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2051 | mz_zip *zip = (mz_zip *)handle; |
| 2052 | if (zip == NULL || number_entry == NULL) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 2053 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 2054 | *number_entry = zip->number_entry; |
| 2055 | return MZ_OK; |
| 2056 | } |
| 2057 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2058 | int32_t mz_zip_set_disk_number_with_cd(void *handle, uint32_t disk_number_with_cd) |
| 2059 | { |
| 2060 | mz_zip *zip = (mz_zip *)handle; |
| 2061 | if (zip == NULL) |
| 2062 | return MZ_PARAM_ERROR; |
| 2063 | zip->disk_number_with_cd = disk_number_with_cd; |
| 2064 | return MZ_OK; |
| 2065 | } |
| 2066 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 2067 | int32_t mz_zip_get_disk_number_with_cd(void *handle, uint32_t *disk_number_with_cd) |
juanii | 566b978 | 2018-02-10 15:07:54 -0300 | [diff] [blame] | 2068 | { |
| 2069 | mz_zip *zip = (mz_zip *)handle; |
| 2070 | if (zip == NULL || disk_number_with_cd == NULL) |
| 2071 | return MZ_PARAM_ERROR; |
| 2072 | *disk_number_with_cd = zip->disk_number_with_cd; |
| 2073 | return MZ_OK; |
| 2074 | } |
| 2075 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 2076 | int64_t mz_zip_get_entry(void *handle) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2077 | { |
| 2078 | mz_zip *zip = (mz_zip *)handle; |
| 2079 | |
| 2080 | if (zip == NULL) |
| 2081 | return MZ_PARAM_ERROR; |
| 2082 | |
| 2083 | return zip->cd_current_pos; |
| 2084 | } |
| 2085 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2086 | int32_t mz_zip_goto_entry(void *handle, int64_t cd_pos) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2087 | { |
| 2088 | mz_zip *zip = (mz_zip *)handle; |
| 2089 | |
| 2090 | if (zip == NULL) |
| 2091 | return MZ_PARAM_ERROR; |
| 2092 | |
| 2093 | if (cd_pos < zip->cd_start_pos || cd_pos > zip->cd_start_pos + zip->cd_size) |
| 2094 | return MZ_PARAM_ERROR; |
| 2095 | |
| 2096 | zip->cd_current_pos = cd_pos; |
| 2097 | |
| 2098 | return mz_zip_goto_next_entry_int(handle); |
| 2099 | } |
| 2100 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 2101 | int32_t mz_zip_goto_first_entry(void *handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2102 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2103 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2104 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2105 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2106 | return MZ_PARAM_ERROR; |
| 2107 | |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 2108 | zip->cd_current_pos = zip->cd_start_pos; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2109 | |
| 2110 | return mz_zip_goto_next_entry_int(handle); |
| 2111 | } |
| 2112 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 2113 | int32_t mz_zip_goto_next_entry(void *handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2114 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2115 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2116 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2117 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2118 | return MZ_PARAM_ERROR; |
| 2119 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2120 | zip->cd_current_pos += (int64_t)MZ_ZIP_SIZE_CD_ITEM + zip->file_info.filename_size + |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2121 | zip->file_info.extrafield_size + zip->file_info.comment_size; |
| 2122 | |
| 2123 | return mz_zip_goto_next_entry_int(handle); |
| 2124 | } |
| 2125 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 2126 | int32_t mz_zip_locate_entry(void *handle, const char *filename, uint8_t ignore_case) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2127 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2128 | mz_zip *zip = (mz_zip *)handle; |
| 2129 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2130 | int32_t result = 0; |
| 2131 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2132 | if (zip == NULL || filename == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2133 | return MZ_PARAM_ERROR; |
| 2134 | |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2135 | // If we are already on the current entry, no need to search |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2136 | if ((zip->entry_scanned) && (zip->file_info.filename != NULL)) |
| 2137 | { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2138 | result = mz_zip_path_compare(zip->file_info.filename, filename, ignore_case); |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2139 | if (result == 0) |
| 2140 | return MZ_OK; |
| 2141 | } |
| 2142 | |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2143 | // Search all entries starting at the first |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2144 | err = mz_zip_goto_first_entry(handle); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2145 | while (err == MZ_OK) |
| 2146 | { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2147 | result = mz_zip_path_compare(zip->file_info.filename, filename, ignore_case); |
| 2148 | if (result == 0) |
| 2149 | return MZ_OK; |
| 2150 | |
| 2151 | err = mz_zip_goto_next_entry(handle); |
| 2152 | } |
| 2153 | |
| 2154 | return err; |
| 2155 | } |
| 2156 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 2157 | int32_t mz_zip_locate_first_entry(void *handle, void *userdata, mz_zip_locate_entry_cb cb) |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2158 | { |
| 2159 | mz_zip *zip = (mz_zip *)handle; |
| 2160 | int32_t err = MZ_OK; |
| 2161 | int32_t result = 0; |
| 2162 | |
| 2163 | // Search first entry looking for match |
| 2164 | err = mz_zip_goto_first_entry(handle); |
| 2165 | if (err != MZ_OK) |
| 2166 | return err; |
| 2167 | |
| 2168 | result = cb(handle, userdata, &zip->file_info); |
| 2169 | if (result == 0) |
| 2170 | return MZ_OK; |
| 2171 | |
| 2172 | return mz_zip_locate_next_entry(handle, userdata, cb); |
| 2173 | } |
| 2174 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 2175 | int32_t mz_zip_locate_next_entry(void *handle, void *userdata, mz_zip_locate_entry_cb cb) |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2176 | { |
| 2177 | mz_zip *zip = (mz_zip *)handle; |
| 2178 | int32_t err = MZ_OK; |
| 2179 | int32_t result = 0; |
| 2180 | |
| 2181 | // Search next entries looking for match |
| 2182 | err = mz_zip_goto_next_entry(handle); |
| 2183 | while (err == MZ_OK) |
| 2184 | { |
| 2185 | result = cb(handle, userdata, &zip->file_info); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2186 | if (result == 0) |
| 2187 | return MZ_OK; |
| 2188 | |
| 2189 | err = mz_zip_goto_next_entry(handle); |
| 2190 | } |
| 2191 | |
| 2192 | return err; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2193 | } |
| 2194 | |
| 2195 | /***************************************************************************/ |
| 2196 | |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2197 | int32_t mz_zip_attrib_is_dir(uint32_t attrib, int32_t version_madeby) |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2198 | { |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2199 | uint32_t posix_attrib = 0; |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2200 | uint8_t system = MZ_HOST_SYSTEM(version_madeby); |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2201 | int32_t err = MZ_OK; |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2202 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2203 | err = mz_zip_attrib_convert(system, attrib, MZ_HOST_SYSTEM_UNIX, &posix_attrib); |
| 2204 | if (err == MZ_OK) |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2205 | { |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2206 | if ((posix_attrib & 0170000) == 0040000) // S_ISDIR |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2207 | return MZ_OK; |
| 2208 | } |
| 2209 | |
| 2210 | return MZ_EXIST_ERROR; |
| 2211 | } |
| 2212 | |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2213 | int32_t mz_zip_attrib_convert(uint8_t src_sys, uint32_t src_attrib, uint8_t target_sys, uint32_t *target_attrib) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2214 | { |
| 2215 | if (target_attrib == NULL) |
| 2216 | return MZ_PARAM_ERROR; |
| 2217 | |
| 2218 | *target_attrib = 0; |
| 2219 | |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2220 | if ((src_sys == MZ_HOST_SYSTEM_MSDOS) || (src_sys == MZ_HOST_SYSTEM_WINDOWS_NTFS)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2221 | { |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2222 | if ((target_sys == MZ_HOST_SYSTEM_MSDOS) || (target_sys == MZ_HOST_SYSTEM_WINDOWS_NTFS)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2223 | { |
| 2224 | *target_attrib = src_attrib; |
| 2225 | return MZ_OK; |
| 2226 | } |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2227 | if ((target_sys == MZ_HOST_SYSTEM_UNIX) || (target_sys == MZ_HOST_SYSTEM_OSX_DARWIN)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2228 | return mz_zip_attrib_win32_to_posix(src_attrib, target_attrib); |
| 2229 | } |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2230 | else if ((src_sys == MZ_HOST_SYSTEM_UNIX) || (src_sys == MZ_HOST_SYSTEM_OSX_DARWIN)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2231 | { |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2232 | if ((target_sys == MZ_HOST_SYSTEM_UNIX) || (target_sys == MZ_HOST_SYSTEM_OSX_DARWIN)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2233 | { |
Nathan Moinvaziri | 5e6bac5 | 2018-10-08 23:47:02 -0700 | [diff] [blame] | 2234 | // If high bytes are set, it contains unix specific attributes |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2235 | if ((src_attrib >> 16) != 0) |
| 2236 | src_attrib >>= 16; |
| 2237 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2238 | *target_attrib = src_attrib; |
| 2239 | return MZ_OK; |
| 2240 | } |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2241 | if ((target_sys == MZ_HOST_SYSTEM_MSDOS) || (target_sys == MZ_HOST_SYSTEM_WINDOWS_NTFS)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2242 | return mz_zip_attrib_posix_to_win32(src_attrib, target_attrib); |
| 2243 | } |
| 2244 | |
| 2245 | return MZ_SUPPORT_ERROR; |
| 2246 | } |
| 2247 | |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2248 | int32_t mz_zip_attrib_posix_to_win32(uint32_t posix_attrib, uint32_t *win32_attrib) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2249 | { |
| 2250 | if (win32_attrib == NULL) |
| 2251 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2252 | |
| 2253 | *win32_attrib = 0; |
| 2254 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2255 | // S_IWUSR | S_IWGRP | S_IWOTH | S_IXUSR | S_IXGRP | S_IXOTH |
| 2256 | if ((posix_attrib & 0000333) == 0 && (posix_attrib & 0000444) != 0) |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2257 | *win32_attrib |= 0x01; // FILE_ATTRIBUTE_READONLY |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2258 | // S_IFDIR |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2259 | if ((posix_attrib & 0170000) == 0040000) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2260 | *win32_attrib |= 0x10; // FILE_ATTRIBUTE_DIRECTORY |
Nathan Moinvaziri | da4b58f | 2018-08-20 18:21:26 -0700 | [diff] [blame] | 2261 | // S_IFREG |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2262 | else |
| 2263 | *win32_attrib |= 0x80; // FILE_ATTRIBUTE_NORMAL |
| 2264 | |
| 2265 | return MZ_OK; |
| 2266 | } |
| 2267 | |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2268 | int32_t mz_zip_attrib_win32_to_posix(uint32_t win32_attrib, uint32_t *posix_attrib) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2269 | { |
| 2270 | if (posix_attrib == NULL) |
| 2271 | return MZ_PARAM_ERROR; |
| 2272 | |
| 2273 | *posix_attrib = 0000444; // S_IRUSR | S_IRGRP | S_IROTH |
| 2274 | // FILE_ATTRIBUTE_READONLY |
| 2275 | if ((win32_attrib & 0x01) == 0) |
| 2276 | *posix_attrib |= 0000222; // S_IWUSR | S_IWGRP | S_IWOTH |
| 2277 | // FILE_ATTRIBUTE_DIRECTORY |
| 2278 | if ((win32_attrib & 0x10) == 0x10) |
| 2279 | *posix_attrib |= 0040111; // S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2280 | else |
| 2281 | *posix_attrib |= 0100000; // S_IFREG |
| 2282 | |
| 2283 | return MZ_OK; |
| 2284 | } |
| 2285 | |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2286 | /***************************************************************************/ |
| 2287 | |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2288 | int32_t mz_zip_extrafield_find(void *stream, uint16_t type, uint16_t *length) |
| 2289 | { |
| 2290 | int32_t err = MZ_OK; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2291 | uint16_t field_type = 0; |
| 2292 | uint16_t field_length = 0; |
| 2293 | |
| 2294 | do |
| 2295 | { |
| 2296 | err = mz_stream_read_uint16(stream, &field_type); |
| 2297 | if (err == MZ_OK) |
| 2298 | err = mz_stream_read_uint16(stream, &field_length); |
| 2299 | if (err != MZ_OK) |
| 2300 | break; |
| 2301 | |
| 2302 | if (type == field_type) |
| 2303 | { |
| 2304 | if (length != NULL) |
| 2305 | *length = field_length; |
| 2306 | return MZ_OK; |
| 2307 | } |
| 2308 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2309 | err = mz_stream_seek(stream, field_length, MZ_SEEK_CUR); |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2310 | } |
| 2311 | while (err == MZ_OK); |
| 2312 | |
| 2313 | return MZ_EXIST_ERROR; |
| 2314 | } |
| 2315 | |
| 2316 | int32_t mz_zip_extrafield_read(void *stream, uint16_t *type, uint16_t *length) |
| 2317 | { |
| 2318 | int32_t err = MZ_OK; |
| 2319 | if (type == NULL || length == NULL) |
| 2320 | return MZ_PARAM_ERROR; |
| 2321 | err = mz_stream_read_uint16(stream, type); |
| 2322 | if (err == MZ_OK) |
| 2323 | err = mz_stream_read_uint16(stream, length); |
| 2324 | return err; |
| 2325 | } |
| 2326 | |
Nathan Moinvaziri | 1d6d183 | 2018-11-10 09:03:55 -0800 | [diff] [blame] | 2327 | int32_t mz_zip_extrafield_write(void *stream, uint16_t type, uint16_t length) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2328 | { |
| 2329 | int32_t err = MZ_OK; |
| 2330 | err = mz_stream_write_uint16(stream, type); |
| 2331 | if (err == MZ_OK) |
| 2332 | err = mz_stream_write_uint16(stream, length); |
| 2333 | return err; |
| 2334 | } |
| 2335 | |
| 2336 | /***************************************************************************/ |
| 2337 | |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2338 | static int32_t mz_zip_invalid_date(const struct tm *ptm) |
| 2339 | { |
| 2340 | #define datevalue_in_range(min, max, value) ((min) <= (value) && (value) <= (max)) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2341 | return (!datevalue_in_range(0, 127 + 80, ptm->tm_year) || // 1980-based year, allow 80 extra |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2342 | !datevalue_in_range(0, 11, ptm->tm_mon) || |
| 2343 | !datevalue_in_range(1, 31, ptm->tm_mday) || |
| 2344 | !datevalue_in_range(0, 23, ptm->tm_hour) || |
| 2345 | !datevalue_in_range(0, 59, ptm->tm_min) || |
| 2346 | !datevalue_in_range(0, 59, ptm->tm_sec)); |
| 2347 | #undef datevalue_in_range |
| 2348 | } |
| 2349 | |
| 2350 | static void mz_zip_dosdate_to_raw_tm(uint64_t dos_date, struct tm *ptm) |
| 2351 | { |
| 2352 | uint64_t date = (uint64_t)(dos_date >> 16); |
| 2353 | |
Nathan Moinvaziri | 1d6d183 | 2018-11-10 09:03:55 -0800 | [diff] [blame] | 2354 | ptm->tm_mday = (uint16_t)(date & 0x1f); |
| 2355 | ptm->tm_mon = (uint16_t)(((date & 0x1E0) / 0x20) - 1); |
| 2356 | ptm->tm_year = (uint16_t)(((date & 0x0FE00) / 0x0200) + 80); |
| 2357 | ptm->tm_hour = (uint16_t)((dos_date & 0xF800) / 0x800); |
| 2358 | ptm->tm_min = (uint16_t)((dos_date & 0x7E0) / 0x20); |
| 2359 | ptm->tm_sec = (uint16_t)(2 * (dos_date & 0x1f)); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2360 | ptm->tm_isdst = -1; |
| 2361 | } |
| 2362 | |
| 2363 | int32_t mz_zip_dosdate_to_tm(uint64_t dos_date, struct tm *ptm) |
| 2364 | { |
| 2365 | if (ptm == NULL) |
| 2366 | return MZ_PARAM_ERROR; |
| 2367 | |
| 2368 | mz_zip_dosdate_to_raw_tm(dos_date, ptm); |
| 2369 | |
| 2370 | if (mz_zip_invalid_date(ptm)) |
| 2371 | { |
| 2372 | // Invalid date stored, so don't return it |
| 2373 | memset(ptm, 0, sizeof(struct tm)); |
| 2374 | return MZ_FORMAT_ERROR; |
| 2375 | } |
| 2376 | return MZ_OK; |
| 2377 | } |
| 2378 | |
| 2379 | time_t mz_zip_dosdate_to_time_t(uint64_t dos_date) |
| 2380 | { |
| 2381 | struct tm ptm; |
| 2382 | mz_zip_dosdate_to_raw_tm(dos_date, &ptm); |
| 2383 | return mktime(&ptm); |
| 2384 | } |
| 2385 | |
| 2386 | int32_t mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm) |
| 2387 | { |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 2388 | struct tm *ltm = NULL; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2389 | if (ptm == NULL) |
| 2390 | return MZ_PARAM_ERROR; |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2391 | ltm = localtime(&unix_time); // Returns a 1900-based year |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 2392 | if (ltm == NULL) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2393 | { |
| 2394 | // Invalid date stored, so don't return it |
| 2395 | memset(ptm, 0, sizeof(struct tm)); |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 2396 | return MZ_INTERNAL_ERROR; |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2397 | } |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 2398 | memcpy(ptm, ltm, sizeof(struct tm)); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2399 | return MZ_OK; |
| 2400 | } |
| 2401 | |
| 2402 | uint32_t mz_zip_time_t_to_dos_date(time_t unix_time) |
| 2403 | { |
| 2404 | struct tm ptm; |
| 2405 | mz_zip_time_t_to_tm(unix_time, &ptm); |
| 2406 | return mz_zip_tm_to_dosdate((const struct tm *)&ptm); |
| 2407 | } |
| 2408 | |
| 2409 | uint32_t mz_zip_tm_to_dosdate(const struct tm *ptm) |
| 2410 | { |
Nathan Moinvaziri | e33916b | 2018-05-01 13:45:08 -0700 | [diff] [blame] | 2411 | struct tm fixed_tm; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2412 | |
| 2413 | // Years supported: |
| 2414 | |
| 2415 | // [00, 79] (assumed to be between 2000 and 2079) |
| 2416 | // [80, 207] (assumed to be between 1980 and 2107, typical output of old |
| 2417 | // software that does 'year-1900' to get a double digit year) |
| 2418 | // [1980, 2107] (due to format limitations, only years 1980-2107 can be stored.) |
| 2419 | |
| 2420 | memcpy(&fixed_tm, ptm, sizeof(struct tm)); |
| 2421 | if (fixed_tm.tm_year >= 1980) // range [1980, 2107] |
| 2422 | fixed_tm.tm_year -= 1980; |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2423 | else if (fixed_tm.tm_year >= 80) // range [80, 207] |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2424 | fixed_tm.tm_year -= 80; |
| 2425 | else // range [00, 79] |
| 2426 | fixed_tm.tm_year += 20; |
| 2427 | |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2428 | if (mz_zip_invalid_date(&fixed_tm)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2429 | return 0; |
| 2430 | |
Anand K Mistry | 57b65f8 | 2018-11-09 10:52:19 +1100 | [diff] [blame] | 2431 | return (((uint32_t)fixed_tm.tm_mday + (32 * ((uint32_t)fixed_tm.tm_mon + 1)) + (512 * (uint32_t)fixed_tm.tm_year)) << 16) | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2432 | (((uint32_t)fixed_tm.tm_sec / 2) + (32 * (uint32_t)fixed_tm.tm_min) + (2048 * (uint32_t)fixed_tm.tm_hour)); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2433 | } |
| 2434 | |
| 2435 | int32_t mz_zip_ntfs_to_unix_time(uint64_t ntfs_time, time_t *unix_time) |
| 2436 | { |
| 2437 | *unix_time = (time_t)((ntfs_time - 116444736000000000LL) / 10000000); |
| 2438 | return MZ_OK; |
| 2439 | } |
| 2440 | |
| 2441 | int32_t mz_zip_unix_to_ntfs_time(time_t unix_time, uint64_t *ntfs_time) |
| 2442 | { |
| 2443 | *ntfs_time = ((uint64_t)unix_time * 10000000) + 116444736000000000LL; |
| 2444 | return MZ_OK; |
| 2445 | } |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2446 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2447 | /***************************************************************************/ |
| 2448 | |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2449 | int32_t mz_zip_path_compare(const char *path1, const char *path2, uint8_t ignore_case) |
| 2450 | { |
| 2451 | do |
| 2452 | { |
| 2453 | if ((*path1 == '\\' && *path2 == '/') || |
| 2454 | (*path2 == '\\' && *path1 == '/')) |
| 2455 | { |
| 2456 | // Ignore comparison of path slashes |
| 2457 | } |
| 2458 | else if (ignore_case) |
| 2459 | { |
| 2460 | if (tolower(*path1) != tolower(*path2)) |
| 2461 | break; |
| 2462 | } |
| 2463 | else if (*path1 != *path2) |
| 2464 | { |
| 2465 | break; |
| 2466 | } |
| 2467 | |
| 2468 | path1 += 1; |
| 2469 | path2 += 1; |
| 2470 | } |
| 2471 | while (*path1 != 0 && *path2 != 0); |
| 2472 | |
| 2473 | if (ignore_case) |
| 2474 | return (int32_t)(tolower(*path1) - tolower(*path2)); |
| 2475 | |
| 2476 | return (int32_t)(*path1 - *path2); |
| 2477 | } |
| 2478 | |
| 2479 | /***************************************************************************/ |