mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9499 from LazyBumHorse/fix_opti

Browse Source 
fix path_relative_to()
This commit is contained in:
Twinaphex 2019-09-22 21:53:50 +02:00 committed by GitHub
commit b4e1ca8a2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -913,15 +913,8 @@ size_t path_relative_to(char *out,
/* Each segment of base turns into ".." */ /* Each segment of base turns into ".." */
out[0] = '\0'; out[0] = '\0';
for (i = 0; trimmed_base[i]; i++) for (i = 0; trimmed_base[i]; i++)
{
if (trimmed_base[i] == path_default_slash_c()) if (trimmed_base[i] == path_default_slash_c())
{ STRLCAT_CONST_INCR(out, written, ".." path_default_slash(), size);
out[written++] = '.';
out[written++] = '.';
out[written++] = path_default_slash_c();
out[written++] = '\0';
}
}
return strlcat(out, trimmed_path, size); return strlcat(out, trimmed_path, size);
} }

4
libretro-common/include/string/stdstring.h
View File

@ -56,8 +56,8 @@ static INLINE bool string_is_equal(const char *a, const char *b)
STRLCPY_CONST((buf) + MIN((strlcpy_ret), (buf_size)-1 - STRLEN_CONST((str))), (str)) STRLCPY_CONST((buf) + MIN((strlcpy_ret), (buf_size)-1 - STRLEN_CONST((str))), (str))
#define STRLCAT_CONST_INCR(buf, strlcpy_ret, str, buf_size) \ #define STRLCAT_CONST_INCR(buf, strlcpy_ret, str, buf_size) \
STRLCAT_CONST(buf, strlcpy_ret, str, buf_size); \ do { STRLCAT_CONST(buf, strlcpy_ret, str, buf_size); \
(strlcpy_ret) += STRLEN_CONST((str)) (strlcpy_ret) += STRLEN_CONST((str)); } while(0)
#define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0) #define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
#define string_is_equal_fast(a, b, size) (memcmp(a, b, size) == 0) #define string_is_equal_fast(a, b, size) (memcmp(a, b, size) == 0)