CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 14:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup build.

Browse Source
This commit is contained in:
Themaister 2011-12-02 21:24:33 +01:00
parent 6db58fe1dd
commit 3377020242
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
conf/config_file.c
View File

@ -195,30 +195,7 @@ static void add_sub_conf(config_file_t *conf, char *line)
char real_path[MAXPATHLEN];
#ifndef _WIN32
if (*path == '/')
{
strlcpy(real_path, path, sizeof(real_path));
}
else if (*path == '~')
{
const char *home = getenv("HOME");
strlcpy(real_path, home ? home : "/", sizeof(real_path));
strlcat(real_path, path + 1, sizeof(real_path));
}
else
{
strlcpy(real_path, conf->path, sizeof(real_path));
char *split = strrchr(real_path, '/');
if (split)
{
split[1] = '\0';
strlcat(real_path, path, sizeof(real_path));
}
else
strlcpy(real_path, path, sizeof(real_path));
}
#else
#ifdef _WIN32
// Accomodate POSIX systems on Win32.
bool is_full_path = *path == '/';
@ -237,6 +214,31 @@ static void add_sub_conf(config_file_t *conf, char *line)
split[1] = '\0';
strlcat(real_path, path, sizeof(real_path));
}
#else
if (*path == '/')
{
strlcpy(real_path, path, sizeof(real_path));
}
#ifndef __CELLOS_LV2__
else if (*path == '~')
{
const char *home = getenv("HOME");
strlcpy(real_path, home ? home : "/", sizeof(real_path));
strlcat(real_path, path + 1, sizeof(real_path));
}
#endif
else
{
strlcpy(real_path, conf->path, sizeof(real_path));
char *split = strrchr(real_path, '/');
if (split)
{
split[1] = '\0';
strlcat(real_path, path, sizeof(real_path));
}
else
strlcpy(real_path, path, sizeof(real_path));
}
#endif
config_file_t *sub_conf = config_file_new_internal(real_path, conf->include_depth + 1);