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

Fixed directory compression method.

Browse Source 
Move zip attribute detection to mz_zip. #257
This commit is contained in:
Nathan Moinvaziri 2018-05-02 10:48:51 -07:00
parent b7bd0421c5
commit bb3b75bc09
5 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minizip.c
View File

@ -322,7 +322,7 @@ int32_t minizip_list(void *handle)
mz_zip_time_t_to_tm(file_info->modified_date, &tmu_date);
string_dir = "";
if (mz_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK)
if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK)
{
string_dir = "/";
string_method = "";
@ -399,7 +399,7 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
}
// If zip entry is a directory then create it on disk
if (mz_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK)
if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK)
{
printf("Creating directory: %s\n", out_path);
mz_make_dir(out_path);

23
mz_os.c
View File

@ -98,29 +98,6 @@ int32_t mz_path_combine(char *path, const char *join, int32_t max_path)
return MZ_OK;
}
int32_t mz_attrib_is_dir(int32_t attributes, int32_t version_madeby)
{
int32_t host_system = 0;
if (version_madeby == 0)
host_system = MZ_VERSION_MADEBY_HOST_SYSTEM;
else
host_system = (uint8_t)(version_madeby >> 8);
if (host_system == MZ_HOST_SYSTEM_MSDOS || host_system == MZ_HOST_SYSTEM_WINDOWS_NTFS)
{
if ((attributes & 0x10) == 0x10) // FILE_ATTRIBUTE_DIRECTORY
return MZ_OK;
}
else if (host_system == MZ_HOST_SYSTEM_UNIX || host_system == MZ_HOST_SYSTEM_OSX_DARWIN)
{
if ((attributes & 00170000) == 0040000) // S_ISDIR
return MZ_OK;
}
return MZ_EXIST_ERROR;
}
int32_t mz_get_file_crc(const char *path, uint32_t *result_crc)
{
void *stream = NULL;

3
mz_os.h
View File

@ -53,9 +53,6 @@ int32_t mz_make_dir(const char *path);
int32_t mz_path_combine(char *path, const char *join, int32_t max_path);
// Combines two paths
int32_t mz_attrib_is_dir(int32_t attributes, int32_t version_madeby);
// Checks to see if the attribute is a directory
int32_t mz_get_file_crc(const char *path, uint32_t *result_crc);
// Gets the crc32 hash of a file

22
mz_zip.c
View File

@ -1297,7 +1297,7 @@ extern int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_inf
zip->file_info.aes_encryption_mode = MZ_AES_ENCRYPTION_MODE_256;
#endif
if (compress_level == 0)
if ((compress_level == 0) || (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK))
compression_method = MZ_COMPRESS_METHOD_RAW;
if (err == MZ_OK)
@ -1555,6 +1555,26 @@ extern int32_t mz_zip_locate_entry(void *handle, const char *filename, mz_filena
/***************************************************************************/
int32_t mz_zip_attrib_is_dir(int32_t attributes, int32_t version_madeby)
{
int32_t host_system = (uint8_t)(version_madeby >> 8);
if (host_system == MZ_HOST_SYSTEM_MSDOS || host_system == MZ_HOST_SYSTEM_WINDOWS_NTFS)
{
if ((attributes & 0x10) == 0x10) // FILE_ATTRIBUTE_DIRECTORY
return MZ_OK;
}
else if (host_system == MZ_HOST_SYSTEM_UNIX || host_system == MZ_HOST_SYSTEM_OSX_DARWIN)
{
if ((attributes & 00170000) == 0040000) // S_ISDIR
return MZ_OK;
}
return MZ_EXIST_ERROR;
}
/***************************************************************************/
static int32_t mz_zip_invalid_date(const struct tm *ptm)
{
#define datevalue_in_range(min, max, value) ((min) <= (value) && (value) <= (max))

3
mz_zip.h
View File

@ -130,6 +130,9 @@ extern int32_t mz_zip_locate_entry(void *handle, const char *filename,
/***************************************************************************/
int32_t mz_zip_attrib_is_dir(int32_t attributes, int32_t version_madeby);
// Checks to see if the attribute is a directory based on platform
int32_t mz_zip_dosdate_to_tm(uint64_t dos_date, struct tm *ptm);
// Convert dos date/time format to struct tm