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 directory entries in minizip. #257

Browse Source 
Added support for file attributes.
This commit is contained in:
Nathan Moinvaziri 2018-05-01 13:45:08 -07:00
parent 0f09a00810
commit e33916b608
11 changed files with 220 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
minizip.c
View File

@ -47,7 +47,7 @@ void minizip_help()
" -o Overwrite existing files\n" \
" -a Append to existing zip file\n" \
" -u Buffered reading and writing\n" \
" -j Exclude path of files\n" \
" -i Include full path of files\n" \
" -0 Store only\n" \
" -1 Compress faster\n" \
" -9 Compress better\n" \
@ -68,7 +68,7 @@ void minizip_help()
/***************************************************************************/
typedef struct minizip_opt_s {
uint8_t exclude_path;
uint8_t include_path;
int16_t compress_level;
int16_t compress_method;
uint8_t overwrite;
@ -79,41 +79,26 @@ typedef struct minizip_opt_s {
/***************************************************************************/
int32_t minizip_add_file(void *handle, const char *path, const char *password, minizip_opt *options)
int32_t minizip_add_path(void *handle, const char *path, const char *filenameinzip, const char *password, int16_t is_dir, minizip_opt *options)
{
mz_zip_file file_info = { 0 };
mz_zip_file file_info;
int32_t read = 0;
int32_t written = 0;
int32_t err = MZ_OK;
int32_t err_close = MZ_OK;
void *stream = NULL;
const char *filenameinzip = NULL;
char buf[INT16_MAX];
// Construct the filename that our file will be stored in the zip as.
memset(&file_info, 0, sizeof(file_info));
// The path name saved, should not include a leading slash.
// If it did, windows/xp and dynazip couldn't read the zip file.
filenameinzip = path;
if (filenameinzip == NULL)
filenameinzip = path;
while (filenameinzip[0] == '\\' || filenameinzip[0] == '/')
filenameinzip += 1;
// Should the file be stored with any path info at all?
if (options->exclude_path)
{
const char *match = NULL;
const char *last_slash = NULL;
for (match = filenameinzip; *match; match += 1)
{
if (*match == '\\' || *match == '/')
last_slash = match;
}
if (last_slash != NULL)
filenameinzip = last_slash + 1; // base filename follows last slash
}
// Get information about the file on disk so we can store it in zip
printf("Adding: %s\n", filenameinzip);
@ -130,6 +115,7 @@ int32_t minizip_add_file(void *handle, const char *path, const char *password, m
mz_os_get_file_date(path, &file_info.modified_date, &file_info.accessed_date,
&file_info.creation_date);
mz_os_get_file_attribs(path, &file_info.external_fa);
// Add to zip
err = mz_zip_entry_write_open(handle, &file_info, options->compress_level, password);
@ -139,43 +125,45 @@ int32_t minizip_add_file(void *handle, const char *path, const char *password, m
return err;
}
mz_stream_os_create(&stream);
err = mz_stream_os_open(stream, path, MZ_OPEN_MODE_READ);
if (err == MZ_OK)
if (!is_dir)
{
// Read contents of file and write it to zip
do
mz_stream_os_create(&stream);
err = mz_stream_os_open(stream, path, MZ_OPEN_MODE_READ);
if (err == MZ_OK)
{
read = mz_stream_os_read(stream, buf, sizeof(buf));
if (read < 0)
// Read contents of file and write it to zip
do
{
err = mz_stream_os_error(stream);
printf("Error %d in reading %s\n", err, filenameinzip);
break;
}
if (read == 0)
break;
read = mz_stream_os_read(stream, buf, sizeof(buf));
if (read < 0)
{
err = mz_stream_os_error(stream);
printf("Error %d in reading %s\n", err, filenameinzip);
break;
}
if (read == 0)
break;
written = mz_zip_entry_write(handle, buf, read);
if (written != read)
{
err = mz_stream_os_error(stream);
printf("Error in writing %s in the zip file (%d)\n", filenameinzip, err);
break;
}
written = mz_zip_entry_write(handle, buf, read);
if (written != read)
{
err = mz_stream_os_error(stream);
printf("Error in writing %s in the zip file (%d)\n", filenameinzip, err);
break;
}
} while (err == MZ_OK);
mz_stream_os_close(stream);
}
else
{
printf("Error in opening %s for reading\n", path);
}
while (err == MZ_OK);
mz_stream_os_close(stream);
mz_stream_os_delete(&stream);
}
else
{
printf("Error in opening %s for reading\n", path);
}
mz_stream_os_delete(&stream);
err_close = mz_zip_entry_close(handle);
if (err_close != MZ_OK)
@ -187,16 +175,51 @@ int32_t minizip_add_file(void *handle, const char *path, const char *password, m
return err;
}
int32_t minizip_add(void *handle, const char *path, const char *password, minizip_opt *options, uint8_t recursive)
int32_t minizip_add(void *handle, const char *path, const char *root_path, const char *password, minizip_opt *options, uint8_t recursive)
{
DIR *dir = NULL;
struct dirent *entry = NULL;
int32_t err = 0;
int32_t err = MZ_OK;
int16_t is_dir = 0;
char full_path[320];
const char *filenameinzip = path;
if (mz_os_is_dir(path) != MZ_OK)
return minizip_add_file(handle, path, password, options);
if (mz_os_is_dir(path) == MZ_OK)
is_dir = 1;
// Construct the filename that our file will be stored in the zip as
if (root_path == NULL)
root_path = path;
// Should the file be stored with any path info at all?
if (!options->include_path)
{
if (!is_dir && root_path == path)
{
const char *match = NULL;
const char *last_slash = NULL;
for (match = filenameinzip; *match; match += 1)
{
if (*match == '\\' || *match == '/')
last_slash = match;
}
if (last_slash != NULL)
filenameinzip = last_slash + 1; // base filename follows last slash
}
else
{
filenameinzip += strlen(root_path);
}
}
if (*filenameinzip != 0)
err = minizip_add_path(handle, path, filenameinzip, password, is_dir, options);
if (!is_dir)
return err;
dir = mz_os_open_dir(path);
@ -218,7 +241,7 @@ int32_t minizip_add(void *handle, const char *path, const char *password, minizi
if (!recursive && mz_os_is_dir(full_path))
continue;
err = minizip_add(handle, full_path, password, options, recursive);
err = minizip_add(handle, full_path, root_path, password, options, recursive);
if (err != MZ_OK)
return err;
}
@ -235,7 +258,7 @@ int32_t minizip_list(void *handle)
uint32_t ratio = 0;
int16_t level = 0;
int32_t err = MZ_OK;
struct tm tmu_date = { 0 };
struct tm tmu_date;
const char *string_method = NULL;
char crypt = ' ';
@ -329,7 +352,6 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
int32_t written = 0;
int32_t err = MZ_OK;
int32_t err_close = MZ_OK;
uint8_t skip = 0;
void *stream = NULL;
char *match = NULL;
char *filename = NULL;
@ -355,22 +377,22 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
// Construct output path
out_path[0] = 0;
if (destination != NULL)
mz_path_combine(out_path, destination, sizeof(out_path));
if (options->exclude_path)
mz_path_combine(out_path, filename, sizeof(out_path));
else
mz_path_combine(out_path, file_info->filename, sizeof(out_path));
// If zip entry is a directory then create it on disk
if (*filename == 0)
if ((*file_info->filename == '/') || (file_info->filename[1] == ':'))
{
if (options->exclude_path == 0)
{
printf("Creating directory: %s\n", out_path);
mz_make_dir(out_path);
}
strncpy(out_path, file_info->filename, sizeof(out_path));
}
else
{
if (destination != NULL)
mz_path_combine(out_path, destination, sizeof(out_path));
mz_path_combine(out_path, file_info->filename, sizeof(out_path));
}
// 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)
{
printf("Creating directory: %s\n", out_path);
mz_make_dir(out_path);
return err;
}
@ -399,7 +421,7 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
while ((rep != 'Y') && (rep != 'N') && (rep != 'A'));
if (rep == 'N')
skip = 1;
return err;
if (rep == 'A')
options->overwrite = 1;
}
@ -407,11 +429,11 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
mz_stream_os_create(&stream);
// Create the file on disk so we can unzip to it
if ((skip == 0) && (err == MZ_OK))
if (err == MZ_OK)
{
// Some zips don't contain directory alone before file
if ((mz_stream_os_open(stream, out_path, MZ_OPEN_MODE_CREATE) != MZ_OK) &&
(options->exclude_path == 0) && (filename != file_info->filename))
(options->include_path == 0) && (filename != file_info->filename))
{
// Create the directory of the output path
strncpy(directory, out_path, sizeof(directory));
@ -580,8 +602,8 @@ int main(int argc, char *argv[])
buffered = 1;
if ((c == 'o') || (c == 'O'))
options.overwrite = 1;
if ((c == 'j') || (c == 'J'))
options.exclude_path = 1;
if ((c == 'i') || (c == 'I'))
options.include_path = 1;
if ((c >= '0') && (c <= '9'))
{
options.compress_level = (c - '0');
@ -737,7 +759,7 @@ int main(int argc, char *argv[])
// Go through command line args looking for files to add to zip
for (i = path_arg + 1; (i < argc) && (err == MZ_OK); i += 1)
err = minizip_add(handle, argv[i], password, &options, 1);
err = minizip_add(handle, argv[i], NULL, password, &options, 1);
mz_zip_set_version_madeby(handle, MZ_VERSION_MADEBY);
}

5
mz.h
View File

@ -71,6 +71,11 @@ extern "C" {
MZ_ZIP_FLAG_DEFLATE_MAX)
#define MZ_ZIP_FLAG_DATA_DESCRIPTOR (1 << 3)
// MZ_HOST_SYSTEM
#define MZ_HOST_SYSTEM_UNIX (3)
#define MZ_HOST_SYSTEM_WINDOWS_NTFS (10)
#define MZ_HOST_SYSTEM_OSX_DARWIN (19)
// MZ_AES
#define MZ_AES_VERSION (1)
#define MZ_AES_ENCRYPTION_MODE_128 (0x01)

2
mz_compat.c
View File

@ -114,7 +114,7 @@ extern int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, cons
ZIP_UNUSED uint32_t crc_for_crypting, uint16_t version_madeby, uint16_t flag_base, int zip64)
{
mz_compat *compat = (mz_compat *)file;
mz_zip_file file_info = { 0 };
mz_zip_file file_info;
uint64_t dos_date = 0;
if (compat == NULL)

23
mz_os.c
View File

@ -149,4 +149,27 @@ int32_t mz_get_file_crc(const char *path, uint32_t *result_crc)
mz_stream_os_delete(&stream);
return err;
}
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_WINDOWS_NTFS)
{
if (attributes & 0x10) // FILE_ATTRIBUTE_DIRECTORY
return MZ_OK;
}
else if (host_system == MZ_HOST_SYSTEM_UNIX || host_system == MZ_HOST_SYSTEM_OSX_DARWIN)
{
if (attributes & 0040000) // S_IFDIR
return MZ_OK;
}
return MZ_EXIST_ERROR;
}

3
mz_os.h
View File

@ -53,6 +53,9 @@ 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_os_posix.c
View File

@ -115,6 +115,28 @@ int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t ac
return MZ_OK;
}
int32_t mz_posix_get_file_attribs(const char *path, int32_t *attributes)
{
struct stat stat_info;
int32_t err = MZ_OK;
memset(&stat_info, 0, sizeof(stat_info));
if (stat(path, &stat_info) == -1)
err = MZ_INTERNAL_ERROR;
*attributes = stat_info.st_mode;
return err;
}
int32_t mz_posix_set_file_attribs(const char *path, int32_t attributes)
{
int32_t err = MZ_OK;
if (chmod(path, attributes) == -1)
err = MZ_INTERNAL_ERROR;
return err;
}
int32_t mz_posix_make_dir(const char *path)
{
int32_t err = 0;

28
mz_os_posix.h
View File

@ -23,9 +23,9 @@ extern "C" {
/***************************************************************************/
#if defined(__APPLE__)
#define MZ_VERSION_MADEBY_HOST_SYSTEM (19)
#define MZ_VERSION_MADEBY_HOST_SYSTEM (MZ_HOST_SYSTEM_OSX_DARWIN)
#elif defined(unix)
#define MZ_VERSION_MADEBY_HOST_SYSTEM (3)
#define MZ_VERSION_MADEBY_HOST_SYSTEM (MZ_HOST_SYSTEM_UNIX)
#endif
/***************************************************************************/
@ -35,6 +35,8 @@ 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, int32_t *attributes);
int32_t mz_posix_set_file_attribs(const char *path, int32_t attributes);
int32_t mz_posix_make_dir(const char *path);
DIR* mz_posix_open_dir(const char *path);
struct
@ -44,16 +46,18 @@ int32_t mz_posix_is_dir(const char *path);
/***************************************************************************/
#define mz_os_rand mz_posix_rand
#define mz_os_file_exists mz_posix_file_exists
#define mz_os_get_file_size mz_posix_get_file_size
#define mz_os_get_file_date mz_posix_get_file_date
#define mz_os_set_file_date mz_posix_set_file_date
#define mz_os_make_dir mz_posix_make_dir
#define mz_os_open_dir mz_posix_open_dir
#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_rand mz_posix_rand
#define mz_os_file_exists mz_posix_file_exists
#define mz_os_get_file_size mz_posix_get_file_size
#define mz_os_get_file_date mz_posix_get_file_date
#define mz_os_set_file_date mz_posix_set_file_date
#define mz_os_get_file_attribs mz_posix_get_file_attribs
#define mz_os_set_file_attribs mz_posix_set_file_attribs
#define mz_os_make_dir mz_posix_make_dir
#define mz_os_open_dir mz_posix_open_dir
#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
/***************************************************************************/

28
mz_os_win32.c
View File

@ -213,6 +213,34 @@ int32_t mz_win32_set_file_date(const char *path, time_t modified_date, time_t ac
return err;
}
int32_t mz_win32_get_file_attribs(const char *path, int32_t *attributes)
{
wchar_t *path_wide = NULL;
int32_t err = MZ_OK;
path_wide = mz_win32_unicode_path_create(path);
*attributes = GetFileAttributesW(path_wide);
free(path_wide);
if (*attributes == INVALID_FILE_ATTRIBUTES)
err = MZ_INTERNAL_ERROR;
return err;
}
int32_t mz_win32_set_file_attribs(const char *path, int32_t attributes)
{
wchar_t *path_wide = NULL;
int32_t err = MZ_OK;
path_wide = mz_win32_unicode_path_create(path);
if (SetFileAttributesW(path_wide, attributes) == 0)
err = MZ_INTERNAL_ERROR;
free(path_wide);
return err;
}
int32_t mz_win32_make_dir(const char *path)
{
wchar_t *path_wide = NULL;

26
mz_os_win32.h
View File

@ -20,7 +20,7 @@ extern "C" {
/***************************************************************************/
#define MZ_VERSION_MADEBY_HOST_SYSTEM (10)
#define MZ_VERSION_MADEBY_HOST_SYSTEM (MZ_HOST_SYSTEM_WINDOWS_NTFS)
/***************************************************************************/
@ -36,6 +36,8 @@ 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, int32_t *attributes);
int32_t mz_win32_set_file_attribs(const char *path, int32_t attributes);
int32_t mz_win32_make_dir(const char *path);
DIR* mz_win32_open_dir(const char *path);
struct
@ -45,16 +47,18 @@ int32_t mz_win32_is_dir(const char *path);
/***************************************************************************/
#define mz_os_rand mz_win32_rand
#define mz_os_file_exists mz_win32_file_exists
#define mz_os_get_file_size mz_win32_get_file_size
#define mz_os_get_file_date mz_win32_get_file_date
#define mz_os_set_file_date mz_win32_set_file_date
#define mz_os_make_dir mz_win32_make_dir
#define mz_os_open_dir mz_win32_open_dir
#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_rand mz_win32_rand
#define mz_os_file_exists mz_win32_file_exists
#define mz_os_get_file_size mz_win32_get_file_size
#define mz_os_get_file_date mz_win32_get_file_date
#define mz_os_set_file_date mz_win32_set_file_date
#define mz_os_get_file_attribs mz_win32_get_file_attribs
#define mz_os_set_file_attribs mz_win32_set_file_attribs
#define mz_os_make_dir mz_win32_make_dir
#define mz_os_open_dir mz_win32_open_dir
#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
/***************************************************************************/

4
mz_strm_lzma.c
View File

@ -66,11 +66,13 @@ int32_t mz_stream_lzma_open(void *stream, const char *path, int32_t mode)
{
mz_stream_lzma *lzma = (mz_stream_lzma *)stream;
lzma_filter filters[LZMA_FILTERS_MAX + 1];
lzma_options_lzma opt_lzma = { 0 };
lzma_options_lzma opt_lzma;
uint32_t size = 0;
uint8_t major = 0;
uint8_t minor = 0;
memset(&opt_lzma, 0, sizeof(opt_lzma));
lzma->lstream.total_in = 0;
lzma->lstream.total_out = 0;

2
mz_zip.c
View File

@ -1627,7 +1627,7 @@ uint32_t mz_zip_time_t_to_dos_date(time_t unix_time)
uint32_t mz_zip_tm_to_dosdate(const struct tm *ptm)
{
struct tm fixed_tm = { 0 };
struct tm fixed_tm;
// Years supported: