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

Added support for converting CP437 to UTF8 via MZ_ENCODING_CODEPAGE437.

Browse Source 
Rename MZ_USE_FILE32API as MZ_FILE32_API and MZ_USE_WIN32_API as MZ_WIN32_API.
This commit is contained in:
Nathan Moinvaziri 2018-08-26 23:23:02 -07:00
parent 3eaa5560bf
commit a0d1877d0e
8 changed files with 91 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mz_compat.h
View File

@ -40,7 +40,6 @@
/***************************************************************************/
#if defined(USE_FILE32API)
# define MZ_USE_FILE32API
# define fopen64 fopen
# define ftello64 ftell
# define fseeko64 fseek

2
mz_os.h
View File

@ -20,7 +20,7 @@ extern "C" {
/***************************************************************************/
#if !defined(_WIN32) && !defined(MZ_USE_WIN32_API)
#if !defined(_WIN32) && !defined(MZ_WIN32_API)
#include "mz_os_posix.h"
#include "mz_strm_posix.h"
#else

70
mz_strm.c
View File

@ -18,6 +18,43 @@
/***************************************************************************/
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;
@ -193,6 +230,39 @@ 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;

1
mz_strm.h
View File

@ -86,6 +86,7 @@ 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);

2
mz_strm_posix.c
View File

@ -25,7 +25,7 @@
/***************************************************************************/
#if defined(MZ_USE_FILE32API)
#if defined(MZ_FILE32_API)
# define fopen64 fopen
# define ftello64 ftell
# define fseeko64 fseek

2
mz_strm_posix.h
View File

@ -36,7 +36,7 @@ void* mz_stream_posix_get_interface(void);
/***************************************************************************/
#if !defined(_WIN32) && !defined(MZ_USE_WIN32_API)
#if !defined(_WIN32) && !defined(MZ_WIN32_API)
#define mz_stream_os_open mz_stream_posix_open
#define mz_stream_os_is_open mz_stream_posix_is_open
#define mz_stream_os_read mz_stream_posix_read

2
mz_strm_win32.h
View File

@ -36,7 +36,7 @@ void* mz_stream_win32_get_interface(void);
/***************************************************************************/
#if defined(_WIN32) || defined(MZ_USE_WIN32_API)
#if defined(_WIN32) || defined(MZ_WIN32_API)
#define mz_stream_os_open mz_stream_win32_open
#define mz_stream_os_is_open mz_stream_win32_is_open
#define mz_stream_os_read mz_stream_win32_read

16
mz_zip.c
View File

@ -770,7 +770,15 @@ 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);
@ -915,7 +923,15 @@ 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);
}