Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boot loader packagefs: Fix ".." lookups

Browse Source 
* PackageDirectory::Lookup(): Support "." and ".." lookups.
* PackageLoaderContentHandler::HandleEntry(): If the entry doesn't have
  a parent directory, use the volume's root directory directly. This
  makes PackageVolume::AddNode() superfluous and also always passes a
  non-NULL parent directory to PackageNode::Init().
This commit is contained in:
Ingo Weinhold 2011-06-19 16:50:39 +02:00
parent 02b57b32a3
commit cb89356142
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/system/boot/loader/file_systems/packagefs/packagefs.cpp
View File

@ -208,9 +208,14 @@ struct PackageDirectory : PackageNode {
return fEntries.GetNext(child);
}
PackageNode* Lookup(const char* name) const
PackageNode* Lookup(const char* name)
{
for (NodeList::ConstIterator it = fEntries.GetIterator();
if (strcmp(name, ".") == 0)
return this;
if (strcmp(name, "..") == 0)
return fParentDirectory;
for (NodeList::Iterator it = fEntries.GetIterator();
PackageNode* child = it.Next();) {
if (strcmp(child->Name(), name) == 0)
return child;
@ -319,11 +324,6 @@ struct PackageVolume : BReferenceable {
return fNextNodeID++;
}
void AddNode(PackageNode* node)
{
fRootDirectory.AddChild(node);
}
status_t CreateFileDataReader(const BPackageData& data,
FileDataReader*& _fileDataReader)
{
@ -395,6 +395,9 @@ struct PackageLoaderContentHandler : BPackageContentHandler {
(PackageNode*)parentEntry->UserToken());
}
if (parentDir == NULL)
parentDir = fVolume->RootDirectory();
status_t error;
// get the file mode -- filter out write permissions
@ -437,10 +440,7 @@ struct PackageLoaderContentHandler : BPackageContentHandler {
node->SetModifiedTime(entry->ModifiedTime());
// add it to the parent directory
if (parentDir != NULL)
parentDir->AddChild(node);
else
fVolume->AddNode(node);
parentDir->AddChild(node);
entry->SetUserToken(node);