From cb89356142930e4357e2419538cbc67751a331b4 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 19 Jun 2011 16:50:39 +0200
Subject: [PATCH] Boot loader packagefs: Fix ".." lookups

* 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().
---
 .../file_systems/packagefs/packagefs.cpp      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/system/boot/loader/file_systems/packagefs/packagefs.cpp b/src/system/boot/loader/file_systems/packagefs/packagefs.cpp
index 067d6596ec..34eabd987e 100644
--- a/src/system/boot/loader/file_systems/packagefs/packagefs.cpp
+++ b/src/system/boot/loader/file_systems/packagefs/packagefs.cpp
@@ -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);