alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

d->path, not path. error while merging. thank goodness for unit tests.

Browse Source
This commit is contained in:
Aaron Seigo 2011-07-15 14:17:42 +02:00
parent acb2644b16
commit 08c07c4a0d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.cpp
View File

@ -361,13 +361,18 @@ QStringList Package::entryList(const char *key) const
QMap<QByteArray, ContentStructure>::const_iterator it = d->contents.constFind(key); QMap<QByteArray, ContentStructure>::const_iterator it = d->contents.constFind(key);
if (it == d->contents.constEnd()) { if (it == d->contents.constEnd()) {
//kDebug() << "couldn't find" << key;
return QStringList(); return QStringList();
} }
//kDebug() << "going to list" << key;
QStringList list; QStringList list;
foreach (const QString &prefix, d->contentsPrefixPaths) { foreach (const QString &prefix, d->contentsPrefixPaths) {
//kDebug() << " looking in" << prefix;
foreach (const QString &path, it.value().paths) { foreach (const QString &path, it.value().paths) {
//kDebug() << " looking in" << path;
if (it.value().directory) { if (it.value().directory) {
//kDebug() << "it's a directory, so trying out" << d->path + prefix + path;
QDir dir(d->path + prefix + path); QDir dir(d->path + prefix + path);
if (d->externalPaths) { if (d->externalPaths) {
@ -376,12 +381,13 @@ QStringList Package::entryList(const char *key) const
// ensure that we don't return files outside of our base path // ensure that we don't return files outside of our base path
// due to symlink or ../ games // due to symlink or ../ games
QString canonicalized = dir.canonicalPath(); QString canonicalized = dir.canonicalPath();
if (canonicalized.startsWith(path)) { if (canonicalized.startsWith(d->path)) {
list += dir.entryList(QDir::Files | QDir::Readable); list += dir.entryList(QDir::Files | QDir::Readable);
} }
} }
} else { } else {
const QString fullPath = d->path + prefix + path; const QString fullPath = d->path + prefix + path;
//kDebug() << "it's a file at" << fullPath << QFile::exists(fullPath);
if (!QFile::exists(fullPath)) { if (!QFile::exists(fullPath)) {
continue; continue;
} }