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

Simplify path_parent_dir

This commit is contained in:
twinaphex 2019-04-23 23:21:16 +02:00
parent b8694ff127
commit f573626144
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,13 +647,15 @@ void path_basedir(char *path)
**/ **/
void path_parent_dir(char *path) void path_parent_dir(char *path)
{ {
bool path_was_absolute = path_is_absolute(path); size_t len = strlen(path);
size_t len = strlen(path);
if (len && path_char_is_slash(path[len - 1])) if (len && path_char_is_slash(path[len - 1]))
{ {
bool path_was_absolute = path_is_absolute(path);
path[len - 1] = '\0'; path[len - 1] = '\0';
if (path_was_absolute && find_last_slash(path) == NULL)
if (path_was_absolute && !find_last_slash(path))
{ {
/* We removed the only slash from what used to be an absolute path. /* We removed the only slash from what used to be an absolute path.
* On Linux, this goes from "/" to an empty string and everything works fine, * On Linux, this goes from "/" to an empty string and everything works fine,
@ -965,7 +967,7 @@ void fill_pathname_expand_special(char *out_path,
retro_assert(src_size < size); retro_assert(src_size < size);
out_path += src_size; out_path += src_size;
size -= src_size; size -= src_size;
} }
in_path += 2; in_path += 2;