X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=1845b7a43cc55ca97935b4e636f37921fefe756e;hb=7b8c541cd83b70296325dbbf047d682fd7b03c22;hp=f549d2bd81551e341beebd2330a72864ce3402c1;hpb=7e5607004c3221d55c7992148b2f0d958cf28533;p=tpg%2Facess2.git diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c index f549d2bd..1845b7a4 100644 --- a/Kernel/vfs/open.c +++ b/Kernel/vfs/open.c @@ -199,6 +199,7 @@ restart_parse: *TruePath = malloc( gVFS_RootMount->MountPointLen+1 ); strcpy(*TruePath, gVFS_RootMount->MountPoint); } + if(MountPoint) *MountPoint = gVFS_RootMount; LEAVE('p', gVFS_RootMount->RootNode); return gVFS_RootMount->RootNode; } @@ -452,6 +453,9 @@ restart_parse: int VFS_int_CreateHandle( tVFS_Node *Node, tVFS_Mount *Mount, int Mode ) { int i; + + ENTER("pNode pMount iMode", Node, Mount, Mode); + i = 0; i |= (Mode & VFS_OPENFLAG_EXEC) ? VFS_PERM_EXECUTE : 0; i |= (Mode & VFS_OPENFLAG_READ) ? VFS_PERM_READ : 0; @@ -533,7 +537,7 @@ int VFS_Open(const char *Path, Uint Mode) LEAVE_RET('i', -1); } } - + LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Mode)); } @@ -578,7 +582,7 @@ int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode) tVFS_Mount *mnt; tVFS_Node *node; - ENTER("iMount iInode xMode", Mount, Inode, Mode); + ENTER("iMount XInode xMode", Mount, Inode, Mode); // Get mount point mnt = VFS_GetMountByIdent(Mount); @@ -590,6 +594,7 @@ int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode) // Does the filesystem support this? if( !mnt->Filesystem->GetNodeFromINode ) { + LOG("Filesystem does not support inode accesses"); errno = ENOENT; LEAVE_RET('i', -1); } @@ -597,6 +602,7 @@ int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode) // Get node node = mnt->Filesystem->GetNodeFromINode(mnt->RootNode, Inode); if( !node ) { + LOG("Unable to find inode"); errno = ENOENT; LEAVE_RET('i', -1); } @@ -645,14 +651,14 @@ int VFS_ChDir(const char *Dest) // Create Absolute buf = VFS_GetAbsPath(Dest); if(buf == NULL) { - Log("VFS_ChDir: Path expansion failed"); + Log_Notice("VFS", "VFS_ChDir: Path expansion failed"); return -1; } // Check if path exists fd = VFS_Open(buf, VFS_OPENFLAG_EXEC); if(fd == -1) { - Log("VFS_ChDir: Path is invalid"); + Log_Notice("VFS", "VFS_ChDir: Path is invalid"); return -1; }