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 compilation errors on Windows.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2017-10-06 00:08:29 -07:00
parent 0c9660b83f
commit fce8e4c2fd
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minizip.c
View File

@ -177,7 +177,7 @@ int32_t minizip_add(void *handle, const char *path, uint8_t opt_exclude_path, mz
continue;
strncpy(full_path, path, sizeof(full_path));
full_path_len = strlen(full_path);
full_path_len = (int16_t)strlen(full_path);
if (full_path_len > 0 && full_path[full_path_len - 1] != '\\')
strncat(full_path, "\\", sizeof(full_path) - full_path_len - 1);
strncat(full_path, entry->d_name, sizeof(full_path) - full_path_len - 2);

19
mz_os_win32.c
View File

@ -163,7 +163,7 @@ int16_t mz_win32_make_dir(const char *path)
typedef struct DIR_int_s {
void *find_handle;
WIN32_FIND_DATAW find_data;
dirent entry;
struct dirent entry;
uint8_t end;
} DIR_int;
@ -174,14 +174,16 @@ DIR *mz_win32_open_dir(const char *path)
wchar_t *path_wide = NULL;
uint32_t path_wide_size = 0;
int16_t err = 0;
void *handle = NULL;
int16_t fixed_path_len = 0;
char fixed_path[320];
void *handle = NULL;
strncpy(fixed_path, path, sizeof(fixed_path));
if (strlen(path) > 0 && path[strlen(path) - 1] != '\\')
strncat(fixed_path, "\\", sizeof(fixed_path));
strncat(fixed_path, "*", sizeof(fixed_path));
fixed_path_len = (int16_t)strlen(fixed_path);
if (fixed_path_len > 0 && fixed_path[fixed_path_len - 1] != '\\')
strncat(fixed_path, "\\", sizeof(fixed_path) - fixed_path_len - 1);
strncat(fixed_path, "*", sizeof(fixed_path) - fixed_path_len - 2);
path_wide_size = MultiByteToWideChar(CP_UTF8, 0, fixed_path, -1, NULL, 0);
path_wide = (wchar_t *)malloc((path_wide_size + 1) * sizeof(wchar_t));
@ -196,19 +198,18 @@ DIR *mz_win32_open_dir(const char *path)
if (handle == INVALID_HANDLE_VALUE)
return NULL;
dir_int = (DIR *)malloc(sizeof(DIR));
dir_int = (DIR_int *)malloc(sizeof(DIR_int));
dir_int->find_handle = handle;
dir_int->end = 0;
memcpy(&dir_int->find_data, &find_data, sizeof(dir_int->find_data));
return dir_int;
return (DIR *)dir_int;
}
dirent* mz_win32_read_dir(DIR *dir)
struct dirent* mz_win32_read_dir(DIR *dir)
{
DIR_int *dir_int;
WIN32_FIND_DATAW find_data;
if (dir == NULL)
return NULL;

5
mz_os_win32.h
View File

@ -20,9 +20,9 @@ extern "C" {
/***************************************************************************/
typedef struct dirent_s {
struct dirent {
char d_name[260];
} dirent;
};
typedef void* DIR;
@ -32,6 +32,7 @@ int16_t mz_win32_set_file_date(const char *path, uint32_t dos_date);
int16_t mz_win32_change_dir(const char *path);
int16_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);