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