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

Make last_slash concatenation parts consistent (#18102)

This commit is contained in:
LibretroAdmin 2025-07-19 23:37:31 +02:00 committed by GitHub
parent ff652ce22d
commit e011e710bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,15 +384,18 @@ char *find_last_slash(const char *str)
**/ **/
size_t fill_pathname_slash(char *s, size_t len) size_t fill_pathname_slash(char *s, size_t len)
{ {
char *last_slash = find_last_slash(s); char *last_slash = find_last_slash(s);
len = strlen(s);
if (!last_slash) if (!last_slash)
return strlcat(s, PATH_DEFAULT_SLASH(), len);
len = strlen(s);
/* Try to preserve slash type. */
if (last_slash != (s + len - 1))
{ {
s[ len] = last_slash[0]; s[ len] = PATH_DEFAULT_SLASH_C();
s[++len] = '\0'; s[++len] = '\0';
}
else if (last_slash != (s + len - 1))
{
/* Try to preserve slash type. */
s[ len] = last_slash[0];
s[++len] = '\0';
} }
return len; return len;
} }
@ -992,20 +995,17 @@ size_t fill_pathname_join_special(char *s,
if (*s) if (*s)
{ {
char *last_slash = find_last_slash(s); char *last_slash = find_last_slash(s);
if (last_slash) if (!last_slash)
{
s[ _len] = PATH_DEFAULT_SLASH_C();
s[++_len] = '\0';
}
else if (last_slash != (s + _len - 1))
{ {
/* Try to preserve slash type. */ /* Try to preserve slash type. */
if (last_slash != (s + _len - 1)) s[ _len] = last_slash[0];
{ s[++_len] = '\0';
s[ _len] = last_slash[0];
s[++_len] = '\0';
}
}
else
{
s[ _len] = PATH_DEFAULT_SLASH_C();
s[++_len] = '\0';
} }
} }
@ -1327,14 +1327,14 @@ void path_basedir_wrapper(char *s)
*last_slash = '\0'; *last_slash = '\0';
#endif #endif
last_slash = find_last_slash(s); last_slash = find_last_slash(s);
if (last_slash) if (!last_slash)
last_slash[1] = '\0';
else
{ {
s[0] = '.'; s[0] = '.';
s[1] = PATH_DEFAULT_SLASH_C(); s[1] = PATH_DEFAULT_SLASH_C();
s[2] = '\0'; s[2] = '\0';
} }
else
last_slash[1] = '\0';
} }
#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL) #if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)