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

Moved get file crc to os functions.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2017-10-23 22:12:07 -07:00
parent a45b34f35e
commit 70d41f6479
4 changed files with 61 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/mz_compat.c
View File

@ -1,4 +1,5 @@
/* mz_compat.c -- Backwards compatible interface for older versions
Version 2.2.1, October 23rd, 2017
part of the MiniZip project
Copyright (C) 2012-2017 Nathan Moinvaziri
@ -568,43 +569,3 @@ void fill_win32_filefunc64W(zlib_filefunc64_def *pzlib_filefunc_def)
pzlib_filefunc_def = mz_stream_os_get_interface();
}
/***************************************************************************/
int get_file_crc(const char *path, void *buf, uint32_t buf_size, uint32_t *result_crc)
{
void *stream = NULL;
void *crc32_stream = NULL;
uint32_t read = 0;
int32_t err = MZ_OK;
mz_stream_os_create(&stream);
err = mz_stream_os_open(stream, path, MZ_OPEN_MODE_READ);
mz_stream_crc32_create(&crc32_stream);
mz_stream_crc32_open(crc32_stream, NULL, MZ_OPEN_MODE_READ);
mz_stream_set_base(crc32_stream, stream);
if (err == MZ_OK)
{
do
{
read = mz_stream_crc32_read(crc32_stream, buf, buf_size);
if ((read < buf_size) && (mz_stream_error(crc32_stream) != MZ_OK))
err = read;
}
while ((err == MZ_OK) && (read > 0));
mz_stream_os_close(stream);
}
mz_stream_crc32_close(crc32_stream);
*result_crc = mz_stream_crc32_get_value(crc32_stream);
mz_stream_crc32_delete(&crc32_stream);
mz_stream_os_delete(&stream);
return err;
}

20
src/mz_compat.h
View File

@ -1,4 +1,5 @@
/* mz_compat.h -- Backwards compatible interface for older versions
Version 2.2.1, October 23rd, 2017
part of the MiniZip project
Copyright (C) 2012-2017 Nathan Moinvaziri
@ -274,17 +275,16 @@ void fill_win32_filefunc64W(zlib_filefunc64_def *pzlib_filefunc_def);
/***************************************************************************/
#define check_file_exists mz_file_exists
#define dosdate_to_tm mz_zip_dosdate_to_tm
#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 check_file_exists mz_file_exists
#define dosdate_to_tm mz_zip_dosdate_to_tm
#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_os_make_dir
#define MKDIR mz_os_make_dir
#define CHDIR mz_os_change_dir
int get_file_crc(const char *path, void *buf, uint32_t buf_size, uint32_t *result_crc);
#define MKDIR mz_os_make_dir
#define CHDIR mz_os_change_dir
/***************************************************************************/

45
src/mz_os.c
View File

@ -15,6 +15,8 @@
#include "mz.h"
#include "mz_os.h"
#include "mz_strm.h"
#include "mz_strm_zlib.h"
/***************************************************************************/
@ -88,3 +90,46 @@ int32_t mz_path_combine(char *path, const char *join, int32_t max_path)
return MZ_OK;
}
int32_t mz_get_file_crc(const char *path, uint32_t *result_crc)
{
void *stream = NULL;
void *crc32_stream = NULL;
uint32_t read = 0;
uint8_t buf[INT16_MAX];
int32_t err = MZ_OK;
mz_stream_os_create(&stream);
err = mz_stream_os_open(stream, path, MZ_OPEN_MODE_READ);
mz_stream_crc32_create(&crc32_stream);
mz_stream_crc32_open(crc32_stream, NULL, MZ_OPEN_MODE_READ);
mz_stream_set_base(crc32_stream, stream);
if (err == MZ_OK)
{
do
{
read = mz_stream_crc32_read(crc32_stream, buf, sizeof(buf));
if (read < 0)
{
err = read;
break;
}
}
while ((err == MZ_OK) && (read > 0));
mz_stream_os_close(stream);
}
mz_stream_crc32_close(crc32_stream);
*result_crc = mz_stream_crc32_get_value(crc32_stream);
mz_stream_crc32_delete(&crc32_stream);
mz_stream_os_delete(&stream);
return err;
}

7
src/mz_os.h
View File

@ -30,12 +30,15 @@ extern "C" {
/***************************************************************************/
int32_t mz_make_dir(const char *path);
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);
int32_t mz_path_combine(char *path, const char *join, int32_t max_path);
// Combines two paths
int32_t mz_get_file_crc(const char *path, uint32_t *result_crc);
// Gets the crc32 hash of a file
/***************************************************************************/
#ifdef __cplusplus