diff options
| author | Rainer Keller <rainer.keller@digia.com> | 2014-10-23 09:50:57 +0200 |
|---|---|---|
| committer | Rainer Keller <rainer.keller@digia.com> | 2014-10-27 08:47:55 +0100 |
| commit | 1ffe1a9a7c5199e46bf280806456a5d86f314169 (patch) | |
| tree | ad21c02fe5045e42fad8ef00a27c2db9e75f2116 /src/corelib/io/qlockfile_unix.cpp | |
| parent | 81998b4e8e440076bd22a9164f0a93481c0e597a (diff) | |
Allow hostname from lock files to be empty
The common format for lock files is to only contain the PID.
(See http://www.pathname.com/fhs/2.2/fhs-5.9.html)
Qt includes some extra information but we can not expect this
information to be present. Otherwise lock files created by other
(non-Qt) processes are not handled correctly.
Change-Id: Ib9be3c9f07eb8e87193f56d96f5559bbdd5180b8
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/io/qlockfile_unix.cpp')
| -rw-r--r-- | src/corelib/io/qlockfile_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp index 2fe93f0af6..3ed973494b 100644 --- a/src/corelib/io/qlockfile_unix.cpp +++ b/src/corelib/io/qlockfile_unix.cpp @@ -183,7 +183,7 @@ bool QLockFilePrivate::isApparentlyStale() const QString hostname, appname; if (!getLockInfo(&pid, &hostname, &appname)) return false; - if (hostname == QString::fromLocal8Bit(localHostName())) { + if (hostname.isEmpty() || hostname == QString::fromLocal8Bit(localHostName())) { if (::kill(pid, 0) == -1 && errno == ESRCH) return true; // PID doesn't exist anymore } |