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

Modifications so you can read the entries when in write mode.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2017-10-21 09:37:18 -07:00
parent 51bf64a65c
commit cda3600384
4 changed files with 77 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mz.h
View File

@ -22,11 +22,11 @@ extern "C" {
// MZ_ERROR
#define MZ_OK (0)
#define MZ_EOF (MZ_OK)
#define MZ_STREAM_ERROR (-1)
#define MZ_DATA_ERROR (-3)
#define MZ_MEM_ERROR (-4)
#define MZ_END_OF_LIST (-100)
#define MZ_END_OF_STREAM (-101)
#define MZ_PARAM_ERROR (-102)
#define MZ_FORMAT_ERROR (-103)
#define MZ_INTERNAL_ERROR (-104)

95
src/mz_strm.c
View File

@ -46,84 +46,65 @@ int32_t mz_stream_read(void *stream, void *buf, int32_t size)
return strm->vtbl->read(strm, buf, size);
}
int32_t mz_stream_read_uint8(void *stream, uint8_t *value)
static int32_t mz_stream_read_value(void *stream, uint64_t *value, int32_t len)
{
uint8_t c = 0;
if (mz_stream_read(stream, &c, 1) == 1)
*value = (uint8_t)c;
uint8_t buf[8];
int32_t n = 0;
int32_t i = 0;
*value = 0;
if (mz_stream_read(stream, buf, len) == len)
{
for (n = 0; n < len; n += 1, i += 8)
*value += ((uint64_t)buf[n]) << i;
}
else if (mz_stream_error(stream))
return MZ_STREAM_ERROR;
else
return MZ_END_OF_STREAM;
return MZ_OK;
}
int32_t mz_stream_read_uint8(void *stream, uint8_t *value)
{
int32_t err = MZ_OK;
uint64_t value64 = 0;
*value = 0;
err = mz_stream_read_value(stream, &value64, sizeof(uint8_t));
if (err == MZ_OK)
*value = (uint8_t)value64;
return err;
}
int32_t mz_stream_read_uint16(void *stream, uint16_t *value)
{
uint8_t c = 0;
int32_t err = MZ_OK;
uint64_t value64 = 0;
*value = 0;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value = (uint16_t)c;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint16_t)c) << 8;
return MZ_OK;
err = mz_stream_read_value(stream, &value64, sizeof(uint16_t));
if (err == MZ_OK)
*value = (uint16_t)value64;
return err;
}
int32_t mz_stream_read_uint32(void *stream, uint32_t *value)
{
uint8_t c = 0;
int32_t err = MZ_OK;
uint64_t value64 = 0;
*value = 0;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value = (uint32_t)c;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint32_t)c) << 8;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint32_t)c) << 16;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint32_t)c) << 24;
return MZ_OK;
err = mz_stream_read_value(stream, &value64, sizeof(uint32_t));
if (err == MZ_OK)
*value = (uint32_t)value64;
return err;
}
int32_t mz_stream_read_uint64(void *stream, uint64_t *value)
{
uint8_t c = 0;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value = (uint64_t)c;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint64_t)c) << 8;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint64_t)c) << 16;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint64_t)c) << 24;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint64_t)c) << 32;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint64_t)c) << 40;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint64_t)c) << 48;
if (mz_stream_read_uint8(stream, &c) != MZ_OK)
return MZ_STREAM_ERROR;
*value += ((uint64_t)c) << 56;
return MZ_OK;
return mz_stream_read_value(stream, value, sizeof(uint64_t));
}
int32_t mz_stream_write(void *stream, const void *buf, int32_t size)

4
src/mz_strm_mem.c
View File

@ -105,6 +105,9 @@ int32_t mz_stream_mem_read(void *stream, void *buf, int32_t size)
if (size > mem->size - mem->position)
size = mem->size - mem->position;
if (mem->position + size > mem->limit)
return 0;
memcpy(buf, mem->buffer + mem->position, size);
mem->position += size;
@ -201,6 +204,7 @@ void mz_stream_mem_set_buffer(void *stream, void *buf, int32_t size)
mz_stream_mem *mem = (mz_stream_mem *)stream;
mem->buffer = buf;
mem->size = size;
mem->limit = size;
}
int32_t mz_stream_mem_get_buffer(void *stream, void **buf)

