X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=1536d1a0f2c21a6c5a02c3db7e1387c8a7b2222f;hb=a2495c6ea4f4cab16b5d339ae511428e92e89e73;hp=eebaa82d000d314f6461acf768de3b89ceeca085;hpb=9b4ce124f950e1bebbf4e011804e0b8ed8472f6a;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index eebaa82d..1536d1a0 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -1,49 +1,44 @@
 /*
- * AcessMicro VFS
+ * Acess2 VFS
  * - Open, Close and ChDir
  */
-#include <common.h>
+#define DEBUG	0
+#include <acess.h>
 #include "vfs.h"
 #include "vfs_int.h"
 #include "vfs_ext.h"
-
-#define DEBUG	0
-
-#if DEBUG
-#else
-# undef ENTER
-# undef LOG
-# undef LEAVE
-# define ENTER(...)
-# define LOG(...)
-# define LEAVE(...)
-#endif
+#include <threads.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	*gRootMount;
+extern tVFS_Mount	*gVFS_RootMount;
+extern int	VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
+extern tVFS_Node	*VFS_MemFile_Create(const char *Path);
 
-// === 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 ===
 /**
- * \fn char *VFS_GetAbsPath(char *Path)
+ * \fn char *VFS_GetAbsPath(const char *Path)
  * \brief Create an absolute path from a relative one
  */
-char *VFS_GetAbsPath(char *Path)
+char *VFS_GetAbsPath(const char *Path)
 {
 	char	*ret;
 	 int	pathLen = strlen(Path);
-	 int	read, write;
-	 int	pos, slashNum=0, baseLen;
-	Uint	slashOffsets[256];
-	char	*cwd = CFGPTR(CFG_VFS_CWD);
+	char	*pathComps[MAX_PATH_SLASHES];
+	char	*tmpStr;
+	int		iPos = 0;
+	int		iPos2 = 0;
+	const char	*chroot = *Threads_GetChroot();
+	 int	chrootLen;
+	const char	*cwd = *Threads_GetCWD();
 	 int	cwdLen;
 	
 	ENTER("sPath", Path);
@@ -52,7 +47,7 @@ char *VFS_GetAbsPath(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);
@@ -60,119 +55,163 @@ char *VFS_GetAbsPath(char *Path)
 		return ret;
 	}
 	
+	// - Fetch ChRoot
+	if( chroot == NULL )
+		chroot = "";
+	chrootLen = strlen(chroot);
+	
 	// 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);
-		baseLen = 1;
-	} else {
-		cwdLen = strlen(cwd);
+		strcpy(ret + chrootLen, Path);
+	}
+	else {
+		if(cwd == NULL) {
+			cwd = "/";
+			cwdLen = 1;
+		}
+		else {
+			cwdLen = strlen(cwd);
+		}
 		// Prepend the current directory
-		ret = malloc(cwdLen+pathLen+1);
-		strcpy(ret, cwd);
-		strcpy(&ret[cwdLen], Path);
-	
-		// Pre-fill the slash positions
-		pos = 0;
-		while( (pos = strpos( &ret[pos+1], '/' )) != -1 )
-			slashOffsets[slashNum++] = pos;
-			
-		baseLen = cwdLen;
+		ret = malloc(chrootLen + cwdLen + 1 + pathLen + 1 );
+		strcpy(ret+chrootLen, cwd);
+		ret[cwdLen] = '/';
+		strcpy(ret+chrootLen+cwdLen+1, Path);
+		//Log("ret = '%s'", ret);
 	}
 	
