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