ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(task_database.c) Use fill_pathname_join_delim in task_database.c

This commit is contained in:
twinaphex 2015-06-22 19:51:13 +02:00
parent 324cf09deb
commit 5d576ce61d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretro-common/file/file_path.c
View File

@ -678,7 +678,7 @@ void fill_pathname_join_delim(char *out_path, const char *dir,
size_t copied = strlcpy(out_path, dir, size); size_t copied = strlcpy(out_path, dir, size);
rarch_assert(copied < size+1); rarch_assert(copied < size+1);
out_path[copied]=delim; out_path[copied] = delim;
out_path[copied+1] = '\0'; out_path[copied+1] = '\0';
rarch_assert(strlcat(out_path, path, size) < size); rarch_assert(strlcat(out_path, path, size) < size);

7
tasks/task_database.c
View File

@ -188,11 +188,10 @@ static int database_info_list_iterate_found_match(
snprintf(db_crc, sizeof(db_crc), "%08X|crc", db_info_entry->crc32); snprintf(db_crc, sizeof(db_crc), "%08X|crc", db_info_entry->crc32);
strlcpy(entry_path_str, entry_path, sizeof(entry_path_str)); strlcpy(entry_path_str, entry_path, sizeof(entry_path_str));
if (zip_name && zip_name[0] != '\0') if (zip_name && zip_name[0] != '\0')
{ fill_pathname_join_delim(entry_path_str, entry_path_str, zip_name,
strlcat(entry_path_str, "#", sizeof(entry_path_str)); '#', sizeof(entry_path_str));
strlcat(entry_path_str, zip_name, sizeof(entry_path_str));
}
#if 0 #if 0
RARCH_LOG("Found match in database !\n"); RARCH_LOG("Found match in database !\n");