-	// Remove . and ..
-	read = write = baseLen;	// Cwd has already been parsed
-	for(; read < baseLen+pathLen; read = pos+1)
+	// Parse Path
+	pathComps[iPos++] = tmpStr = ret+chrootLen+1;
+	while(*tmpStr)
 	{
-		pos = strpos( &ret[read], '/' );
-		// If we are in the last section, force a break at the end of the itteration
-		if(pos == -1)	pos = baseLen+pathLen;
-		else	pos += read;	// Else, Adjust to absolute
-		
-		// Check Length
-		if(pos - read <= 2)
+		if(*tmpStr++ == '/')
 		{
-			// Current Dir "."
-			if(strncmp(&ret[read], ".", pos-read) == 0)	continue;
-			// Parent ".."
-			if(strncmp(&ret[read], "..", pos-read) == 0)
-			{
-				// If there is no higher, silently ignore
-				if(!slashNum)	continue;
-				// Reverse write pointer
-				write = slashOffsets[ slashNum-- ];
-				continue;
+			pathComps[iPos++] = tmpStr;
+			if(iPos == MAX_PATH_SLASHES) {
+				LOG("Path '%s' has too many elements", Path);
+				free(ret);
+				LEAVE('n');
+				return NULL;
 			}
 		}
-		
-		
-		// Only copy if the positions differ
-		if(read != write) {
-			memcpy( &ret[write], &ret[read], pos-read+1 );
+	}
+	pathComps[iPos] = NULL;
+	
+	// Cleanup
+	iPos2 = iPos = 0;
+	while(pathComps[iPos])
+	{
+		tmpStr = pathComps[iPos];
+		// Always Increment iPos
+		iPos++;
+		// ..
+		if(tmpStr[0] == '.' && tmpStr[1] == '.'	&& (tmpStr[2] == '/' || tmpStr[2] == '\0') )
+		{
+			if(iPos2 != 0)
+				iPos2 --;
+			continue;
 		}
-		write = pos+1;
-		if(slashNum < 256)
-			slashOffsets[ slashNum++ ] = pos;
-		else {
-			LOG("Path '%s' has too many elements", Path);
-			free(ret);
-			LEAVE('n');
-			return NULL;
+		// .
+		if(tmpStr[0] == '.' && (tmpStr[1] == '/' || tmpStr[1] == '\0') )
+		{
+			continue;
 		}
+		// Empty
+		if(tmpStr[0] == '/' || tmpStr[0] == '\0')
+		{
+			continue;
+		}
+		
+		// Set New Position
+		pathComps[iPos2] = tmpStr;
+		iPos2++;
 	}
+	pathComps[iPos2] = NULL;
+	
+	// Build New Path
+	iPos2 = chrootLen + 1;	iPos = 0;
+	ret[0] = '/';
+	while(pathComps[iPos])
+	{
+		tmpStr = pathComps[iPos];
+		while(*tmpStr && *tmpStr != '/')
+		{
+			ret[iPos2++] = *tmpStr;
+			tmpStr++;
+		}
+		ret[iPos2++] = '/';
+		iPos++;
+	}
+	if(iPos2 > 1)
+		ret[iPos2-1] = 0;
+	else
+		ret[iPos2] = 0;
+
+	// Prepend the chroot
+	if(chrootLen)
+		memcpy( ret, chroot, chrootLen );
 	
-	// `ret` should now be the absolute path
 	LEAVE('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(char *Path, char **TruePath)
+tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath, tVFS_Mount **MountPoint)
 {
-	tVFS_Mount	*mnt;
-	tVFS_Mount	*longestMount = gRootMount;	// 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);
 	
-	// Memory File
-	if(Path[0] == '$') {
+	// HACK: Memory File
+	if(Threads_GetUID() == 0 && Path[0] == '$') {
 		if(TruePath) {
 			*TruePath = malloc(strlen(Path)+1);
 			strcpy(*TruePath, Path);
 		}
-		curNode = gVFS_MemRoot.FindDir(&gVFS_MemRoot, Path);
+		curNode = VFS_MemFile_Create(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( gRootMount->MountPointLen+1 );
-			strcpy(*TruePath, gRootMount->MountPoint);
+			*TruePath = malloc( gVFS_RootMount->MountPointLen+1 );
+			strcpy(*TruePath, gVFS_RootMount->MountPoint);
 		}
-		LEAVE('p', gRootMount->RootNode);
-		return gRootMount->RootNode;
+		if(MountPoint)	*MountPoint = gVFS_RootMount;
+		LEAVE('p', gVFS_RootMount->RootNode);
+		return gVFS_RootMount->RootNode;
 	}
 	
 	// Check if there is anything mounted
-	if(!gMounts)	return NULL;
+	if(!gVFS_Mounts) {
+		Log_Error("VFS", "VFS_ParsePath - No filesystems mounted");
+		return NULL;
+	}
 	
 	// Find Mountpoint
-	for(mnt = gMounts;
-		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')
@@ -189,6 +228,8 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 				*TruePath = malloc( mnt->MountPointLen+1 );
 				strcpy(*TruePath, mnt->MountPoint);
 			}
+			if(MountPoint)
+				*MountPoint = mnt;
 			LEAVE('p', mnt->RootNode);
 			return mnt->RootNode;
 		}
@@ -198,12 +239,6 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 		longestMount = mnt;
 	}
 	
-	// Sanity Check
-	/*if(!longestMount) {
-		Log("VFS_GetTruePath - ERROR: No Root Node\n");
-		return NULL;
-	}*/
-	
 	// Save to shorter variable
 	mnt = longestMount;
 	
@@ -212,7 +247,8 @@ tVFS_Node *VFS_ParsePath(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;
 	}
@@ -221,54 +257,39 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 	curNode->ReferenceCount ++;	
 	// Parse Path
 	ofs = mnt->MountPointLen+1;
-	for(; (nextSlash = strpos(&Path[ofs], '/')) != -1; Path[nextSlash]='/',ofs = nextSlash + 1)
+	for(; (nextSlash = strpos(&Path[ofs], '/')) != -1; ofs += nextSlash + 1)
 	{
-		nextSlash += ofs;
-		Path[nextSlash] = '\0';
-	
-		// Check for empty string
-		if( Path[ofs] == '\0' )	continue;
+		char	pathEle[nextSlash+1];
+		
+		// Empty String
+		if(nextSlash == 0)	continue;
+		
+		memcpy(pathEle, &Path[ofs], nextSlash);
+		pathEle[nextSlash] = 0;
 	
 		// Check permissions on root of filesystem
 		if( !VFS_CheckACL(curNode, VFS_PERM_EXECUTE) ) {
-			curNode->Close( curNode );
-			if(TruePath) {
-				free(*TruePath);
-				*TruePath = NULL;
-			}
-			LEAVE('n');
-			return NULL;
+			//Log("Permissions fail on '%s'", Path);
+			goto _error;
 		}
 		
 		// Check if the node has a FindDir method
-		if(!curNode->FindDir) {
-			if(curNode->Close)	curNode->Close(curNode);
-			if(TruePath) {
-				free(*TruePath);
-				*TruePath = NULL;
-			}
-			Path[nextSlash] = '/';
-			LEAVE('n');
-			return NULL;
+		if( !curNode->Type->FindDir )
+		{
+			//Log("FindDir fail on '%s'", Path);
+			goto _error;
 		}
-		LOG("FindDir(%p, '%s')", curNode, &Path[ofs]);
+		LOG("FindDir{=%p}(%p, '%s')", curNode->Type->FindDir, curNode, pathEle);
 		// Get Child Node
-		tmpNode = curNode->FindDir(curNode, &Path[ofs]);
+		tmpNode = curNode->Type->FindDir(curNode, pathEle);
 		LOG("tmpNode = %p", tmpNode);
-		if(curNode->Close)
-			curNode->Close(curNode);
+		_CloseNode( curNode );
 		curNode = tmpNode;
 		
 		// Error Check
 		if(!curNode) {
-			LOG("Node '%s' not found in dir '%s'", &Path[ofs], Path);
-			if(TruePath) {
-				free(*TruePath);
-				*TruePath = NULL;
-			}
-			Path[nextSlash] = '/';
-			LEAVE('n');
-			return NULL;
+			LOG("Node '%s' not found in dir '%s'", pathEle, Path);
+			goto _error;
 		}
 		
 		// Handle Symbolic Links
@@ -277,74 +298,85 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 				free(*TruePath);
 				*TruePath = NULL;
 			}
-			tmp = malloc( curNode->Size + 1 );
-			curNode->Read( curNode, 0, curNode->Size, tmp );
-			tmp[ curNode->Size ] = '\0';
-			
-			// Parse Symlink Path
-			curNode = VFS_ParsePath(tmp, TruePath);
-			
-			// Error Check
-			if(!curNode) {
-				free(tmp);	// Free temp string
-				LEAVE('n');
-				return NULL;
+			if(!curNode->Type || !curNode->Type->Read) {
+				Log_Warning("VFS", "VFS_ParsePath - Read of symlink node %p'%s' is NULL",
+					curNode, Path);
+				goto _error;
 			}
 			
-			// Set Path Variable
-			if(TruePath) {
-				*TruePath = tmp;
-				retLength = strlen(tmp);
-			} else {
-				free(tmp);	// Free temp string
+			if(iNestedLinks > MAX_NESTED_LINKS) {
+				Log_Notice("VFS", "VFS_ParsePath - Nested link limit exceeded");
+				goto _error;
 			}
 			
-			continue;
+			// Parse Symlink Path
+			// - 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 ) {
+					Log_Warning("VFS", "VFS_ParsePath - Symlinked path too long");
+					goto _error;
+				}
+				curNode->Type->Read( curNode, 0, curNode->Size, path_buffer );
+				path_buffer[ curNode->Size ] = '\0';
+				LOG("path_buffer = '%s'", path_buffer);
+				strcat(path_buffer, Path + ofs+nextSlash);
+				
+				Path = path_buffer;
+//				Log_Debug("VFS", "VFS_ParsePath: Symlink translated to '%s'", Path);
+				iNestedLinks ++;
+			}
+
+			// EVIL: Goto :)
+			LOG("Symlink -> '%s', restart", Path);
+			goto restart_parse;
 		}
 		
 		// Handle Non-Directories
 		if( !(curNode->Flags & VFS_FFLAG_DIRECTORY) )
 		{
-			Warning("VFS_ParsePath - File in directory context");
-			if(TruePath)	free(*TruePath);
-			LEAVE('n');
-			return NULL;
+			Log_Warning("VFS", "VFS_ParsePath - Path segment is not a directory");
+			goto _error;
 		}
 		
 		// Check if path needs extending
 		if(!TruePath)	continue;
 		
 		// Increase buffer space
-		tmp = realloc( *TruePath, retLength + strlen(&Path[ofs]) + 1 + 1 );
+		tmp = realloc( *TruePath, retLength + strlen(pathEle) + 1 + 1 );
 		// Check if allocation succeeded
 		if(!tmp) {
-			Warning("VFS_ParsePath -  Unable to reallocate true path buffer");
-			free(*TruePath);
-			if(curNode->Close)	curNode->Close(curNode);
-			LEAVE('n');
-			return NULL;
+			Log_Warning("VFS", "VFS_ParsePath - Unable to reallocate true path buffer");
+			goto _error;
 		}
 		*TruePath = tmp;
 		// Append to path
 		(*TruePath)[retLength] = '/';
-		strcpy(*TruePath+retLength+1, &Path[ofs]);
+		strcpy(*TruePath+retLength+1, pathEle);
+		
+		LOG("*TruePath = '%s'", *TruePath);
+		
 		// - Extend Path
-		retLength += strlen(&Path[ofs])+1;
+		retLength += nextSlash + 1;
+	}
+
+	// Check final finddir call	
+	if( !curNode->Type || !curNode->Type->FindDir ) {
+		Log_Warning("VFS", "VFS_ParsePath - FindDir doesn't exist for element of '%s'", Path);
+		goto _error;
 	}
 	
 	// Get last node
-	LOG("VFS_ParsePath: FindDir(%p, '%s')", curNode, &Path[ofs]);
-	tmpNode = curNode->FindDir(curNode, &Path[ofs]);
+	LOG("FindDir(%p, '%s')", curNode, &Path[ofs]);
+	tmpNode = curNode->Type->FindDir(curNode, &Path[ofs]);
 	LOG("tmpNode = %p", tmpNode);
-	if(curNode->Close)	curNode->Close(curNode);
 	// Check if file was found
 	if(!tmpNode) {
 		LOG("Node '%s' not found in dir '%s'", &Path[ofs], Path);
-		if(TruePath)	free(*TruePath);
-		if(curNode->Close)	curNode->Close(curNode);
-		LEAVE('n');
-		return NULL;
+		goto _error;
 	}
+	_CloseNode( curNode );
 	
 	if(TruePath)
 	{
@@ -352,11 +384,8 @@ tVFS_Node *VFS_ParsePath(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");
-			free(*TruePath);
-			if(tmpNode->Close)	tmpNode->Close(curNode);
-			LEAVE('n');
-			return NULL;
+			Log_Warning("VFS", "VFS_ParsePath -  Unable to reallocate true path buffer");
+			goto _error;
 		}
 		*TruePath = tmp;
 		// Append to path
@@ -365,121 +394,211 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 		// - Extend Path
 		//retLength += strlen(tmpNode->Name) + 1;
 	}
+
+	if( MountPoint ) {
+		*MountPoint = mnt;
+	}
 	
 	LEAVE('p', tmpNode);
 	return tmpNode;
+
+_error:
+	_CloseNode( curNode );
+	
+	if(TruePath && *TruePath) {
+		free(*TruePath);
+		*TruePath = NULL;
+	}
+	LEAVE('n');
+	return NULL;
+}
+
+/**
+ * \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 xMode", 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) ) {
+		_CloseNode( 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(char *Path, Uint Mode)
+ * \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 Flags)
+{
+	return VFS_OpenEx(Path, Flags, 0);
+}
+
+int VFS_OpenEx(const char *Path, Uint Flags, Uint Mode)
 {
 	tVFS_Node	*node;
+	tVFS_Mount	*mnt;
 	char	*absPath;
-	 int	i;
 	
-	ENTER("sPath xMode", Path, Mode);
+	ENTER("sPath xFlags oMode", Path, Flags);
 	
 	// 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);
+	
+	// Create file if requested and it doesn't exist
+	if( !node && (Flags & VFS_OPENFLAG_CREATE) )
+	{
+		// TODO: Translate `Mode` into ACL and node flags
+		// Get parent, create node
+		VFS_MkNod(absPath, 0);
+		node = VFS_ParsePath(absPath, NULL, &mnt);
+	}
+	
 	// Free generated path
 	free(absPath);
 	
-	if(!node) {
+	// Check for error
+	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) )
+	if( !(Flags & VFS_OPENFLAG_NOLINK) && (node->Flags & VFS_FFLAG_SYMLINK) )
 	{
-		if( !node->Read ) {
-			Warning("No read method on symlink");
-			LEAVE('i', -1);
-			return -1;
+		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->Type || !node->Type->Read ) {
+			Log_Warning("VFS", "VFS_Open - No read method on symlink");
+			LEAVE_RET('i', -1);
+		}
+		// Read symlink's path
+		node->Type->Read( node, 0, node->Size, tmppath );
+		tmppath[ node->Size ] = '\0';
+		_CloseNode( node );
+		// 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);
 		}
-		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
 	}
+
+	LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Flags));
+}
+
+
+/**
+ * \brief Open a file from an open directory
+ */
+int VFS_OpenChild(int FD, const char *Name, Uint Mode)
+{
+	tVFS_Handle	*h;
+	tVFS_Node	*node;
 	
-	if(!node) {
-		LEAVE('i', -1);
-		return -1;
+	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);
+		errno = EINVAL;
+		LEAVE_RET('i', -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);
+	// Check for directory
+	if( !(h->Node->Flags & VFS_FFLAG_DIRECTORY) ) {
+		Log_Warning("VFS", "VFS_OpenChild - Passed handle is not a directory");
+		errno = ENOTDIR;
+		LEAVE_RET('i', -1);
+	}
+
+	// Sanity check
+	if( !h->Node->Type || !h->Node->Type->FindDir ) {
+		Log_Error("VFS", "VFS_OpenChild - Node does not have a type/is missing FindDir");
+		errno = ENOTDIR;
+		LEAVE_RET('i', -1);
+	}
 	
-	// Permissions Check
-	if( !VFS_CheckACL(node, i) ) {
-		node->Close( node );
-		LEAVE('i', -1);
-		return -1;
+	// Find Child
+	node = h->Node->Type->FindDir(h->Node, Name);
+	if(!node) {
+		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);
+	
+	// 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);
 	}
 	
-	LEAVE('i', -1);
-	return -1;
+	LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Mode));
 }
 
 /**
@@ -493,37 +612,43 @@ void VFS_Close(int FD)
 	// Get handle
 	h = VFS_GetHandle(FD);
 	if(h == NULL) {
-		Warning("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;
 	}
 	
-	if(h->Node->Close)
-		h->Node->Close( h->Node );
+	#if VALIDATE_VFS_FUNCTIPONS
+	if(h->Node->Close && !MM_GetPhysAddr(h->Node->Close)) {
+		Log_Warning("VFS", "Node %p's ->Close method is invalid (%p)",
+			h->Node, h->Node->Close);
+		return ;
+	}
+	#endif
+	
+	_CloseNode(h->Node);
 	
 	h->Node = NULL;
 }
 
 /**
- * \fn int VFS_ChDir(char *New)
  * \brief Change current working directory
  */
