mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

content_file_init_extract - cleanups

Browse Source
This commit is contained in:
twinaphex 2016-12-21 15:27:08 +01:00
parent a5c52dcc07
commit cb28584883
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasks/task_content.c
View File

@ -426,20 +426,17 @@ static bool content_file_init_extract(
{
char temp_content[PATH_MAX_LENGTH];
char new_path[PATH_MAX_LENGTH];
bool contains_compressed = NULL;
bool block_extract = content->elems[i].attr.i & 1;
const char *path = content->elems[i].data;
const char *valid_ext = content_ctx->valid_extensions;
const char *valid_ext = special ?
special->roms[i].valid_extensions :
content_ctx->valid_extensions;
bool contains_compressed = path_contains_compressed_file(path);
/* Block extract check. */
if (block_extract)
continue;
contains_compressed = path_contains_compressed_file(path);
if (special)
valid_ext = special->roms[i].valid_extensions;
if (!contains_compressed)
{
/* just use the first file in the archive */
@ -451,11 +448,14 @@ static bool content_file_init_extract(
strlcpy(temp_content, path, sizeof(temp_content));
if (!valid_ext || !file_archive_extract_file(temp_content,
sizeof(temp_content), valid_ext,
if (!valid_ext || !file_archive_extract_file(
temp_content,
sizeof(temp_content),
valid_ext,
!string_is_empty(content_ctx->directory_cache) ?
content_ctx->directory_cache : NULL,
new_path, sizeof(new_path)))
new_path,
sizeof(new_path)))
{
char str[1024];
@ -467,6 +467,7 @@ static bool content_file_init_extract(
}
string_list_set(content, i, new_path);
if (!string_list_append(content_ctx->temporary_content,
new_path, *attr))
return false;