morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

uxplay.cpp refactor to split off get_homedir()

Browse Source
This commit is contained in:
F. Duncanh
2023-11-28 11:41:16 -05:00
parent ff7680881c
commit a60d4d8f74
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
uxplay.cpp
View File

@@ -480,6 +480,19 @@ static int parse_hw_addr (std::string str, std::vector<char> &hw_addr) {
return 0;
}
const char *get_homedir() {
const char *homedir = getenv("XDG_CONFIG_HOMEDIR");
if (homedir == NULL) {
homedir = getenv("HOME");
}
#ifndef _WIN32
if (homedir == NULL){
homedir = getpwuid(getuid())->pw_dir;
}
#endif
return homedir;
}
static std::string find_uxplay_config_file() {
std::string no_config_file = "";
const char *homedir = NULL;
@@ -491,15 +504,7 @@ static std::string find_uxplay_config_file() {
config0 = uxplayrc;
if (stat(config0.c_str(), &sb) == 0) return config0;
}
homedir = getenv("XDG_CONFIG_HOMEDIR");
if (homedir == NULL) {
homedir = getenv("HOME");
}
#ifndef _WIN32
if (homedir == NULL){
homedir = getpwuid(getuid())->pw_dir;
}
#endif
homedir = get_homedir();
if (homedir) {
config1 = homedir;
config1.append("/.uxplayrc");