-int VFS_ChDir(char *New)
+int VFS_ChDir(const char *Dest)
 {
 	char	*buf;
 	 int	fd;
 	tVFS_Handle	*h;
 	
 	// Create Absolute
-	buf = VFS_GetAbsPath(New);
+	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;
 	}
 	
@@ -538,9 +663,13 @@ int VFS_ChDir(char *New)
 	// Close file
 	VFS_Close(fd);
 	
-	// Free working directory and set new one
-	free( CFGPTR(CFG_VFS_CWD) );
-	CFGPTR(CFG_VFS_CWD) = buf;
+	{
+		char	**cwdptr = Threads_GetCWD();
+		// Free old working directory
+		if( *cwdptr )	free( *cwdptr );
+		// Set new
+		*cwdptr = buf;
+	}
 	
 	Log("Updated CWD to '%s'", buf);
 	
@@ -548,24 +677,55 @@ int VFS_ChDir(char *New)
 }
 
 /**
- * \fn tVFS_Handle *VFS_GetHandle(int FD)
- * \brief Gets a pointer to the handle information structure
+ * \fn int VFS_ChRoot(char *New)
+ * \brief Change current root directory
  */
-tVFS_Handle *VFS_GetHandle(int FD)
+int VFS_ChRoot(const char *New)
 {
+	char	*buf;
+	 int	fd;
 	tVFS_Handle	*h;
 	
-	if(FD < 0)	return NULL;
+	if(New[0] == '/' && New[1] == '\0')
+		return 1;	// What a useless thing to ask!
 	
-	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 ];
+	// Create Absolute
+	buf = VFS_GetAbsPath(New);
+	if(buf == NULL) {
+		LOG("Path expansion failed");
+		return -1;
+	}
+	
+	// Check if path exists
+	fd = VFS_Open(buf, VFS_OPENFLAG_EXEC);
+	if(fd == -1) {
+		LOG("Path is invalid");
+		return -1;
+	}
+	
+	// Get node so we can check for directory
+	h = VFS_GetHandle(fd);
+	if( !(h->Node->Flags & VFS_FFLAG_DIRECTORY) ) {
+		LOG("Path is not a directory");
+		VFS_Close(fd);
+		return -1;
 	}
 	
-	if(h->Node == NULL)	return NULL;
-	return h;
+	// Close file
+	VFS_Close(fd);
+
+	// Update	
+	{
+		char	**chroot_ptr = Threads_GetChroot();
+		if( *chroot_ptr )	free( *chroot_ptr );
+		*chroot_ptr = buf;
+	}
+	
+	LOG("Updated Root to '%s'", buf);
+	
+	return 1;
 }
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);