RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-04 22:31:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make home_directory look in the password database in addition to $HOME.

Browse Source 
This is something of an edge case, but when the $HOME environment
variable is not set, we can still look in the password database
to get the current user's home directory.

Added a test for this by getting the value of $HOME, then unsetting
it, then calling home_directory() and verifying that it succeeds
and that the value is the same as what we originally read from
the environment.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298513 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Zachary Turner 2017-03-22 15:24:59 +00:00
parent 677bddb49c
commit 2811bb8f72
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Support/Unix/Path.inc
View File

@ -920,12 +920,18 @@ std::error_code real_path(const Twine &path, SmallVectorImpl<char> &dest,
namespace path { namespace path {
bool home_directory(SmallVectorImpl<char> &result) { bool home_directory(SmallVectorImpl<char> &result) {
if (char *RequestedDir = getenv("HOME")) { char *RequestedDir = getenv("HOME");
result.clear(); if (!RequestedDir) {
result.append(RequestedDir, RequestedDir + strlen(RequestedDir)); struct passwd *pw = getpwuid(getuid());
return true; if (pw && pw->pw_dir)
RequestedDir = pw->pw_dir;
} }
return false; if (!RequestedDir)
return false;
result.clear();
result.append(RequestedDir, RequestedDir + strlen(RequestedDir));
return true;
} }
static bool getDarwinConfDir(bool TempDir, SmallVectorImpl<char> &Result) { static bool getDarwinConfDir(bool TempDir, SmallVectorImpl<char> &Result) {

20
unittests/Support/Path.cpp
View File

@ -328,6 +328,26 @@ TEST(Support, HomeDirectory) {
} }
} }
#ifndef LLVM_ON_WIN32
TEST(Support, HomeDirectoryWithNoEnv) {
std::string Original;
char const *path = ::getenv("HOME");
// Don't try to test if we don't have something to compare against.
if (!path)
return;
Original = path;
::unsetenv("HOME");
SmallString<128> HomeDir;
auto status = path::home_directory(HomeDir);
EXPECT_TRUE(status);
EXPECT_EQ(Original, HomeDir);
// Now put the original environment variable back
::setenv("HOME", Original.c_str(), 1);
}
#endif
TEST(Support, UserCacheDirectory) { TEST(Support, UserCacheDirectory) {
SmallString<13> CacheDir; SmallString<13> CacheDir;
SmallString<20> CacheDir2; SmallString<20> CacheDir2;