Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 1 | /* zip.c -- Zip manipulation |
Nathan Moinvaziri | c98dec4 | 2018-08-15 07:37:30 -0700 | [diff] [blame] | 2 | Version 2.5.0, August 15, 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 |
| 13 | http://www.winimage.com/zLibDll/minizip.html |
| 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 | |
| 19 | #include <stdio.h> |
| 20 | #include <stdlib.h> |
| 21 | #include <stdint.h> |
| 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> |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 25 | #include <errno.h> |
Nathan Moinvaziri | 34eff62 | 2018-01-22 09:25:15 -0800 | [diff] [blame] | 26 | #include <limits.h> |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 27 | |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 28 | #include "mz.h" |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 29 | #include "mz_strm.h" |
| 30 | #ifdef HAVE_AES |
| 31 | # include "mz_strm_aes.h" |
| 32 | #endif |
| 33 | #ifdef HAVE_BZIP2 |
| 34 | # include "mz_strm_bzip.h" |
| 35 | #endif |
Nathan Moinvaziri | b47b41b | 2018-07-11 09:44:29 -0700 | [diff] [blame] | 36 | #include "mz_strm_crc32.h" |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 37 | #ifdef HAVE_LZMA |
| 38 | # include "mz_strm_lzma.h" |
| 39 | #endif |
Nathan Moinvaziri | b47b41b | 2018-07-11 09:44:29 -0700 | [diff] [blame] | 40 | #include "mz_strm_mem.h" |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 41 | #ifdef HAVE_PKCRYPT |
| 42 | # include "mz_strm_pkcrypt.h" |
| 43 | #endif |
Nathan Moinvaziri | 4f6a0e3 | 2017-11-10 08:45:14 -0800 | [diff] [blame] | 44 | #ifdef HAVE_ZLIB |
| 45 | # include "mz_strm_zlib.h" |
| 46 | #endif |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 47 | |
| 48 | #include "mz_zip.h" |
| 49 | |
| 50 | /***************************************************************************/ |
| 51 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 52 | #define MZ_ZIP_MAGIC_LOCALHEADER (0x04034b50) |
| 53 | #define MZ_ZIP_MAGIC_CENTRALHEADER (0x02014b50) |
| 54 | #define MZ_ZIP_MAGIC_ENDHEADER (0x06054b50) |
| 55 | #define MZ_ZIP_MAGIC_ENDHEADER64 (0x06064b50) |
| 56 | #define MZ_ZIP_MAGIC_ENDLOCHEADER64 (0x07064b50) |
| 57 | #define MZ_ZIP_MAGIC_DATADESCRIPTOR (0x08074b50) |
| 58 | |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 59 | #define MZ_ZIP_SIZE_CD_ITEM (0x2e) |
| 60 | #define MZ_ZIP_SIZE_CD_LOCATOR64 (0x14) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 61 | |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 62 | #define MZ_ZIP_EXTENSION_ZIP64 (0x0001) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 63 | #define MZ_ZIP_EXTENSION_NTFS (0x000a) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 64 | #define MZ_ZIP_EXTENSION_AES (0x9901) |
| 65 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 66 | /***************************************************************************/ |
| 67 | |
| 68 | typedef struct mz_zip_s |
| 69 | { |
| 70 | mz_zip_file file_info; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 71 | mz_zip_file local_file_info; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 72 | |
| 73 | void *stream; // main stream |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 74 | void *cd_stream; // pointer to the stream with the cd |
| 75 | void *cd_mem_stream; // memory stream for central directory |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 76 | void *compress_stream; // compression stream |
| 77 | void *crc32_stream; // crc32 stream |
| 78 | void *crypt_stream; // encryption stream |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 79 | void *file_info_stream; // memory stream for storing file info |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 80 | 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] | 81 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 82 | int32_t open_mode; |
| 83 | |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 84 | uint32_t disk_number_with_cd; // number of the disk with the central dir |
Nathan Moinvaziri | ee614ff | 2018-07-12 12:36:33 -0700 | [diff] [blame] | 85 | uint64_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] | 86 | |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 87 | uint64_t cd_start_pos; // pos of the first file in the central dir stream |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 88 | uint64_t cd_current_pos; // pos of the current file in the central dir |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 89 | uint64_t cd_offset; // offset of start of central directory |
| 90 | uint64_t cd_size; // size of the central directory |
| 91 | |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 92 | uint8_t entry_scanned; // entry header information read ok |
| 93 | uint8_t entry_opened; // entry is open for read/write |
| 94 | uint8_t entry_raw; // entry opened with raw mode |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 95 | |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 96 | int64_t number_entry; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 97 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 98 | uint16_t version_madeby; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 99 | char *comment; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 100 | } mz_zip; |
| 101 | |
| 102 | /***************************************************************************/ |
| 103 | |
Nathan Moinvaziri | e824da8 | 2018-07-26 17:53:15 -0700 | [diff] [blame] | 104 | // Locate the end of central directory of a zip file (at the end, just before the global comment) |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 105 | static int32_t mz_zip_search_eocd(void *stream, uint64_t *central_pos) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 106 | { |
Nathan Moinvaziri | 9ab31ba | 2017-10-16 07:51:09 -0700 | [diff] [blame] | 107 | uint8_t buf[1024 + 4]; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 108 | int64_t file_size = 0; |
| 109 | int64_t back_read = 0; |
| 110 | int64_t max_back = UINT16_MAX; // maximum size of global comment |
| 111 | int32_t read_size = sizeof(buf); |
| 112 | int64_t read_pos = 0; |
| 113 | int32_t i = 0; |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 114 | |
Nathan Moinvaziri | f6e81cd | 2017-10-10 18:24:03 -0700 | [diff] [blame] | 115 | *central_pos = 0; |
| 116 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 117 | if (mz_stream_seek(stream, 0, MZ_SEEK_END) != MZ_OK) |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 118 | return MZ_STREAM_ERROR; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 119 | |
| 120 | file_size = mz_stream_tell(stream); |
| 121 | |
| 122 | if (max_back > file_size) |
| 123 | max_back = file_size; |
| 124 | |
| 125 | while (back_read < max_back) |
| 126 | { |
Nathan Moinvaziri | 9ab31ba | 2017-10-16 07:51:09 -0700 | [diff] [blame] | 127 | back_read += (sizeof(buf) - 4); |
| 128 | if (back_read > max_back) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 129 | back_read = max_back; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 130 | |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 131 | read_pos = file_size - back_read; |
Nathan Moinvaziri | 9ab31ba | 2017-10-16 07:51:09 -0700 | [diff] [blame] | 132 | if (read_size > (file_size - read_pos)) |
| 133 | read_size = (uint32_t)(file_size - read_pos); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 134 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 135 | if (mz_stream_seek(stream, read_pos, MZ_SEEK_SET) != MZ_OK) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 136 | break; |
| 137 | if (mz_stream_read(stream, buf, read_size) != read_size) |
| 138 | break; |
| 139 | |
| 140 | for (i = read_size - 3; (i--) > 0;) |
| 141 | { |
Nathan Moinvaziri | 9ab31ba | 2017-10-16 07:51:09 -0700 | [diff] [blame] | 142 | if (((*(buf + i)) == (MZ_ZIP_MAGIC_ENDHEADER & 0xff)) && |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 143 | ((*(buf + i + 1)) == (MZ_ZIP_MAGIC_ENDHEADER >> 8 & 0xff)) && |
| 144 | ((*(buf + i + 2)) == (MZ_ZIP_MAGIC_ENDHEADER >> 16 & 0xff)) && |
| 145 | ((*(buf + i + 3)) == (MZ_ZIP_MAGIC_ENDHEADER >> 24 & 0xff))) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 146 | { |
Nathan Moinvaziri | f6e81cd | 2017-10-10 18:24:03 -0700 | [diff] [blame] | 147 | *central_pos = read_pos + i; |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 148 | return MZ_OK; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 149 | } |
| 150 | } |
| 151 | |
Nathan Moinvaziri | f6e81cd | 2017-10-10 18:24:03 -0700 | [diff] [blame] | 152 | if (*central_pos != 0) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 153 | break; |
| 154 | } |
| 155 | |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 156 | return MZ_EXIST_ERROR; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 157 | } |
| 158 | |
Nathan Moinvaziri | e824da8 | 2018-07-26 17:53:15 -0700 | [diff] [blame] | 159 | // Locate the end of central directory 64 of a zip file |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 160 | static int32_t mz_zip_search_zip64_eocd(void *stream, const uint64_t end_central_offset, uint64_t *central_pos) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 161 | { |
| 162 | uint64_t offset = 0; |
| 163 | uint32_t value32 = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 164 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 165 | |
| 166 | |
| 167 | *central_pos = 0; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 168 | |
| 169 | // Zip64 end of central directory locator |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 170 | 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] | 171 | // Read locator signature |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 172 | if (err == MZ_OK) |
| 173 | { |
| 174 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 175 | if (value32 != MZ_ZIP_MAGIC_ENDLOCHEADER64) |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 176 | err = MZ_FORMAT_ERROR; |
| 177 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 178 | // 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] | 179 | if (err == MZ_OK) |
| 180 | err = mz_stream_read_uint32(stream, &value32); |
| 181 | // Relative offset of the zip64 end of central directory record8 |
| 182 | if (err == MZ_OK) |
| 183 | err = mz_stream_read_uint64(stream, &offset); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 184 | // Total number of disks |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 185 | if (err == MZ_OK) |
| 186 | err = mz_stream_read_uint32(stream, &value32); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 187 | // Goto end of central directory record |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 188 | if (err == MZ_OK) |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 189 | err = mz_stream_seek(stream, offset, MZ_SEEK_SET); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 190 | // The signature |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 191 | if (err == MZ_OK) |
| 192 | { |
| 193 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 194 | if (value32 != MZ_ZIP_MAGIC_ENDHEADER64) |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 195 | err = MZ_FORMAT_ERROR; |
| 196 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 197 | |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 198 | if (err == MZ_OK) |
| 199 | *central_pos = offset; |
| 200 | |
| 201 | return err; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 202 | } |
| 203 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 204 | static int32_t mz_zip_read_cd(void *handle) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 205 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 206 | mz_zip *zip = (mz_zip *)handle; |
| 207 | int64_t number_entry_cd = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 208 | uint64_t number_entry_cd64 = 0; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 209 | uint64_t number_entry = 0; |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 210 | uint64_t eocd_pos = 0; |
| 211 | uint64_t eocd_pos64 = 0; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 212 | uint16_t value16 = 0; |
| 213 | uint32_t value32 = 0; |
| 214 | uint64_t value64 = 0; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 215 | uint16_t comment_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 216 | int32_t err = MZ_OK; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 217 | |
| 218 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 219 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 220 | return MZ_PARAM_ERROR; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 221 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 222 | // Read and cache central directory records |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 223 | err = mz_zip_search_eocd(zip->stream, &eocd_pos); |
| 224 | if (err == MZ_OK) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 225 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 226 | // Read end of central directory info |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 227 | err = mz_stream_seek(zip->stream, eocd_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 228 | // The signature, already checked |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 229 | if (err == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 230 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 231 | // Number of this disk |
| 232 | if (err == MZ_OK) |
| 233 | err = mz_stream_read_uint16(zip->stream, &value16); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 234 | // Number of the disk with the start of the central directory |
| 235 | if (err == MZ_OK) |
| 236 | err = mz_stream_read_uint16(zip->stream, &value16); |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 237 | zip->disk_number_with_cd = value16; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 238 | // Total number of entries in the central dir on this disk |
| 239 | if (err == MZ_OK) |
| 240 | err = mz_stream_read_uint16(zip->stream, &value16); |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 241 | zip->number_entry = value16; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 242 | // Total number of entries in the central dir |
| 243 | if (err == MZ_OK) |
| 244 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 245 | number_entry_cd = value16; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 246 | if (number_entry_cd != zip->number_entry) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 247 | err = MZ_FORMAT_ERROR; |
| 248 | // Size of the central directory |
| 249 | if (err == MZ_OK) |
| 250 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 251 | if (err == MZ_OK) |
| 252 | zip->cd_size = value32; |
| 253 | // Offset of start of central directory with respect to the starting disk number |
| 254 | if (err == MZ_OK) |
| 255 | err = mz_stream_read_uint32(zip->stream, &value32); |
Nathan Moinvaziri | ee614ff | 2018-07-12 12:36:33 -0700 | [diff] [blame] | 256 | if (err == MZ_OK) |
| 257 | zip->cd_offset = value32; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 258 | // Zip file global comment length |
| 259 | if (err == MZ_OK) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 260 | err = mz_stream_read_uint16(zip->stream, &comment_size); |
Nathan Moinvaziri | 51bf61d | 2018-07-26 16:41:54 -0700 | [diff] [blame] | 261 | if ((err == MZ_OK) && (comment_size > 0)) |
| 262 | { |
| 263 | zip->comment = (char *)MZ_ALLOC(comment_size + 1); |
| 264 | if (zip->comment) |
| 265 | { |
| 266 | if (mz_stream_read(zip->stream, zip->comment, comment_size) != comment_size) |
| 267 | err = MZ_STREAM_ERROR; |
| 268 | zip->comment[comment_size] = 0; |
| 269 | } |
| 270 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 271 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 272 | if ((err == MZ_OK) && ((number_entry_cd == UINT16_MAX) || (zip->cd_offset == UINT32_MAX))) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 273 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 274 | // Format should be Zip64, as the central directory or file size is too large |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 275 | if (mz_zip_search_zip64_eocd(zip->stream, eocd_pos, &eocd_pos64) == MZ_OK) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 276 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 277 | eocd_pos = eocd_pos64; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 278 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 279 | err = mz_stream_seek(zip->stream, eocd_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 280 | // The signature, already checked |
| 281 | if (err == MZ_OK) |
| 282 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 283 | // Size of zip64 end of central directory record |
| 284 | if (err == MZ_OK) |
| 285 | err = mz_stream_read_uint64(zip->stream, &value64); |
| 286 | // Version made by |
| 287 | if (err == MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 288 | err = mz_stream_read_uint16(zip->stream, &zip->version_madeby); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 289 | // Version needed to extract |
| 290 | if (err == MZ_OK) |
| 291 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 292 | // Number of this disk |
| 293 | if (err == MZ_OK) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 294 | err = mz_stream_read_uint32(zip->stream, &value32); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 295 | // Number of the disk with the start of the central directory |
| 296 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 297 | err = mz_stream_read_uint32(zip->stream, &zip->disk_number_with_cd); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 298 | // Total number of entries in the central directory on this disk |
| 299 | if (err == MZ_OK) |
| 300 | err = mz_stream_read_uint64(zip->stream, &number_entry); |
| 301 | // Total number of entries in the central directory |
| 302 | if (err == MZ_OK) |
| 303 | err = mz_stream_read_uint64(zip->stream, &number_entry_cd64); |
| 304 | if (number_entry == UINT32_MAX) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 305 | zip->number_entry = number_entry_cd64; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 306 | // Size of the central directory |
| 307 | if (err == MZ_OK) |
| 308 | err = mz_stream_read_uint64(zip->stream, &zip->cd_size); |
| 309 | // Offset of start of central directory with respect to the starting disk number |
| 310 | if (err == MZ_OK) |
| 311 | err = mz_stream_read_uint64(zip->stream, &zip->cd_offset); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 312 | } |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 313 | else if ((zip->number_entry == UINT16_MAX) || (number_entry_cd != zip->number_entry) || |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 314 | (zip->cd_size == UINT16_MAX) || (zip->cd_offset == UINT32_MAX)) |
Nathan Moinvaziri | 016ad47 | 2017-10-09 23:36:30 -0700 | [diff] [blame] | 315 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 316 | err = MZ_FORMAT_ERROR; |
Nathan Moinvaziri | 016ad47 | 2017-10-09 23:36:30 -0700 | [diff] [blame] | 317 | } |
| 318 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 319 | } |
| 320 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 321 | if (err == MZ_OK) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 322 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 323 | if (eocd_pos < zip->cd_offset + zip->cd_size) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 324 | err = MZ_FORMAT_ERROR; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 325 | } |
| 326 | |
Nathan Moinvaziri | ee614ff | 2018-07-12 12:36:33 -0700 | [diff] [blame] | 327 | if (err == MZ_OK) |
| 328 | { |
| 329 | // Verify central directory signature exists at offset |
| 330 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 331 | if (err == MZ_OK) |
| 332 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 333 | if (value32 != MZ_ZIP_MAGIC_CENTRALHEADER) |
| 334 | { |
| 335 | // If not found attempt to seek backward to find it |
| 336 | err = mz_stream_seek(zip->stream, eocd_pos - zip->cd_size, MZ_SEEK_SET); |
| 337 | if (err == MZ_OK) |
| 338 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 339 | if (value32 == MZ_ZIP_MAGIC_CENTRALHEADER) |
| 340 | { |
| 341 | // If found compensate for incorrect locations |
| 342 | value64 = zip->cd_offset; |
| 343 | zip->cd_offset = eocd_pos - zip->cd_size; |
| 344 | zip->disk_offset_shift = zip->cd_offset - value64; |
| 345 | } |
| 346 | } |
| 347 | } |
| 348 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 349 | return err; |
| 350 | } |
| 351 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 352 | static int32_t mz_zip_write_cd(void *handle) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 353 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 354 | mz_zip *zip = (mz_zip *)handle; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 355 | uint16_t comment_size = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 356 | uint64_t zip64_eocd_pos_inzip = 0; |
Nathan Moinvaziri | 016ad47 | 2017-10-09 23:36:30 -0700 | [diff] [blame] | 357 | int64_t disk_number = 0; |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 358 | int64_t disk_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 359 | int32_t err = MZ_OK; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 360 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 361 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 362 | if (zip == NULL) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 363 | return MZ_PARAM_ERROR; |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 364 | |
Nathan Moinvaziri | 016ad47 | 2017-10-09 23:36:30 -0700 | [diff] [blame] | 365 | if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number) == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 366 | zip->disk_number_with_cd = (uint32_t)disk_number; |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 367 | if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_SIZE, &disk_size) == MZ_OK && disk_size > 0) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 368 | zip->disk_number_with_cd += 1; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 369 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 370 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 371 | zip->cd_offset = mz_stream_tell(zip->stream); |
| 372 | mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_END); |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 373 | zip->cd_size = (uint32_t)mz_stream_tell(zip->cd_mem_stream); |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 374 | mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_SET); |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 375 | |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 376 | err = mz_stream_copy(zip->stream, zip->cd_mem_stream, (int32_t)zip->cd_size); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 377 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 378 | // Write the ZIP64 central directory header |
juanii | 3f59ffc | 2018-02-08 12:44:17 -0300 | [diff] [blame] | 379 | if (zip->cd_offset >= UINT32_MAX || zip->number_entry > UINT16_MAX) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 380 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 381 | zip64_eocd_pos_inzip = mz_stream_tell(zip->stream); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 382 | |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 383 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDHEADER64); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 384 | |
| 385 | // Size of this 'zip64 end of central directory' |
| 386 | if (err == MZ_OK) |
| 387 | err = mz_stream_write_uint64(zip->stream, (uint64_t)44); |
| 388 | // Version made by |
| 389 | if (err == MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 390 | err = mz_stream_write_uint16(zip->stream, zip->version_madeby); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 391 | // Version needed |
| 392 | if (err == MZ_OK) |
| 393 | err = mz_stream_write_uint16(zip->stream, (uint16_t)45); |
| 394 | // Number of this disk |
| 395 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 396 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 397 | // Number of the disk with the start of the central directory |
| 398 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 399 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 400 | // Total number of entries in the central dir on this disk |
| 401 | if (err == MZ_OK) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 402 | err = mz_stream_write_uint64(zip->stream, zip->number_entry); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 403 | // Total number of entries in the central dir |
| 404 | if (err == MZ_OK) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 405 | err = mz_stream_write_uint64(zip->stream, zip->number_entry); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 406 | // Size of the central directory |
| 407 | if (err == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 408 | err = mz_stream_write_uint64(zip->stream, (uint64_t)zip->cd_size); |
| 409 | // Offset of start of central directory with respect to the starting disk number |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 410 | if (err == MZ_OK) |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 411 | err = mz_stream_write_uint64(zip->stream, zip->cd_offset); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 412 | if (err == MZ_OK) |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 413 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDLOCHEADER64); |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 414 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 415 | // Number of the disk with the start of the central directory |
| 416 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 417 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 418 | // Relative offset to the end of zip64 central directory |
| 419 | if (err == MZ_OK) |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 420 | err = mz_stream_write_uint64(zip->stream, zip64_eocd_pos_inzip); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 421 | // Number of the disk with the start of the central directory |
| 422 | if (err == MZ_OK) |
juanii | c65486d | 2018-02-08 17:07:07 -0300 | [diff] [blame] | 423 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd + 1); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 424 | } |
| 425 | |
| 426 | // Write the central directory header |
| 427 | |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 428 | // Signature |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 429 | if (err == MZ_OK) |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 430 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDHEADER); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 431 | // Number of this disk |
| 432 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 433 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->disk_number_with_cd); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 434 | // Number of the disk with the start of the central directory |
| 435 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 436 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->disk_number_with_cd); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 437 | // Total number of entries in the central dir on this disk |
| 438 | if (err == MZ_OK) |
| 439 | { |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 440 | if (zip->number_entry >= UINT16_MAX) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 441 | err = mz_stream_write_uint16(zip->stream, UINT16_MAX); |
| 442 | else |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 443 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->number_entry); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 444 | } |
| 445 | // Total number of entries in the central dir |
| 446 | if (err == MZ_OK) |
| 447 | { |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 448 | if (zip->number_entry >= UINT16_MAX) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 449 | err = mz_stream_write_uint16(zip->stream, UINT16_MAX); |
| 450 | else |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 451 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->number_entry); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 452 | } |
| 453 | // Size of the central directory |
| 454 | if (err == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 455 | err = mz_stream_write_uint32(zip->stream, (uint32_t)zip->cd_size); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 456 | // Offset of start of central directory with respect to the starting disk number |
| 457 | if (err == MZ_OK) |
| 458 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 459 | if (zip->cd_offset >= UINT32_MAX) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 460 | err = mz_stream_write_uint32(zip->stream, UINT32_MAX); |
| 461 | else |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 462 | err = mz_stream_write_uint32(zip->stream, (uint32_t)zip->cd_offset); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 463 | } |
| 464 | |
| 465 | // Write global comment |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 466 | if (zip->comment != NULL) |
| 467 | comment_size = (uint16_t)strlen(zip->comment); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 468 | if (err == MZ_OK) |
| 469 | err = mz_stream_write_uint16(zip->stream, comment_size); |
| 470 | if (err == MZ_OK) |
| 471 | { |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 472 | if (mz_stream_write(zip->stream, zip->comment, comment_size) != comment_size) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 473 | err = MZ_STREAM_ERROR; |
| 474 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 475 | return err; |
| 476 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 477 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 478 | void *mz_zip_create(void **handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 479 | { |
| 480 | mz_zip *zip = NULL; |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 481 | |
| 482 | zip = (mz_zip *)MZ_ALLOC(sizeof(mz_zip)); |
| 483 | if (zip != NULL) |
| 484 | { |
| 485 | memset(zip, 0, sizeof(mz_zip)); |
| 486 | } |
| 487 | if (handle != NULL) |
| 488 | *handle = zip; |
| 489 | |
| 490 | return zip; |
| 491 | } |
| 492 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 493 | void mz_zip_delete(void **handle) |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 494 | { |
| 495 | mz_zip *zip = NULL; |
| 496 | if (handle == NULL) |
| 497 | return; |
| 498 | zip = (mz_zip *)*handle; |
| 499 | if (zip != NULL) |
| 500 | { |
| 501 | MZ_FREE(zip); |
| 502 | } |
| 503 | *handle = NULL; |
| 504 | } |
| 505 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 506 | int32_t mz_zip_open(void *handle, void *stream, int32_t mode) |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 507 | { |
| 508 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 509 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 510 | |
| 511 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 512 | if (zip == NULL) |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 513 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 514 | |
| 515 | zip->stream = stream; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 516 | |
Nathan Moinvaziri | 3f7de8e | 2017-12-11 21:09:52 -0800 | [diff] [blame] | 517 | if (mode & MZ_OPEN_MODE_WRITE) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 518 | { |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 519 | mz_stream_mem_create(&zip->cd_mem_stream); |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 520 | mz_stream_mem_open(zip->cd_mem_stream, NULL, MZ_OPEN_MODE_CREATE); |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 521 | |
| 522 | zip->cd_stream = zip->cd_mem_stream; |
| 523 | } |
| 524 | else |
| 525 | { |
| 526 | zip->cd_stream = stream; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 527 | } |
| 528 | |
Nathan Moinvaziri | 3f7de8e | 2017-12-11 21:09:52 -0800 | [diff] [blame] | 529 | if ((mode & MZ_OPEN_MODE_READ) || (mode & MZ_OPEN_MODE_APPEND)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 530 | { |
Nathan Moinvaziri | 446d062 | 2018-07-16 19:17:46 -0700 | [diff] [blame] | 531 | if ((mode & MZ_OPEN_MODE_CREATE) == 0) |
| 532 | err = mz_zip_read_cd(zip); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 533 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 534 | if ((err == MZ_OK) && (mode & MZ_OPEN_MODE_APPEND)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 535 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 536 | if (zip->cd_size > 0) |
| 537 | { |
| 538 | // Store central directory in memory |
| 539 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 540 | if (err == MZ_OK) |
| 541 | err = mz_stream_copy(zip->cd_mem_stream, zip->stream, (uint32_t)zip->cd_size); |
| 542 | if (err == MZ_OK) |
| 543 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 544 | } |
| 545 | else |
| 546 | { |
| 547 | // If no central directory, append new zip to end of file |
| 548 | err = mz_stream_seek(zip->stream, 0, MZ_SEEK_END); |
| 549 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 550 | } |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 551 | else |
| 552 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 553 | zip->cd_start_pos = zip->cd_offset; |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 554 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 555 | } |
| 556 | |
| 557 | if (err == MZ_OK) |
| 558 | { |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 559 | // Memory streams used to store variable length file info data |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 560 | mz_stream_mem_create(&zip->file_info_stream); |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 561 | mz_stream_mem_open(zip->file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 562 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 563 | mz_stream_mem_create(&zip->local_file_info_stream); |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 564 | mz_stream_mem_open(zip->local_file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 565 | } |
| 566 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 567 | if (err != MZ_OK) |
| 568 | { |
Nathan Moinvaziri | 3f7de8e | 2017-12-11 21:09:52 -0800 | [diff] [blame] | 569 | mz_zip_close(zip); |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 570 | return err; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 571 | } |
| 572 | |
Nathan Moinvaziri | 3f7de8e | 2017-12-11 21:09:52 -0800 | [diff] [blame] | 573 | zip->open_mode = mode; |
| 574 | |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 575 | return err; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 576 | } |
| 577 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 578 | int32_t mz_zip_close(void *handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 579 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 580 | mz_zip *zip = (mz_zip *)handle; |
| 581 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 582 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 583 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 584 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 585 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 586 | if (mz_zip_entry_is_open(handle) == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 587 | { |
| 588 | err = mz_zip_entry_close(handle); |
| 589 | if (err != MZ_OK) |
| 590 | return err; |
| 591 | } |
| 592 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 593 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 594 | err = mz_zip_write_cd(handle); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 595 | |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 596 | if (zip->cd_mem_stream != NULL) |
Nathan Moinvaziri | 51bf64a | 2017-10-20 14:23:37 -0700 | [diff] [blame] | 597 | { |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 598 | mz_stream_close(zip->cd_mem_stream); |
| 599 | mz_stream_delete(&zip->cd_mem_stream); |
Nathan Moinvaziri | 51bf64a | 2017-10-20 14:23:37 -0700 | [diff] [blame] | 600 | } |
| 601 | |
Nathan Moinvaziri | 3f7de8e | 2017-12-11 21:09:52 -0800 | [diff] [blame] | 602 | if (zip->file_info_stream != NULL) |
| 603 | { |
| 604 | mz_stream_mem_close(zip->file_info_stream); |
| 605 | mz_stream_mem_delete(&zip->file_info_stream); |
| 606 | } |
| 607 | if (zip->local_file_info_stream != NULL) |
| 608 | { |
| 609 | mz_stream_mem_close(zip->local_file_info_stream); |
| 610 | mz_stream_mem_delete(&zip->local_file_info_stream); |
| 611 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 612 | |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 613 | if (zip->comment) |
Nathan Moinvaziri | 5244fc0 | 2018-05-02 20:01:35 -0700 | [diff] [blame] | 614 | MZ_FREE(zip->comment); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 615 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 616 | return err; |
| 617 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 618 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 619 | int32_t mz_zip_get_comment(void *handle, const char **comment) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 620 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 621 | mz_zip *zip = (mz_zip *)handle; |
| 622 | if (zip == NULL || comment == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 623 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 624 | if (zip->comment == NULL) |
| 625 | return MZ_EXIST_ERROR; |
| 626 | *comment = zip->comment; |
| 627 | return MZ_OK; |
| 628 | } |
| 629 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 630 | int32_t mz_zip_set_comment(void *handle, const char *comment) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 631 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 632 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 633 | uint16_t comment_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 634 | if (zip == NULL || comment == NULL) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 635 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 636 | if (zip->comment != NULL) |
Nathan Moinvaziri | 5244fc0 | 2018-05-02 20:01:35 -0700 | [diff] [blame] | 637 | MZ_FREE(zip->comment); |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 638 | comment_size = (uint16_t)(strlen(comment) + 1); |
Nathan Moinvaziri | 5244fc0 | 2018-05-02 20:01:35 -0700 | [diff] [blame] | 639 | zip->comment = (char *)MZ_ALLOC(comment_size); |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 640 | strncpy(zip->comment, comment, comment_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 641 | return MZ_OK; |
| 642 | } |
| 643 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 644 | int32_t mz_zip_get_version_madeby(void *handle, uint16_t *version_madeby) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 645 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 646 | mz_zip *zip = (mz_zip *)handle; |
| 647 | if (zip == NULL || version_madeby == NULL) |
| 648 | return MZ_PARAM_ERROR; |
| 649 | *version_madeby = zip->version_madeby; |
| 650 | return MZ_OK; |
| 651 | } |
| 652 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 653 | int32_t mz_zip_set_version_madeby(void *handle, uint16_t version_madeby) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 654 | { |
| 655 | mz_zip *zip = (mz_zip *)handle; |
| 656 | if (zip == NULL) |
| 657 | return MZ_PARAM_ERROR; |
| 658 | zip->version_madeby = version_madeby; |
| 659 | return MZ_OK; |
| 660 | } |
| 661 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 662 | // Get info about the current file in the zip file |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 663 | static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file *file_info, void *file_info_stream) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 664 | { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 665 | uint64_t ntfs_time = 0; |
| 666 | uint32_t reserved = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 667 | uint32_t magic = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 668 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 669 | uint32_t extra_pos = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 670 | uint32_t extra_data_size_read = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 671 | uint16_t extra_header_id = 0; |
| 672 | uint16_t extra_data_size = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 673 | uint16_t ntfs_attrib_id = 0; |
| 674 | uint16_t ntfs_attrib_size = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 675 | uint16_t value16 = 0; |
| 676 | uint32_t value32 = 0; |
| 677 | uint64_t value64 = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 678 | int64_t max_seek = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 679 | int64_t seek = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 680 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 681 | |
| 682 | |
| 683 | memset(file_info, 0, sizeof(mz_zip_file)); |
| 684 | |
| 685 | // Check the magic |
| 686 | err = mz_stream_read_uint32(stream, &magic); |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 687 | if (err == MZ_END_OF_STREAM) |
| 688 | err = MZ_END_OF_LIST; |
| 689 | else if (magic == MZ_ZIP_MAGIC_ENDHEADER || magic == MZ_ZIP_MAGIC_ENDHEADER64) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 690 | err = MZ_END_OF_LIST; |
| 691 | else if ((local) && (magic != MZ_ZIP_MAGIC_LOCALHEADER)) |
| 692 | err = MZ_FORMAT_ERROR; |
| 693 | else if ((!local) && (magic != MZ_ZIP_MAGIC_CENTRALHEADER)) |
| 694 | err = MZ_FORMAT_ERROR; |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 695 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 696 | // Read header fields |
| 697 | if (err == MZ_OK) |
| 698 | { |
| 699 | if (!local) |
| 700 | err = mz_stream_read_uint16(stream, &file_info->version_madeby); |
| 701 | if (err == MZ_OK) |
| 702 | err = mz_stream_read_uint16(stream, &file_info->version_needed); |
| 703 | if (err == MZ_OK) |
| 704 | err = mz_stream_read_uint16(stream, &file_info->flag); |
| 705 | if (err == MZ_OK) |
| 706 | err = mz_stream_read_uint16(stream, &file_info->compression_method); |
| 707 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 708 | { |
| 709 | err = mz_stream_read_uint32(stream, &dos_date); |
| 710 | file_info->modified_date = mz_zip_dosdate_to_time_t(dos_date); |
| 711 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 712 | if (err == MZ_OK) |
| 713 | err = mz_stream_read_uint32(stream, &file_info->crc); |
| 714 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 715 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 716 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 717 | file_info->compressed_size = value32; |
| 718 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 719 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 720 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 721 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 722 | file_info->uncompressed_size = value32; |
| 723 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 724 | if (err == MZ_OK) |
| 725 | err = mz_stream_read_uint16(stream, &file_info->filename_size); |
| 726 | if (err == MZ_OK) |
| 727 | err = mz_stream_read_uint16(stream, &file_info->extrafield_size); |
| 728 | if (!local) |
| 729 | { |
| 730 | if (err == MZ_OK) |
| 731 | err = mz_stream_read_uint16(stream, &file_info->comment_size); |
| 732 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 733 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 734 | err = mz_stream_read_uint16(stream, &value16); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 735 | file_info->disk_number = value16; |
| 736 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 737 | if (err == MZ_OK) |
| 738 | err = mz_stream_read_uint16(stream, &file_info->internal_fa); |
| 739 | if (err == MZ_OK) |
| 740 | err = mz_stream_read_uint32(stream, &file_info->external_fa); |
| 741 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 742 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 743 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 744 | file_info->disk_offset = value32; |
| 745 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 746 | } |
| 747 | } |
| 748 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 749 | max_seek = file_info->filename_size + file_info->extrafield_size + file_info->comment_size + 3; |
| 750 | if (err == MZ_OK) |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 751 | err = mz_stream_seek(file_info_stream, max_seek, MZ_SEEK_SET); |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 752 | if (err == MZ_OK) |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 753 | err = mz_stream_seek(file_info_stream, 0, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 754 | |
| 755 | if ((err == MZ_OK) && (file_info->filename_size > 0)) |
| 756 | { |
Nathan Moinvaziri | a710bd7 | 2018-05-09 00:46:47 -0700 | [diff] [blame] | 757 | mz_stream_mem_get_buffer(file_info_stream, (const void **)&file_info->filename); |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 758 | |
| 759 | err = mz_stream_copy(file_info_stream, stream, file_info->filename_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 760 | if (err == MZ_OK) |
| 761 | err = mz_stream_write_uint8(file_info_stream, 0); |
| 762 | |
| 763 | seek += file_info->filename_size + 1; |
| 764 | } |
| 765 | |
| 766 | if ((err == MZ_OK) && (file_info->extrafield_size > 0)) |
| 767 | { |
Nathan Moinvaziri | a710bd7 | 2018-05-09 00:46:47 -0700 | [diff] [blame] | 768 | mz_stream_mem_get_buffer_at(file_info_stream, seek, (const void **)&file_info->extrafield); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 769 | |
| 770 | err = mz_stream_copy(file_info_stream, stream, file_info->extrafield_size); |
| 771 | if (err == MZ_OK) |
| 772 | err = mz_stream_write_uint8(file_info_stream, 0); |
| 773 | |
| 774 | // Seek back and parse the extra field |
| 775 | if (err == MZ_OK) |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 776 | err = mz_stream_seek(file_info_stream, seek, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 777 | |
| 778 | seek += file_info->extrafield_size + 1; |
| 779 | |
| 780 | while ((err == MZ_OK) && (extra_pos < file_info->extrafield_size)) |
| 781 | { |
| 782 | err = mz_stream_read_uint16(file_info_stream, &extra_header_id); |
| 783 | if (err == MZ_OK) |
| 784 | err = mz_stream_read_uint16(file_info_stream, &extra_data_size); |
| 785 | |
| 786 | // ZIP64 extra field |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 787 | if (extra_header_id == MZ_ZIP_EXTENSION_ZIP64) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 788 | { |
| 789 | if ((err == MZ_OK) && (file_info->uncompressed_size == UINT32_MAX)) |
| 790 | err = mz_stream_read_uint64(file_info_stream, &file_info->uncompressed_size); |
| 791 | if ((err == MZ_OK) && (file_info->compressed_size == UINT32_MAX)) |
| 792 | err = mz_stream_read_uint64(file_info_stream, &file_info->compressed_size); |
| 793 | if ((err == MZ_OK) && (file_info->disk_offset == UINT32_MAX)) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 794 | err = mz_stream_read_uint64(file_info_stream, &file_info->disk_offset); |
juanii | 4ae7992 | 2018-02-11 14:29:36 -0300 | [diff] [blame] | 795 | if ((err == MZ_OK) && (file_info->disk_number == UINT16_MAX)) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 796 | err = mz_stream_read_uint32(file_info_stream, &file_info->disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 797 | } |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 798 | // NTFS extra field |
| 799 | else if (extra_header_id == MZ_ZIP_EXTENSION_NTFS) |
| 800 | { |
Nathan Moinvaziri | 7a3b698 | 2018-05-09 00:45:02 -0700 | [diff] [blame] | 801 | if (err == MZ_OK) |
| 802 | err = mz_stream_read_uint32(file_info_stream, &reserved); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 803 | extra_data_size_read = 4; |
| 804 | |
| 805 | while ((err == MZ_OK) && (extra_data_size_read < extra_data_size)) |
| 806 | { |
| 807 | err = mz_stream_read_uint16(file_info_stream, &ntfs_attrib_id); |
| 808 | if (err == MZ_OK) |
| 809 | err = mz_stream_read_uint16(file_info_stream, &ntfs_attrib_size); |
| 810 | |
Nathan Moinvaziri | 7a3b698 | 2018-05-09 00:45:02 -0700 | [diff] [blame] | 811 | if ((err == MZ_OK) && (ntfs_attrib_id == 0x01) && (ntfs_attrib_size == 24)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 812 | { |
| 813 | err = mz_stream_read_uint64(file_info_stream, &ntfs_time); |
| 814 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->modified_date); |
| 815 | |
juanii | 7063b0e | 2018-02-11 13:56:21 -0300 | [diff] [blame] | 816 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 817 | { |
| 818 | err = mz_stream_read_uint64(file_info_stream, &ntfs_time); |
| 819 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->accessed_date); |
| 820 | } |
juanii | 7063b0e | 2018-02-11 13:56:21 -0300 | [diff] [blame] | 821 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 822 | { |
| 823 | err = mz_stream_read_uint64(file_info_stream, &ntfs_time); |
| 824 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->creation_date); |
| 825 | } |
| 826 | } |
| 827 | else |
| 828 | { |
Nathan Moinvaziri | 7a3b698 | 2018-05-09 00:45:02 -0700 | [diff] [blame] | 829 | if (err == MZ_OK) |
| 830 | err = mz_stream_seek(file_info_stream, ntfs_attrib_size, MZ_SEEK_CUR); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 831 | } |
| 832 | |
| 833 | extra_data_size_read += ntfs_attrib_size + 4; |
| 834 | } |
| 835 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 836 | #ifdef HAVE_AES |
| 837 | // AES extra field |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 838 | else if (extra_header_id == MZ_ZIP_EXTENSION_AES) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 839 | { |
| 840 | uint8_t value8 = 0; |
| 841 | // Verify version info |
| 842 | err = mz_stream_read_uint16(file_info_stream, &value16); |
| 843 | // Support AE-1 and AE-2 |
| 844 | if (value16 != 1 && value16 != 2) |
| 845 | err = MZ_FORMAT_ERROR; |
| 846 | file_info->aes_version = value16; |
| 847 | if (err == MZ_OK) |
| 848 | err = mz_stream_read_uint8(file_info_stream, &value8); |
| 849 | if ((char)value8 != 'A') |
| 850 | err = MZ_FORMAT_ERROR; |
| 851 | if (err == MZ_OK) |
| 852 | err = mz_stream_read_uint8(file_info_stream, &value8); |
| 853 | if ((char)value8 != 'E') |
| 854 | err = MZ_FORMAT_ERROR; |
| 855 | // Get AES encryption strength and actual compression method |
| 856 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 857 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 858 | err = mz_stream_read_uint8(file_info_stream, &value8); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 859 | file_info->aes_encryption_mode = value8; |
| 860 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 861 | if (err == MZ_OK) |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 862 | { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 863 | err = mz_stream_read_uint16(file_info_stream, &value16); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 864 | file_info->compression_method = value16; |
| 865 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 866 | } |
| 867 | #endif |
| 868 | else |
| 869 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 870 | err = mz_stream_seek(file_info_stream, extra_data_size, MZ_SEEK_CUR); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 871 | } |
| 872 | |
| 873 | extra_pos += 4 + extra_data_size; |
| 874 | } |
| 875 | } |
| 876 | |
| 877 | if ((err == MZ_OK) && (file_info->comment_size > 0)) |
| 878 | { |
Nathan Moinvaziri | a710bd7 | 2018-05-09 00:46:47 -0700 | [diff] [blame] | 879 | mz_stream_mem_get_buffer_at(file_info_stream, seek, (const void **)&file_info->comment); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 880 | |
| 881 | err = mz_stream_copy(file_info_stream, stream, file_info->comment_size); |
| 882 | if (err == MZ_OK) |
| 883 | err = mz_stream_write_uint8(file_info_stream, 0); |
| 884 | } |
| 885 | |
| 886 | return err; |
| 887 | } |
| 888 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 889 | 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] | 890 | { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 891 | uint64_t ntfs_time = 0; |
| 892 | uint32_t reserved = 0; |
| 893 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 894 | uint16_t extrafield_size = 0; |
| 895 | uint16_t extrafield_zip64_size = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 896 | uint16_t extrafield_ntfs_size = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 897 | uint16_t filename_size = 0; |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 898 | uint16_t filename_length = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 899 | uint16_t comment_size = 0; |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 900 | uint16_t version_needed = 0; |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 901 | uint16_t field_type = 0; |
| 902 | uint16_t field_length = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 903 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 904 | int32_t err_mem = MZ_OK; |
| 905 | uint8_t zip64 = 0; |
| 906 | uint8_t skip_aes = 0; |
| 907 | void *extrafield_ms = NULL; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 908 | |
| 909 | if (file_info == NULL) |
| 910 | return MZ_PARAM_ERROR; |
| 911 | |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 912 | // Calculate extra field sizes |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 913 | if (file_info->uncompressed_size >= UINT32_MAX) |
| 914 | extrafield_zip64_size += 8; |
| 915 | if (file_info->compressed_size >= UINT32_MAX) |
| 916 | extrafield_zip64_size += 8; |
| 917 | if (file_info->disk_offset >= UINT32_MAX) |
| 918 | extrafield_zip64_size += 8; |
| 919 | |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 920 | if (file_info->zip64 == MZ_ZIP64_AUTO) |
Nathan Moinvaziri | 121e088 | 2018-05-03 17:57:20 -0700 | [diff] [blame] | 921 | { |
| 922 | // If uncompressed size is unknown, assume zip64 for 64-bit data descriptors |
| 923 | zip64 = (local && file_info->uncompressed_size == 0) || (extrafield_zip64_size > 0); |
| 924 | } |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 925 | else if (file_info->zip64 == MZ_ZIP64_FORCE) |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 926 | { |
Nathan Moinvaziri | a56a08c | 2018-05-03 09:35:37 -0700 | [diff] [blame] | 927 | zip64 = 1; |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 928 | } |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 929 | else if (file_info->zip64 == MZ_ZIP64_DISABLE) |
Nathan Moinvaziri | a56a08c | 2018-05-03 09:35:37 -0700 | [diff] [blame] | 930 | { |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 931 | // Zip64 extension is required to zip file |
| 932 | if (extrafield_zip64_size > 0) |
| 933 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | a56a08c | 2018-05-03 09:35:37 -0700 | [diff] [blame] | 934 | } |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 935 | |
| 936 | if (zip64) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 937 | { |
| 938 | extrafield_size += 4; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 939 | extrafield_size += extrafield_zip64_size; |
| 940 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 941 | |
| 942 | // Calculate extra field size and check for duplicates |
| 943 | if (file_info->extrafield_size > 0) |
| 944 | { |
| 945 | mz_stream_mem_create(&extrafield_ms); |
| 946 | mz_stream_mem_set_buffer(extrafield_ms, (void *)file_info->extrafield, file_info->extrafield_size); |
| 947 | |
| 948 | do |
| 949 | { |
| 950 | err_mem = mz_stream_read_uint16(extrafield_ms, &field_type); |
| 951 | if (err_mem == MZ_OK) |
| 952 | err_mem = mz_stream_read_uint16(extrafield_ms, &field_length); |
| 953 | if (err_mem != MZ_OK) |
| 954 | break; |
| 955 | |
| 956 | // Prefer incoming ntfs, aes extensions over ours |
| 957 | if (field_type == MZ_ZIP_EXTENSION_AES) |
| 958 | skip_aes = 1; |
| 959 | |
| 960 | // Prefer our zip64, ntfs extension over incoming |
| 961 | if (field_type != MZ_ZIP_EXTENSION_ZIP64 && field_type != MZ_ZIP_EXTENSION_NTFS) |
| 962 | extrafield_size += 4 + field_length; |
| 963 | |
| 964 | if (err_mem == MZ_OK) |
| 965 | err_mem = mz_stream_seek(extrafield_ms, field_length, SEEK_CUR); |
| 966 | } |
| 967 | while (err_mem == MZ_OK); |
| 968 | } |
| 969 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 970 | #ifdef HAVE_AES |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 971 | if (!skip_aes) |
| 972 | { |
| 973 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
| 974 | extrafield_size += 4 + 7; |
| 975 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 976 | #endif |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 977 | // NTFS timestamps |
Nathan Moinvaziri | d9e159a | 2018-02-13 15:30:30 -0800 | [diff] [blame] | 978 | if ((file_info->modified_date != 0) && |
| 979 | (file_info->accessed_date != 0) && |
| 980 | (file_info->creation_date != 0)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 981 | { |
juanii | 3679a3d | 2018-02-11 13:55:38 -0300 | [diff] [blame] | 982 | extrafield_ntfs_size += 8 + 8 + 8 + 4 + 2 + 2; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 983 | extrafield_size += 4; |
| 984 | extrafield_size += extrafield_ntfs_size; |
| 985 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 986 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 987 | if (local) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 988 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_LOCALHEADER); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 989 | else |
| 990 | { |
| 991 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_CENTRALHEADER); |
| 992 | if (err == MZ_OK) |
| 993 | err = mz_stream_write_uint16(stream, file_info->version_madeby); |
| 994 | } |
| 995 | |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 996 | // Calculate version needed to extract |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 997 | if (err == MZ_OK) |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 998 | { |
| 999 | version_needed = file_info->version_needed; |
| 1000 | if (version_needed == 0) |
| 1001 | { |
| 1002 | version_needed = 20; |
| 1003 | if (zip64) |
| 1004 | version_needed = 45; |
| 1005 | #ifdef HAVE_AES |
| 1006 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
| 1007 | version_needed = 51; |
| 1008 | #endif |
| 1009 | #ifdef HAVE_LZMA |
| 1010 | if (file_info->compression_method == MZ_COMPRESS_METHOD_LZMA) |
| 1011 | version_needed = 63; |
| 1012 | #endif |
| 1013 | } |
| 1014 | err = mz_stream_write_uint16(stream, version_needed); |
| 1015 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1016 | if (err == MZ_OK) |
| 1017 | err = mz_stream_write_uint16(stream, file_info->flag); |
| 1018 | if (err == MZ_OK) |
| 1019 | { |
| 1020 | #ifdef HAVE_AES |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 1021 | if (file_info->aes_version) |
| 1022 | err = mz_stream_write_uint16(stream, MZ_COMPRESS_METHOD_AES); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1023 | else |
| 1024 | #endif |
| 1025 | err = mz_stream_write_uint16(stream, file_info->compression_method); |
| 1026 | } |
| 1027 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1028 | { |
Nathan Moinvaziri | 17cdaec | 2017-10-26 10:18:41 -0700 | [diff] [blame] | 1029 | if (file_info->modified_date != 0) |
| 1030 | 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] | 1031 | err = mz_stream_write_uint32(stream, dos_date); |
| 1032 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1033 | |
| 1034 | if (err == MZ_OK) |
| 1035 | err = mz_stream_write_uint32(stream, file_info->crc); // crc |
| 1036 | if (err == MZ_OK) |
| 1037 | { |
| 1038 | if (file_info->compressed_size >= UINT32_MAX) // compr size |
| 1039 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
| 1040 | else |
| 1041 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->compressed_size); |
| 1042 | } |
| 1043 | if (err == MZ_OK) |
| 1044 | { |
| 1045 | if (file_info->uncompressed_size >= UINT32_MAX) // uncompr size |
| 1046 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
| 1047 | else |
| 1048 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->uncompressed_size); |
| 1049 | } |
| 1050 | |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 1051 | filename_length = (uint16_t)strlen(file_info->filename); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1052 | if (err == MZ_OK) |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 1053 | { |
| 1054 | filename_size = filename_length; |
| 1055 | if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK) |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 1056 | { |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1057 | if ((file_info->filename[filename_length - 1] == '/') || |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 1058 | (file_info->filename[filename_length - 1] == '\\')) |
| 1059 | filename_length -= 1; |
| 1060 | else |
| 1061 | filename_size += 1; |
| 1062 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1063 | err = mz_stream_write_uint16(stream, filename_size); |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 1064 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1065 | if (err == MZ_OK) |
| 1066 | err = mz_stream_write_uint16(stream, extrafield_size); |
| 1067 | |
| 1068 | if (!local) |
| 1069 | { |
| 1070 | if (file_info->comment != NULL) |
| 1071 | comment_size = (uint16_t)strlen(file_info->comment); |
| 1072 | if (err == MZ_OK) |
| 1073 | err = mz_stream_write_uint16(stream, comment_size); |
| 1074 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 1075 | err = mz_stream_write_uint16(stream, (uint16_t)file_info->disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1076 | if (err == MZ_OK) |
| 1077 | err = mz_stream_write_uint16(stream, file_info->internal_fa); |
| 1078 | if (err == MZ_OK) |
| 1079 | err = mz_stream_write_uint32(stream, file_info->external_fa); |
| 1080 | if (err == MZ_OK) |
| 1081 | { |
| 1082 | if (file_info->disk_offset >= UINT32_MAX) |
| 1083 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
| 1084 | else |
| 1085 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->disk_offset); |
| 1086 | } |
| 1087 | } |
| 1088 | |
| 1089 | if (err == MZ_OK) |
| 1090 | { |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 1091 | if (mz_stream_write(stream, file_info->filename, filename_length) != filename_length) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1092 | err = MZ_STREAM_ERROR; |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 1093 | if (err == MZ_OK) |
| 1094 | { |
Nathan Moinvaziri | 240b3b6 | 2018-05-02 13:38:14 -0700 | [diff] [blame] | 1095 | // Ensure that directories have a slash appended to them for compatibility |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 1096 | if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK) |
| 1097 | err = mz_stream_write_uint8(stream, '/'); |
| 1098 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1099 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1100 | |
| 1101 | if (file_info->extrafield_size > 0) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1102 | { |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1103 | err_mem = mz_stream_mem_seek(extrafield_ms, 0, SEEK_SET); |
| 1104 | while (err == MZ_OK && err_mem == MZ_OK) |
| 1105 | { |
| 1106 | err_mem = mz_stream_read_uint16(extrafield_ms, &field_type); |
| 1107 | if (err_mem == MZ_OK) |
| 1108 | err_mem = mz_stream_read_uint16(extrafield_ms, &field_length); |
| 1109 | if (err_mem != MZ_OK) |
| 1110 | break; |
| 1111 | |
| 1112 | // Prefer our zip 64, ntfs extensions over incoming |
| 1113 | if (field_type == MZ_ZIP_EXTENSION_ZIP64 || field_type == MZ_ZIP_EXTENSION_NTFS) |
| 1114 | { |
| 1115 | err_mem = mz_stream_seek(extrafield_ms, field_length, SEEK_CUR); |
| 1116 | continue; |
| 1117 | } |
| 1118 | |
| 1119 | err = mz_stream_write_uint16(stream, field_type); |
| 1120 | if (err == MZ_OK) |
| 1121 | err = mz_stream_write_uint16(stream, field_length); |
| 1122 | if (err == MZ_OK) |
| 1123 | err = mz_stream_copy(stream, extrafield_ms, field_length); |
| 1124 | } |
| 1125 | |
| 1126 | mz_stream_mem_delete(&extrafield_ms); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1127 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1128 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1129 | // Add ZIP64 extra info header to central directory |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1130 | if ((err == MZ_OK) && (zip64)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1131 | { |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 1132 | err = mz_stream_write_uint16(stream, MZ_ZIP_EXTENSION_ZIP64); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1133 | if (err == MZ_OK) |
| 1134 | err = mz_stream_write_uint16(stream, extrafield_zip64_size); |
| 1135 | if ((err == MZ_OK) && (file_info->uncompressed_size >= UINT32_MAX)) |
| 1136 | err = mz_stream_write_uint64(stream, file_info->uncompressed_size); |
| 1137 | if ((err == MZ_OK) && (file_info->compressed_size >= UINT32_MAX)) |
| 1138 | err = mz_stream_write_uint64(stream, file_info->compressed_size); |
| 1139 | if ((err == MZ_OK) && (file_info->disk_offset >= UINT32_MAX)) |
| 1140 | err = mz_stream_write_uint64(stream, file_info->disk_offset); |
| 1141 | } |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1142 | // Write NTFS timestamps |
| 1143 | if ((err == MZ_OK) && (extrafield_ntfs_size > 0)) |
| 1144 | { |
| 1145 | err = mz_stream_write_uint16(stream, MZ_ZIP_EXTENSION_NTFS); |
| 1146 | if (err == MZ_OK) |
| 1147 | err = mz_stream_write_uint16(stream, extrafield_ntfs_size); |
| 1148 | if (err == MZ_OK) |
| 1149 | err = mz_stream_write_uint32(stream, reserved); |
| 1150 | if (err == MZ_OK) |
| 1151 | err = mz_stream_write_uint16(stream, 0x01); |
| 1152 | if (err == MZ_OK) |
| 1153 | err = mz_stream_write_uint16(stream, extrafield_ntfs_size - 8); |
juanii | 3679a3d | 2018-02-11 13:55:38 -0300 | [diff] [blame] | 1154 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1155 | { |
| 1156 | mz_zip_unix_to_ntfs_time(file_info->modified_date, &ntfs_time); |
| 1157 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 1158 | } |
juanii | 3679a3d | 2018-02-11 13:55:38 -0300 | [diff] [blame] | 1159 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1160 | { |
| 1161 | mz_zip_unix_to_ntfs_time(file_info->accessed_date, &ntfs_time); |
| 1162 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 1163 | } |
juanii | 3679a3d | 2018-02-11 13:55:38 -0300 | [diff] [blame] | 1164 | if (err == MZ_OK) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1165 | { |
| 1166 | mz_zip_unix_to_ntfs_time(file_info->creation_date, &ntfs_time); |
| 1167 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 1168 | } |
| 1169 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1170 | #ifdef HAVE_AES |
| 1171 | // Write AES extra info header to central directory |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1172 | 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] | 1173 | { |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 1174 | err = mz_stream_write_uint16(stream, MZ_ZIP_EXTENSION_AES); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1175 | if (err == MZ_OK) |
| 1176 | err = mz_stream_write_uint16(stream, 7); |
| 1177 | if (err == MZ_OK) |
| 1178 | err = mz_stream_write_uint16(stream, file_info->aes_version); |
| 1179 | if (err == MZ_OK) |
| 1180 | err = mz_stream_write_uint8(stream, 'A'); |
| 1181 | if (err == MZ_OK) |
| 1182 | err = mz_stream_write_uint8(stream, 'E'); |
| 1183 | if (err == MZ_OK) |
| 1184 | err = mz_stream_write_uint8(stream, file_info->aes_encryption_mode); |
| 1185 | if (err == MZ_OK) |
| 1186 | err = mz_stream_write_uint16(stream, file_info->compression_method); |
| 1187 | } |
| 1188 | #endif |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1189 | if ((err == MZ_OK) && (!local) && (file_info->comment != NULL)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1190 | { |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1191 | if (mz_stream_write(stream, file_info->comment, file_info->comment_size) != file_info->comment_size) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1192 | err = MZ_STREAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1193 | } |
| 1194 | |
| 1195 | return err; |
| 1196 | } |
| 1197 | |
Nathan Moinvaziri | 26308b2 | 2018-08-08 09:40:15 -0700 | [diff] [blame] | 1198 | 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] | 1199 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1200 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1201 | int64_t max_total_in = 0; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1202 | int64_t header_size = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1203 | int64_t footer_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1204 | int32_t err = MZ_OK; |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1205 | uint8_t use_crypt = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1206 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1207 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1208 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1209 | |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1210 | switch (zip->file_info.compression_method) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1211 | { |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1212 | case MZ_COMPRESS_METHOD_STORE: |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1213 | case MZ_COMPRESS_METHOD_DEFLATE: |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1214 | #ifdef HAVE_BZIP2 |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1215 | case MZ_COMPRESS_METHOD_BZIP2: |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1216 | #endif |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1217 | #if HAVE_LZMA |
| 1218 | case MZ_COMPRESS_METHOD_LZMA: |
| 1219 | #endif |
| 1220 | err = MZ_OK; |
| 1221 | break; |
| 1222 | default: |
Nathan Moinvaziri | 829ffb5 | 2018-08-14 14:00:16 -0700 | [diff] [blame] | 1223 | return MZ_SUPPORT_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1224 | } |
| 1225 | |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1226 | zip->entry_raw = raw; |
| 1227 | |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1228 | if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password != NULL)) |
| 1229 | { |
| 1230 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
| 1231 | { |
| 1232 | // 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] | 1233 | if (!zip->entry_raw) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1234 | use_crypt = 1; |
| 1235 | } |
| 1236 | else if (zip->open_mode & MZ_OPEN_MODE_READ) |
| 1237 | { |
| 1238 | // Decrypt only when password is supplied. Don't error when password |
| 1239 | // is not supplied as we may want to read the raw encrypted data. |
| 1240 | use_crypt = 1; |
| 1241 | } |
| 1242 | } |
| 1243 | |
| 1244 | if ((err == MZ_OK) && (use_crypt)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1245 | { |
| 1246 | #ifdef HAVE_AES |
| 1247 | if (zip->file_info.aes_version) |
| 1248 | { |
| 1249 | mz_stream_aes_create(&zip->crypt_stream); |
| 1250 | mz_stream_aes_set_password(zip->crypt_stream, password); |
| 1251 | mz_stream_aes_set_encryption_mode(zip->crypt_stream, zip->file_info.aes_encryption_mode); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1252 | } |
| 1253 | else |
| 1254 | #endif |
| 1255 | { |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 1256 | #ifdef HAVE_PKCRYPT |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1257 | uint8_t verify1 = 0; |
| 1258 | uint8_t verify2 = 0; |
| 1259 | |
| 1260 | // Info-ZIP modification to ZipCrypto format: |
| 1261 | // If bit 3 of the general purpose bit flag is set, it uses high byte of 16-bit File Time. |
| 1262 | |
Nathan Moinvaziri | 18a3065 | 2017-12-07 06:59:53 -0800 | [diff] [blame] | 1263 | if (zip->file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR) |
| 1264 | { |
| 1265 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1266 | |
Nathan Moinvaziri | 18a3065 | 2017-12-07 06:59:53 -0800 | [diff] [blame] | 1267 | dos_date = mz_zip_time_t_to_dos_date(zip->file_info.modified_date); |
| 1268 | |
| 1269 | verify1 = (uint8_t)((dos_date >> 16) & 0xff); |
| 1270 | verify2 = (uint8_t)((dos_date >> 8) & 0xff); |
| 1271 | } |
| 1272 | else |
| 1273 | { |
| 1274 | verify1 = (uint8_t)((zip->file_info.crc >> 16) & 0xff); |
| 1275 | verify2 = (uint8_t)((zip->file_info.crc >> 24) & 0xff); |
| 1276 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1277 | |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 1278 | mz_stream_pkcrypt_create(&zip->crypt_stream); |
| 1279 | mz_stream_pkcrypt_set_password(zip->crypt_stream, password); |
| 1280 | mz_stream_pkcrypt_set_verify(zip->crypt_stream, verify1, verify2); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1281 | #endif |
| 1282 | } |
| 1283 | } |
| 1284 | |
| 1285 | if (err == MZ_OK) |
| 1286 | { |
| 1287 | if (zip->crypt_stream == NULL) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1288 | mz_stream_raw_create(&zip->crypt_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1289 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1290 | mz_stream_set_base(zip->crypt_stream, zip->stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1291 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1292 | err = mz_stream_open(zip->crypt_stream, NULL, zip->open_mode); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1293 | } |
| 1294 | |
| 1295 | if (err == MZ_OK) |
| 1296 | { |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1297 | 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] | 1298 | mz_stream_raw_create(&zip->compress_stream); |
Andy Maloney | 3909c23 | 2018-05-22 09:02:09 -0400 | [diff] [blame] | 1299 | #ifdef HAVE_ZLIB |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1300 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1301 | mz_stream_zlib_create(&zip->compress_stream); |
Andy Maloney | 3909c23 | 2018-05-22 09:02:09 -0400 | [diff] [blame] | 1302 | #endif |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1303 | #ifdef HAVE_BZIP2 |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1304 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_BZIP2) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1305 | mz_stream_bzip_create(&zip->compress_stream); |
| 1306 | #endif |
| 1307 | #ifdef HAVE_LZMA |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1308 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1309 | mz_stream_lzma_create(&zip->compress_stream); |
| 1310 | #endif |
| 1311 | else |
| 1312 | err = MZ_PARAM_ERROR; |
| 1313 | } |
| 1314 | |
| 1315 | if (err == MZ_OK) |
| 1316 | { |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1317 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1318 | { |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1319 | 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] | 1320 | } |
| 1321 | else |
| 1322 | { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1323 | 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] | 1324 | { |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1325 | max_total_in = zip->file_info.compressed_size; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1326 | mz_stream_set_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in); |
| 1327 | |
| 1328 | if (mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_HEADER_SIZE, &header_size) == MZ_OK) |
| 1329 | max_total_in -= header_size; |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1330 | if (mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_FOOTER_SIZE, &footer_size) == MZ_OK) |
| 1331 | max_total_in -= footer_size; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1332 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1333 | 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] | 1334 | } |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1335 | 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] | 1336 | { |
| 1337 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, zip->file_info.compressed_size); |
| 1338 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT_MAX, zip->file_info.uncompressed_size); |
| 1339 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1340 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1341 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1342 | mz_stream_set_base(zip->compress_stream, zip->crypt_stream); |
| 1343 | |
| 1344 | err = mz_stream_open(zip->compress_stream, NULL, zip->open_mode); |
| 1345 | } |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1346 | |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1347 | if (err == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1348 | { |
| 1349 | mz_stream_crc32_create(&zip->crc32_stream); |
| 1350 | mz_stream_set_base(zip->crc32_stream, zip->compress_stream); |
| 1351 | |
| 1352 | err = mz_stream_open(zip->crc32_stream, NULL, zip->open_mode); |
| 1353 | } |
| 1354 | |
| 1355 | if (err == MZ_OK) |
| 1356 | { |
| 1357 | zip->entry_opened = 1; |
| 1358 | } |
| 1359 | |
| 1360 | return err; |
| 1361 | } |
| 1362 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1363 | int32_t mz_zip_entry_is_open(void *handle) |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1364 | { |
| 1365 | mz_zip *zip = (mz_zip *)handle; |
| 1366 | if (zip == NULL) |
| 1367 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1368 | if (zip->entry_opened == 0) |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1369 | return MZ_EXIST_ERROR; |
| 1370 | return MZ_OK; |
| 1371 | } |
| 1372 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1373 | int32_t mz_zip_entry_is_dir(void *handle) |
Nathan Moinvaziri | 829ffb5 | 2018-08-14 14:00:16 -0700 | [diff] [blame] | 1374 | { |
| 1375 | mz_zip *zip = (mz_zip *)handle; |
| 1376 | int32_t filename_length = 0; |
| 1377 | |
| 1378 | if (zip == NULL) |
| 1379 | return MZ_PARAM_ERROR; |
| 1380 | if (zip->entry_scanned == 0) |
| 1381 | return MZ_PARAM_ERROR; |
| 1382 | if (mz_zip_attrib_is_dir(zip->file_info.external_fa, zip->file_info.version_madeby) == MZ_OK) |
| 1383 | return MZ_OK; |
| 1384 | |
| 1385 | filename_length = (int32_t )strlen(zip->file_info.filename); |
| 1386 | if (filename_length > 0) |
| 1387 | { |
| 1388 | if ((zip->file_info.filename[filename_length - 1] == '/') || |
| 1389 | (zip->file_info.filename[filename_length - 1] == '\\')) |
| 1390 | return MZ_OK; |
| 1391 | } |
| 1392 | return MZ_EXIST_ERROR; |
| 1393 | } |
| 1394 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1395 | 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] | 1396 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1397 | mz_zip *zip = (mz_zip *)handle; |
| 1398 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1399 | |
Nathan Moinvaziri | 4042763 | 2018-07-22 11:12:40 -0700 | [diff] [blame] | 1400 | #if defined(MZ_ZIP_NO_ENCRYPTION) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1401 | if (password != NULL) |
| 1402 | return MZ_PARAM_ERROR; |
| 1403 | #endif |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1404 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1405 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1406 | if ((zip->open_mode & MZ_OPEN_MODE_READ) == 0) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1407 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1408 | if (zip->entry_scanned == 0) |
| 1409 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 0f09a00 | 2018-04-23 18:48:30 -0700 | [diff] [blame] | 1410 | if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password == NULL) && (!raw)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1411 | return MZ_PARAM_ERROR; |
| 1412 | |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 1413 | if (zip->file_info.disk_number == zip->disk_number_with_cd) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1414 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
| 1415 | else |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 1416 | 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] | 1417 | |
Nathan Moinvaziri | ee614ff | 2018-07-12 12:36:33 -0700 | [diff] [blame] | 1418 | 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] | 1419 | if (err == MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1420 | 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] | 1421 | |
Nathan Moinvaziri | a6d1f66 | 2018-07-22 10:35:49 -0700 | [diff] [blame] | 1422 | #ifdef MZ_ZIP_NO_DECOMPRESSION |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1423 | if (zip->file_info.compression_method != MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1424 | err = MZ_SUPPORT_ERROR; |
| 1425 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1426 | if (err == MZ_OK) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1427 | err = mz_zip_entry_open_int(handle, raw, 0, password); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1428 | |
| 1429 | return err; |
| 1430 | } |
| 1431 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1432 | 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] | 1433 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1434 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1435 | int64_t disk_number = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1436 | int32_t err = MZ_OK; |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1437 | int32_t len = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1438 | |
Nathan Moinvaziri | 4042763 | 2018-07-22 11:12:40 -0700 | [diff] [blame] | 1439 | #if defined(MZ_ZIP_NO_ENCRYPTION) |
tz-lom | b1b2580 | 2017-11-10 15:03:02 +0300 | [diff] [blame] | 1440 | if (password != NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1441 | return MZ_PARAM_ERROR; |
| 1442 | #endif |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1443 | if (zip == NULL || file_info == NULL || file_info->filename == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1444 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1445 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1446 | if (mz_zip_entry_is_open(handle) == MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1447 | { |
| 1448 | err = mz_zip_entry_close(handle); |
| 1449 | if (err != MZ_OK) |
| 1450 | return err; |
| 1451 | } |
| 1452 | |
| 1453 | memcpy(&zip->file_info, file_info, sizeof(mz_zip_file)); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1454 | |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1455 | mz_stream_seek(zip->file_info_stream, 0, SEEK_SET); |
| 1456 | mz_stream_write(zip->file_info_stream, file_info, sizeof(mz_zip_file)); |
| 1457 | |
| 1458 | // Copy filename, extrafield, and comment internally |
| 1459 | if (file_info->filename != NULL) |
| 1460 | { |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1461 | mz_stream_mem_get_buffer_at_current(zip->file_info_stream, &zip->file_info.filename); |
| 1462 | mz_stream_write_chars(zip->file_info_stream, file_info->filename, 1); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1463 | } |
| 1464 | if (file_info->extrafield != NULL) |
| 1465 | { |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1466 | mz_stream_mem_get_buffer_at_current(zip->file_info_stream, &zip->file_info.extrafield); |
| 1467 | 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] | 1468 | } |
| 1469 | if (file_info->comment != NULL) |
| 1470 | { |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1471 | mz_stream_mem_get_buffer_at_current(zip->file_info_stream, &zip->file_info.comment); |
| 1472 | mz_stream_write_chars(zip->file_info_stream, file_info->comment, 1); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1473 | } |
| 1474 | |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1475 | if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE) |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1476 | { |
| 1477 | if ((compress_level == 8) || (compress_level == 9)) |
| 1478 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_MAX; |
| 1479 | if (compress_level == 2) |
| 1480 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_FAST; |
| 1481 | if (compress_level == 1) |
| 1482 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_SUPER_FAST; |
| 1483 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1484 | #ifdef HAVE_LZMA |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1485 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA) |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1486 | zip->file_info.flag |= MZ_ZIP_FLAG_LZMA_EOS_MARKER; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1487 | #endif |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1488 | |
| 1489 | zip->file_info.flag |= MZ_ZIP_FLAG_DATA_DESCRIPTOR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1490 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1491 | if (password != NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1492 | zip->file_info.flag |= MZ_ZIP_FLAG_ENCRYPTED; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1493 | |
juanii | b8887e9 | 2018-02-14 00:51:05 -0300 | [diff] [blame] | 1494 | mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number); |
| 1495 | zip->file_info.disk_number = (uint32_t)disk_number; |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1496 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1497 | zip->file_info.disk_offset = mz_stream_tell(zip->stream); |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1498 | zip->file_info.crc = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1499 | zip->file_info.compressed_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1500 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1501 | #ifdef HAVE_AES |
| 1502 | if (zip->file_info.aes_version && zip->file_info.aes_encryption_mode == 0) |
| 1503 | zip->file_info.aes_encryption_mode = MZ_AES_ENCRYPTION_MODE_256; |
| 1504 | #endif |
| 1505 | |
Nathan Moinvaziri | 4827f71 | 2018-05-02 10:50:47 -0700 | [diff] [blame] | 1506 | if ((compress_level == 0) || (mz_zip_attrib_is_dir(zip->file_info.external_fa, zip->file_info.version_madeby) == MZ_OK)) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1507 | zip->file_info.compression_method = MZ_COMPRESS_METHOD_STORE; |
Viktor Szakats | 2884e67 | 2018-04-30 08:12:13 +0000 | [diff] [blame] | 1508 | |
Nathan Moinvaziri | a6d1f66 | 2018-07-22 10:35:49 -0700 | [diff] [blame] | 1509 | #ifdef MZ_ZIP_NO_COMPRESSION |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1510 | if (zip->file_info.compression_method != MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1511 | err = MZ_SUPPORT_ERROR; |
| 1512 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1513 | if (err == MZ_OK) |
| 1514 | err = mz_zip_entry_write_header(zip->stream, 1, &zip->file_info); |
| 1515 | if (err == MZ_OK) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1516 | err = mz_zip_entry_open_int(handle, raw, compress_level, password); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1517 | |
| 1518 | return err; |
| 1519 | } |
| 1520 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1521 | 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] | 1522 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1523 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1524 | int32_t read = 0; |
| 1525 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1526 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1527 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1528 | if (UINT_MAX == UINT16_MAX && len > UINT16_MAX) // zlib limitation |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1529 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | d7814e9 | 2018-07-11 14:54:14 -0700 | [diff] [blame] | 1530 | if (len == 0) |
| 1531 | return MZ_PARAM_ERROR; |
| 1532 | |
Nathan Moinvaziri | eb80cd9 | 2018-07-11 16:45:09 -0700 | [diff] [blame] | 1533 | if (zip->file_info.compressed_size == 0) |
| 1534 | return 0; |
| 1535 | |
Nathan Moinvaziri | d7814e9 | 2018-07-11 14:54:14 -0700 | [diff] [blame] | 1536 | // Read entire entry even if uncompressed_size = 0, otherwise |
| 1537 | // aes encryption validation will fail if compressed_size > 0 |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1538 | read = mz_stream_read(zip->crc32_stream, buf, len); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1539 | return read; |
| 1540 | } |
| 1541 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1542 | 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] | 1543 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1544 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1545 | int32_t written = 0; |
| 1546 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1547 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1548 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1549 | written = mz_stream_write(zip->crc32_stream, buf, len); |
| 1550 | return written; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1551 | } |
| 1552 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1553 | 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] | 1554 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1555 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1556 | if (zip == NULL || !zip->entry_scanned) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1557 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1558 | *file_info = &zip->file_info; |
| 1559 | return MZ_OK; |
| 1560 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1561 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1562 | 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] | 1563 | { |
| 1564 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1565 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1566 | return MZ_PARAM_ERROR; |
| 1567 | *local_file_info = &zip->local_file_info; |
| 1568 | return MZ_OK; |
| 1569 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1570 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1571 | int32_t mz_zip_entry_close(void *handle) |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 1572 | { |
| 1573 | return mz_zip_entry_close_raw(handle, 0, 0); |
| 1574 | } |
| 1575 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1576 | int32_t mz_zip_entry_close_raw(void *handle, uint64_t uncompressed_size, uint32_t crc32) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1577 | { |
| 1578 | mz_zip *zip = (mz_zip *)handle; |
| 1579 | uint64_t compressed_size = 0; |
Nathan Moinvaziri | 8871f6c | 2018-07-08 19:23:56 -0700 | [diff] [blame] | 1580 | int64_t total_in = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1581 | int32_t err = MZ_OK; |
| 1582 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1583 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1584 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1585 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1586 | mz_stream_close(zip->compress_stream); |
Nathan Moinvaziri | 6ac2ff4 | 2018-07-21 14:29:29 -0700 | [diff] [blame] | 1587 | |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 1588 | if (!zip->entry_raw) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1589 | crc32 = mz_stream_crc32_get_value(zip->crc32_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1590 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1591 | if ((zip->open_mode & MZ_OPEN_MODE_WRITE) == 0) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1592 | { |
| 1593 | #ifdef HAVE_AES |
| 1594 | // AES zip version AE-1 will expect a valid crc as well |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1595 | if (zip->file_info.aes_version <= 0x0001) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1596 | #endif |
| 1597 | { |
Nathan Moinvaziri | 6ac2ff4 | 2018-07-21 14:29:29 -0700 | [diff] [blame] | 1598 | mz_stream_get_prop_int64(zip->crc32_stream, MZ_STREAM_PROP_TOTAL_IN, &total_in); |
Nathan Moinvaziri | 184f4cb | 2018-07-09 07:53:17 -0700 | [diff] [blame] | 1599 | // If entire entry was not read this will fail |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 1600 | if ((total_in > 0) && (!zip->entry_raw)) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1601 | { |
| 1602 | if (crc32 != zip->file_info.crc) |
| 1603 | err = MZ_CRC_ERROR; |
| 1604 | } |
| 1605 | } |
| 1606 | } |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1607 | |
| 1608 | mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT, (int64_t *)&compressed_size); |
Nathan Moinvaziri | 9eb113d | 2018-08-08 17:38:38 -0700 | [diff] [blame] | 1609 | if (!zip->entry_raw) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1610 | mz_stream_get_prop_int64(zip->crc32_stream, MZ_STREAM_PROP_TOTAL_OUT, (int64_t *)&uncompressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1611 | |
| 1612 | if (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) |
| 1613 | { |
| 1614 | mz_stream_set_base(zip->crypt_stream, zip->stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1615 | err = mz_stream_close(zip->crypt_stream); |
| 1616 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1617 | 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] | 1618 | } |
| 1619 | |
| 1620 | mz_stream_delete(&zip->crypt_stream); |
| 1621 | |
| 1622 | mz_stream_delete(&zip->compress_stream); |
| 1623 | mz_stream_crc32_delete(&zip->crc32_stream); |
| 1624 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1625 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1626 | { |
| 1627 | if (err == MZ_OK) |
| 1628 | { |
| 1629 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_DATADESCRIPTOR); |
| 1630 | if (err == MZ_OK) |
| 1631 | err = mz_stream_write_uint32(zip->stream, crc32); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1632 | // Store data descriptor as 8 bytes if zip 64 extension enabled |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1633 | if (err == MZ_OK) |
| 1634 | { |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 1635 | // Zip 64 extension is enabled when uncompressed size is > UINT32_mAX |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1636 | if (zip->file_info.uncompressed_size <= UINT32_MAX) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1637 | err = mz_stream_write_uint32(zip->stream, (uint32_t)compressed_size); |
Andrew Gunnerson | 3c52d21 | 2018-01-05 22:28:12 -0500 | [diff] [blame] | 1638 | else |
| 1639 | err = mz_stream_write_uint64(zip->stream, compressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1640 | } |
| 1641 | if (err == MZ_OK) |
| 1642 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1643 | if (zip->file_info.uncompressed_size <= UINT32_MAX) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1644 | err = mz_stream_write_uint32(zip->stream, (uint32_t)uncompressed_size); |
Andrew Gunnerson | 3c52d21 | 2018-01-05 22:28:12 -0500 | [diff] [blame] | 1645 | else |
| 1646 | err = mz_stream_write_uint64(zip->stream, uncompressed_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1647 | } |
| 1648 | } |
| 1649 | |
| 1650 | zip->file_info.crc = crc32; |
| 1651 | zip->file_info.compressed_size = compressed_size; |
| 1652 | zip->file_info.uncompressed_size = uncompressed_size; |
| 1653 | |
| 1654 | if (err == MZ_OK) |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 1655 | 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] | 1656 | |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 1657 | zip->number_entry += 1; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1658 | } |
| 1659 | |
| 1660 | zip->entry_opened = 0; |
| 1661 | |
| 1662 | return err; |
| 1663 | } |
| 1664 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1665 | static int32_t mz_zip_goto_next_entry_int(void *handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1666 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1667 | mz_zip *zip = (mz_zip *)handle; |
| 1668 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1669 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1670 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1671 | return MZ_PARAM_ERROR; |
| 1672 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1673 | zip->entry_scanned = 0; |
| 1674 | |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1675 | 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] | 1676 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1677 | 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] | 1678 | if (err == MZ_OK) |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 1679 | 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] | 1680 | if (err == MZ_OK) |
| 1681 | zip->entry_scanned = 1; |
| 1682 | return err; |
| 1683 | } |
| 1684 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1685 | int32_t mz_zip_get_number_entry(void *handle, int64_t *number_entry) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 1686 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1687 | mz_zip *zip = (mz_zip *)handle; |
| 1688 | if (zip == NULL || number_entry == NULL) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 1689 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 1690 | *number_entry = zip->number_entry; |
| 1691 | return MZ_OK; |
| 1692 | } |
| 1693 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1694 | 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] | 1695 | { |
| 1696 | mz_zip *zip = (mz_zip *)handle; |
| 1697 | if (zip == NULL || disk_number_with_cd == NULL) |
| 1698 | return MZ_PARAM_ERROR; |
| 1699 | *disk_number_with_cd = zip->disk_number_with_cd; |
| 1700 | return MZ_OK; |
| 1701 | } |
| 1702 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1703 | int64_t mz_zip_get_entry(void *handle) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1704 | { |
| 1705 | mz_zip *zip = (mz_zip *)handle; |
| 1706 | |
| 1707 | if (zip == NULL) |
| 1708 | return MZ_PARAM_ERROR; |
| 1709 | |
| 1710 | return zip->cd_current_pos; |
| 1711 | } |
| 1712 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1713 | int32_t mz_zip_goto_entry(void *handle, uint64_t cd_pos) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1714 | { |
| 1715 | mz_zip *zip = (mz_zip *)handle; |
| 1716 | |
| 1717 | if (zip == NULL) |
| 1718 | return MZ_PARAM_ERROR; |
| 1719 | |
| 1720 | if (cd_pos < zip->cd_start_pos || cd_pos > zip->cd_start_pos + zip->cd_size) |
| 1721 | return MZ_PARAM_ERROR; |
| 1722 | |
| 1723 | zip->cd_current_pos = cd_pos; |
| 1724 | |
| 1725 | return mz_zip_goto_next_entry_int(handle); |
| 1726 | } |
| 1727 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1728 | int32_t mz_zip_goto_first_entry(void *handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1729 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1730 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1731 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1732 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1733 | return MZ_PARAM_ERROR; |
| 1734 | |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 1735 | zip->cd_current_pos = zip->cd_start_pos; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1736 | |
| 1737 | return mz_zip_goto_next_entry_int(handle); |
| 1738 | } |
| 1739 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1740 | int32_t mz_zip_goto_next_entry(void *handle) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1741 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1742 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1743 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1744 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1745 | return MZ_PARAM_ERROR; |
| 1746 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1747 | zip->cd_current_pos += MZ_ZIP_SIZE_CD_ITEM + zip->file_info.filename_size + |
| 1748 | zip->file_info.extrafield_size + zip->file_info.comment_size; |
| 1749 | |
| 1750 | return mz_zip_goto_next_entry_int(handle); |
| 1751 | } |
| 1752 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1753 | 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] | 1754 | { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1755 | mz_zip *zip = (mz_zip *)handle; |
| 1756 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1757 | int32_t result = 0; |
| 1758 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1759 | if (zip == NULL || filename == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1760 | return MZ_PARAM_ERROR; |
| 1761 | |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1762 | // If we are already on the current entry, no need to search |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1763 | if ((zip->entry_scanned) && (zip->file_info.filename != NULL)) |
| 1764 | { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1765 | result = mz_zip_path_compare(zip->file_info.filename, filename, ignore_case); |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1766 | if (result == 0) |
| 1767 | return MZ_OK; |
| 1768 | } |
| 1769 | |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1770 | // Search all entries starting at the first |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1771 | err = mz_zip_goto_first_entry(handle); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1772 | while (err == MZ_OK) |
| 1773 | { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1774 | result = mz_zip_path_compare(zip->file_info.filename, filename, ignore_case); |
| 1775 | if (result == 0) |
| 1776 | return MZ_OK; |
| 1777 | |
| 1778 | err = mz_zip_goto_next_entry(handle); |
| 1779 | } |
| 1780 | |
| 1781 | return err; |
| 1782 | } |
| 1783 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1784 | 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] | 1785 | { |
| 1786 | mz_zip *zip = (mz_zip *)handle; |
| 1787 | int32_t err = MZ_OK; |
| 1788 | int32_t result = 0; |
| 1789 | |
| 1790 | // Search first entry looking for match |
| 1791 | err = mz_zip_goto_first_entry(handle); |
| 1792 | if (err != MZ_OK) |
| 1793 | return err; |
| 1794 | |
| 1795 | result = cb(handle, userdata, &zip->file_info); |
| 1796 | if (result == 0) |
| 1797 | return MZ_OK; |
| 1798 | |
| 1799 | return mz_zip_locate_next_entry(handle, userdata, cb); |
| 1800 | } |
| 1801 | |
Nathan Moinvaziri | 590e590 | 2018-08-17 11:10:35 -0700 | [diff] [blame] | 1802 | 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] | 1803 | { |
| 1804 | mz_zip *zip = (mz_zip *)handle; |
| 1805 | int32_t err = MZ_OK; |
| 1806 | int32_t result = 0; |
| 1807 | |
| 1808 | // Search next entries looking for match |
| 1809 | err = mz_zip_goto_next_entry(handle); |
| 1810 | while (err == MZ_OK) |
| 1811 | { |
| 1812 | result = cb(handle, userdata, &zip->file_info); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1813 | if (result == 0) |
| 1814 | return MZ_OK; |
| 1815 | |
| 1816 | err = mz_zip_goto_next_entry(handle); |
| 1817 | } |
| 1818 | |
| 1819 | return err; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1820 | } |
| 1821 | |
| 1822 | /***************************************************************************/ |
| 1823 | |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 1824 | int32_t mz_zip_attrib_is_dir(int32_t attributes, int32_t version_madeby) |
| 1825 | { |
| 1826 | int32_t host_system = (uint8_t)(version_madeby >> 8); |
| 1827 | |
| 1828 | if (host_system == MZ_HOST_SYSTEM_MSDOS || host_system == MZ_HOST_SYSTEM_WINDOWS_NTFS) |
| 1829 | { |
| 1830 | if ((attributes & 0x10) == 0x10) // FILE_ATTRIBUTE_DIRECTORY |
| 1831 | return MZ_OK; |
| 1832 | } |
| 1833 | else if (host_system == MZ_HOST_SYSTEM_UNIX || host_system == MZ_HOST_SYSTEM_OSX_DARWIN) |
| 1834 | { |
| 1835 | if ((attributes & 00170000) == 0040000) // S_ISDIR |
| 1836 | return MZ_OK; |
| 1837 | } |
| 1838 | |
| 1839 | return MZ_EXIST_ERROR; |
| 1840 | } |
| 1841 | |
| 1842 | /***************************************************************************/ |
| 1843 | |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1844 | static int32_t mz_zip_invalid_date(const struct tm *ptm) |
| 1845 | { |
| 1846 | #define datevalue_in_range(min, max, value) ((min) <= (value) && (value) <= (max)) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1847 | 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] | 1848 | !datevalue_in_range(0, 11, ptm->tm_mon) || |
| 1849 | !datevalue_in_range(1, 31, ptm->tm_mday) || |
| 1850 | !datevalue_in_range(0, 23, ptm->tm_hour) || |
| 1851 | !datevalue_in_range(0, 59, ptm->tm_min) || |
| 1852 | !datevalue_in_range(0, 59, ptm->tm_sec)); |
| 1853 | #undef datevalue_in_range |
| 1854 | } |
| 1855 | |
| 1856 | static void mz_zip_dosdate_to_raw_tm(uint64_t dos_date, struct tm *ptm) |
| 1857 | { |
| 1858 | uint64_t date = (uint64_t)(dos_date >> 16); |
| 1859 | |
| 1860 | ptm->tm_mday = (uint16_t)(date & 0x1f); |
| 1861 | ptm->tm_mon = (uint16_t)(((date & 0x1E0) / 0x20) - 1); |
| 1862 | ptm->tm_year = (uint16_t)(((date & 0x0FE00) / 0x0200) + 80); |
| 1863 | ptm->tm_hour = (uint16_t)((dos_date & 0xF800) / 0x800); |
| 1864 | ptm->tm_min = (uint16_t)((dos_date & 0x7E0) / 0x20); |
| 1865 | ptm->tm_sec = (uint16_t)(2 * (dos_date & 0x1f)); |
| 1866 | ptm->tm_isdst = -1; |
| 1867 | } |
| 1868 | |
| 1869 | int32_t mz_zip_dosdate_to_tm(uint64_t dos_date, struct tm *ptm) |
| 1870 | { |
| 1871 | if (ptm == NULL) |
| 1872 | return MZ_PARAM_ERROR; |
| 1873 | |
| 1874 | mz_zip_dosdate_to_raw_tm(dos_date, ptm); |
| 1875 | |
| 1876 | if (mz_zip_invalid_date(ptm)) |
| 1877 | { |
| 1878 | // Invalid date stored, so don't return it |
| 1879 | memset(ptm, 0, sizeof(struct tm)); |
| 1880 | return MZ_FORMAT_ERROR; |
| 1881 | } |
| 1882 | return MZ_OK; |
| 1883 | } |
| 1884 | |
| 1885 | time_t mz_zip_dosdate_to_time_t(uint64_t dos_date) |
| 1886 | { |
| 1887 | struct tm ptm; |
| 1888 | mz_zip_dosdate_to_raw_tm(dos_date, &ptm); |
| 1889 | return mktime(&ptm); |
| 1890 | } |
| 1891 | |
| 1892 | int32_t mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm) |
| 1893 | { |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 1894 | struct tm *ltm = NULL; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1895 | if (ptm == NULL) |
| 1896 | return MZ_PARAM_ERROR; |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1897 | ltm = localtime(&unix_time); // Returns a 1900-based year |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 1898 | if (ltm == NULL) |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1899 | { |
| 1900 | // Invalid date stored, so don't return it |
| 1901 | memset(ptm, 0, sizeof(struct tm)); |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 1902 | return MZ_INTERNAL_ERROR; |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1903 | } |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 1904 | memcpy(ptm, ltm, sizeof(struct tm)); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1905 | return MZ_OK; |
| 1906 | } |
| 1907 | |
| 1908 | uint32_t mz_zip_time_t_to_dos_date(time_t unix_time) |
| 1909 | { |
| 1910 | struct tm ptm; |
| 1911 | mz_zip_time_t_to_tm(unix_time, &ptm); |
| 1912 | return mz_zip_tm_to_dosdate((const struct tm *)&ptm); |
| 1913 | } |
| 1914 | |
| 1915 | uint32_t mz_zip_tm_to_dosdate(const struct tm *ptm) |
| 1916 | { |
Nathan Moinvaziri | e33916b | 2018-05-01 13:45:08 -0700 | [diff] [blame] | 1917 | struct tm fixed_tm; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1918 | |
| 1919 | // Years supported: |
| 1920 | |
| 1921 | // [00, 79] (assumed to be between 2000 and 2079) |
| 1922 | // [80, 207] (assumed to be between 1980 and 2107, typical output of old |
| 1923 | // software that does 'year-1900' to get a double digit year) |
| 1924 | // [1980, 2107] (due to format limitations, only years 1980-2107 can be stored.) |
| 1925 | |
| 1926 | memcpy(&fixed_tm, ptm, sizeof(struct tm)); |
| 1927 | if (fixed_tm.tm_year >= 1980) // range [1980, 2107] |
| 1928 | fixed_tm.tm_year -= 1980; |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1929 | else if (fixed_tm.tm_year >= 80) // range [80, 207] |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1930 | fixed_tm.tm_year -= 80; |
| 1931 | else // range [00, 79] |
| 1932 | fixed_tm.tm_year += 20; |
| 1933 | |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 1934 | if (mz_zip_invalid_date(&fixed_tm)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 1935 | return 0; |
| 1936 | |
| 1937 | return (uint32_t)(((fixed_tm.tm_mday) + (32 * (fixed_tm.tm_mon + 1)) + (512 * fixed_tm.tm_year)) << 16) | |
| 1938 | ((fixed_tm.tm_sec / 2) + (32 * fixed_tm.tm_min) + (2048 * (uint32_t)fixed_tm.tm_hour)); |
| 1939 | } |
| 1940 | |
| 1941 | int32_t mz_zip_ntfs_to_unix_time(uint64_t ntfs_time, time_t *unix_time) |
| 1942 | { |
| 1943 | *unix_time = (time_t)((ntfs_time - 116444736000000000LL) / 10000000); |
| 1944 | return MZ_OK; |
| 1945 | } |
| 1946 | |
| 1947 | int32_t mz_zip_unix_to_ntfs_time(time_t unix_time, uint64_t *ntfs_time) |
| 1948 | { |
| 1949 | *ntfs_time = ((uint64_t)unix_time * 10000000) + 116444736000000000LL; |
| 1950 | return MZ_OK; |
| 1951 | } |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1952 | |
| 1953 | int32_t mz_zip_path_compare(const char *path1, const char *path2, uint8_t ignore_case) |
| 1954 | { |
| 1955 | do |
| 1956 | { |
| 1957 | if ((*path1 == '\\' && *path2 == '/') || |
| 1958 | (*path2 == '\\' && *path1 == '/')) |
| 1959 | { |
| 1960 | // Ignore comparison of path slashes |
| 1961 | } |
| 1962 | else if (ignore_case) |
| 1963 | { |
| 1964 | if (tolower(*path1) != tolower(*path2)) |
| 1965 | break; |
| 1966 | } |
| 1967 | else if (*path1 != *path2) |
| 1968 | { |
| 1969 | break; |
| 1970 | } |
| 1971 | |
| 1972 | path1 += 1; |
| 1973 | path2 += 1; |
| 1974 | } |
| 1975 | while (*path1 != 0 && *path2 != 0); |
| 1976 | |
| 1977 | if (ignore_case) |
| 1978 | return (int32_t)(tolower(*path1) - tolower(*path2)); |
| 1979 | |
| 1980 | return (int32_t)(*path1 - *path2); |
| 1981 | } |
| 1982 | |
| 1983 | /***************************************************************************/ |