X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=1845b7a43cc55ca97935b4e636f37921fefe756e;hb=6e41a8a3aa767cd5aeddbad393ce4f637a47a367;hp=118380fd340e4160babee9a2aaaf229e5db8d262;hpb=73e8ed89c011abce9b0ae2c5a3eb232bdbe8660e;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 118380fd..1845b7a4 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -1,26 +1,26 @@
 /*
- * AcessMicro VFS
+ * Acess2 VFS
  * - Open, Close and ChDir
  */
 #define DEBUG	0
 #include <acess.h>
-#include <mm_virt.h>
 #include "vfs.h"
 #include "vfs_int.h"
 #include "vfs_ext.h"
 
 // === CONSTANTS ===
 #define	OPEN_MOUNT_ROOT	1
-#define MAX_KERNEL_FILES	128
 #define MAX_PATH_SLASHES	256
+#define MAX_NESTED_LINKS	4
+#define MAX_PATH_LEN	255
 
 // === IMPORTS ===
 extern tVFS_Node	gVFS_MemRoot;
 extern tVFS_Mount	*gVFS_RootMount;
+extern int	VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
 
-// === GLOBALS ===
-tVFS_Handle	*gaUserHandles = (void*)MM_PPD_VFS;
-tVFS_Handle	*gaKernelHandles = (void*)MM_KERNEL_VFS;
+// === PROTOTYPES ===
+ int	VFS_int_CreateHandle( tVFS_Node *Node, tVFS_Mount *Mount, int Mode );
 
 // === CODE ===
 /**
@@ -35,9 +35,9 @@ char *VFS_GetAbsPath(const char *Path)
 	char	*tmpStr;
 	int		iPos = 0;
 	int		iPos2 = 0;
-	char	*chroot = CFGPTR(CFG_VFS_CHROOT);
+	const char	*chroot = CFGPTR(CFG_VFS_CHROOT);
 	 int	chrootLen;
-	char	*cwd = CFGPTR(CFG_VFS_CWD);
+	const char	*cwd = CFGPTR(CFG_VFS_CWD);
 	 int	cwdLen;
 	
 	ENTER("sPath", Path);
@@ -46,7 +46,7 @@ char *VFS_GetAbsPath(const char *Path)
 	if(Path[0] == '$') {
 		ret = malloc(strlen(Path)+1);
 		if(!ret) {
-			Warning("VFS_GetAbsPath - malloc() returned NULL");
+			Log_Warning("VFS", "VFS_GetAbsPath: malloc() returned NULL");
 			return NULL;
 		}
 		strcpy(ret, Path);
@@ -64,13 +64,14 @@ char *VFS_GetAbsPath(const char *Path)
 	
 	// Check if the path is already absolute
 	if(Path[0] == '/') {
-		ret = malloc(pathLen + 1);
+		ret = malloc(chrootLen + pathLen + 1);
 		if(!ret) {
-			Warning("VFS_GetAbsPath - malloc() returned NULL");
+			Log_Warning("VFS", "VFS_GetAbsPath: malloc() returned NULL");
 			return NULL;
 		}
-		strcpy(ret, Path);
-	} else {
+		strcpy(ret + chrootLen, Path);
+	}
+	else {
 		if(cwd == NULL) {
 			cwd = "/";
 			cwdLen = 1;
@@ -79,15 +80,15 @@ char *VFS_GetAbsPath(const char *Path)
 			cwdLen = strlen(cwd);
 		}
 		// Prepend the current directory
-		ret = malloc( cwdLen + 1 + pathLen + 1 );
-		strcpy(ret, cwd);
+		ret = malloc(chrootLen + cwdLen + 1 + pathLen + 1 );
+		strcpy(ret+chrootLen, cwd);
 		ret[cwdLen] = '/';
-		strcpy(&ret[cwdLen+1], Path);
-		//Log("ret = '%s'\n", ret);
+		strcpy(ret+chrootLen+cwdLen+1, Path);
+		//Log("ret = '%s'", ret);
 	}
 	
 	// Parse Path
-	pathComps[iPos++] = tmpStr = ret+1;
+	pathComps[iPos++] = tmpStr = ret+chrootLen+1;
 	while(*tmpStr)
 	{
 		if(*tmpStr++ == '/')
@@ -135,7 +136,7 @@ char *VFS_GetAbsPath(const char *Path)
 	pathComps[iPos2] = NULL;
 	
 	// Build New Path
-	iPos2 = 1;	iPos = 0;
+	iPos2 = chrootLen + 1;	iPos = 0;
 	ret[0] = '/';
 	while(pathComps[iPos])
 	{
@@ -152,32 +153,28 @@ char *VFS_GetAbsPath(const char *Path)
 		ret[iPos2-1] = 0;
 	else
 		ret[iPos2] = 0;
-	
-	
+
 	// Prepend the chroot
-	tmpStr = malloc(chrootLen + strlen(ret) + 1);
-	strcpy( tmpStr, chroot );
-	strcpy( tmpStr+chrootLen, ret );
-	free(ret);
-	ret = tmpStr;
+	memcpy( ret, chroot, chrootLen );
 	
 	LEAVE('s', ret);
-	//Log("VFS_GetAbsPath: RETURN '%s'", ret);
+//	Log_Debug("VFS", "VFS_GetAbsPath: RETURN '%s'", ret);
 	return ret;
 }
 
 /**
- * \fn char *VFS_ParsePath(char *Path, char **TruePath)
+ * \fn char *VFS_ParsePath(const char *Path, char **TruePath)
  * \brief Parses a path, resolving sysmlinks and applying permissions
  */
-tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
+tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath, tVFS_Mount **MountPoint)
 {
-	tVFS_Mount	*mnt;
-	tVFS_Mount	*longestMount = gVFS_RootMount;	// Root is first
+	tVFS_Mount	*mnt, *longestMount;
 	 int	cmp, retLength = 0;
 	 int	ofs, nextSlash;
+	 int	iNestedLinks = 0;
 	tVFS_Node	*curNode, *tmpNode;
 	char	*tmp;
+	char	path_buffer[MAX_PATH_LEN+1];
 	
 	ENTER("sPath pTruePath", Path, TruePath);
 	
@@ -188,30 +185,34 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 			strcpy(*TruePath, Path);
 		}
 		curNode = gVFS_MemRoot.FindDir(&gVFS_MemRoot, Path);
+		if(MountPoint) {
+			*MountPoint = NULL;
+		}
 		LEAVE('p', curNode);
 		return curNode;
 	}
-	
+
+restart_parse:	
 	// For root we always fast return
 	if(Path[0] == '/' && Path[1] == '\0') {
 		if(TruePath) {
 			*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;
 	}
 	
-	// Check if there is an`ything mounted
+	// Check if there is anything mounted
 	if(!gVFS_Mounts) {
-		Warning("WTF! There's nothing mounted?");
+		Log_Error("VFS", "VFS_ParsePath - No filesystems mounted");
 		return NULL;
 	}
 	
 	// Find Mountpoint
-	for(mnt = gVFS_Mounts;
-		mnt;
-		mnt = mnt->Next)
+	longestMount = gVFS_RootMount;
+	for(mnt = gVFS_Mounts; mnt; mnt = mnt->Next)
 	{
 		// Quick Check
 		if( Path[mnt->MountPointLen] != '/' && Path[mnt->MountPointLen] != '\0')
@@ -228,6 +229,8 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 				*TruePath = malloc( mnt->MountPointLen+1 );
 				strcpy(*TruePath, mnt->MountPoint);
 			}
+			if(MountPoint)
+				*MountPoint = mnt;
 			LEAVE('p', mnt->RootNode);
 			return mnt->RootNode;
 		}
@@ -237,12 +240,6 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 		longestMount = mnt;
 	}
 	
-	// Sanity Check
-	/*if(!longestMount) {
-		Log("VFS_ParsePath - ERROR: No Root Node\n");
-		return NULL;
-	}*/
-	
 	// Save to shorter variable
 	mnt = longestMount;
 	
