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

treat no contents prefixes as valid and equivalent to one prefix of QString()

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1206635
This commit is contained in:
Aaron J. Seigo 2010-12-15 06:28:33 +00:00
parent c549c85181
commit e2ea3a5715
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packagestructure.cpp
View File

@ -90,6 +90,7 @@ public:
}
void createPackageMetadata(const QString &path);
QStringList entryList(const QString &prefix, const QString &requestedPath);
static QHash<QString, PackageStructure::Ptr> structures;
@ -284,26 +285,36 @@ QStringList PackageStructure::entryList(const char *key)
}
QStringList list;
foreach (QString prefix, d->contentsPrefixPaths) {
QDir dir(d->path + prefix + p);
if (dir.exists()) {
if (d->externalPaths) {
return dir.entryList(QDir::Files | QDir::Readable);
}
// ensure that we don't return files outside of our base path
// due to symlink or ../ games
QString canonicalized = dir.canonicalPath();
if (canonicalized.startsWith(d->path)) {
list << dir.entryList(QDir::Files | QDir::Readable);
}
if (d->contentsPrefixPaths.isEmpty()) {
// no prefixes is the same as d->contentsPrefixPths with QStringList() << QString()
list << d->entryList(QString(), p);
} else {
foreach (QString prefix, d->contentsPrefixPaths) {
list << d->entryList(prefix, p);
}
}
return list;
}
QStringList PackageStructurePrivate::entryList(const QString &prefix, const QString &requestedPath)
{
QDir dir(path + prefix + requestedPath);
if (externalPaths) {
return dir.entryList(QDir::Files | QDir::Readable);
}
// ensure that we don't return files outside of our base path
// due to symlink or ../ games
QString canonicalized = dir.canonicalPath();
if (canonicalized.startsWith(path)) {
return dir.entryList(QDir::Files | QDir::Readable);
}
return QStringList();
}
void PackageStructure::addDirectoryDefinition(const char *key,
const QString &path, const QString &name)
{
@ -528,7 +539,7 @@ void PackageStructure::write(KConfigBase *config) const
QString PackageStructure::contentsPrefix() const
{
return d->contentsPrefixPaths.first();
return d->contentsPrefixPaths.isEmpty() ? QString() : d->contentsPrefixPaths.first();
}
void PackageStructure::setContentsPrefix(const QString &prefix)