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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-09-18 20:30:37 -07:00
commit 0863941638
6 changed files with 119 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mz_os_posix.c
View File

@ -20,19 +20,24 @@
#ifdef HAVE_GETRANDOM
# include <sys/random.h>
#endif
#if defined unix || defined __APPLE__
#if defined(unix) || defined(__APPLE__)
# include <unistd.h>
# include <utime.h>
# ifndef HAVE_ARC4RANDOM_BUF
# define HAVE_ARC4RANDOM_BUF
# endif
#endif
#if defined(HAVE_LIBBSD) && \
!defined(MZ_ZIP_NO_COMPRESSION) && \
!defined(MZ_ZIP_NO_ENCRYPTION)
#if defined(HAVE_LIBBSD) && \
!defined(MZ_ZIP_NO_COMPRESSION) && \
!defined(MZ_ZIP_NO_ENCRYPTION)
# include <bsd/stdlib.h> // arc4random_buf
#endif
#ifdef __APPLE__
#include <mach/clock.h>
#include <mach/mach.h>
#endif
#include "mz.h"
#include "mz_strm.h"
#include "mz_os.h"
@ -260,3 +265,24 @@ int32_t mz_posix_is_dir(const char *path)
return MZ_OK;
return MZ_EXIST_ERROR;
}
uint64_t mz_posix_ms_time(void)
{
struct timespec ts;
#ifdef __APPLE__
clock_serv_t cclock;
mach_timespec_t mts;
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
clock_get_time(cclock, &mts);
mach_port_deallocate(mach_task_self(), cclock);
ts.tv_sec = mts.tv_sec;
ts.tv_nsec = mts.tv_nsec;
#else
clock_gettime(CLOCK_MONOTONIC, &ts);
#endif
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
}

30
mz_os_posix.h
View File

@ -30,21 +30,22 @@ extern "C" {
/***************************************************************************/
int32_t mz_posix_rand(uint8_t *buf, int32_t size);
int32_t mz_posix_rename(const char *source_path, const char *target_path);
int32_t mz_posix_delete(const char *path);
int32_t mz_posix_file_exists(const char *path);
int64_t mz_posix_get_file_size(const char *path);
int32_t mz_posix_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date);
int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date);
int32_t mz_posix_get_file_attribs(const char *path, uint32_t *attributes);
int32_t mz_posix_set_file_attribs(const char *path, uint32_t attributes);
int32_t mz_posix_make_dir(const char *path);
DIR* mz_posix_open_dir(const char *path);
int32_t mz_posix_rand(uint8_t *buf, int32_t size);
int32_t mz_posix_rename(const char *source_path, const char *target_path);
int32_t mz_posix_delete(const char *path);
int32_t mz_posix_file_exists(const char *path);
int64_t mz_posix_get_file_size(const char *path);
int32_t mz_posix_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date);
int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date);
int32_t mz_posix_get_file_attribs(const char *path, uint32_t *attributes);
int32_t mz_posix_set_file_attribs(const char *path, uint32_t attributes);
int32_t mz_posix_make_dir(const char *path);
DIR* mz_posix_open_dir(const char *path);
struct
dirent* mz_posix_read_dir(DIR *dir);
int32_t mz_posix_close_dir(DIR *dir);
int32_t mz_posix_is_dir(const char *path);
dirent* mz_posix_read_dir(DIR *dir);
int32_t mz_posix_close_dir(DIR *dir);
int32_t mz_posix_is_dir(const char *path);
uint64_t mz_posix_ms_time(void);
/***************************************************************************/
@ -62,6 +63,7 @@ int32_t mz_posix_is_dir(const char *path);
#define mz_os_read_dir mz_posix_read_dir
#define mz_os_close_dir mz_posix_close_dir
#define mz_os_is_dir mz_posix_is_dir
#define mz_os_ms_time mz_posix_ms_time
/***************************************************************************/

15
mz_os_win32.c
View File

@ -381,3 +381,18 @@ int32_t mz_win32_is_dir(const char *path)
return MZ_EXIST_ERROR;
}
uint64_t mz_win32_ms_time(void)
{
SYSTEMTIME system_time;
FILETIME file_time;
uint64_t quad_file_time = 0;
GetSystemTime(&system_time);
SystemTimeToFileTime(&system_time, &file_time);
quad_file_time = file_time.dwLowDateTime;
quad_file_time |= ((uint64_t)file_time.dwHighDateTime << 32);
return quad_file_time / 10000 - 11644473600000LL;
}

30
mz_os_win32.h
View File

