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 adding wildcard patterns when creating archive.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-07-31 14:43:30 -07:00
parent 65a87024d4
commit c65c7a928f
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
minizip.c
View File

@ -182,37 +182,49 @@ int32_t minizip_add(void *handle, const char *path, const char *root_path, const
struct dirent *entry = NULL;
int32_t err = MZ_OK;
int16_t is_dir = 0;
char full_path[320];
const char *filename = NULL;
const char *filenameinzip = path;
char *wildcard_ptr = NULL;
char full_path[320];
char path_dir[320];
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 (strrchr(path, '*') != NULL)
{
if (!is_dir && root_path == path)
{
if (mz_path_get_filename(filenameinzip, &filename) == MZ_OK)
filenameinzip = filename;
}
else
{
filenameinzip += strlen(root_path);
}
strncpy(path_dir, path, sizeof(path_dir));
mz_path_remove_filename(path_dir);
wildcard_ptr = path_dir + strlen(path_dir) + 1;
root_path = path = path_dir;
}
else
{
// Construct the filename that our file will be stored in the zip as
if (root_path == NULL)
root_path = path;
if (*filenameinzip != 0)
err = minizip_add_path(handle, path, filenameinzip, password, is_dir, options);
// Should the file be stored with any path info at all?
if (!options->include_path)
{
if (!is_dir && root_path == path)
{
if (mz_path_get_filename(filenameinzip, &filename) == MZ_OK)
filenameinzip = filename;
}
else
{
filenameinzip += strlen(root_path);
}
}
if (!is_dir)
return err;
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);
@ -233,6 +245,8 @@ int32_t minizip_add(void *handle, const char *path, const char *root_path, const
if (!recursive && mz_os_is_dir(full_path))
continue;
if ((wildcard_ptr != NULL) && (mz_path_compare_wc(entry->d_name, wildcard_ptr, 1) != MZ_OK))
continue;
err = minizip_add(handle, full_path, root_path, password, options, recursive);
if (err != MZ_OK)
@ -629,6 +643,7 @@ int32_t minizip_copy_specific_entries(void *src_handle, void *target_handle, int
/***************************************************************************/
#if !defined(MZ_NO_MAIN)
int main(int argc, const char *argv[])
{
minizip_opt options;
@ -921,4 +936,5 @@ int main(int argc, const char *argv[])
}
return err;
}
}
#endif

1
mz_os.h
View File

@ -60,7 +60,6 @@ int32_t mz_path_resolve(const char *path, char *target, int32_t max_target);
int32_t mz_path_remove_filename(const char *path);
// Remove the filename from a path
int32_t mz_path_get_filename(const char *path, const char **filename);
// Get the filename from a path