mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-10 08:23:22 +00:00
Code Issues Releases Wiki Activity

replace CreateDirA() and mkdir() scattered everywhere by createDir() with some more error checking.

Browse source
This commit is contained in:
fgenesis 2013-11-14 20:07:39 +01:00
commit ab752e1156
5 changed files with 47 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
BBGE/Core.cpp
View file

@ -899,7 +899,7 @@ Core::Core(const std::string &filesystem, const std::string& extraDataDir, int n
envr = "."; // oh well.
const std::string home(envr);
mkdir(home.c_str(), 0700); // just in case.
createDir(home); // just in case.
// "/home/icculus/.Aquaria" or something. Spaces are okay.
#ifdef BBGE_BUILD_MACOSX
@ -909,11 +909,12 @@ Core::Core(const std::string &filesystem, const std::string& extraDataDir, int n
#endif
userDataFolder = home + "/" + prefix + userDataSubFolder;
mkdir(userDataFolder.c_str(), 0700);
createDir(userDataFolder);
debugLogPath = userDataFolder + "/";
mkdir((userDataFolder + "/screenshots").c_str(), 0700);
createDir(userDataFolder + "/screenshots");
std::string prefpath(getPreferencesFolder());
mkdir(prefpath.c_str(), 0700);
createDir(prefpath);
#else
debugLogPath = "";
userDataFolder = ".";
@ -929,7 +930,7 @@ Core::Core(const std::string &filesystem, const std::string& extraDataDir, int n
// not sure about this right now -- FG
/*else
{
puts("Working directory is not writeable...");
puts("Working directory is not writable...");
char pathbuf[MAX_PATH];
if(SHGetSpecialFolderPathA(NULL, &pathbuf[0], CSIDL_APPDATA, 0))
{
@ -941,7 +942,7 @@ Core::Core(const std::string &filesystem, const std::string& extraDataDir, int n
userDataFolder[i] = '/';
debugLogPath = userDataFolder + "/";
puts(("Using \"" + userDataFolder + "\" as user directory.").c_str());
CreateDirectoryA(userDataFolder.c_str(), NULL);
createDir(userDataFolder);
checkWritable(userDataFolder, true, true);
}
else