@ -31,21 +31,22 @@ typedef void* DIR;
/***************************************************************************/
int32_t mz_win32_rand(uint8_t *buf, int32_t size);
int32_t mz_win32_rename(const char *source_path, const char *target_path);
int32_t mz_win32_delete(const char *path);
int32_t mz_win32_file_exists(const char *path);
int64_t mz_win32_get_file_size(const char *path);
int32_t mz_win32_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date);
int32_t mz_win32_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date);
int32_t mz_win32_get_file_attribs(const char *path, uint32_t *attributes);
int32_t mz_win32_set_file_attribs(const char *path, uint32_t attributes);
int32_t mz_win32_make_dir(const char *path);
DIR* mz_win32_open_dir(const char *path);
int32_t mz_win32_rand(uint8_t *buf, int32_t size);
int32_t mz_win32_rename(const char *source_path, const char *target_path);
int32_t mz_win32_delete(const char *path);
int32_t mz_win32_file_exists(const char *path);
int64_t mz_win32_get_file_size(const char *path);
int32_t mz_win32_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date);
int32_t mz_win32_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date);
int32_t mz_win32_get_file_attribs(const char *path, uint32_t *attributes);
int32_t mz_win32_set_file_attribs(const char *path, uint32_t attributes);
int32_t mz_win32_make_dir(const char *path);
DIR* mz_win32_open_dir(const char *path);
struct
dirent* mz_win32_read_dir(DIR *dir);
int32_t mz_win32_close_dir(DIR *dir);
int32_t mz_win32_is_dir(const char *path);
dirent* mz_win32_read_dir(DIR *dir);
int32_t mz_win32_close_dir(DIR *dir);
int32_t mz_win32_is_dir(const char *path);
uint64_t mz_win32_ms_time(void);
/***************************************************************************/
@ -63,6 +64,7 @@ int32_t mz_win32_is_dir(const char *path);
#define mz_os_read_dir mz_win32_read_dir
#define mz_os_close_dir mz_win32_close_dir
#define mz_os_is_dir mz_win32_is_dir
#define mz_os_ms_time mz_win32_ms_time
/***************************************************************************/

52
mz_zip_rw.c
View File

