diff options
| -rw-r--r-- | llvm/lib/Support/Unix/Path.inc | 16 | ||||
| -rw-r--r-- | llvm/unittests/Support/Path.cpp | 20 |
2 files changed, 31 insertions, 5 deletions
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc index 7a5816ba1dd..93f8982196b 100644 --- a/llvm/lib/Support/Unix/Path.inc +++ b/llvm/lib/Support/Unix/Path.inc @@ -920,12 +920,18 @@ std::error_code real_path(const Twine &path, SmallVectorImpl<char> &dest, namespace path { bool home_directory(SmallVectorImpl<char> &result) { - if (char *RequestedDir = getenv("HOME")) { - result.clear(); - result.append(RequestedDir, RequestedDir + strlen(RequestedDir)); - return true; + char *RequestedDir = getenv("HOME"); + if (!RequestedDir) { + struct passwd *pw = getpwuid(getuid()); + 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) { diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp index 4883adef165..afa5a5a0d46 100644 --- a/llvm/unittests/Support/Path.cpp +++ b/llvm/unittests/Support/Path.cpp @@ -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) { SmallString<13> CacheDir; SmallString<20> CacheDir2; |
