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

(XDK) platform_xdk - use fill_pathname_join where appropriate

Browse Source
This commit is contained in:
twinaphex 2013-11-03 17:55:59 +01:00
parent 27fd78e8fa
commit abf2079920
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/platform/platform_xdk.c
View File

@ -49,7 +49,7 @@ static void find_and_set_first_file(void)
if(first_file) if(first_file)
{ {
#ifdef _XBOX1 #ifdef _XBOX1
snprintf(default_paths.libretro_path, sizeof(default_paths.libretro_path), "D:\\%s", first_file); fill_pathname_join(default_paths.libretro_path, "D:", first_file, sizeof(default_paths.libretro_path));
#else #else
strlcpy(default_paths.libretro_path, first_file, sizeof(default_paths.libretro_path)); strlcpy(default_paths.libretro_path, first_file, sizeof(default_paths.libretro_path));
#endif #endif
@ -87,15 +87,15 @@ static void salamander_init_settings(void)
//try to find CORE executable //try to find CORE executable
char core_executable[1024]; char core_executable[1024];
#if defined(_XBOX360) #if defined(_XBOX360)
snprintf(core_executable, sizeof(core_executable), "game:\\CORE.xex"); strlcpy(core_executable, "game:\\CORE.xex", sizeof(core_executable));
#elif defined(_XBOX1) #elif defined(_XBOX1)
snprintf(core_executable, sizeof(core_executable), "D:\\CORE.xbe"); fill_pathname_join(core_executable, "D:", "CORE.xbe", sizeof(core_executable));
#endif #endif
if(path_file_exists(core_executable)) if(path_file_exists(core_executable))
{ {
//Start CORE executable //Start CORE executable
snprintf(default_paths.libretro_path, sizeof(default_paths.libretro_path), core_executable); strlcpy(default_paths.libretro_path, core_executable, sizeof(default_paths.libretro_path));
RARCH_LOG("Start [%s].\n", default_paths.libretro_path); RARCH_LOG("Start [%s].\n", default_paths.libretro_path);
} }
else else
@ -104,7 +104,7 @@ static void salamander_init_settings(void)
{ {
config_file_t * conf = config_file_new(default_paths.config_path); config_file_t * conf = config_file_new(default_paths.config_path);
config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str)); config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
snprintf(default_paths.libretro_path, sizeof(default_paths.libretro_path), tmp_str); strlcpy(default_paths.libretro_path, tmp_str, sizeof(default_paths.libretro_path));
} }
if(!config_file_exists || !strcmp(default_paths.libretro_path, "")) if(!config_file_exists || !strcmp(default_paths.libretro_path, ""))
@ -224,17 +224,17 @@ static void get_environment_settings(int argc, char *argv[], void *args)
#if defined(_XBOX1) #if defined(_XBOX1)
strlcpy(default_paths.core_dir, "D:", sizeof(default_paths.core_dir)); strlcpy(default_paths.core_dir, "D:", sizeof(default_paths.core_dir));
#ifdef IS_SALAMANDER #ifdef IS_SALAMANDER
strlcpy(default_paths.config_path, "D:\\retroarch.cfg", sizeof(default_paths.config_path)); fill_pathname_join(default_paths.config_path, default_paths.core_dir, "retroarch.cfg", sizeof(default_paths.config_path));
#else #else
strlcpy(g_extern.config_path, "D:\\retroarch.cfg", sizeof(g_extern.config_path)); fill_pathname_join(g_extern.config_path, default_paths.core_dir, "retroarch.cfg", sizeof(g_extern.config_path));
#endif #endif
strlcpy(default_paths.savestate_dir, "D:\\savestates", sizeof(default_paths.savestate_dir)); fill_pathname_join(default_paths.savestate_dir, default_paths.core_dir, "savestates", sizeof(default_paths.savestate_dir));
strlcpy(default_paths.sram_dir, "D:\\savefiles", sizeof(default_paths.sram_dir)); fill_pathname_join(default_paths.sram_dir, default_paths.core_dir, "savefiles", sizeof(default_paths.sram_dir));
strlcpy(default_paths.system_dir, "D:\\system", sizeof(default_paths.system_dir)); fill_pathname_join(default_paths.system_dir, default_paths.core_dir, "system", sizeof(default_paths.system_dir));
strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir)); strlcpy(default_paths.filesystem_root_dir, default_paths.core_dir, sizeof(default_paths.filesystem_root_dir));
strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir)); strlcpy(default_paths.filebrowser_startup_dir, default_paths.core_dir, sizeof(default_paths.filebrowser_startup_dir));
#ifndef IS_SALAMANDER #ifndef IS_SALAMANDER
strlcpy(g_settings.screenshot_directory, "D:\\screenshots", sizeof(g_settings.screenshot_directory)); fill_pathname_join(g_settings.screenshot_directory, default_paths.core_dir, "screenshots", sizeof(g_settings.screenshot_directory));
#endif #endif
strlcpy(default_paths.menu_border_file, "D:\\Media\\main-menu_480p.png", sizeof(default_paths.menu_border_file)); strlcpy(default_paths.menu_border_file, "D:\\Media\\main-menu_480p.png", sizeof(default_paths.menu_border_file));
#elif defined(_XBOX360) #elif defined(_XBOX360)