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

(file_path.c)

Browse Source 
- file_path_expand_special - cut down on code duplication
- file_path_expand_special - add size_t return value
- fill_pathname_abbreviate_special - add size_t return value
This commit is contained in:
LibretroAdmin 2022-08-04 16:53:53 +02:00
parent 5172fe2ba6
commit 9ae46d2648
2 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@
#include <boolean.h>
#include <file/file_path.h>
#include <retro_assert.h>
#include <retro_miscellaneous.h>
#include <string/stdstring.h>
#include <time/rtime.h>
@ -1009,59 +1008,35 @@ size_t fill_pathname_join_delim(char *out_path, const char *dir,
return copied;
}
void fill_pathname_expand_special(char *out_path,
size_t fill_pathname_expand_special(char *out_path,
const char *in_path, size_t size)
{
#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
char *app_dir = NULL;
if (in_path[0] == '~')
{
char *home_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
fill_pathname_home_dir(home_dir,
PATH_MAX_LENGTH * sizeof(char));
if (*home_dir)
{
size_t src_size = strlcpy(out_path, home_dir, size);
retro_assert(src_size < size);
out_path += src_size;
size -= src_size;
if (!PATH_CHAR_IS_SLASH(out_path[-1]))
{
src_size = strlcpy(out_path, PATH_DEFAULT_SLASH(), size);
retro_assert(src_size < size);
out_path += src_size;
size -= src_size;
}
in_path += 2;
}
free(home_dir);
app_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
fill_pathname_home_dir(app_dir, PATH_MAX_LENGTH * sizeof(char));
}
else if (in_path[0] == ':')
{
char *application_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
app_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
app_dir[0] = '\0';
fill_pathname_application_dir(app_dir, PATH_MAX_LENGTH * sizeof(char));
}
application_dir[0] = '\0';
fill_pathname_application_dir(application_dir,
PATH_MAX_LENGTH * sizeof(char));
if (*application_dir)
if (app_dir)
{
if (*app_dir)
{
size_t src_size = strlcpy(out_path, application_dir, size);
retro_assert(src_size < size);
size_t src_size = strlcpy(out_path, app_dir, size);
out_path += src_size;
size -= src_size;
out_path += src_size;
size -= src_size;
if (!PATH_CHAR_IS_SLASH(out_path[-1]))
{
src_size = strlcpy(out_path, PATH_DEFAULT_SLASH(), size);
retro_assert(src_size < size);
src_size = strlcpy(out_path, PATH_DEFAULT_SLASH(), size);
out_path += src_size;
size -= src_size;
@ -1070,14 +1045,13 @@ void fill_pathname_expand_special(char *out_path,
in_path += 2;
}
free(application_dir);
free(app_dir);
}
#endif
retro_assert(strlcpy(out_path, in_path, size) < size);
return strlcpy(out_path, in_path, size);
}
void fill_pathname_abbreviate_special(char *out_path,
size_t fill_pathname_abbreviate_special(char *out_path,
const char *in_path, size_t size)
{
#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
@ -1114,8 +1088,6 @@ void fill_pathname_abbreviate_special(char *out_path,
{
size_t src_size = strlcpy(out_path, notations[i], size);
retro_assert(src_size < size);
out_path += src_size;
size -= src_size;
in_path += strlen(candidates[i]);
@ -1130,10 +1102,8 @@ void fill_pathname_abbreviate_special(char *out_path,
break; /* Don't allow more abbrevs to take place. */
}
}
#endif
retro_assert(strlcpy(out_path, in_path, size) < size);
return strlcpy(out_path, in_path, size);
}
/**
@ -1353,7 +1323,7 @@ void fill_pathname_application_path(char *s, size_t len)
#ifndef HAVE_COCOATOUCH
/* Not sure what this does but it breaks
* stuff for iOS, so skipping */
retro_assert(strlcat(s, "nobin", len) < len);
strlcat(s, "nobin", len);
#endif
return;
}

4
libretro-common/include/file/file_path.h
View File

@ -512,10 +512,10 @@ size_t fill_pathname_join_special_ext(char *out_path,
size_t fill_pathname_join_delim(char *out_path, const char *dir,
const char *path, const char delim, size_t size);
void fill_pathname_expand_special(char *out_path,
size_t fill_pathname_expand_special(char *out_path,
const char *in_path, size_t size);
void fill_pathname_abbreviate_special(char *out_path,
size_t fill_pathname_abbreviate_special(char *out_path,
const char *in_path, size_t size);
/**