@ -11,8 +11,8 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
#include "mz.h"
@ -27,6 +27,10 @@
/***************************************************************************/
#define MZ_DEFAULT_PROGRESS_INTERVAL (1000u)
/***************************************************************************/
typedef struct mz_zip_reader_s {
void *zip_handle;
void *file_stream;
@ -46,6 +50,7 @@ typedef struct mz_zip_reader_s {
void *progress_userdata;
mz_zip_reader_progress_cb
progress_cb;
uint32_t progress_cb_interval_ms;
void *entry_userdata;
mz_zip_reader_entry_cb
entry_cb;
@ -410,12 +415,12 @@ int32_t mz_zip_reader_entry_save_process(void *handle, void *stream, mz_stream_w
int32_t mz_zip_reader_entry_save(void *handle, void *stream, mz_stream_write_cb write_cb)
{
mz_zip_reader *reader = (mz_zip_reader *)handle;
uint64_t current_time = 0;
uint64_t update_time = 0;
int64_t current_pos = 0;
int64_t update_pos = 0;
int32_t err = MZ_OK;
int32_t written = 0;
time_t current_time = time(NULL);
time_t update_time = 0;
if (mz_zip_reader_is_open(reader) != MZ_OK)
return MZ_PARAM_ERROR;
@ -437,9 +442,9 @@ int32_t mz_zip_reader_entry_save(void *handle, void *stream, mz_stream_write_cb
if (written < 0)
err = written;
// Every 1 second lets update the progress
current_time = time(NULL);
if (current_time > update_time)
// Update progress if enough time have passed
current_time = mz_os_ms_time();
if ((current_time - update_time) > reader->progress_cb_interval_ms)
{
if (reader->progress_cb != NULL)
reader->progress_cb(handle, reader->progress_userdata, reader->file_info, current_pos);
@ -591,7 +596,9 @@ int32_t mz_zip_reader_save_all(void *handle, const char *destination_dir)
path[0] = 0;
if ((reader->legacy_encoding) && (reader->file_info->flag & MZ_ZIP_FLAG_UTF8) == 0)
{
mz_encoding_cp437_to_utf8(reader->file_info->filename, utf8_name, sizeof(utf8_name));
}
else
{
strncpy(utf8_name, reader->file_info->filename, sizeof(utf8_name) - 1);
@ -677,6 +684,12 @@ void mz_zip_reader_set_progress_cb(void *handle, void *userdata, mz_zip_reader_p
reader->progress_userdata = userdata;
}
void mz_zip_reader_set_progress_interval(void *handle, uint32_t milliseconds)
{
mz_zip_reader *reader = (mz_zip_reader *)handle;
reader->progress_cb_interval_ms = milliseconds;
}
void mz_zip_reader_set_entry_cb(void *handle, void *userdata, mz_zip_reader_entry_cb cb)
{
mz_zip_reader *reader = (mz_zip_reader *)handle;
@ -705,9 +718,9 @@ void *mz_zip_reader_create(void **handle)
if (reader != NULL)
{
memset(reader, 0, sizeof(mz_zip_reader));
}
if (reader != NULL)
reader->progress_cb_interval_ms = MZ_DEFAULT_PROGRESS_INTERVAL;
*handle = reader;
}
return reader;
}
@ -744,6 +757,7 @@ typedef struct mz_zip_writer_s {
void *progress_userdata;
mz_zip_writer_progress_cb
progress_cb;
uint32_t progress_cb_interval_ms;
void *entry_userdata;
mz_zip_writer_entry_cb
entry_cb;
@ -1008,13 +1022,12 @@ int32_t mz_zip_writer_add_process(void *handle, void *stream, mz_stream_read_cb
int32_t mz_zip_writer_add(void *handle, void *stream, mz_stream_read_cb read_cb)
{
mz_zip_writer *writer = (mz_zip_writer *)handle;
uint64_t current_time = 0;
uint64_t update_time = 0;
int64_t current_pos = 0;
int64_t update_pos = 0;
int32_t err = MZ_OK;
int32_t written = 0;
time_t current_time = time(NULL);
time_t update_time = 0;
// Update the progress at the beginning
if (writer->progress_cb != NULL)
@ -1031,9 +1044,9 @@ int32_t mz_zip_writer_add(void *handle, void *stream, mz_stream_read_cb read_cb)
if (written < 0)
err = written;
// Every 1 second lets update the progress
current_time = time(NULL);
if (current_time > update_time)
// Update progress if enough time have passed
current_time = mz_os_ms_time();
if ((current_time - update_time) > writer->progress_cb_interval_ms)
{
if (writer->progress_cb != NULL)
writer->progress_cb(handle, writer->progress_userdata, &writer->file_info, current_pos);
@ -1342,6 +1355,12 @@ void mz_zip_writer_set_progress_cb(void *handle, void *userdata, mz_zip_writer_p
writer->progress_userdata = userdata;
}
void mz_zip_writer_set_progress_interval(void *handle, uint32_t milliseconds)
{
mz_zip_writer *writer = (mz_zip_writer *)handle;
writer->progress_cb_interval_ms = milliseconds;
}
void mz_zip_writer_set_entry_cb(void *handle, void *userdata, mz_zip_writer_entry_cb cb)
{
mz_zip_writer *writer = (mz_zip_writer *)handle;
@ -1373,9 +1392,10 @@ void *mz_zip_writer_create(void **handle)
writer->compress_method = MZ_COMPRESS_METHOD_DEFLATE;
writer->compress_level = MZ_COMPRESS_LEVEL_BEST;
}
if (writer != NULL)
writer->progress_cb_interval_ms = MZ_DEFAULT_PROGRESS_INTERVAL;
*handle = writer;
}
return writer;
}

6
mz_zip_rw.h
View File

@ -119,6 +119,9 @@ void mz_zip_reader_set_password_cb(void *handle, void *userdata, mz_zip_reade
void mz_zip_reader_set_progress_cb(void *handle, void *userdata, mz_zip_reader_progress_cb cb);
// Callback for extraction progress
void mz_zip_reader_set_progress_interval(void *handle, uint32_t milliseconds);
// Let at least milliseconds pass between calls to progress callback
void mz_zip_reader_set_entry_cb(void *handle, void *userdata, mz_zip_reader_entry_cb cb);
// Callback for zip file entries
@ -218,6 +221,9 @@ void mz_zip_writer_set_password_cb(void *handle, void *userdata, mz_zip_write
void mz_zip_writer_set_progress_cb(void *handle, void *userdata, mz_zip_writer_progress_cb cb);
// Callback for compression progress
void mz_zip_writer_set_progress_interval(void *handle, uint32_t milliseconds);
// Let at least milliseconds pass between calls to progress callback
void mz_zip_writer_set_entry_cb(void *handle, void *userdata, mz_zip_writer_entry_cb cb);
// Callback for zip file entries