mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

(file_path.c) Remove some strlcpy/strlcat invocations

Browse Source
This commit is contained in:
twinaphex 2019-09-19 03:45:18 +02:00
parent 1d621c412c
commit f4c6b06b49
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,12 +431,8 @@ void fill_pathname_slash(char *path, size_t size)
/* Try to preserve slash type. */
if (last_slash != (path + path_len - 1))
{
char join_str[2];
join_str[0] = '\0';
strlcpy(join_str, last_slash, sizeof(join_str));
strlcat(path, join_str, size);
path[path_len] = last_slash[0];
path[path_len+1] = '\0';
}
}
@ -901,7 +897,7 @@ end:
void path_relative_to(char *out,
const char *path, const char *base, size_t size)
{
size_t i;
size_t i, written = 0;
const char *trimmed_path, *trimmed_base;
#ifdef _WIN32
@ -924,8 +920,16 @@ void path_relative_to(char *out,
/* Each segment of base turns into ".." */
out[0] = '\0';
for (i = 0; trimmed_base[i]; i++)
{
if (trimmed_base[i] == path_default_slash_c())
strlcat(out, ".." path_default_slash(), size);
{
out[written++] = '.';
out[written++] = '.';
out[written++] = path_default_slash_c();
out[written++] = '\0';
}
}
strlcat(out, trimmed_path, size);
}