diff options
author | Reid Kleckner <reid@kleckner.net> | 2013-08-07 01:22:04 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2013-08-07 01:22:04 +0000 |
commit | 97c57dfcb4c76ede59443fe4c03e415ee7fa358a (patch) | |
tree | 24961b66454a2646411db87f8e10fe8d4a8a8ce8 /lib/Support/LockFileManager.cpp | |
parent | e3c7bdf9a955dac6536588f8ee9c25716f479a04 (diff) | |
download | external_llvm-97c57dfcb4c76ede59443fe4c03e415ee7fa358a.tar.gz external_llvm-97c57dfcb4c76ede59443fe4c03e415ee7fa358a.tar.bz2 external_llvm-97c57dfcb4c76ede59443fe4c03e415ee7fa358a.zip |
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
Diffstat (limited to 'lib/Support/LockFileManager.cpp')
-rw-r--r-- | lib/Support/LockFileManager.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/Support/LockFileManager.cpp b/lib/Support/LockFileManager.cpp index b1ff22c2e6..eeec274ad8 100644 --- a/lib/Support/LockFileManager.cpp +++ b/lib/Support/LockFileManager.cpp @@ -38,14 +38,16 @@ LockFileManager::readLockFile(StringRef LockFileName) { // 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); |