Fix boolean logic in LockFileManager and test it
This fixes a bug from r187826.
Reviewers: hans
Differential Revision: http://llvm-reviews.chandlerc.com/D1304
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187846 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/LockFileManager.cpp b/lib/Support/LockFileManager.cpp
index b1ff22c..eeec274 100644
--- a/lib/Support/LockFileManager.cpp
+++ b/lib/Support/LockFileManager.cpp
@@ -38,14 +38,16 @@
// Read the owning host and PID out of the lock file. If it appears that the
// owning process is dead, the lock file is invalid.
OwningPtr<MemoryBuffer> MB;
- if (MemoryBuffer::getFile(LockFileName, MB)) {
- StringRef Hostname;
- StringRef PIDStr;
- tie(Hostname, PIDStr) = getToken(MB->getBuffer(), " ");
- int PID;
- if (PIDStr.getAsInteger(10, PID))
- return std::make_pair(std::string(Hostname), PID);
- }
+ if (MemoryBuffer::getFile(LockFileName, MB))
+ return None;
+
+ StringRef Hostname;
+ StringRef PIDStr;
+ tie(Hostname, PIDStr) = getToken(MB->getBuffer(), " ");
+ PIDStr = PIDStr.substr(PIDStr.find_first_not_of(" "));
+ int PID;
+ if (!PIDStr.getAsInteger(10, PID))
+ return std::make_pair(std::string(Hostname), PID);
// Delete the lock file. It's invalid anyway.
sys::fs::remove(LockFileName);