mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-14 12:23:59 +02:00
Code Issues Projects Releases Wiki Activity

added a fallback to use glib API if we cannot find the users home folder

Browse Source
This commit is contained in:
Mark Vejvoda
2013-08-09 18:03:29 +00:00
parent cd0a8933cd
commit 5ea417b2bd
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/shared_lib/sources/util/properties.cpp
View File

@@ -22,13 +22,20 @@
#include "randomgen.h" #include "randomgen.h"
#ifdef WIN32 #ifdef WIN32
#include <shlwapi.h> #include <shlwapi.h>
#include <shlobj.h> #include <shlobj.h>
#endif
#if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500 || _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED
#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
#endif #endif
#include "utf8.h" #include "utf8.h"
#include "font.h" #include "font.h"
#include "string_utils.h" #include "string_utils.h"
#include "leak_dumper.h" #include "leak_dumper.h"
@@ -170,6 +177,22 @@ void Properties::load(const string &path, bool clearCurrentProperties) {
#endif #endif
} }
string getUserHomeFromGLIBC() {
string home_folder = "";
char dateiname[512];
const char *homedir = getenv("HOME");
if (!homedir) {
#if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500 || _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED
struct passwd *pw = getpwuid(getuid());
homedir = pw->pw_dir;
#else
homedir = "";
#endif
}
home_folder = homedir;
return home_folder;
}
std::map<string,string> Properties::getTagReplacementValues(std::map<string,string> *mapExtraTagReplacementValues) { std::map<string,string> Properties::getTagReplacementValues(std::map<string,string> *mapExtraTagReplacementValues) {
std::map<string,string> mapTagReplacementValues; std::map<string,string> mapTagReplacementValues;
@@ -178,9 +201,10 @@ std::map<string,string> Properties::getTagReplacementValues(std::map<string,stri
// First add the standard tags // First add the standard tags
// //
#ifdef WIN32 #ifdef WIN32
char *homeDir = getenv("USERPROFILE"); const char *homeDir = getenv("USERPROFILE");
#else #else
char *homeDir = getenv("HOME"); string home = getUserHomeFromGLIBC();
const char *homeDir = home.c_str();
#endif #endif
mapTagReplacementValues["~/"] = (homeDir != NULL ? homeDir : ""); mapTagReplacementValues["~/"] = (homeDir != NULL ? homeDir : "");
@@ -279,9 +303,10 @@ bool Properties::applyTagsToValue(string &value, const std::map<string,string> *
} }
else { else {
#ifdef WIN32 #ifdef WIN32
char *homeDir = getenv("USERPROFILE"); const char *homeDir = getenv("USERPROFILE");
#else #else
char *homeDir = getenv("HOME"); string home = getUserHomeFromGLIBC();
const char *homeDir = home.c_str();
#endif #endif
replaceAll(value, "~/", (homeDir != NULL ? homeDir : "")); replaceAll(value, "~/", (homeDir != NULL ? homeDir : ""));