mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 10:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify path_basename

Browse Source
This commit is contained in:
libretroadmin 2023-07-17 15:13:13 +02:00
parent d26c4e52b3
commit a5f2903253
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,9 +198,9 @@ const char *path_get_archive_delim(const char *path)
string_to_lower(buf); string_to_lower(buf);
/* Check if this is a '.zip', '.apk' or '.7z' file */ /* Check if this is a '.zip', '.apk' or '.7z' file */
if (string_is_equal(buf, ".zip") || if ( string_is_equal(buf, ".zip")
string_is_equal(buf, ".apk") || || string_is_equal(buf, ".apk")
string_is_equal(buf + 1, ".7z")) || string_is_equal(buf + 1, ".7z"))
return delim; return delim;
} }
else if (delim - path > 3) else if (delim - path > 3)
@ -652,18 +652,12 @@ void path_parent_dir(char *path, size_t len)
**/ **/
const char *path_basename(const char *path) const char *path_basename(const char *path)
{ {
/* We cut at the first compression-related hash */ /* We cut either at the first compression-related hash,
const char *delim = path_get_archive_delim(path); * or we cut at the last slash */
if (delim) const char *ptr = NULL;
return delim + 1; if ( (ptr = path_get_archive_delim(path))
|| (ptr = find_last_slash(path)))
{ return ptr + 1;
/* We cut at the last slash */
const char *last = find_last_slash(path);
if (last)
return last + 1;
}
return path; return path;
} }
@ -797,9 +791,9 @@ char *path_resolve_realpath(char *buf, size_t size, bool resolve_symlinks)
return NULL; return NULL;
len = strlen(tmp); len = strlen(tmp);
t += len; t += len;
if (tmp[len-1] != '/') if (tmp[len - 1] != '/')
tmp[t++] = '/'; tmp[t++] = '/';
if (string_is_empty(buf)) if (string_is_empty(buf))
@ -843,7 +837,7 @@ char *path_resolve_realpath(char *buf, size_t size, bool resolve_symlinks)
else else
{ {
/* fail when truncating */ /* fail when truncating */
if (t + next-p+1 > PATH_MAX_LENGTH-1) if (t + next - p + 1 > PATH_MAX_LENGTH-1)
return NULL; return NULL;
while (p <= next) while (p <= next)