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