feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Move resolveSymLinks from FileUtils to FilePath

Browse Source 
And make it work with remote paths.

Change-Id: I1fe4548547231338284152a86c43f5d0b1eba4d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-02 08:53:59 +02:00
parent 943447aed3
commit 2bf72a6dfd
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/utils/fileutils.cpp
View File

@@ -224,7 +224,7 @@ Qt::CaseSensitivity FilePath::caseSensitivity() const
}
/*!
Recursively resolves symlinks if \a filePath is a symlink.
Recursively resolves symlinks if this is a symlink.
To resolve symlinks anywhere in the path, see canonicalPath.
Unlike QFileInfo::canonicalFilePath(), this function will still return the expected deepest
target file even if the symlink is dangling.
@@ -233,15 +233,17 @@ Qt::CaseSensitivity FilePath::caseSensitivity() const
Returns the symlink target file path.
*/
FilePath FileUtils::resolveSymlinks(const FilePath &path)
FilePath FilePath::resolveSymlinks() const
{
QFileInfo f = path.toFileInfo();
FilePath current = *this;
int links = 16;
while (links-- && f.isSymLink())
f.setFile(f.dir(), f.symLinkTarget());
if (links <= 0)
return FilePath();
return FilePath::fromString(f.filePath());
while (links--) {
const FilePath target = current.symLinkTarget();
if (target.isEmpty())
return current;
current = target;
}
return current;
}
/*!