56
src/mz_zip.c
View File

@ -66,7 +66,8 @@ typedef struct mz_zip_s
mz_zip_file local_file_info;
void *stream; // main stream
void *cd_stream; // memory stream for central directory
void *cd_stream; // pointer to the stream with the cd
void *cd_mem_stream; // memory stream for central directory
void *compress_stream; // compression stream
void *crc32_stream; // crc32 stream
void *crypt_stream; // encryption stream
@ -77,6 +78,7 @@ typedef struct mz_zip_s
uint64_t disk_offset; // byte before the zip file, (>0 for sfx)
uint64_t cd_start_pos; // pos of the first file in the central dir stream
uint64_t cd_current_pos; // pos of the current file in the central dir
uint64_t cd_pos; // position of the beginning of the central dir
uint64_t cd_offset; // offset of start of central directory
@ -350,11 +352,11 @@ static int32_t mz_zip_write_cd(void *handle)
mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1);
zip->cd_pos = mz_stream_tell(zip->stream);
mz_stream_seek(zip->cd_stream, 0, MZ_STREAM_SEEK_END);
zip->cd_size = (uint32_t)mz_stream_tell(zip->cd_stream);
mz_stream_seek(zip->cd_stream, 0, MZ_STREAM_SEEK_SET);
mz_stream_seek(zip->cd_mem_stream, 0, MZ_STREAM_SEEK_END);
zip->cd_size = (uint32_t)mz_stream_tell(zip->cd_mem_stream);
mz_stream_seek(zip->cd_mem_stream, 0, MZ_STREAM_SEEK_SET);
err = mz_stream_copy(zip->stream, zip->cd_stream, (int32_t)zip->cd_size);
err = mz_stream_copy(zip->stream, zip->cd_mem_stream, (int32_t)zip->cd_size);
// Write the ZIP64 central directory header
if (pos >= UINT32_MAX || zip->number_entry > UINT32_MAX)
@ -479,8 +481,14 @@ extern void* ZEXPORT mz_zip_open(void *stream, int32_t mode)
if (zip->open_mode & MZ_STREAM_MODE_WRITE)
{
mz_stream_mem_create(&zip->cd_stream);
mz_stream_mem_open(zip->cd_stream, NULL, MZ_STREAM_MODE_CREATE);
mz_stream_mem_create(&zip->cd_mem_stream);
mz_stream_mem_open(zip->cd_mem_stream, NULL, MZ_STREAM_MODE_CREATE);
zip->cd_stream = zip->cd_mem_stream;
}
else
{
zip->cd_stream = stream;
}
if ((zip->open_mode & MZ_STREAM_MODE_READ) || (mode & MZ_STREAM_MODE_APPEND))
@ -492,11 +500,15 @@ extern void* ZEXPORT mz_zip_open(void *stream, int32_t mode)
// Store central directory in memory
if (mz_stream_seek(zip->stream, zip->cd_offset + zip->disk_offset, MZ_STREAM_SEEK_SET) != MZ_OK)
err = MZ_STREAM_ERROR;
if (mz_stream_copy(zip->cd_stream, zip->stream, (uint32_t)zip->cd_size) != MZ_OK)
if (mz_stream_copy(zip->cd_mem_stream, zip->stream, (uint32_t)zip->cd_size) != MZ_OK)
err = MZ_STREAM_ERROR;
if (mz_stream_seek(zip->stream, zip->cd_offset + zip->disk_offset, MZ_STREAM_SEEK_SET) != MZ_OK)
err = MZ_STREAM_ERROR;
}
else
{
zip->cd_start_pos = zip->disk_offset + zip->cd_offset;
}
}
if (err == MZ_OK)
@ -513,10 +525,10 @@ extern void* ZEXPORT mz_zip_open(void *stream, int32_t mode)
mz_stream_mem_delete(&zip->file_info_stream);
if (zip->local_file_info_stream != NULL)
mz_stream_mem_delete(&zip->local_file_info_stream);
if (zip->cd_stream != NULL)
if (zip->cd_mem_stream != NULL)
{
mz_stream_close(zip->cd_stream);
mz_stream_delete(&zip->cd_stream);
mz_stream_close(zip->cd_mem_stream);
mz_stream_delete(&zip->cd_mem_stream);
}
if (zip->comment)
@ -547,10 +559,10 @@ extern int32_t ZEXPORT mz_zip_close(void *handle)
if (zip->open_mode & MZ_STREAM_MODE_WRITE)
err = mz_zip_write_cd(handle);
if (zip->cd_stream != NULL)
if (zip->cd_mem_stream != NULL)
{
mz_stream_close(zip->cd_stream);
mz_stream_delete(&zip->cd_stream);
mz_stream_close(zip->cd_mem_stream);
mz_stream_delete(&zip->cd_mem_stream);
}
mz_stream_mem_close(zip->file_info_stream);
@ -649,13 +661,15 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
// Check the magic
err = mz_stream_read_uint32(stream, &magic);
if (magic == MZ_ZIP_MAGIC_ENDHEADER || magic == MZ_ZIP_MAGIC_ENDHEADER64)
if (err == MZ_END_OF_STREAM)
err = MZ_END_OF_LIST;
else if (magic == MZ_ZIP_MAGIC_ENDHEADER || magic == MZ_ZIP_MAGIC_ENDHEADER64)
err = MZ_END_OF_LIST;
else if ((local) && (magic != MZ_ZIP_MAGIC_LOCALHEADER))
err = MZ_FORMAT_ERROR;
else if ((!local) && (magic != MZ_ZIP_MAGIC_CENTRALHEADER))
err = MZ_FORMAT_ERROR;
// Read header fields
if (err == MZ_OK)
{
@ -1135,8 +1149,6 @@ extern int32_t ZEXPORT mz_zip_entry_write_open(void *handle, const mz_zip_file *
#endif
if (zip == NULL || file_info == NULL || file_info->filename == NULL)
return MZ_PARAM_ERROR;
if ((zip->open_mode & MZ_STREAM_MODE_WRITE) == 0)
return MZ_PARAM_ERROR;
if (zip->entry_opened == 1)
{
@ -1303,7 +1315,7 @@ extern int32_t ZEXPORT mz_zip_entry_close_raw(void *handle, uint64_t uncompresse
zip->file_info.uncompressed_size = uncompressed_size;
if (err == MZ_OK)
err = mz_zip_entry_write_header(zip->cd_stream, 0, &zip->file_info);
err = mz_zip_entry_write_header(zip->cd_mem_stream, 0, &zip->file_info);
zip->number_entry += 1;
}
@ -1330,9 +1342,9 @@ static int32_t mz_zip_goto_next_entry_int(void *handle)
mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1);
err = mz_stream_seek(zip->stream, zip->disk_offset + zip->cd_current_pos, MZ_STREAM_SEEK_SET);
err = mz_stream_seek(zip->cd_stream, zip->cd_current_pos, MZ_STREAM_SEEK_SET);
if (err == MZ_OK)
err = mz_zip_entry_read_header(zip->stream, 0, &zip->file_info, zip->file_info_stream);
err = mz_zip_entry_read_header(zip->cd_stream, 0, &zip->file_info, zip->file_info_stream);
if (err == MZ_OK)
zip->entry_scanned = 1;
return err;
@ -1354,7 +1366,7 @@ extern int32_t ZEXPORT mz_zip_goto_first_entry(void *handle)
if (zip == NULL)
return MZ_PARAM_ERROR;
zip->cd_current_pos = zip->cd_offset;
zip->cd_current_pos = zip->cd_start_pos;
return mz_zip_goto_next_entry_int(handle);
}