aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Support/Unix
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-08-10 00:50:57 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-08-10 00:50:57 +0000
commit0a69bac39607c1f715835d951a6deb1c7ecbedfe (patch)
tree042b0fa9423ee2565cfdf76c165c26be9c3a0f2a /lib/Support/Unix
parent3ed7576a3bfd8e4e76e7b8f7ae76422c1ae48f72 (diff)
downloadexternal_llvm-0a69bac39607c1f715835d951a6deb1c7ecbedfe.zip
external_llvm-0a69bac39607c1f715835d951a6deb1c7ecbedfe.tar.gz
external_llvm-0a69bac39607c1f715835d951a6deb1c7ecbedfe.tar.bz2
Check for $PWD in llvm::sys::current_path.
Some users (clang, libTooling) require this. After this patch we can remove the calls to getenv("PWD") from clang. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188125 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/Unix')
-rw-r--r--lib/Support/Unix/Path.inc12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc
index 4dcfa09..f6a137e 100644
--- a/lib/Support/Unix/Path.inc
+++ b/lib/Support/Unix/Path.inc
@@ -298,6 +298,18 @@ UniqueID file_status::getUniqueID() const {
}
error_code current_path(SmallVectorImpl<char> &result) {
+ result.clear();
+
+ const char *pwd = ::getenv("PWD");
+ llvm::sys::fs::file_status PWDStatus, DotStatus;
+ if (pwd && llvm::sys::path::is_absolute(pwd) &&
+ !llvm::sys::fs::status(pwd, PWDStatus) &&
+ !llvm::sys::fs::status(".", DotStatus) &&
+ PWDStatus.getUniqueID() == DotStatus.getUniqueID()) {
+ result.append(pwd, pwd + strlen(pwd));
+ return error_code::success();
+ }
+
#ifdef MAXPATHLEN
result.reserve(MAXPATHLEN);
#else