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

Fixed endless looping in include paths in some cases with symlinks

Browse Source 
Done-with: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Thorbjørn Lindeijer
2009-08-28 16:54:38 +02:00
parent 1d022d32ec
commit 20e3d53602
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -1099,6 +1099,9 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
QStringList suffixes) QStringList suffixes)
{ {
QMap<QString, QStringList> entriesInPaths; QMap<QString, QStringList> entriesInPaths;
typedef QPair<QString, QString> SymLink;
typedef QList<SymLink> SymLinks;
SymLinks symlinks;
int processed = 0; int processed = 0;
future.setProgressRange(0, paths.size()); future.setProgressRange(0, paths.size());
@@ -1111,6 +1114,11 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
break; break;
const QString path = paths.takeFirst(); const QString path = paths.takeFirst();
// Skip already scanned paths
if (entriesInPaths.contains(path))
continue;
QStringList entries; QStringList entries;
QDirIterator i(path, QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); QDirIterator i(path, QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
@@ -1125,11 +1133,18 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
// Also scan subdirectory, but avoid endless recursion with symbolic links // Also scan subdirectory, but avoid endless recursion with symbolic links
if (fileInfo.isSymLink()) { if (fileInfo.isSymLink()) {
QMap<QString, QStringList>::const_iterator result = entriesInPaths.find(fileInfo.canonicalFilePath()); QString target = fileInfo.symLinkTarget();
// Don't add broken symlinks
if (!QFileInfo(target).exists())
continue;
QMap<QString, QStringList>::const_iterator result = entriesInPaths.find(target);
if (result != entriesInPaths.constEnd()) { if (result != entriesInPaths.constEnd()) {
entriesInPaths.insert(fileName, result.value()); entriesInPaths.insert(fileName, result.value());
} else { } else {
paths.append(fileName); paths.append(target);
symlinks.append(SymLink(fileName, target));
} }
} else { } else {
paths.append(fileName); paths.append(fileName);
@@ -1145,6 +1160,14 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
future.setProgressRange(0, processed + paths.size()); future.setProgressRange(0, processed + paths.size());
future.setProgressValue(processed); future.setProgressValue(processed);
} }
// link symlinks
QListIterator<SymLink> it(symlinks);
it.toBack();
while (it.hasPrevious()) {
SymLink v = it.previous();
QMap<QString, QStringList>::const_iterator result = entriesInPaths.find(v.second);
entriesInPaths.insert(v.first, result.value());
}
manager->setIncludesInPaths(entriesInPaths); manager->setIncludesInPaths(entriesInPaths);