CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-27 14:23:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set archive path before extracting

Browse Source
This commit is contained in:
Brad Parker 2016-09-18 16:05:33 -04:00
parent 80d577094c
commit 050ab56038
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretro-common/include/file/archive_file.h
View File

@ -99,7 +99,7 @@ struct archive_extract_userdata
char archive_name[PATH_MAX_LENGTH];
uint32_t crc;
struct decomp_state_t decomp_state;
decompress_state_t dec;
decompress_state_t *dec;
};
/* Returns true when parsing should continue. False to stop. */

17
tasks/task_decompress.c
View File

@ -48,12 +48,12 @@ static int file_decompressed_subdir(const char *name,
if (name[strlen(name) - 1] == '/' || name[strlen(name) - 1] == '\\')
goto next_file;
if (strstr(name, userdata->dec.subdir) != name)
if (strstr(name, userdata->dec->subdir) != name)
return 1;
name += strlen(userdata->dec.subdir) + 1;
name += strlen(userdata->dec->subdir) + 1;
fill_pathname_join(path, userdata->dec.target_dir, name, sizeof(path));
fill_pathname_join(path, userdata->dec->target_dir, name, sizeof(path));
fill_pathname_basedir(path_dir, path, sizeof(path_dir));
/* Make directory */
@ -70,8 +70,8 @@ next_file:
return 1;
error:
userdata->dec.callback_error = (char*)malloc(PATH_MAX_LENGTH);
snprintf(userdata->dec.callback_error,
userdata->dec->callback_error = (char*)malloc(PATH_MAX_LENGTH);
snprintf(userdata->dec->callback_error,
PATH_MAX_LENGTH, "Failed to deflate %s.\n", path);
return 0;
@ -82,7 +82,7 @@ static int file_decompressed(const char *name, const char *valid_exts,
uint32_t crc32, struct archive_extract_userdata *userdata)
{
char path[PATH_MAX_LENGTH] = {0};
decompress_state_t *dec = &userdata->dec;
decompress_state_t *dec = userdata->dec;
/* Ignore directories. */
if (name[strlen(name) - 1] == '/' || name[strlen(name) - 1] == '\\')
@ -147,6 +147,9 @@ static void task_decompress_handler(retro_task_t *task)
decompress_state_t *dec = (decompress_state_t*)task->state;
struct archive_extract_userdata userdata = {0};
userdata.dec = dec;
userdata.archive_path = dec->source_file;
int ret = file_archive_parse_file_iterate(&dec->archive,
&retdec, dec->source_file,
dec->valid_ext, file_decompressed, &userdata);
@ -188,7 +191,7 @@ static void task_decompress_handler_subdir(retro_task_t *task)
decompress_state_t *dec = (decompress_state_t*)task->state;
struct archive_extract_userdata userdata = {0};
userdata.dec = *dec;
userdata.dec = dec;
int ret = file_archive_parse_file_iterate(&dec->archive,
&retdec, dec->source_file,