piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

misc cleanup

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3942 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-08-06 06:18:22 +00:00
parent 43adc4f194
commit 95344be674
10 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Common/Src/FileUtil.cpp
View File

@ -487,18 +487,20 @@ bool DeleteDirRecursively(const char *directory)
return true;
}
// Returns the current directory, caller should free
const char *GetCurrentDir()
// Returns the current directory
std::string GetCurrentDir()
{
const char *dir;
char *dir;
// Get the current working directory (getcwd uses malloc)
if (!(dir = __getcwd(NULL, 0))) {
ERROR_LOG(COMMON, "GetCurrentDirectory failed: %s",
GetLastErrorMsg());
return NULL;
return NULL;
}
return dir;
std::string strDir = dir;
free(dir);
return strDir;
}
// Sets the current directory to the given directory
@ -577,14 +579,15 @@ std::string GetSysDirectory()
sysDir = GetBundleDirectory();
sysDir += DIR_SEP;
sysDir += SYSDATA_DIR;
sysDir += DIR_SEP;
#elif defined __linux__
sysDir = SYSDATA_DIR;
sysDir += DIR_SEP;
// FIXME global install
#else
sysDir = SYSDATA_DIR;
sysDir = FULL_SYSDATA_DIR;
#endif
sysDir += DIR_SEP;
INFO_LOG(COMMON, "GetSysDirectory: Setting to %s:", sysDir.c_str());
return sysDir;
}