pathut: give $HOME priority over pwd entry
This commit is contained in:
parent
5fc0066a34
commit
cadfabc3b1
@ -666,19 +666,16 @@ string path_home()
|
||||
path_catslash(dir);
|
||||
return dir;
|
||||
#else
|
||||
uid_t uid = getuid();
|
||||
|
||||
struct passwd *entry = getpwuid(uid);
|
||||
if (entry == 0) {
|
||||
const char *cp = getenv("HOME");
|
||||
if (cp) {
|
||||
return cp;
|
||||
} else {
|
||||
if (nullptr == cp) {
|
||||
uid_t uid = getuid();
|
||||
struct passwd *entry = getpwuid(uid);
|
||||
if (nullptr == entry) {
|
||||
return "/";
|
||||
}
|
||||
cp = entry->pw_dir;
|
||||
}
|
||||
|
||||
string homedir = entry->pw_dir;
|
||||
string homedir{cp};
|
||||
path_catslash(homedir);
|
||||
return homedir;
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user