diff --git a/headers/private/kernel/boot/vfs.h b/headers/private/kernel/boot/vfs.h index e6a6fb045e..50ab2e927b 100644 --- a/headers/private/kernel/boot/vfs.h +++ b/headers/private/kernel/boot/vfs.h @@ -45,7 +45,13 @@ typedef NodeList::Iterator NodeIterator; class Directory : public Node { public: - Directory(); + Directory(Directory* parent); + ~Directory(); + + Directory* Parent() const; + void SetParent(Directory* parent); + + status_t GetPath(const char* entry, char* buffer, size_t bufferSize); virtual ssize_t ReadAt(void *cookie, off_t pos, void *buffer, size_t bufferSize); virtual ssize_t WriteAt(void *cookie, off_t pos, const void *buffer, size_t bufferSize); @@ -58,6 +64,9 @@ class Directory : public Node { virtual status_t GetNextNode(void *cookie, Node **_node) = 0; virtual status_t Rewind(void *cookie) = 0; virtual bool IsEmpty() = 0; + + private: + Directory* fParent; }; /** The console based nodes don't need cookies for I/O, they diff --git a/src/system/boot/loader/RootFileSystem.cpp b/src/system/boot/loader/RootFileSystem.cpp index 441f5a1765..769dcde1b5 100644 --- a/src/system/boot/loader/RootFileSystem.cpp +++ b/src/system/boot/loader/RootFileSystem.cpp @@ -14,6 +14,8 @@ RootFileSystem::RootFileSystem() + : + Directory(NULL) { } @@ -29,7 +31,16 @@ RootFileSystem::~RootFileSystem() } -status_t +status_t +RootFileSystem::GetName(char *nameBuffer, size_t bufferSize) const +{ + if (strlcpy(nameBuffer, "/", bufferSize) >= bufferSize) + return B_BUFFER_OVERFLOW; + return B_OK; +} + + +status_t RootFileSystem::Open(void **_cookie, int mode) { EntryIterator *iterator = new (std::nothrow) EntryIterator(&fList); @@ -42,7 +53,7 @@ RootFileSystem::Open(void **_cookie, int mode) } -status_t +status_t RootFileSystem::Close(void *cookie) { delete (EntryIterator *)cookie; @@ -84,7 +95,7 @@ RootFileSystem::Lookup(const char *name, bool /*traverseLinks*/) } -status_t +status_t RootFileSystem::GetNextEntry(void *_cookie, char *name, size_t size) { EntryIterator *iterator = (EntryIterator *)_cookie; @@ -98,7 +109,7 @@ RootFileSystem::GetNextEntry(void *_cookie, char *name, size_t size) } -status_t +status_t RootFileSystem::GetNextNode(void *_cookie, Node **_node) { EntryIterator *iterator = (EntryIterator *)_cookie; @@ -113,24 +124,24 @@ RootFileSystem::GetNextNode(void *_cookie, Node **_node) } -status_t +status_t RootFileSystem::Rewind(void *_cookie) { EntryIterator *iterator = (EntryIterator *)_cookie; iterator->Rewind(); - return B_OK; + return B_OK; } -bool +bool RootFileSystem::IsEmpty() { return fList.IsEmpty(); } -status_t +status_t RootFileSystem::AddVolume(Directory *volume, Partition *partition) { struct entry *entry = new (std::nothrow) RootFileSystem::entry(); @@ -138,6 +149,7 @@ RootFileSystem::AddVolume(Directory *volume, Partition *partition) return B_NO_MEMORY; volume->Acquire(); + volume->SetParent(this); entry->name = NULL; entry->root = volume; entry->partition = partition; @@ -165,7 +177,7 @@ RootFileSystem::AddLink(const char *name, Directory *target) } -status_t +status_t RootFileSystem::GetPartitionFor(Directory *volume, Partition **_partition) { EntryIterator iterator = fList.GetIterator(); diff --git a/src/system/boot/loader/RootFileSystem.h b/src/system/boot/loader/RootFileSystem.h index e1adfc434e..afaf7241b1 100644 --- a/src/system/boot/loader/RootFileSystem.h +++ b/src/system/boot/loader/RootFileSystem.h @@ -17,6 +17,8 @@ class RootFileSystem : public Directory { RootFileSystem(); virtual ~RootFileSystem(); + virtual status_t GetName(char *nameBuffer, size_t bufferSize) const; + virtual status_t Open(void **_cookie, int mode); virtual status_t Close(void *cookie); diff --git a/src/system/boot/loader/file_systems/amiga_ffs/Directory.cpp b/src/system/boot/loader/file_systems/amiga_ffs/Directory.cpp index c299717118..c558149457 100644 --- a/src/system/boot/loader/file_systems/amiga_ffs/Directory.cpp +++ b/src/system/boot/loader/file_systems/amiga_ffs/Directory.cpp @@ -18,8 +18,9 @@ namespace FFS { -Directory::Directory(Volume &volume, int32 block) +Directory::Directory(Volume &volume, ::Directory* parent, int32 block) : + ::Directory(parent), fVolume(volume) { void *data = malloc(volume.BlockSize()); @@ -31,8 +32,9 @@ Directory::Directory(Volume &volume, int32 block) } -Directory::Directory(Volume &volume, RootBlock &root) +Directory::Directory(Volume &volume, ::Directory* parent, RootBlock &root) : + ::Directory(parent), fVolume(volume) { fNode.SetTo(root.BlockData(), root.BlockSize()); @@ -45,14 +47,14 @@ Directory::~Directory() } -status_t +status_t Directory::InitCheck() { return fNode.ValidateCheckSum(); } -status_t +status_t Directory::Open(void **_cookie, int mode) { _inherited::Open(_cookie, mode); @@ -71,7 +73,7 @@ Directory::Open(void **_cookie, int mode) } -status_t +status_t Directory::Close(void *cookie) { _inherited::Close(cookie); @@ -104,7 +106,7 @@ Directory::Lookup(const char *name, bool traverseLinks) if (node->IsFile()) return new(nothrow) File(fVolume, block); if (node->IsDirectory()) - return new(nothrow) Directory(fVolume, block); + return new(nothrow) Directory(fVolume, this, block); return NULL; } @@ -113,7 +115,7 @@ Directory::Lookup(const char *name, bool traverseLinks) } -status_t +status_t Directory::GetNextEntry(void *cookie, char *name, size_t size) { HashIterator *iterator = (HashIterator *)cookie; @@ -127,7 +129,7 @@ Directory::GetNextEntry(void *cookie, char *name, size_t size) } -status_t +status_t Directory::GetNextNode(void *cookie, Node **_node) { return B_ERROR; diff --git a/src/system/boot/loader/file_systems/amiga_ffs/Directory.h b/src/system/boot/loader/file_systems/amiga_ffs/Directory.h index bed55f8f32..988aeea109 100644 --- a/src/system/boot/loader/file_systems/amiga_ffs/Directory.h +++ b/src/system/boot/loader/file_systems/amiga_ffs/Directory.h @@ -17,9 +17,8 @@ class Volume; class Directory : public ::Directory { public: - Directory(); - Directory(Volume &volume, RootBlock &root); - Directory(Volume &volume, int32 block); + Directory(Volume &volume, ::Directory* parent, RootBlock &root); + Directory(Volume &volume, ::Directory* parent, int32 block); virtual ~Directory(); status_t InitCheck(); diff --git a/src/system/boot/loader/file_systems/amiga_ffs/Volume.cpp b/src/system/boot/loader/file_systems/amiga_ffs/Volume.cpp index 4d1cd26e31..a16f1e0381 100644 --- a/src/system/boot/loader/file_systems/amiga_ffs/Volume.cpp +++ b/src/system/boot/loader/file_systems/amiga_ffs/Volume.cpp @@ -75,7 +75,7 @@ Volume::Volume(boot::Partition *partition) buffer = newBuffer; fRootNode.SetTo(buffer, blockSize); - fRoot = new(nothrow) Directory(*this, fRootNode); + fRoot = new(nothrow) Directory(*this, NULL, fRootNode); // fRoot will free the buffer for us upon destruction } @@ -87,7 +87,7 @@ Volume::~Volume() } -status_t +status_t Volume::InitCheck() { if (fRoot != NULL) diff --git a/src/system/boot/loader/file_systems/bfs/Directory.cpp b/src/system/boot/loader/file_systems/bfs/Directory.cpp index 83b0caa86c..a3a81c7906 100644 --- a/src/system/boot/loader/file_systems/bfs/Directory.cpp +++ b/src/system/boot/loader/file_systems/bfs/Directory.cpp @@ -22,24 +22,27 @@ extern Node *get_node_from(int fd); namespace BFS { -Directory::Directory(Volume &volume, block_run run) +Directory::Directory(Volume &volume, ::Directory* parent, block_run run) : + ::Directory(parent), fStream(volume, run), fTree(&fStream) { } -Directory::Directory(Volume &volume, off_t id) +Directory::Directory(Volume &volume, ::Directory* parent, off_t id) : + ::Directory(parent), fStream(volume, id), fTree(&fStream) { } -Directory::Directory(const Stream &stream) +Directory::Directory(::Directory* parent, const Stream &stream) : + ::Directory(parent), fStream(stream), fTree(&fStream) { @@ -51,14 +54,14 @@ Directory::~Directory() } -status_t +status_t Directory::InitCheck() { return fStream.InitCheck(); } -status_t +status_t Directory::Open(void **_cookie, int mode) { _inherited::Open(_cookie, mode); @@ -71,7 +74,7 @@ Directory::Open(void **_cookie, int mode) } -status_t +status_t Directory::Close(void *cookie) { _inherited::Close(cookie); @@ -88,7 +91,7 @@ Directory::Lookup(const char *name, bool traverseLinks) if (fTree.Find((uint8 *)name, strlen(name), &id) < B_OK) return NULL; - Node *node = Stream::NodeFactory(fStream.GetVolume(), id); + Node *node = Stream::NodeFactory(fStream.GetVolume(), this, id); if (!node) return NULL; @@ -117,7 +120,7 @@ Directory::Lookup(const char *name, bool traverseLinks) } -status_t +status_t Directory::GetNextEntry(void *cookie, char *name, size_t size) { TreeIterator *iterator = (TreeIterator *)cookie; @@ -128,7 +131,7 @@ Directory::GetNextEntry(void *cookie, char *name, size_t size) } -status_t +status_t Directory::GetNextNode(void *cookie, Node **_node) { TreeIterator *iterator = (TreeIterator *)cookie; @@ -140,7 +143,7 @@ Directory::GetNextNode(void *cookie, Node **_node) if (status != B_OK) return status; - *_node = Stream::NodeFactory(fStream.GetVolume(), id); + *_node = Stream::NodeFactory(fStream.GetVolume(), this, id); if (*_node == NULL) return B_ERROR; @@ -148,7 +151,7 @@ Directory::GetNextNode(void *cookie, Node **_node) } -status_t +status_t Directory::Rewind(void *cookie) { TreeIterator *iterator = (TreeIterator *)cookie; @@ -157,7 +160,7 @@ Directory::Rewind(void *cookie) } -bool +bool Directory::IsEmpty() { TreeIterator iterator(&fTree); @@ -184,7 +187,7 @@ Directory::IsEmpty() status_t Directory::GetName(char *name, size_t size) const { - if (fStream.inode_num == fStream.GetVolume().Root()) { + if (fStream.InodeNum() == fStream.GetVolume().Root()) { strlcpy(name, fStream.GetVolume().SuperBlock().name, size); return B_OK; } diff --git a/src/system/boot/loader/file_systems/bfs/Directory.h b/src/system/boot/loader/file_systems/bfs/Directory.h index 4645b8154c..25f54a05dd 100644 --- a/src/system/boot/loader/file_systems/bfs/Directory.h +++ b/src/system/boot/loader/file_systems/bfs/Directory.h @@ -17,9 +17,9 @@ namespace BFS { class Directory : public ::Directory { public: - Directory(Volume &volume, block_run run); - Directory(Volume &volume, off_t id); - Directory(const Stream &stream); + Directory(Volume &volume, ::Directory* parent, block_run run); + Directory(Volume &volume, ::Directory* parent, off_t id); + Directory(::Directory* parent, const Stream &stream); virtual ~Directory(); status_t InitCheck(); diff --git a/src/system/boot/loader/file_systems/bfs/Stream.cpp b/src/system/boot/loader/file_systems/bfs/Stream.cpp index 75e1bb0c4e..f2120f3053 100644 --- a/src/system/boot/loader/file_systems/bfs/Stream.cpp +++ b/src/system/boot/loader/file_systems/bfs/Stream.cpp @@ -106,31 +106,47 @@ CachedBlock::SetTo(block_run run) Stream::Stream(Volume &volume, block_run run) : - fVolume(volume) + fVolume(volume), + fInode(NULL) { - if (read_pos(volume.Device(), volume.ToOffset(run), this, sizeof(bfs_inode)) != sizeof(bfs_inode)) - return; + _LoadInode(volume.ToOffset(run)); } Stream::Stream(Volume &volume, off_t id) : - fVolume(volume) + fVolume(volume), + fInode(NULL) { - if (read_pos(volume.Device(), volume.ToOffset(id), this, sizeof(bfs_inode)) != sizeof(bfs_inode)) - return; + _LoadInode(volume.ToOffset(id)); +} + + +Stream::Stream(const Stream& other) + : + fVolume(other.fVolume), + fInode(NULL) +{ + _UseInode(other.fInode); } Stream::~Stream() { + if (fInode != NULL) { + if (--(((int32*)fInode)[-1]) == 0) + free((int32*)fInode - 1); + } } status_t Stream::InitCheck() { - return bfs_inode::InitCheck(&fVolume); + if (fInode == NULL) + return B_NO_MEMORY; + + return fInode->InitCheck(&fVolume); } @@ -141,12 +157,12 @@ Stream::GetNextSmallData(const small_data **_smallData) const // begin from the start? if (smallData == NULL) - smallData = small_data_start; + smallData = fInode->small_data_start; else smallData = smallData->Next(); // is already last item? - if (smallData->IsLast(this)) + if (smallData->IsLast(fInode)) return B_ENTRY_NOT_FOUND; *_smallData = smallData; @@ -155,7 +171,7 @@ Stream::GetNextSmallData(const small_data **_smallData) const } -status_t +status_t Stream::GetName(char *name, size_t size) const { const small_data *smallData = NULL; @@ -170,17 +186,17 @@ Stream::GetName(char *name, size_t size) const } -status_t +status_t Stream::ReadLink(char *buffer, size_t bufferSize) { // link in the stream - if (Flags() & INODE_LONG_SYMLINK) + if (fInode->Flags() & INODE_LONG_SYMLINK) return ReadAt(0, (uint8 *)buffer, &bufferSize); // link in the inode - strlcpy(buffer, short_symlink, bufferSize); + strlcpy(buffer, fInode->short_symlink, bufferSize); return B_OK; } @@ -190,21 +206,25 @@ Stream::FindBlockRun(off_t pos, block_run &run, off_t &offset) { // find matching block run - if (data.MaxDirectRange() > 0 && pos >= data.MaxDirectRange()) { - if (data.MaxDoubleIndirectRange() > 0 && pos >= data.MaxIndirectRange()) { + if (fInode->data.MaxDirectRange() > 0 + && pos >= fInode->data.MaxDirectRange()) { + if (fInode->data.MaxDoubleIndirectRange() > 0 + && pos >= fInode->data.MaxIndirectRange()) { // access to double indirect blocks CachedBlock cached(fVolume); - off_t start = pos - data.MaxIndirectRange(); - int32 indirectSize = (1L << (INDIRECT_BLOCKS_SHIFT + cached.BlockShift())) - * (fVolume.BlockSize() / sizeof(block_run)); + off_t start = pos - fInode->data.MaxIndirectRange(); + int32 indirectSize + = (1L << (INDIRECT_BLOCKS_SHIFT + cached.BlockShift())) + * (fVolume.BlockSize() / sizeof(block_run)); int32 directSize = NUM_ARRAY_BLOCKS << cached.BlockShift(); int32 index = start / indirectSize; int32 runsPerBlock = cached.BlockSize() / sizeof(block_run); - block_run *indirect = (block_run *)cached.SetTo( - fVolume.ToBlock(data.double_indirect) + index / runsPerBlock); + block_run *indirect = (block_run*)cached.SetTo( + fVolume.ToBlock(fInode->data.double_indirect) + + index / runsPerBlock); if (indirect == NULL) return B_ERROR; @@ -213,24 +233,25 @@ Stream::FindBlockRun(off_t pos, block_run &run, off_t &offset) int32 current = (start % indirectSize) / directSize; - indirect = (block_run *)cached.SetTo( + indirect = (block_run*)cached.SetTo( fVolume.ToBlock(indirect[index % runsPerBlock]) + current / runsPerBlock); if (indirect == NULL) return B_ERROR; run = indirect[current % runsPerBlock]; - offset = data.MaxIndirectRange() + (index * indirectSize) + (current * directSize); + offset = fInode->data.MaxIndirectRange() + (index * indirectSize) + + (current * directSize); //printf("\tfCurrent = %ld, fRunFileOffset = %Ld, fRunBlockEnd = %Ld, fRun = %ld,%d\n",fCurrent,fRunFileOffset,fRunBlockEnd,fRun.allocation_group,fRun.start); } else { // access to indirect blocks int32 runsPerBlock = fVolume.BlockSize() / sizeof(block_run); - off_t runBlockEnd = data.MaxDirectRange(); + off_t runBlockEnd = fInode->data.MaxDirectRange(); CachedBlock cached(fVolume); - off_t block = fVolume.ToBlock(data.indirect); + off_t block = fVolume.ToBlock(fInode->data.indirect); - for (int32 i = 0;i < data.indirect.Length();i++) { + for (int32 i = 0;i < fInode->data.indirect.Length();i++) { block_run *indirect = (block_run *)cached.SetTo(block + i); if (indirect == NULL) return B_IO_ERROR; @@ -259,12 +280,13 @@ Stream::FindBlockRun(off_t pos, block_run &run, off_t &offset) int32 current = -1; while (++current < NUM_DIRECT_BLOCKS) { - if (data.direct[current].IsZero()) + if (fInode->data.direct[current].IsZero()) break; - runBlockEnd += data.direct[current].Length() << fVolume.BlockShift(); + runBlockEnd += fInode->data.direct[current].Length() + << fVolume.BlockShift(); if (runBlockEnd > pos) { - run = data.direct[current]; + run = fInode->data.direct[current]; offset = runBlockEnd - (run.Length() << fVolume.BlockShift()); //printf("### run[%ld] = (%ld,%d,%d), offset = %Ld\n",fCurrent,fRun.allocation_group,fRun.start,fRun.length,fRunFileOffset); return fVolume.ValidateBlockRun(run); @@ -284,15 +306,15 @@ Stream::ReadAt(off_t pos, uint8 *buffer, size_t *_length) if (pos < 0) return B_BAD_VALUE; - if (pos >= data.Size()) { + if (pos >= fInode->data.Size()) { *_length = 0; return B_NO_ERROR; } size_t length = *_length; - if (pos + length > data.Size()) - length = data.Size() - pos; + if (pos + length > fInode->data.Size()) + length = fInode->data.Size() - pos; block_run run; off_t offset; @@ -396,14 +418,14 @@ Stream::ReadAt(off_t pos, uint8 *buffer, size_t *_length) Node * -Stream::NodeFactory(Volume &volume, off_t id) +Stream::NodeFactory(Volume &volume, ::Directory* parent, off_t id) { Stream stream(volume, id); if (stream.InitCheck() != B_OK) return NULL; if (stream.IsContainer()) - return new(nothrow) Directory(stream); + return new(nothrow) Directory(parent, stream); if (stream.IsSymlink()) return new(nothrow) Link(stream); @@ -412,10 +434,41 @@ Stream::NodeFactory(Volume &volume, off_t id) } +status_t +Stream::_LoadInode(off_t offset) +{ + int32* inodeRef = (int32*)malloc(fVolume.BlockSize() + 4); + if (inodeRef == NULL) + return B_NO_MEMORY; + + fInode = (bfs_inode*)(inodeRef + 1); + *inodeRef = 1; + + ssize_t bytesRead = read_pos(fVolume.Device(), offset, fInode, + fVolume.BlockSize()); + if (bytesRead >= 0 && (size_t)bytesRead == fVolume.BlockSize()) + return B_OK; + + free(inodeRef); + fInode = NULL; + + return bytesRead < 0 ? bytesRead : B_ERROR; +} + + +void +Stream::_UseInode(bfs_inode* inode) +{ + fInode = inode; + if (fInode != NULL) + ((int32*)fInode)[-1]++; +} + + // #pragma mark - -status_t +status_t bfs_inode::InitCheck(Volume *volume) { if (Flags() & INODE_NOT_READY) { diff --git a/src/system/boot/loader/file_systems/bfs/Stream.h b/src/system/boot/loader/file_systems/bfs/Stream.h index 908d0b4d14..b52030ba24 100644 --- a/src/system/boot/loader/file_systems/bfs/Stream.h +++ b/src/system/boot/loader/file_systems/bfs/Stream.h @@ -6,20 +6,23 @@ #ifndef STREAM_H #define STREAM_H +#include + +#include #include "Volume.h" -#include class Node; namespace BFS { -class Stream : public bfs_inode { +class Stream { public: Stream(Volume &volume, block_run run); Stream(Volume &volume, off_t id); + Stream(const Stream& other); ~Stream(); status_t InitCheck(); @@ -29,19 +32,27 @@ class Stream : public bfs_inode { status_t ReadAt(off_t pos, uint8 *buffer, size_t *length); status_t GetName(char *name, size_t size) const; - off_t Size() const { return data.Size(); } - off_t ID() const { return fVolume.ToVnode(inode_num); } + off_t Size() const { return fInode->data.Size(); } + off_t ID() const { return fVolume.ToVnode(fInode->inode_num); } + inode_addr InodeNum() const { return fInode->inode_num; } + int32 Mode() const { return fInode->Mode(); } status_t ReadLink(char *buffer, size_t bufferSize); bool IsContainer() const { return Mode() & (S_IFDIR | S_INDEX_DIR | S_ATTR_DIR); } bool IsSymlink() const { return S_ISLNK(Mode()); } - static Node *NodeFactory(Volume &volume, off_t id); + static Node *NodeFactory(Volume &volume, ::Directory* parent, off_t id); private: + Stream& operator=(const Stream& other); + status_t GetNextSmallData(const small_data **_smallData) const; - Volume &fVolume; + status_t _LoadInode(off_t offset); + void _UseInode(bfs_inode* inode); + + Volume& fVolume; + bfs_inode* fInode; }; } // namespace BFS diff --git a/src/system/boot/loader/file_systems/bfs/bfs.cpp b/src/system/boot/loader/file_systems/bfs/bfs.cpp index 9b50897ede..e096b18556 100644 --- a/src/system/boot/loader/file_systems/bfs/bfs.cpp +++ b/src/system/boot/loader/file_systems/bfs/bfs.cpp @@ -45,7 +45,7 @@ Volume::Volume(boot::Partition *partition) // try block 0 again (can only happen on the big endian BFS) if (read_pos(fDevice, 0, &fSuperBlock, sizeof(disk_super_block)) < B_OK) return; - + if (!IsValidSuperBlock()) return; #else @@ -55,7 +55,7 @@ Volume::Volume(boot::Partition *partition) TRACE(("bfs: we do have a valid super block (name = %s)!\n", fSuperBlock.name)); - fRootNode = new(nothrow) BFS::Directory(*this, Root()); + fRootNode = new(nothrow) BFS::Directory(*this, NULL, Root()); if (fRootNode == NULL) return; @@ -74,7 +74,7 @@ Volume::~Volume() } -status_t +status_t Volume::InitCheck() { if (fDevice < B_OK) @@ -118,7 +118,7 @@ Volume::ValidateBlockRun(block_run run) } -block_run +block_run Volume::ToBlockRun(off_t block) const { block_run run; diff --git a/src/system/boot/loader/file_systems/tarfs/tarfs.cpp b/src/system/boot/loader/file_systems/tarfs/tarfs.cpp index 835ac4d988..0d044130f0 100644 --- a/src/system/boot/loader/file_systems/tarfs/tarfs.cpp +++ b/src/system/boot/loader/file_systems/tarfs/tarfs.cpp @@ -96,7 +96,7 @@ class File : public ::Node, public Entry { class Directory : public ::Directory, public Entry { public: - Directory(const char *name); + Directory(::Directory* parent, const char* name); virtual ~Directory(); virtual status_t Open(void **_cookie, int mode); @@ -181,7 +181,7 @@ bool skip_gzip_header(z_stream *stream) { uint8 *buffer = (uint8 *)stream->next_in; - + // check magic and skip method if (buffer[0] != 0x1f || buffer[1] != 0x8b) return false; @@ -306,8 +306,10 @@ TarFS::File::Inode() const // #pragma mark - -TarFS::Directory::Directory(const char *name) - : TarFS::Entry(name) +TarFS::Directory::Directory(::Directory* parent, const char* name) + : + ::Directory(parent), + TarFS::Entry(name) { } @@ -321,7 +323,7 @@ TarFS::Directory::~Directory() } -status_t +status_t TarFS::Directory::Open(void **_cookie, int mode) { _inherited::Open(_cookie, mode); @@ -336,7 +338,7 @@ TarFS::Directory::Open(void **_cookie, int mode) } -status_t +status_t TarFS::Directory::Close(void *cookie) { _inherited::Close(cookie); @@ -395,7 +397,7 @@ TarFS::Directory::Lookup(const char *name, bool traverseLinks) } -status_t +status_t TarFS::Directory::GetNextEntry(void *_cookie, char *name, size_t size) { EntryIterator *iterator = (EntryIterator *)_cookie; @@ -410,7 +412,7 @@ TarFS::Directory::GetNextEntry(void *_cookie, char *name, size_t size) } -status_t +status_t TarFS::Directory::GetNextNode(void *_cookie, Node **_node) { EntryIterator *iterator = (EntryIterator *)_cookie; @@ -424,12 +426,12 @@ TarFS::Directory::GetNextNode(void *_cookie, Node **_node) } -status_t +status_t TarFS::Directory::Rewind(void *_cookie) { EntryIterator *iterator = (EntryIterator *)_cookie; *iterator = fEntries.GetIterator(); - return B_OK; + return B_OK; } @@ -458,7 +460,7 @@ TarFS::Directory::AddDirectory(char *dirName, TarFS::Directory **_dir) return B_ERROR; } else { // doesn't exist yet -- create it - dir = new(nothrow) TarFS::Directory(dirName); + dir = new(nothrow) TarFS::Directory(this, dirName); if (!dir) return B_NO_MEMORY; @@ -517,7 +519,7 @@ TarFS::Directory::AddFile(tar_header *header) } -bool +bool TarFS::Directory::IsEmpty() { return fEntries.IsEmpty(); @@ -597,7 +599,7 @@ TarFS::Symlink::Inode() const TarFS::Volume::Volume() - : TarFS::Directory("Boot from CD-ROM") + : TarFS::Directory(NULL, "Boot from CD-ROM") { } diff --git a/src/system/boot/loader/vfs.cpp b/src/system/boot/loader/vfs.cpp index 801401581e..ddae826b5c 100644 --- a/src/system/boot/loader/vfs.cpp +++ b/src/system/boot/loader/vfs.cpp @@ -92,21 +92,21 @@ Node::Close(void *cookie) } -status_t +status_t Node::GetName(char *nameBuffer, size_t bufferSize) const { return B_ERROR; } -int32 +int32 Node::Type() const { return 0; } -off_t +off_t Node::Size() const { return 0LL; @@ -120,7 +120,7 @@ Node::Inode() const } -status_t +status_t Node::Acquire() { fRefCount++; @@ -128,7 +128,7 @@ Node::Acquire() return B_OK; } -status_t +status_t Node::Release() { TRACE(("%p::Release(), fRefCount = %ld\n", this, fRefCount)); @@ -168,27 +168,98 @@ ConsoleNode::Write(const void *buffer, size_t bufferSize) // #pragma mark - -Directory::Directory() - : Node() +Directory::Directory(Directory* parent) + : + Node(), + fParent(NULL) { + SetParent(parent); } -ssize_t +Directory::~Directory() +{ + SetParent(NULL); +} + + +Directory* +Directory::Parent() const +{ + return fParent; +} + + +void +Directory::SetParent(Directory* parent) +{ + if (fParent != NULL) + fParent->Release(); + + fParent = parent; + + if (fParent != NULL) + fParent->Acquire(); +} + + +status_t +Directory::GetPath(const char* entry, char* buffer, size_t bufferSize) +{ + // get parent path, if any + if (fParent != NULL) { + status_t error = fParent->GetPath(NULL, buffer, bufferSize); + if (error != B_OK) + return error; + + size_t len = strlen(buffer); + if (len == 0) + return B_BAD_VALUE; + + if (buffer[len - 1] != '/') { + if (len == bufferSize) + return B_BUFFER_OVERFLOW; + + buffer[len++] = '/'; + } + + buffer += len; + bufferSize -= len; + } + + // append directory name + status_t error = GetName(buffer, bufferSize); + if (error != B_OK) + return error; + + if (entry == NULL) + return B_OK; + + // append entry name + if (strlcat(buffer, "/", bufferSize) >= bufferSize + || strlcat(buffer, entry, bufferSize) >= bufferSize) { + return B_BUFFER_OVERFLOW; + } + + return B_OK; +} + + +ssize_t Directory::ReadAt(void *cookie, off_t pos, void *buffer, size_t bufferSize) { return B_ERROR; } -ssize_t +ssize_t Directory::WriteAt(void *cookie, off_t pos, const void *buffer, size_t bufferSize) { return B_ERROR; } -int32 +int32 Directory::Type() const { return S_IFDIR; @@ -265,7 +336,7 @@ Descriptor::~Descriptor() } -ssize_t +ssize_t Descriptor::Read(void *buffer, size_t bufferSize) { ssize_t bytesRead = fNode->ReadAt(fCookie, fOffset, buffer, bufferSize); @@ -276,7 +347,7 @@ Descriptor::Read(void *buffer, size_t bufferSize) } -ssize_t +ssize_t Descriptor::ReadAt(off_t pos, void *buffer, size_t bufferSize) { return fNode->ReadAt(fCookie, pos, buffer, bufferSize); @@ -351,7 +422,7 @@ status_t register_boot_file_system(Directory *volume) { gRoot->AddLink("boot", volume); - + Partition *partition; status_t status = gRoot->GetPartitionFor(volume, &partition); if (status != B_OK) { @@ -576,7 +647,7 @@ open_node(Node *node, int mode) return B_ERROR; // get free descriptor - + int fd = 0; for (; fd < MAX_VFS_DESCRIPTORS; fd++) { if (sDescriptors[fd] == NULL) @@ -588,7 +659,7 @@ open_node(Node *node, int mode) TRACE(("got descriptor %d for node %p\n", fd, node)); // we got a free descriptor entry, now try to open the node - + void *cookie; status_t status = node->Open(&cookie, mode); if (status < B_OK)