Merge pull request #1476 from ColinKinloch/xdg_config_home

config: Use XDG_CONFIG_HOME
This commit is contained in:
tildearrow 2023-09-11 21:54:43 -05:00 committed by GitHub
commit 959cba29a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -61,9 +61,11 @@ void DivEngine::initConfDir() {
return;
}
#else
// TODO this should check XDG_CONFIG_HOME first
char* xdgConfigHome=getenv("XDG_CONFIG_HOME");
char* home=getenv("HOME");
if (home==NULL) {
if (xdgConfigHome) {
configPath=xdgConfigHome;
} else if (home==NULL) {
int uid=getuid();
struct passwd* entry=getpwuid(uid);
if (entry==NULL) {
@ -79,8 +81,9 @@ void DivEngine::initConfDir() {
#ifdef __APPLE__
configPath+="/Library/Application Support";
#else
// FIXME this doesn't honour XDG_CONFIG_HOME *at all*
configPath+="/.config";
if (xdgConfigHome==NULL) {
configPath+="/.config";
}
#endif // __APPLE__
#endif // __HAIKU__
#ifdef __APPLE__