c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed writing backslashes in zip on Windows.

Browse Source 
All slashes should be written as forward slashes according
to the zip app note section 4.4.17.1.

Co-authored-by: jeremybernstein@users.noreply.github.com
This commit is contained in:
Nathan Moinvaziri 2022-08-06 10:13:08 -07:00
parent 27b9dde455
commit 6005ae7fbb
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mz_os.h
View File

@ -41,8 +41,9 @@ extern "C" {
(MZ_VERSION_MADEBY_ZIP_VERSION))
#define MZ_PATH_SLASH_UNIX ('/')
#define MZ_PATH_SLASH_WINDOWS ('\\')
#if defined(_WIN32)
# define MZ_PATH_SLASH_PLATFORM ('\\')
# define MZ_PATH_SLASH_PLATFORM (MZ_PATH_SLASH_WINDOWS)
#else
# define MZ_PATH_SLASH_PLATFORM (MZ_PATH_SLASH_UNIX)
#endif

22
mz_zip.c
View File

@ -789,8 +789,26 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
}
if (err == MZ_OK) {
if (mz_stream_write(stream, filename, filename_length) != filename_length)
err = MZ_WRITE_ERROR;
const char *backslash = NULL;
const char *next = filename;
int32_t left = filename_length;
/* Ensure all slashes are written as forward slashes according to 4.4.17.1 */
while ((err == MZ_OK) && (backslash = strrchr(next, '\\')) != NULL) {
int32_t part_length = (int32_t)(backslash - next);
if (mz_stream_write(stream, next, part_length) != part_length ||
mz_stream_write(stream, "/", 1) != 1)
err = MZ_WRITE_ERROR;
left -= part_length + 1;
next = backslash + 1;
}
if (err == MZ_OK && left > 0) {
if (mz_stream_write(stream, next, left) != left)
err = MZ_WRITE_ERROR;
}
/* Ensure that directories have a slash appended to them for compatibility */
if (err == MZ_OK && write_end_slash)