From 900e9a3da059b31e0da49e5025ac6819a14f43e6 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 21 Mar 2014 21:45:07 +0000 Subject: [Support] Follow up to r204426, for LockFileManager, make the given path absolute so relative paths are properly handled in both Windows and Unix. llvm-svn: 204520 --- llvm/lib/Support/LockFileManager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Support') diff --git a/llvm/lib/Support/LockFileManager.cpp b/llvm/lib/Support/LockFileManager.cpp index 55858473f59..cd1cbcb2c5b 100644 --- a/llvm/lib/Support/LockFileManager.cpp +++ b/llvm/lib/Support/LockFileManager.cpp @@ -68,7 +68,11 @@ bool LockFileManager::processStillExecuting(StringRef Hostname, int PID) { LockFileManager::LockFileManager(StringRef FileName) { this->FileName = FileName; - LockFileName = FileName; + if (error_code EC = sys::fs::make_absolute(this->FileName)) { + Error = EC; + return; + } + LockFileName = this->FileName; LockFileName += ".lock"; // If the lock file already exists, don't bother to try to create our own @@ -116,8 +120,7 @@ LockFileManager::LockFileManager(StringRef FileName) while (1) { // Create a link from the lock file name. If this succeeds, we're done. error_code EC = - sys::fs::create_link(sys::path::filename(UniqueLockFileName.str()), - LockFileName.str()); + sys::fs::create_link(UniqueLockFileName.str(), LockFileName.str()); if (EC == errc::success) return; -- cgit v1.2.3