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

boot tarfs: Support resolving "." and ".." directory entries

Browse Source 
This makes resolving the boot module symlinks work.
This commit is contained in:
Ingo Weinhold 2013-09-12 23:29:16 +02:00
parent b0d7a45c3d
commit 3465e718e7
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/system/boot/loader/file_systems/tarfs/tarfs.cpp
View File

@ -109,7 +109,7 @@ private:
class Directory : public ::Directory, public Entry { class Directory : public ::Directory, public Entry {
public: public:
Directory(const char* name); Directory(Directory* parent, const char* name);
virtual ~Directory(); virtual ~Directory();
virtual status_t Open(void** _cookie, int mode); virtual status_t Open(void** _cookie, int mode);
@ -136,10 +136,11 @@ public:
TarFS::Directory** _dir = NULL); TarFS::Directory** _dir = NULL);
status_t AddFile(tar_header* header); status_t AddFile(tar_header* header);
private: private:
typedef ::Directory _inherited; typedef ::Directory _inherited;
EntryList fEntries; Directory* fParent;
EntryList fEntries;
}; };
@ -329,8 +330,10 @@ TarFS::File::Inode() const
// #pragma mark - // #pragma mark -
TarFS::Directory::Directory(const char* name) TarFS::Directory::Directory(Directory* parent, const char* name)
: TarFS::Entry(name) :
TarFS::Entry(name),
fParent(parent)
{ {
} }
@ -381,6 +384,11 @@ TarFS::Directory::GetName(char* nameBuffer, size_t bufferSize) const
TarFS::Entry* TarFS::Entry*
TarFS::Directory::LookupEntry(const char* name) TarFS::Directory::LookupEntry(const char* name)
{ {
if (strcmp(name, ".") == 0)
return this;
if (strcmp(name, "..") == 0)
return fParent;
EntryIterator iterator(fEntries.GetIterator()); EntryIterator iterator(fEntries.GetIterator());
while (iterator.HasNext()) { while (iterator.HasNext()) {
@ -471,7 +479,7 @@ TarFS::Directory::AddDirectory(char* dirName, TarFS::Directory** _dir)
return B_ERROR; return B_ERROR;
} else { } else {
// doesn't exist yet -- create it // doesn't exist yet -- create it
dir = new(nothrow) TarFS::Directory(dirName); dir = new(nothrow) TarFS::Directory(this, dirName);
if (!dir) if (!dir)
return B_NO_MEMORY; return B_NO_MEMORY;
@ -624,7 +632,8 @@ TarFS::Symlink::Inode() const
TarFS::Volume::Volume() TarFS::Volume::Volume()
: TarFS::Directory("Boot from CD-ROM") :
TarFS::Directory(this, "Boot from CD-ROM")
{ {
} }