@@ -251,7 +248,8 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 	// Initialise String
 	if(TruePath)
 	{
-		*TruePath = malloc( mnt->MountPointLen+1 );
+		// Assumes that the resultant path (here) will not be > strlen(Path) + 1
+		*TruePath = malloc( strlen(Path) + 1 );
 		strcpy(*TruePath, mnt->MountPoint);
 		retLength = mnt->MountPointLen;
 	}
@@ -294,11 +292,14 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 			LEAVE('n');
 			return NULL;
 		}
-		LOG("FindDir(%p, '%s')", curNode, pathEle);
+		LOG("FindDir{=%p}(%p, '%s')", curNode->FindDir, curNode, pathEle);
 		// Get Child Node
 		tmpNode = curNode->FindDir(curNode, pathEle);
 		LOG("tmpNode = %p", tmpNode);
-		if(curNode->Close)	curNode->Close(curNode);
+		if(curNode->Close) {
+			//LOG2("curNode->Close = %p", curNode->Close);
+			curNode->Close(curNode);
+		}
 		curNode = tmpNode;
 		
 		// Error Check
@@ -320,53 +321,48 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 				*TruePath = NULL;
 			}
 			if(!curNode->Read) {
-				Warning("VFS_ParsePath - Read of node %p is NULL (%s)",
+				Log_Warning("VFS", "VFS_ParsePath - Read of symlink node %p'%s' is NULL",
 					curNode, Path);
 				if(curNode->Close)	curNode->Close(curNode);
-				// No need to free *TruePath, see above
+				// No need to free *TruePath, it should already be NULL
 				LEAVE('n');
 				return NULL;
 			}
 			
-			tmp = malloc( curNode->Size + 1 );
-			if(!tmp) {
-				Log_Warning("VFS", "VFS_ParsePath - Malloc failure");
-				// No need to free *TruePath, see above
+			if(iNestedLinks > MAX_NESTED_LINKS) {
+				if(curNode->Close)	curNode->Close(curNode);
 				LEAVE('n');
 				return NULL;
 			}
-			curNode->Read( curNode, 0, curNode->Size, tmp );
-			tmp[ curNode->Size ] = '\0';
 			
 			// Parse Symlink Path
-			curNode = VFS_ParsePath(tmp, TruePath);
-			if(TruePath)
-				LOG("VFS", "*TruePath='%s'", *TruePath);
-			
-			// Error Check
-			if(!curNode) {
-				Log_Debug("VFS", "Symlink fail '%s'", tmp);
-				free(tmp);	// Free temp string
-				if(TruePath)	free(TruePath);
-				LEAVE('n');
-				return NULL;
+			// - Just update the path variable and restart the function
+			// > Count nested symlinks and limit to some value (counteracts loops)
+			{
+				 int	remlen = strlen(Path) - (ofs + nextSlash);
+				if( curNode->Size + remlen > MAX_PATH_LEN ) {
+					if(curNode->Close)	curNode->Close(curNode);
+					Log_Warning("VFS", "VFS_ParsePath - Symlinked path too long");
+					LEAVE('n');
+					return NULL;
+				}
+				curNode->Read( curNode, 0, curNode->Size, path_buffer );
+				path_buffer[ curNode->Size ] = '\0';
+				strcat(path_buffer, Path + ofs+nextSlash);
+				
+				Path = path_buffer;
+//				Log_Debug("VFS", "VFS_ParsePath: Symlink translated to '%s'", Path);
+				iNestedLinks ++;
 			}
-			
-			// Free temp link
-			free(tmp);
-			
-			// Set Path Variable
-			if(TruePath) {
-				retLength = strlen(*TruePath);
-			}
-			
-			continue;
+
+			// EVIL: Goto :)
+			goto restart_parse;
 		}
 		
 		// Handle Non-Directories
 		if( !(curNode->Flags & VFS_FFLAG_DIRECTORY) )
 		{
-			Warning("VFS_ParsePath - File in directory context");
+			Log_Warning("VFS", "VFS_ParsePath - Path segment is not a directory");
 			if(TruePath)	free(*TruePath);
 			LEAVE('n');
 			return NULL;
@@ -379,7 +375,7 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 		tmp = realloc( *TruePath, retLength + strlen(pathEle) + 1 + 1 );
 		// Check if allocation succeeded
 		if(!tmp) {
-			Warning("VFS_ParsePath -  Unable to reallocate true path buffer");
+			Log_Warning("VFS", "VFS_ParsePath - Unable to reallocate true path buffer");
 			free(*TruePath);
 			*TruePath = NULL;
 			if(curNode->Close)	curNode->Close(curNode);
@@ -391,14 +387,25 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 		(*TruePath)[retLength] = '/';
 		strcpy(*TruePath+retLength+1, pathEle);
 		
-		LOG("*TruePath = '%s'\n", *TruePath);
+		LOG("*TruePath = '%s'", *TruePath);
 		
 		// - Extend Path
 		retLength += nextSlash + 1;
 	}
 	
+	if( !curNode->FindDir ) {
+		if(curNode->Close)	curNode->Close(curNode);
+		if(TruePath) {
+			free(*TruePath);
+			*TruePath = NULL;
+		}
+		Log_Warning("VFS", "VFS_ParsePath - FindDir doesn't exist for element of '%s'", Path);
+		LEAVE('n');
+		return NULL;
+	}
+	
 	// Get last node
-	LOG("VFS_ParsePath: FindDir(%p, '%s')", curNode, &Path[ofs]);
+	LOG("FindDir(%p, '%s')", curNode, &Path[ofs]);
 	tmpNode = curNode->FindDir(curNode, &Path[ofs]);
 	LOG("tmpNode = %p", tmpNode);
 	if(curNode->Close)	curNode->Close(curNode);
@@ -418,7 +425,7 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 		tmp = realloc(*TruePath, retLength + strlen(&Path[ofs]) + 1 + 1);
 		// Check if allocation succeeded
 		if(!tmp) {
-			Warning("VFS_ParsePath -  Unable to reallocate true path buffer");
+			Log_Warning("VFS", "VFS_ParsePath -  Unable to reallocate true path buffer");
 			free(*TruePath);
 			if(tmpNode->Close)	tmpNode->Close(curNode);
 			LEAVE('n');
@@ -431,225 +438,176 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 		// - Extend Path
 		//retLength += strlen(tmpNode->Name) + 1;
 	}
+
+	if( MountPoint ) {
+		*MountPoint = mnt;
+	}
 	
 	LEAVE('p', tmpNode);
 	return tmpNode;
 }
 
 /**
- * \fn int VFS_Open(char *Path, Uint Mode)
+ * \brief Create and return a handle number for the given node and mode
+ */
+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;
+	i |= (Mode & VFS_OPENFLAG_WRITE) ? VFS_PERM_WRITE : 0;
+	
+	LOG("i = 0b%b", i);
+	
+	// Permissions Check
+	if( !VFS_CheckACL(Node, i) ) {
+		if(Node->Close)	Node->Close( Node );
+		Log_Log("VFS", "VFS_int_CreateHandle: Permissions Failed");
+		errno = EACCES;
+		LEAVE_RET('i', -1);
+	}
+	
+	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), Node, Mode );
+	if( i < 0 ) {
+		Log_Notice("VFS", "VFS_int_CreateHandle: Out of handles");
+		errno = ENFILE;
+		LEAVE_RET('i', -1);
+	}
+
+	VFS_GetHandle(i)->Mount = Mount;
+
+	LEAVE_RET('x', i);
+}
+
+/**
+ * \fn int VFS_Open(const char *Path, Uint Mode)
  * \brief Open a file
  */
