X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Fopen.c;h=e4d2bb2f7ee1e14cbc80851a1e647f8bca9f145c;hb=f19a9d7e00271ffbba6e827da3b553b900acc33c;hp=12a8f8d19952ecdbcaedaf63d4bf0a6f456c08f0;hpb=3a8670fa06b6be062caead81737848fcb01b0c60;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/vfs/open.c b/KernelLand/Kernel/vfs/open.c index 12a8f8d1..e4d2bb2f 100644 --- a/KernelLand/Kernel/vfs/open.c +++ b/KernelLand/Kernel/vfs/open.c @@ -283,9 +283,16 @@ restart_parse: } // Check if the node has a FindDir method + if( !curNode->Type ) + { + LOG("Finddir failure on '%s' - No type", Path); + Log_Error("VFS", "Node at '%s' has no type (mount %s:%s)", + Path, mnt->Filesystem->Name, mnt->MountPoint); + goto _error; + } if( !curNode->Type->FindDir ) { - LOG("Finddir failure on '%s'", Path); + LOG("Finddir failure on '%s' - No FindDir method in %s", Path, curNode->Type->Name); goto _error; } LOG("FindDir{=%p}(%p, '%s')", curNode->Type->FindDir, curNode, pathEle); @@ -331,6 +338,7 @@ restart_parse: path_buffer[ curNode->Size ] = '\0'; LOG("path_buffer = '%s'", path_buffer); strcat(path_buffer, Path + ofs+nextSlash); + // TODO: Pass to VFS_GetAbsPath to handle ../. in the symlink Path = path_buffer; // Log_Debug("VFS", "VFS_ParsePath: Symlink translated to '%s'", Path); @@ -647,7 +655,8 @@ void VFS_Close(int FD) _CloseNode(h->Node); - h->Mount->OpenHandleCount --; + if( h->Mount ) + h->Mount->OpenHandleCount --; h->Node = NULL; } @@ -694,7 +703,7 @@ int VFS_ChDir(const char *Dest) *cwdptr = buf; } - Log("Updated CWD to '%s'", buf); + Log_Debug("VFS", "Updated CWD to '%s'", buf); return 1; }