1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLockFile/Unix: remove the " (deleted)" suffix from kernel-supplied names

Browse Source 
The kernel appends that to the symlink targets in /proc for files that
have been deleted.

Change-Id: I7a386ad4f0cb4e2ba629fffd16789b5a52491627
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
This commit is contained in:
Thiago Macieira 2021-04-23 14:54:38 -07:00
parent 615972b74f
commit c58be606dd
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qlockfile_unix.cpp
View File

@ -238,6 +238,12 @@ QString QLockFilePrivate::processNameByPid(qint64 pid)
// The pid is gone. Return some invalid process name to fail the test. // The pid is gone. Return some invalid process name to fail the test.
return QStringLiteral("/ERROR/"); return QStringLiteral("/ERROR/");
} }
// remove the " (deleted)" suffix, if any
static const char deleted[] = " (deleted)";
if (buf.endsWith(deleted))
buf.chop(strlen(deleted));
return QFileInfo(QFile::decodeName(buf)).fileName(); return QFileInfo(QFile::decodeName(buf)).fileName();
#elif defined(Q_OS_HAIKU) #elif defined(Q_OS_HAIKU)
thread_info info; thread_info info;