-int VFS_Open(char *Path, Uint Mode)
+int VFS_Open(const char *Path, Uint Mode)
 {
 	tVFS_Node	*node;
+	tVFS_Mount	*mnt;
 	char	*absPath;
-	 int	i;
 	
 	ENTER("sPath xMode", Path, Mode);
 	
 	// Get absolute path
 	absPath = VFS_GetAbsPath(Path);
+	if(absPath == NULL) {
+		Log_Warning("VFS", "VFS_Open: Path expansion failed '%s'", Path);
+		LEAVE_RET('i', -1);
+	}
 	LOG("absPath = \"%s\"", absPath);
 	// Parse path and get mount point
-	node = VFS_ParsePath(absPath, NULL);
+	node = VFS_ParsePath(absPath, NULL, &mnt);
 	// Free generated path
 	free(absPath);
 	
 	if(!node) {
 		LOG("Cannot find node");
-		LEAVE('i', -1);
-		return -1;
+		errno = ENOENT;
+		LEAVE_RET('i', -1);
 	}
 	
 	// Check for symlinks
 	if( !(Mode & VFS_OPENFLAG_NOLINK) && (node->Flags & VFS_FFLAG_SYMLINK) )
 	{
+		char	tmppath[node->Size+1];
+		if( node->Size > MAX_PATH_LEN ) {
+			Log_Warning("VFS", "VFS_Open - Symlink is too long (%i)", node->Size);
+			LEAVE_RET('i', -1);
+		}
 		if( !node->Read ) {
-			Warning("No read method on symlink");
-			LEAVE('i', -1);
-			return -1;
+			Log_Warning("VFS", "VFS_Open - No read method on symlink");
+			LEAVE_RET('i', -1);
 		}
-		absPath = malloc(node->Size+1);	// Allocate Buffer
-		node->Read( node, 0, node->Size, absPath );	// Read Path
-		
-		absPath[ node->Size ] = '\0';	// End String
-		if(node->Close)	node->Close( node );	// Close old node
-		node = VFS_ParsePath(absPath, NULL);	// Get new node
-		free( absPath );	// Free allocated path
-	}
-	
-	if(!node) {
-		LOG("Cannot find node");
-		LEAVE('i', -1);
-		return -1;
-	}
-	
-	i = 0;
-	i |= (Mode & VFS_OPENFLAG_EXEC) ? VFS_PERM_EXECUTE : 0;
-	i |= (Mode & VFS_OPENFLAG_READ) ? VFS_PERM_READ : 0;
-	i |= (Mode & VFS_OPENFLAG_WRITE) ? VFS_PERM_WRITE : 0;
-	
-	LOG("i = 0b%b", i);
-	
-	// Permissions Check
-	if( !VFS_CheckACL(node, i) ) {
+		// Read symlink's path
+		node->Read( node, 0, node->Size, tmppath );
+		tmppath[ node->Size ] = '\0';
 		if(node->Close)	node->Close( node );
-		Log("VFS_Open: Permissions Failed");
-		LEAVE('i', -1);
-		return -1;
-	}
-	
-	// Check for a user open
-	if(Mode & VFS_OPENFLAG_USER)
-	{
-		// Allocate Buffer
-		if( MM_GetPhysAddr( (Uint)gaUserHandles ) == 0 )
-		{
-			Uint	addr, size;
-			size = CFGINT(CFG_VFS_MAXFILES) * sizeof(tVFS_Handle);
-			for(addr = 0; addr < size; addr += 0x1000)
-				MM_Allocate( (Uint)gaUserHandles + addr );
-			memset( gaUserHandles, 0, size );
-		}
-		// Get a handle
-		for(i=0;i<CFGINT(CFG_VFS_MAXFILES);i++)
-		{
-			if(gaUserHandles[i].Node)	continue;
-			gaUserHandles[i].Node = node;
-			gaUserHandles[i].Position = 0;
-			gaUserHandles[i].Mode = Mode;
-			LEAVE('i', i);
-			return i;
+		// Open the target
+		node = VFS_ParsePath(tmppath, NULL, &mnt);
+		if(!node) {
+			LOG("Cannot find symlink target node (%s)", tmppath);
+			errno = ENOENT;
+			LEAVE_RET('i', -1);
 		}
 	}
-	else
-	{
-		// Allocate space if not already
-		if( MM_GetPhysAddr( (Uint)gaKernelHandles ) == 0 )
-		{
-			Uint	addr, size;
-			size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
-			for(addr = 0; addr < size; addr += 0x1000)
-				MM_Allocate( (Uint)gaKernelHandles + addr );
-			memset( gaKernelHandles, 0, size );
-		}
-		// Get a handle
-		for(i=0;i<MAX_KERNEL_FILES;i++)
-		{
-			if(gaKernelHandles[i].Node)	continue;
-			gaKernelHandles[i].Node = node;
-			gaKernelHandles[i].Position = 0;
-			gaKernelHandles[i].Mode = Mode;
-			LEAVE('x', i|VFS_KERNEL_FLAG);
-			return i|VFS_KERNEL_FLAG;
-		}
-	}
-	
-	Log("VFS_Open: Out of handles");
-	LEAVE('i', -1);
-	return -1;
+
+	LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Mode));
 }
 
 
 /**
  * \brief Open a file from an open directory
  */
