mirror of
https://github.com/zlib-ng/minizip-ng
synced 2025-03-28 21:13:18 +00:00
Move CP437 encoding handling higher up the stack.
This commit is contained in:
Nathan Moinvaziri
parent
a0d1877d0e
commit
638f31ff41
20
mz_compat.c
20
mz_compat.c
@ -608,12 +608,14 @@ int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char
|
||||
pfile_info->compressed_size = (uint32_t)file_info->compressed_size;
|
||||
pfile_info->uncompressed_size = (uint32_t)file_info->uncompressed_size;
|
||||
|
||||
if (filename_size > 0 && filename != NULL)
|
||||
if (filename_size > 0 && filename != NULL && file_info->filename != NULL)
|
||||
{
|
||||
bytes_to_copy = filename_size;
|
||||
if (bytes_to_copy > file_info->filename_size)
|
||||
bytes_to_copy = file_info->filename_size;
|
||||
memcpy(filename, file_info->filename, bytes_to_copy);
|
||||
if (bytes_to_copy < filename_size)
|
||||
filename[bytes_to_copy] = 0;
|
||||
}
|
||||
if (extrafield_size > 0 && extrafield != NULL)
|
||||
{
|
||||
@ -622,12 +624,14 @@ int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char
|
||||
bytes_to_copy = file_info->extrafield_size;
|
||||
memcpy(extrafield, file_info->extrafield, bytes_to_copy);
|
||||
}
|
||||
if (comment_size > 0 && comment != NULL)
|
||||
if (comment_size > 0 && comment != NULL && file_info->comment != NULL)
|
||||
{
|
||||
bytes_to_copy = comment_size;
|
||||
if (bytes_to_copy > file_info->comment_size)
|
||||
bytes_to_copy = file_info->comment_size;
|
||||
memcpy(comment, file_info->comment, bytes_to_copy);
|
||||
if (bytes_to_copy < comment_size)
|
||||
comment[bytes_to_copy] = 0;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
@ -668,14 +672,14 @@ int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfile_info,
|
||||
pfile_info->compressed_size = file_info->compressed_size;
|
||||
pfile_info->uncompressed_size = file_info->uncompressed_size;
|
||||
|
||||
if (filename_size > 0 && filename != NULL)
|
||||
if (filename_size > 0 && filename != NULL && file_info->filename != NULL)
|
||||
{
|
||||
bytes_to_copy = filename_size;
|
||||
if (bytes_to_copy > file_info->filename_size)
|
||||
bytes_to_copy = file_info->filename_size;
|
||||
memcpy(filename, file_info->filename, bytes_to_copy);
|
||||
if (file_info->filename_size < filename_size)
|
||||
filename[file_info->filename_size] = 0;
|
||||
if (bytes_to_copy < filename_size)
|
||||
filename[bytes_to_copy] = 0;
|
||||
}
|
||||
|
||||
if (extrafield_size > 0 && extrafield != NULL)
|
||||
@ -686,14 +690,14 @@ int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfile_info,
|
||||
memcpy(extrafield, file_info->extrafield, bytes_to_copy);
|
||||
}
|
||||
|
||||
if (comment_size > 0 && comment != NULL)
|
||||
if (comment_size > 0 && comment != NULL && file_info->comment != NULL)
|
||||
{
|
||||
bytes_to_copy = comment_size;
|
||||
if (bytes_to_copy > file_info->comment_size)
|
||||
bytes_to_copy = file_info->comment_size;
|
||||
memcpy(comment, file_info->comment, bytes_to_copy);
|
||||
if (file_info->comment_size < comment_size)
|
||||
comment[file_info->comment_size] = 0;
|
||||
if (bytes_to_copy < comment_size)
|
||||
comment[bytes_to_copy] = 0;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
|
||||
@ -303,8 +303,8 @@ void fill_memory_filefunc(zlib_filefunc_def *pzlib_filefunc_def);
|
||||
#define change_file_date mz_os_set_file_date
|
||||
#define get_file_date mz_os_get_file_date
|
||||
#define is_large_file(x) (mz_os_get_file_size(x) >= UINT32_MAX)
|
||||
#define makedir mz_make_dir
|
||||
#define get_file_crc(p,b,bs,rc) mz_get_file_crc(p,rc)
|
||||
#define makedir mz_dir_make
|
||||
#define get_file_crc(p,b,bs,rc) mz_file_get_crc(p,rc)
|
||||
|
||||
#define MKDIR mz_os_make_dir
|
||||
#define CHDIR chdir
|
||||
|
||||
170
mz_os.c
170
mz_os.c
@ -23,53 +23,42 @@
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
int32_t mz_make_dir(const char *path)
|
||||
{
|
||||
int32_t err = MZ_OK;
|
||||
int16_t len = 0;
|
||||
char *current_dir = NULL;
|
||||
char *match = NULL;
|
||||
char hold = 0;
|
||||
static uint32_t mz_encoding_codepage437_to_utf8[256] = {
|
||||
0x000000, 0xba98e2, 0xbb98e2, 0xa599e2, 0xa699e2, 0xa399e2, 0xa099e2, 0xa280e2,
|
||||
0x9897e2, 0x8b97e2, 0x9997e2, 0x8299e2, 0x8099e2, 0xaa99e2, 0xab99e2, 0xbc98e2,
|
||||
0xba96e2, 0x8497e2, 0x9586e2, 0xbc80e2, 0x00b6c2, 0x00a7c2, 0xac96e2, 0xa886e2,
|
||||
0x9186e2, 0x9386e2, 0x9286e2, 0x9086e2, 0x9f88e2, 0x9486e2, 0xb296e2, 0xbc96e2,
|
||||
0x000020, 0x000021, 0x000022, 0x000023, 0x000024, 0x000025, 0x000026, 0x000027,
|
||||
0x000028, 0x000029, 0x00002a, 0x00002b, 0x00002c, 0x00002d, 0x00002e, 0x00002f,
|
||||
0x000030, 0x000031, 0x000032, 0x000033, 0x000034, 0x000035, 0x000036, 0x000037,
|
||||
0x000038, 0x000039, 0x00003a, 0x00003b, 0x00003c, 0x00003d, 0x00003e, 0x00003f,
|
||||
0x000040, 0x000041, 0x000042, 0x000043, 0x000044, 0x000045, 0x000046, 0x000047,
|
||||
0x000048, 0x000049, 0x00004a, 0x00004b, 0x00004c, 0x00004d, 0x00004e, 0x00004f,
|
||||
0x000050, 0x000051, 0x000052, 0x000053, 0x000054, 0x000055, 0x000056, 0x000057,
|
||||
0x000058, 0x000059, 0x00005a, 0x00005b, 0x00005c, 0x00005d, 0x00005e, 0x00005f,
|
||||
0x000060, 0x000061, 0x000062, 0x000063, 0x000064, 0x000065, 0x000066, 0x000067,
|
||||
0x000068, 0x000069, 0x00006a, 0x00006b, 0x00006c, 0x00006d, 0x00006e, 0x00006f,
|
||||
0x000070, 0x000071, 0x000072, 0x000073, 0x000074, 0x000075, 0x000076, 0x000077,
|
||||
0x000078, 0x000079, 0x00007a, 0x00007b, 0x00007c, 0x00007d, 0x00007e, 0x828ce2,
|
||||
0x0087c3, 0x00bcc3, 0x00a9c3, 0x00a2c3, 0x00a4c3, 0x00a0c3, 0x00a5c3, 0x00a7c3,
|
||||
0x00aac3, 0x00abc3, 0x00a8c3, 0x00afc3, 0x00aec3, 0x00acc3, 0x0084c3, 0x0085c3,
|
||||
0x0089c3, 0x00a6c3, 0x0086c3, 0x00b4c3, 0x00b6c3, 0x00b2c3, 0x00bbc3, 0x00b9c3,
|
||||
0x00bfc3, 0x0096c3, 0x009cc3, 0x00a2c2, 0x00a3c2, 0x00a5c2, 0xa782e2, 0x0092c6,
|
||||
0x00a1c3, 0x00adc3, 0x00b3c3, 0x00bac3, 0x00b1c3, 0x0091c3, 0x00aac2, 0x00bac2,
|
||||
0x00bfc2, 0x908ce2, 0x00acc2, 0x00bdc2, 0x00bcc2, 0x00a1c2, 0x00abc2, 0x00bbc2,
|
||||
0x9196e2, 0x9296e2, 0x9396e2, 0x8294e2, 0xa494e2, 0xa195e2, 0xa295e2, 0x9695e2,
|
||||
0x9595e2, 0xa395e2, 0x9195e2, 0x9795e2, 0x9d95e2, 0x9c95e2, 0x9b95e2, 0x9094e2,
|
||||
0x9494e2, 0xb494e2, 0xac94e2, 0x9c94e2, 0x8094e2, 0xbc94e2, 0x9e95e2, 0x9f95e2,
|
||||
0x9a95e2, 0x9495e2, 0xa995e2, 0xa695e2, 0xa095e2, 0x9095e2, 0xac95e2, 0xa795e2,
|
||||
0xa895e2, 0xa495e2, 0xa595e2, 0x9995e2, 0x9895e2, 0x9295e2, 0x9395e2, 0xab95e2,
|
||||
0xaa95e2, 0x9894e2, 0x8c94e2, 0x8896e2, 0x8496e2, 0x8c96e2, 0x9096e2, 0x8096e2,
|
||||
0x00b1ce, 0x009fc3, 0x0093ce, 0x0080cf, 0x00a3ce, 0x0083cf, 0x00b5c2, 0x0084cf,
|
||||
0x00a6ce, 0x0098ce, 0x00a9ce, 0x00b4ce, 0x9e88e2, 0x0086cf, 0x00b5ce, 0xa988e2,
|
||||
0xa189e2, 0x00b1c2, 0xa589e2, 0xa489e2, 0xa08ce2, 0xa18ce2, 0x00b7c3, 0x8889e2,
|
||||
0x00b0c2, 0x9988e2, 0x00b7c2, 0x9a88e2, 0xbf81e2, 0x00b2c2, 0xa096e2, 0x00a0c2
|
||||
};
|
||||
|
||||
|
||||
len = (int16_t)strlen(path);
|
||||
if (len <= 0)
|
||||
return 0;
|
||||
|
||||
current_dir = (char *)MZ_ALLOC(len + 1);
|
||||
if (current_dir == NULL)
|
||||
return MZ_MEM_ERROR;
|
||||
|
||||
strcpy(current_dir, path);
|
||||
|
||||
if (current_dir[len - 1] == '/')
|
||||
current_dir[len - 1] = 0;
|
||||
|
||||
err = mz_os_make_dir(current_dir);
|
||||
if (err != MZ_OK)
|
||||
{
|
||||
match = current_dir + 1;
|
||||
while (1)
|
||||
{
|
||||
while (*match != 0 && *match != '\\' && *match != '/')
|
||||
match += 1;
|
||||
hold = *match;
|
||||
*match = 0;
|
||||
|
||||
err = mz_os_make_dir(current_dir);
|
||||
if (err != MZ_OK)
|
||||
break;
|
||||
if (hold == 0)
|
||||
break;
|
||||
|
||||
*match = hold;
|
||||
match += 1;
|
||||
}
|
||||
}
|
||||
|
||||
MZ_FREE(current_dir);
|
||||
return err;
|
||||
}
|
||||
/***************************************************************************/
|
||||
|
||||
int32_t mz_path_combine(char *path, const char *join, int32_t max_path)
|
||||
{
|
||||
@ -286,7 +275,55 @@ int32_t mz_path_get_filename(const char *path, const char **filename)
|
||||
return MZ_OK;
|
||||
}
|
||||
|
||||
int32_t mz_get_file_crc(const char *path, uint32_t *result_crc)
|
||||
int32_t mz_dir_make(const char *path)
|
||||
{
|
||||
int32_t err = MZ_OK;
|
||||
int16_t len = 0;
|
||||
char *current_dir = NULL;
|
||||
char *match = NULL;
|
||||
char hold = 0;
|
||||
|
||||
|
||||
len = (int16_t)strlen(path);
|
||||
if (len <= 0)
|
||||
return 0;
|
||||
|
||||
current_dir = (char *)MZ_ALLOC(len + 1);
|
||||
if (current_dir == NULL)
|
||||
return MZ_MEM_ERROR;
|
||||
|
||||
strcpy(current_dir, path);
|
||||
|
||||
if (current_dir[len - 1] == '/')
|
||||
current_dir[len - 1] = 0;
|
||||
|
||||
err = mz_os_make_dir(current_dir);
|
||||
if (err != MZ_OK)
|
||||
{
|
||||
match = current_dir + 1;
|
||||
while (1)
|
||||
{
|
||||
while (*match != 0 && *match != '\\' && *match != '/')
|
||||
match += 1;
|
||||
hold = *match;
|
||||
*match = 0;
|
||||
|
||||
err = mz_os_make_dir(current_dir);
|
||||
if (err != MZ_OK)
|
||||
break;
|
||||
if (hold == 0)
|
||||
break;
|
||||
|
||||
*match = hold;
|
||||
match += 1;
|
||||
}
|
||||
}
|
||||
|
||||
MZ_FREE(current_dir);
|
||||
return err;
|
||||
}
|
||||
|
||||
int32_t mz_file_get_crc(const char *path, uint32_t *result_crc)
|
||||
{
|
||||
void *stream = NULL;
|
||||
void *crc32_stream = NULL;
|
||||
@ -328,3 +365,42 @@ int32_t mz_get_file_crc(const char *path, uint32_t *result_crc)
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int32_t mz_encoding_cp437_to_utf8(char *source, char *target, int32_t max_target)
|
||||
{
|
||||
uint32_t utf8_char = 0;
|
||||
uint8_t utf8_byte = 0;
|
||||
uint8_t cp437_char = 0;
|
||||
int32_t i = 0;
|
||||
int32_t x = 0;
|
||||
int32_t written = 0;
|
||||
|
||||
// Convert ibm codepage 437 encoding to utf-8
|
||||
while (*source != 0)
|
||||
{
|
||||
cp437_char = *source;
|
||||
source += 1;
|
||||
utf8_char = mz_encoding_codepage437_to_utf8[cp437_char];
|
||||
for (x = 0; x < 32; x += 8)
|
||||
{
|
||||
utf8_byte = (uint8_t)(utf8_char >> x);
|
||||
if (x > 0 && utf8_byte == 0)
|
||||
continue;
|
||||
if (max_target <= 1)
|
||||
break;
|
||||
target[written] = utf8_byte;
|
||||
written += 1;
|
||||
max_target -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (max_target > 0)
|
||||
{
|
||||
target[written] = 0;
|
||||
written += 1;
|
||||
}
|
||||
|
||||
return written;
|
||||
}
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
11
mz_os.h
11
mz_os.h
@ -45,9 +45,6 @@ extern "C" {
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
int32_t mz_make_dir(const char *path);
|
||||
// Creates a directory recursively
|
||||
|
||||
int32_t mz_path_combine(char *path, const char *join, int32_t max_path);
|
||||
// Combines two paths
|
||||
|
||||
@ -63,9 +60,15 @@ int32_t mz_path_remove_filename(const char *path);
|
||||
int32_t mz_path_get_filename(const char *path, const char **filename);
|
||||
// Get the filename from a path
|
||||
|
||||
int32_t mz_get_file_crc(const char *path, uint32_t *result_crc);
|
||||
int32_t mz_dir_make(const char *path);
|
||||
// Creates a directory recursively
|
||||
|
||||
int32_t mz_file_get_crc(const char *path, uint32_t *result_crc);
|
||||
// Gets the crc32 hash of a file
|
||||
|
||||
int32_t mz_encoding_cp437_to_utf8(char *source, char *target, int32_t max_target);
|
||||
// Converts ibm cp437 encoded string to utf8
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
70
mz_strm.c
70
mz_strm.c
@ -18,43 +18,6 @@
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
static uint32_t mz_encoding_codepage437_to_utf8[256] = {
|
||||
0x000000, 0xba98e2, 0xbb98e2, 0xa599e2, 0xa699e2, 0xa399e2, 0xa099e2, 0xa280e2,
|
||||
0x9897e2, 0x8b97e2, 0x9997e2, 0x8299e2, 0x8099e2, 0xaa99e2, 0xab99e2, 0xbc98e2,
|
||||
0xba96e2, 0x8497e2, 0x9586e2, 0xbc80e2, 0x00b6c2, 0x00a7c2, 0xac96e2, 0xa886e2,
|
||||
0x9186e2, 0x9386e2, 0x9286e2, 0x9086e2, 0x9f88e2, 0x9486e2, 0xb296e2, 0xbc96e2,
|
||||
0x000020, 0x000021, 0x000022, 0x000023, 0x000024, 0x000025, 0x000026, 0x000027,
|
||||
0x000028, 0x000029, 0x00002a, 0x00002b, 0x00002c, 0x00002d, 0x00002e, 0x00002f,
|
||||
0x000030, 0x000031, 0x000032, 0x000033, 0x000034, 0x000035, 0x000036, 0x000037,
|
||||
0x000038, 0x000039, 0x00003a, 0x00003b, 0x00003c, 0x00003d, 0x00003e, 0x00003f,
|
||||
0x000040, 0x000041, 0x000042, 0x000043, 0x000044, 0x000045, 0x000046, 0x000047,
|
||||
0x000048, 0x000049, 0x00004a, 0x00004b, 0x00004c, 0x00004d, 0x00004e, 0x00004f,
|
||||
0x000050, 0x000051, 0x000052, 0x000053, 0x000054, 0x000055, 0x000056, 0x000057,
|
||||
0x000058, 0x000059, 0x00005a, 0x00005b, 0x00005c, 0x00005d, 0x00005e, 0x00005f,
|
||||
0x000060, 0x000061, 0x000062, 0x000063, 0x000064, 0x000065, 0x000066, 0x000067,
|
||||
0x000068, 0x000069, 0x00006a, 0x00006b, 0x00006c, 0x00006d, 0x00006e, 0x00006f,
|
||||
0x000070, 0x000071, 0x000072, 0x000073, 0x000074, 0x000075, 0x000076, 0x000077,
|
||||
0x000078, 0x000079, 0x00007a, 0x00007b, 0x00007c, 0x00007d, 0x00007e, 0x828ce2,
|
||||
0x0087c3, 0x00bcc3, 0x00a9c3, 0x00a2c3, 0x00a4c3, 0x00a0c3, 0x00a5c3, 0x00a7c3,
|
||||
0x00aac3, 0x00abc3, 0x00a8c3, 0x00afc3, 0x00aec3, 0x00acc3, 0x0084c3, 0x0085c3,
|
||||
0x0089c3, 0x00a6c3, 0x0086c3, 0x00b4c3, 0x00b6c3, 0x00b2c3, 0x00bbc3, 0x00b9c3,
|
||||
0x00bfc3, 0x0096c3, 0x009cc3, 0x00a2c2, 0x00a3c2, 0x00a5c2, 0xa782e2, 0x0092c6,
|
||||
0x00a1c3, 0x00adc3, 0x00b3c3, 0x00bac3, 0x00b1c3, 0x0091c3, 0x00aac2, 0x00bac2,
|
||||
0x00bfc2, 0x908ce2, 0x00acc2, 0x00bdc2, 0x00bcc2, 0x00a1c2, 0x00abc2, 0x00bbc2,
|
||||
0x9196e2, 0x9296e2, 0x9396e2, 0x8294e2, 0xa494e2, 0xa195e2, 0xa295e2, 0x9695e2,
|
||||
0x9595e2, 0xa395e2, 0x9195e2, 0x9795e2, 0x9d95e2, 0x9c95e2, 0x9b95e2, 0x9094e2,
|
||||
0x9494e2, 0xb494e2, 0xac94e2, 0x9c94e2, 0x8094e2, 0xbc94e2, 0x9e95e2, 0x9f95e2,
|
||||
0x9a95e2, 0x9495e2, 0xa995e2, 0xa695e2, 0xa095e2, 0x9095e2, 0xac95e2, 0xa795e2,
|
||||
0xa895e2, 0xa495e2, 0xa595e2, 0x9995e2, 0x9895e2, 0x9295e2, 0x9395e2, 0xab95e2,
|
||||
0xaa95e2, 0x9894e2, 0x8c94e2, 0x8896e2, 0x8496e2, 0x8c96e2, 0x9096e2, 0x8096e2,
|
||||
0x00b1ce, 0x009fc3, 0x0093ce, 0x0080cf, 0x00a3ce, 0x0083cf, 0x00b5c2, 0x0084cf,
|
||||
0x00a6ce, 0x0098ce, 0x00a9ce, 0x00b4ce, 0x9e88e2, 0x0086cf, 0x00b5ce, 0xa988e2,
|
||||
0xa189e2, 0x00b1c2, 0xa589e2, 0xa489e2, 0xa08ce2, 0xa18ce2, 0x00b7c3, 0x8889e2,
|
||||
0x00b0c2, 0x9988e2, 0x00b7c2, 0x9a88e2, 0xbf81e2, 0x00b2c2, 0xa096e2, 0x00a0c2
|
||||
};
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
int32_t mz_stream_open(void *stream, const char *path, int32_t mode)
|
||||
{
|
||||
mz_stream *strm = (mz_stream *)stream;
|
||||
@ -230,39 +193,6 @@ int32_t mz_stream_copy(void *target, void *source, int32_t len)
|
||||
return MZ_OK;
|
||||
}
|
||||
|
||||
int32_t mz_stream_copy_cp437(void *target, void *source, int32_t len)
|
||||
{
|
||||
uint32_t utf8_char = 0;
|
||||
uint8_t utf8_byte = 0;
|
||||
uint8_t cp437_char = 0;
|
||||
int32_t i = 0;
|
||||
int32_t x = 0;
|
||||
int32_t err = MZ_OK;
|
||||
int32_t written = 0;
|
||||
|
||||
// Convert ibm codepage 437 encoding to utf-8 while copying
|
||||
for (i = 0; i < len; i += 1)
|
||||
{
|
||||
err = mz_stream_read_uint8(source, &cp437_char);
|
||||
if (err != MZ_OK)
|
||||
return err;
|
||||
|
||||
utf8_char = mz_encoding_codepage437_to_utf8[cp437_char];
|
||||
for (x = 0; x < 32; x += 8)
|
||||
{
|
||||
utf8_byte = utf8_char >> x;
|
||||
if (x > 0 && utf8_byte == 0)
|
||||
continue;
|
||||
err = mz_stream_write_uint8(target, utf8_byte);
|
||||
if (err != MZ_OK)
|
||||
return err;
|
||||
written += 1;
|
||||
}
|
||||
}
|
||||
|
||||
return written;
|
||||
}
|
||||
|
||||
int64_t mz_stream_tell(void *stream)
|
||||
{
|
||||
mz_stream *strm = (mz_stream *)stream;
|
||||
|
||||
@ -86,7 +86,6 @@ int32_t mz_stream_write_uint32(void *stream, uint32_t value);
|
||||
int32_t mz_stream_write_uint64(void *stream, uint64_t value);
|
||||
int32_t mz_stream_write_chars(void *stream, const char *value, uint8_t null_terminate);
|
||||
int32_t mz_stream_copy(void *target, void *source, int32_t len);
|
||||
int32_t mz_stream_copy_cp437(void *target, void *source, int32_t len);
|
||||
int64_t mz_stream_tell(void *stream);
|
||||
int32_t mz_stream_seek(void *stream, int64_t offset, int32_t origin);
|
||||
int32_t mz_stream_close(void *stream);
|
||||
|
||||
21
mz_zip.c
21
mz_zip.c
@ -56,8 +56,9 @@
|
||||
#define MZ_ZIP_MAGIC_ENDLOCHEADER64 (0x07064b50)
|
||||
#define MZ_ZIP_MAGIC_DATADESCRIPTOR (0x08074b50)
|
||||
|
||||
#define MZ_ZIP_SIZE_CD_ITEM (0x2e)
|
||||
#define MZ_ZIP_SIZE_CD_LOCATOR64 (0x14)
|
||||
#define MZ_ZIP_SIZE_LD_ITEM (32)
|
||||
#define MZ_ZIP_SIZE_CD_ITEM (46)
|
||||
#define MZ_ZIP_SIZE_CD_LOCATOR64 (20)
|
||||
|
||||
#define MZ_ZIP_EXTENSION_ZIP64 (0x0001)
|
||||
#define MZ_ZIP_EXTENSION_NTFS (0x000a)
|
||||
@ -770,15 +771,7 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
|
||||
{
|
||||
mz_stream_mem_get_buffer(file_info_stream, (const void **)&file_info->filename);
|
||||
|
||||
#ifdef MZ_ENCODING_CODEPAGE437
|
||||
if (file_info->flag & MZ_ZIP_FLAG_UTF8)
|
||||
err = mz_stream_copy(file_info_stream, stream, file_info->filename_size);
|
||||
else
|
||||
err = mz_stream_copy_cp437(file_info_stream, stream, file_info->filename_size);
|
||||
#else
|
||||
err = mz_stream_copy(file_info_stream, stream, file_info->filename_size);
|
||||
#endif
|
||||
|
||||
if (err == MZ_OK)
|
||||
err = mz_stream_write_uint8(file_info_stream, 0);
|
||||
|
||||
@ -923,15 +916,7 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
|
||||
{
|
||||
mz_stream_mem_get_buffer_at(file_info_stream, seek, (const void **)&file_info->comment);
|
||||
|
||||
#ifdef MZ_ENCODING_CODEPAGE437
|
||||
if (file_info->flag & MZ_ZIP_FLAG_UTF8)
|
||||
err = mz_stream_copy(file_info_stream, stream, file_info->comment_size);
|
||||
else
|
||||
err = mz_stream_copy_cp437(file_info_stream, stream, file_info->comment_size);
|
||||
#else
|
||||
err = mz_stream_copy(file_info_stream, stream, file_info->comment_size);
|
||||
#endif
|
||||
|
||||
if (err == MZ_OK)
|
||||
err = mz_stream_write_uint8(file_info_stream, 0);
|
||||
}
|
||||
|
||||
4
mz_zip.h
4
mz_zip.h
@ -49,9 +49,9 @@ typedef struct mz_zip_file_s
|
||||
uint32_t external_fa; // external file attributes
|
||||
uint16_t zip64; // zip64 extension mode
|
||||
|
||||
const char *filename; // filename string
|
||||
const char *filename; // filename utf8 null-terminated string
|
||||
const uint8_t *extrafield; // extrafield data
|
||||
const char *comment; // comment string
|
||||
const char *comment; // comment utf8 null-terminated string
|
||||
|
||||
#ifdef HAVE_AES
|
||||
uint16_t aes_version; // winzip aes extension if not 0
|
||||
|
||||
15
mz_zip_rw.c
15
mz_zip_rw.c
@ -478,7 +478,7 @@ int32_t mz_zip_reader_entry_save_file(void *handle, const char *path)
|
||||
// If it is a directory entry then create a directory instead of writing file
|
||||
if (mz_zip_entry_is_dir(reader->zip_handle) == MZ_OK)
|
||||
{
|
||||
err = mz_make_dir(directory);
|
||||
err = mz_dir_make(directory);
|
||||
return err;
|
||||
}
|
||||
|
||||
@ -493,7 +493,7 @@ int32_t mz_zip_reader_entry_save_file(void *handle, const char *path)
|
||||
// Create the output directory if it doesn't already exist
|
||||
if (mz_os_is_dir(directory) != MZ_OK)
|
||||
{
|
||||
err = mz_make_dir(directory);
|
||||
err = mz_dir_make(directory);
|
||||
if (err != MZ_OK)
|
||||
return err;
|
||||
}
|
||||
@ -577,6 +577,7 @@ int32_t mz_zip_reader_save_all(void *handle, const char *destination_dir)
|
||||
mz_zip_reader *reader = (mz_zip_reader *)handle;
|
||||
int32_t err = MZ_OK;
|
||||
char path[512];
|
||||
char utf8_name[256];
|
||||
char resolved_name[256];
|
||||
|
||||
err = mz_zip_reader_goto_first_entry(handle);
|
||||
@ -586,7 +587,14 @@ int32_t mz_zip_reader_save_all(void *handle, const char *destination_dir)
|
||||
// Construct output path
|
||||
path[0] = 0;
|
||||
|
||||
err = mz_path_resolve(reader->file_info->filename, resolved_name, sizeof(resolved_name));
|
||||
#ifdef MZ_LEGACY_ENCODING
|
||||
if ((reader->file_info->flag & MZ_ZIP_FLAG_UTF8) == 0)
|
||||
mz_encoding_cp437_to_utf8(reader->file_info->filename, utf8_name, sizeof(utf8_name));
|
||||
else
|
||||
#endif
|
||||
strncpy(utf8_name, reader->file_info->filename, sizeof(utf8_name));
|
||||
|
||||
err = mz_path_resolve(utf8_name, resolved_name, sizeof(resolved_name));
|
||||
if (err != MZ_OK)
|
||||
break;
|
||||
|
||||
@ -1115,7 +1123,6 @@ int32_t mz_zip_writer_add_file(void *handle, const char *path, const char *filen
|
||||
file_info.version_madeby = MZ_VERSION_MADEBY;
|
||||
file_info.compression_method = writer->compress_method;
|
||||
file_info.filename = filename;
|
||||
file_info.filename_size = (uint16_t)strlen(filename);
|
||||
file_info.uncompressed_size = mz_os_get_file_size(path);
|
||||
file_info.flag = MZ_ZIP_FLAG_UTF8;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user