TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix segmentation fault that only seems to happen in the buildbot's master shell environment. But I suppose the crash could manifest in other environments where getlogin() fails

Browse Source
This commit is contained in:
rdb 2010-10-26 16:40:42 +00:00
parent d09a9be4da
commit e69958cfe9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
direct/src/plugin/find_root_dir.cxx
View File

@ -229,16 +229,19 @@ find_root_dir_default() {
return root; return root;
} }
#else // The Linux case #else // The Linux/*BSD case
// e.g., /home/<username>/.panda3d // e.g., /home/<username>/.panda3d
string root; string root;
const char *uname = getlogin(); const passwd *pwdata = getpwuid(getuid());
if (uname == NULL) uname = getenv("USER");
const passwd *pwdata = getpwnam(uname);
if (pwdata == NULL) { if (pwdata == NULL) {
root = getenv("HOME"); char *home = getenv("HOME");
if (home == NULL) {
// Beh. Let's hope it never gets to this point.
return ".";
} else {
root = home;
}
} else { } else {
root = pwdata->pw_dir; root = pwdata->pw_dir;
} }