-int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode)
+int VFS_OpenChild(int FD, const char *Name, Uint Mode)
 {
 	tVFS_Handle	*h;
 	tVFS_Node	*node;
-	 int	i;
 	
+	ENTER("xFD sName xMode", FD, Name, Mode);
+
 	// Get handle
 	h = VFS_GetHandle(FD);
 	if(h == NULL) {
 		Log_Warning("VFS", "VFS_OpenChild - Invalid file handle 0x%x", FD);
-		if(Errno)	*Errno = EINVAL;
-		LEAVE('i', -1);
-		return -1;
+		errno = EINVAL;
+		LEAVE_RET('i', -1);
 	}
 	
 	// Check for directory
 	if( !(h->Node->Flags & VFS_FFLAG_DIRECTORY) ) {
 		Log_Warning("VFS", "VFS_OpenChild - Passed handle is not a directory", FD);
-		if(Errno)	*Errno = ENOTDIR;
-		LEAVE('i', -1);
-		return -1;
+		errno = ENOTDIR;
+		LEAVE_RET('i', -1);
 	}
 	
 	// Find Child
 	node = h->Node->FindDir(h->Node, Name);
 	if(!node) {
-		if(Errno)	*Errno = ENOENT;
-		LEAVE('i', -1);
-		return -1;
+		errno = ENOENT;
+		LEAVE_RET('i', -1);
 	}
+
+	LEAVE_RET('x', VFS_int_CreateHandle(node, h->Mount, Mode));
+}
+
+int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode)
+{
+	tVFS_Mount	*mnt;
+	tVFS_Node	*node;
+
+	ENTER("iMount XInode xMode", Mount, Inode, Mode);
 	
-	i = 0;
-	i |= (Mode & VFS_OPENFLAG_EXEC) ? VFS_PERM_EXECUTE : 0;
-	i |= (Mode & VFS_OPENFLAG_READ) ? VFS_PERM_READ : 0;
-	i |= (Mode & VFS_OPENFLAG_WRITE) ? VFS_PERM_WRITE : 0;
-	
-	// Permissions Check
-	if( !VFS_CheckACL(node, i) ) {
-		if(node->Close)	node->Close( node );
-		Log_Notice("VFS", "VFS_OpenChild - Permissions Failed");
-		if(Errno)	*Errno = EACCES;
-		LEAVE('i', -1);
-		return -1;
+	// Get mount point
+	mnt = VFS_GetMountByIdent(Mount);
+	if( !mnt ) {
+		LOG("Mount point ident invalid");
+		errno = ENOENT;
+		LEAVE_RET('i', -1);
 	}
 	
-	// Check for a user open
-	if(Mode & VFS_OPENFLAG_USER)
-	{
-		// Allocate Buffer
-		if( MM_GetPhysAddr( (Uint)gaUserHandles ) == 0 )
-		{
-			Uint	addr, size;
-			size = CFGINT(CFG_VFS_MAXFILES) * sizeof(tVFS_Handle);
-			for(addr = 0; addr < size; addr += 0x1000)
-				MM_Allocate( (Uint)gaUserHandles + addr );
-			memset( gaUserHandles, 0, size );
-		}
-		// Get a handle
-		for(i=0;i<CFGINT(CFG_VFS_MAXFILES);i++)
-		{
-			if(gaUserHandles[i].Node)	continue;
-			gaUserHandles[i].Node = node;
-			gaUserHandles[i].Position = 0;
-			gaUserHandles[i].Mode = Mode;
-			LEAVE('i', i);
-			return i;
-		}
+	// Does the filesystem support this?
+	if( !mnt->Filesystem->GetNodeFromINode ) {
+		LOG("Filesystem does not support inode accesses");
+		errno = ENOENT;
+		LEAVE_RET('i', -1);
 	}
-	else
-	{
-		// Allocate space if not already
-		if( MM_GetPhysAddr( (Uint)gaKernelHandles ) == 0 )
-		{
-			Uint	addr, size;
-			size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
-			for(addr = 0; addr < size; addr += 0x1000)
-				MM_Allocate( (Uint)gaKernelHandles + addr );
-			memset( gaKernelHandles, 0, size );
-		}
-		// Get a handle
-		for(i=0;i<MAX_KERNEL_FILES;i++)
-		{
-			if(gaKernelHandles[i].Node)	continue;
-			gaKernelHandles[i].Node = node;
-			gaKernelHandles[i].Position = 0;
-			gaKernelHandles[i].Mode = Mode;
-			LEAVE('x', i|VFS_KERNEL_FLAG);
-			return i|VFS_KERNEL_FLAG;
-		}
+
+	// Get node
+	node = mnt->Filesystem->GetNodeFromINode(mnt->RootNode, Inode);
+	if( !node ) {
+		LOG("Unable to find inode");
+		errno = ENOENT;
+		LEAVE_RET('i', -1);
 	}
 	
-	Log_Error("VFS", "VFS_OpenChild - Out of handles");
-	if(Errno)	*Errno = ENFILE;
-	LEAVE('i', -1);
-	return -1;
+	LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Mode));
 }
 
 /**
@@ -663,7 +621,7 @@ void VFS_Close(int FD)
 	// Get handle
 	h = VFS_GetHandle(FD);
 	if(h == NULL) {
-		Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x\n", FD);
+		Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x", FD);
 		return;
 	}
 	
@@ -684,7 +642,7 @@ void VFS_Close(int FD)
 /**
  * \brief Change current working directory
  */
-int VFS_ChDir(char *Dest)
+int VFS_ChDir(const char *Dest)
 {
 	char	*buf;
 	 int	fd;
@@ -693,14 +651,14 @@ int VFS_ChDir(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;
 	}
 	
@@ -730,7 +688,7 @@ int VFS_ChDir(char *Dest)
  * \fn int VFS_ChRoot(char *New)
  * \brief Change current root directory
  */
-int VFS_ChRoot(char *New)
+int VFS_ChRoot(const char *New)
 {
 	char	*buf;
 	 int	fd;
@@ -775,32 +733,6 @@ int VFS_ChRoot(char *New)
 	return 1;
 }
 
-/**
- * \fn tVFS_Handle *VFS_GetHandle(int FD)
- * \brief Gets a pointer to the handle information structure
- */
-tVFS_Handle *VFS_GetHandle(int FD)
-{
-	tVFS_Handle	*h;
-	
-	//Log_Debug("VFS", "VFS_GetHandle: (FD=0x%x)", FD);
-	
-	if(FD < 0)	return NULL;
-	
-	if(FD & VFS_KERNEL_FLAG) {
-		FD &= (VFS_KERNEL_FLAG - 1);
-		if(FD >= MAX_KERNEL_FILES)	return NULL;
-		h = &gaKernelHandles[ FD ];
-	} else {
-		if(FD >= CFGINT(CFG_VFS_MAXFILES))	return NULL;
-		h = &gaUserHandles[ FD ];
-	}
-	
-	if(h->Node == NULL)	return NULL;
-	//Log_Debug("VFS", "VFS_GetHandle: RETURN %p", h);
-	return h;
-}
-
 // === EXPORTS ===
 EXPORT(VFS_Open);
 EXPORT(VFS_Close);