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

Implemented the missing Directory::Lookup() method, since it's now needed

Browse Source 
during path parsing.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4708 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-09-16 02:34:55 +00:00
parent 09fb7d4bbc
commit 434eb84378
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/kernel/boot/loader/file_systems/amiga_ffs/Directory.cpp
View File

@ -55,10 +55,16 @@ Directory::InitCheck()
status_t
Directory::Open(void **_cookie, int mode)
{
*_cookie = (void *)new HashIterator(fVolume.Device(), fNode);
if (*_cookie == NULL)
HashIterator *iterator = new HashIterator(fVolume.Device(), fNode);
if (iterator == NULL)
return B_NO_MEMORY;
if (iterator->InitCheck() != B_OK) {
delete iterator;
return B_NO_MEMORY;
}
*_cookie = (void *)iterator;
return B_OK;
}
@ -74,6 +80,31 @@ Directory::Close(void *cookie)
Node *
Directory::Lookup(const char *name, bool traverseLinks)
{
HashIterator iterator(fVolume.Device(), fNode);
if (iterator.InitCheck() != B_OK)
return NULL;
if (!strcmp(name, ".")) {
Acquire();
return this;
}
iterator.Goto(fNode.HashIndexFor(fVolume.Type(), name));
NodeBlock *node;
int32 block;
while ((node = iterator.GetNext(block)) != NULL) {
char fileName[FFS_NAME_LENGTH];
if (node->GetName(fileName, sizeof(fileName)) == B_OK
&& !strcmp(name, fileName)) {
if (node->IsFile())
return new File(fVolume, block);
if (node->IsDirectory())
return new Directory(fVolume, block);
return NULL;
}
}
return NULL;
}