griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GHOST/Unix: always use getpwuid for home directory access

Browse Source 
getpwuid for accessing home wasn't used when looking up the path
for older Blender versions. There is no reason for the code-paths
to differ. Use a shared utility function to access home.
This commit is contained in:
Campbell Barton
2024-10-09 15:30:10 +11:00
parent 0ac66493c0
commit 8d7c98a3c8
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
intern/ghost/intern/GHOST_SystemPathsUnix.cc
View File

@@ -42,6 +42,17 @@ const char *GHOST_SystemPathsUnix::getSystemDir(int /*version*/, const char *ver
return nullptr;
}
static const char *home_dir_get()
{
const char *home_dir = getenv("HOME");
if (home_dir == nullptr) {
if (const passwd *pwuser = getpwuid(getuid())) {
home_dir = pwuser->pw_dir;
}
}
return home_dir;
}
const char *GHOST_SystemPathsUnix::getUserDir(int version, const char *versionstr) const
{
static string user_path = "";
@@ -51,7 +62,7 @@ const char *GHOST_SystemPathsUnix::getUserDir(int version, const char *versionst
* operator works we give a different path depending on the requested version */
if (version < 264) {
if (user_path.empty() || last_version != version) {
const char *home = getenv("HOME");
const char *home = home_dir_get();
last_version = version;
@@ -73,13 +84,7 @@ const char *GHOST_SystemPathsUnix::getUserDir(int version, const char *versionst
user_path = string(home) + "/blender/" + versionstr;
}
else {
home = getenv("HOME");
if (home == nullptr) {
if (const passwd *pwuser = getpwuid(getuid())) {
home = pwuser->pw_dir;
}
}
const char *home = home_dir_get();
if (home) {
user_path = string(home) + "/.config/blender/" + versionstr;
}