mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load_content_from_compressed_archive sets new_path - attempt

Browse Source 
to pass it to retro_load_game
This commit is contained in:
twinaphex 2016-01-26 06:49:35 +01:00
parent b333775611
commit 754bf4043d
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
content.c
View File

@ -399,14 +399,14 @@ error:
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
static bool load_content_from_compressed_archive( static bool load_content_from_compressed_archive(
char *new_path, size_t len,
struct string_list *temporary_content, struct string_list *temporary_content,
struct retro_game_info *info, unsigned i, struct retro_game_info *info, unsigned i,
struct string_list* additional_path_allocs, struct string_list* additional_path_allocs,
bool need_fullpath, const char *path) bool need_fullpath, const char *path)
{ {
ssize_t len;
union string_list_elem_attr attributes; union string_list_elem_attr attributes;
char new_path[PATH_MAX_LENGTH]; ssize_t new_path_len;
char new_basedir[PATH_MAX_LENGTH]; char new_basedir[PATH_MAX_LENGTH];
bool ret = false; bool ret = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -420,7 +420,7 @@ static bool load_content_from_compressed_archive(
return true; return true;
RARCH_LOG("Compressed file in case of need_fullpath." RARCH_LOG("Compressed file in case of need_fullpath."
"Now extracting to temporary directory.\n"); " Now extracting to temporary directory.\n");
strlcpy(new_basedir, settings->cache_directory, strlcpy(new_basedir, settings->cache_directory,
sizeof(new_basedir)); sizeof(new_basedir));
@ -437,11 +437,11 @@ static bool load_content_from_compressed_archive(
attributes.i = 0; attributes.i = 0;
fill_pathname_join(new_path, new_basedir, fill_pathname_join(new_path, new_basedir,
path_basename(path), sizeof(new_path)); path_basename(path), len);
ret = read_compressed_file(path, NULL, new_path, &len); ret = read_compressed_file(path, NULL, new_path, &new_path_len);
if (!ret || len < 0) if (!ret || new_path_len < 0)
{ {
RARCH_ERR("%s \"%s\".\n", RARCH_ERR("%s \"%s\".\n",
msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE), msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE),
@ -449,7 +449,9 @@ static bool load_content_from_compressed_archive(
return false; return false;
} }
string_list_append(additional_path_allocs,new_path, attributes); RARCH_LOG("New path is: [%s]\n", new_path);
string_list_append(additional_path_allocs, new_path, attributes);
info[i].path = info[i].path =
additional_path_allocs->elems[additional_path_allocs->size -1 ].data; additional_path_allocs->elems[additional_path_allocs->size -1 ].data;
@ -478,21 +480,22 @@ static bool load_content(
) )
{ {
unsigned i; unsigned i;
char new_path[PATH_MAX_LENGTH];
bool ret = true; bool ret = true;
const char *path = NULL; const char *path = NULL;
if (!info || !additional_path_allocs) if (!info || !additional_path_allocs)
return false; return false;
for (i = 0; i < content->size; i++) for (i = 0; i < content->size; i++)
{ {
int attr = content->elems[i].attr.i; int attr = content->elems[i].attr.i;
bool need_fullpath = attr & 2; bool need_fullpath = attr & 2;
bool require_content = attr & 4; bool require_content = attr & 4;
const char *file_path= content->elems[i].data;
path = content->elems[i].data; if (require_content && string_is_empty(file_path))
if (require_content && string_is_empty(path))
{ {
RARCH_LOG("libretro core requires content, " RARCH_LOG("libretro core requires content, "
"but nothing was provided.\n"); "but nothing was provided.\n");
@ -501,12 +504,12 @@ static bool load_content(
info[i].path = NULL; info[i].path = NULL;
if (*path) if (*file_path)
info[i].path = path; info[i].path = file_path;
if (!need_fullpath && !string_is_empty(path)) if (!need_fullpath && !string_is_empty(file_path))
{ {
if (!load_content_into_memory(&info[i], i, path)) if (!load_content_into_memory(&info[i], i, file_path))
return false; return false;
} }
else else
@ -516,15 +519,18 @@ static bool load_content(
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
if (!load_content_from_compressed_archive( if (!load_content_from_compressed_archive(
new_path, sizeof(new_path),
temporary_content, temporary_content,
&info[i], i, &info[i], i,
additional_path_allocs, need_fullpath, path)) additional_path_allocs, need_fullpath, file_path))
return false; return false;
path = new_path;
#endif #endif
} }
} }
path = content->elems[0].data; if (path == NULL)
path = content->elems[0].data;
RARCH_LOG("Calling %s with path: [%s]\n", special ? RARCH_LOG("Calling %s with path: [%s]\n", special ?
"retro_load_game_special" : "retro_load_game", *path ? path : "N/A"); "retro_load_game_special" : "retro_load_game", *path ? path : "N/A");