CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 14:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix set_savestate_auto_index.

Browse Source
This commit is contained in:
Themaister 2012-10-11 22:54:07 +02:00
parent aa6a17b6ab
commit 08f64edc84
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
file_path.c
View File

@ -393,7 +393,7 @@ void fill_pathname_dir(char *in_dir, const char *in_basename, const char *replac
rarch_assert(strlcat(in_dir, replace, size) < size);
}
void fill_pathname_base(char *out_dir, const char *in_path, size_t size)
void fill_pathname_base(char *out, const char *in_path, size_t size)
{
const char *ptr = strrchr(in_path, '/');
if (!ptr)
@ -404,7 +404,7 @@ void fill_pathname_base(char *out_dir, const char *in_path, size_t size)
else
ptr = in_path;
rarch_assert(strlcpy(out_dir, ptr, size) < size);
rarch_assert(strlcpy(out, ptr, size) < size);
}
void fill_pathname_basedir(char *out_dir, const char *in_path, size_t size)

27
retroarch.c
View File

@ -1671,33 +1671,26 @@ static void set_savestate_auto_index(void)
// Find the file in the same directory as g_extern.savestate_name with the largest numeral suffix.
// E.g. /foo/path/game.state, will try to find /foo/path/game.state%d, where %d is the largest number available.
char state_path[PATH_MAX];
strlcpy(state_path, g_extern.savestate_name, sizeof(state_path));
char state_dir[PATH_MAX];
char state_base[PATH_MAX];
char *split = strrchr(state_path, '/');
if (!split)
split = strrchr(state_path, '\\');
const char *base = state_path;
const char *dir = state_path;
if (split)
{
*split = '\0';
base = split + 1;
}
else
dir = ".";
fill_pathname_basedir(state_dir, g_extern.savestate_name, sizeof(state_dir));
fill_pathname_base(state_base, g_extern.savestate_name, sizeof(state_base));
unsigned max_index = 0;
struct string_list *dir_list = dir_list_new(dir, NULL, false);
struct string_list *dir_list = dir_list_new(state_dir, NULL, false);
if (!dir_list)
return;
for (size_t i = 0; i < dir_list->size; i++)
{
const char *dir_elem = dir_list->elems[i].data;
if (strstr(dir_elem, base) != dir_elem)
char elem_base[PATH_MAX];
fill_pathname_base(elem_base, dir_elem, sizeof(elem_base));
if (strstr(elem_base, state_base) != elem_base)
continue;
const char *end = dir_elem + strlen(dir_elem);