X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=5d1d9fa7cd114af74644ef1e1ccbd50b2a955894;hb=4d498b090274b87befa5652589e0aa54b2b6fe0a;hp=1c00a1feebd32387c99a3a52a093d08f7bf7d702;hpb=4d4fd4c5070735f93183f5a703f8ec488900cd8d;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 1c00a1fe..5d1d9fa7 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -1,39 +1,38 @@
 /*
- * AcessMicro VFS
+ * Acess2 VFS
  * - Open, Close and ChDir
  */
 #define DEBUG	0
-#include <common.h>
+#include <acess.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
 
 // === IMPORTS ===
 extern tVFS_Node	gVFS_MemRoot;
-extern tVFS_Mount	*gRootMount;
-
-// === GLOBALS ===
-tVFS_Handle	*gaUserHandles = (void*)MM_PPD_VFS;
-tVFS_Handle	*gaKernelHandles = (void*)MM_KERNEL_VFS;
+extern tVFS_Mount	*gVFS_RootMount;
+extern int	VFS_AllocHandle(int bIsUser, tVFS_Node *Node, 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[MAX_PATH_SLASHES];
-	char	*cwd = CFGPTR(CFG_VFS_CWD);
+	char	*pathComps[MAX_PATH_SLASHES];
+	char	*tmpStr;
+	int		iPos = 0;
+	int		iPos2 = 0;
+	const char	*chroot = CFGPTR(CFG_VFS_CHROOT);
+	 int	chrootLen;
+	const char	*cwd = CFGPTR(CFG_VFS_CWD);
 	 int	cwdLen;
 	
 	ENTER("sPath", Path);
@@ -42,7 +41,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);
@@ -50,92 +49,126 @@ char *VFS_GetAbsPath(char *Path)
 		return ret;
 	}
 	
+	// - Fetch ChRoot
+	if( chroot == NULL ) {
+		chroot = "";
+		chrootLen = 0;
+	} else {
+		chrootLen = strlen(chroot);
+	}
+	
 	// Check if the path is already absolute
 	if(Path[0] == '/') {
 		ret = malloc(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);
+		if(cwd == NULL) {
+			cwd = "/";
+			cwdLen = 1;
+		}
+		else {
+			cwdLen = strlen(cwd);
+		}
 		// Prepend the current directory
-		ret = malloc(cwdLen+pathLen+2);
+		ret = malloc( cwdLen + 1 + pathLen + 1 );
 		strcpy(ret, cwd);
 		ret[cwdLen] = '/';
 		strcpy(&ret[cwdLen+1], Path);
+		//Log("ret = '%s'", ret);
+	}
 	
-		// Pre-fill the slash positions
-		read = 1;	slashNum = 0;
-		while( (pos = strpos( &ret[read], '/' )) != -1 && slashNum < MAX_PATH_SLASHES )
+	// Parse Path
+	pathComps[iPos++] = tmpStr = ret+1;
+	while(*tmpStr)
+	{
+		if(*tmpStr++ == '/')
 		{
-			read += pos+1;
-			slashOffsets[slashNum++] = pos;
+			pathComps[iPos++] = tmpStr;
+			if(iPos == MAX_PATH_SLASHES) {
+				LOG("Path '%s' has too many elements", Path);
+				free(ret);
+				LEAVE('n');
+				return NULL;
+			}
 		}
-			
-		baseLen = cwdLen+1;
 	}
+	pathComps[iPos] = NULL;
 	
-	// Remove . and ..
-	read = write = baseLen;	// Cwd has already been parsed
-	for(; read < baseLen+pathLen; read = pos+1)
+	// Cleanup
+	iPos2 = iPos = 0;
+	while(pathComps[iPos])
 	{
-		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
-		
-		Log("pos-read = %i", pos-read);
-		
-		// Check Length
-		if(pos - read <= 2)
+		tmpStr = pathComps[iPos];
+		// Always Increment iPos
+		iPos++;
+		// ..
+		if(tmpStr[0] == '.' && tmpStr[1] == '.'	&& (tmpStr[2] == '/' || tmpStr[2] == '\0') )
 		{
-			Log("&ret[read] = '%s'", &ret[read]);
-			// 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;
-			}
+			if(iPos2 != 0)
+				iPos2 --;
+			continue;
 		}
-		
-		
-		// Only copy if the positions differ
-		if(read != write) {
-			memcpy( &ret[write], &ret[read], pos-read+1 );
+		// .
+		if(tmpStr[0] == '.' && (tmpStr[1] == '/' || tmpStr[1] == '\0') )
+		{
+			continue;
 		}
-		write = pos+1;
-		if(slashNum < MAX_PATH_SLASHES)
-			slashOffsets[ slashNum++ ] = pos;
-		else {
-			LOG("Path '%s' has too many elements", Path);
-			free(ret);
-			LEAVE('n');
-			return NULL;
+		// Empty
+		if(tmpStr[0] == '/' || tmpStr[0] == '\0')
+		{
+			continue;
 		}
+		
+		// Set New Position
+		pathComps[iPos2] = tmpStr;
+		iPos2++;
 	}
+	pathComps[iPos2] = NULL;
+	
+	// Build New Path
+	iPos2 = 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
+	tmpStr = malloc(chrootLen + strlen(ret) + 1);
+	strcpy( tmpStr, chroot );
+	strcpy( tmpStr+chrootLen, ret );
+	free(ret);
+	ret = tmpStr;
 	
-	// `ret` should now be the absolute path
 	LEAVE('s', ret);
-	Log("VFS_GetAbsPath: RETURN '%s'", ret);
+	//Log("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	*mnt;
-	tVFS_Mount	*longestMount = gRootMount;	// Root is first
+	tVFS_Mount	*longestMount = gVFS_RootMount;	// Root is first
 	 int	cmp, retLength = 0;
 	 int	ofs, nextSlash;
 	tVFS_Node	*curNode, *tmpNode;
@@ -153,22 +186,25 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 		LEAVE('p', curNode);
 		return curNode;
 	}
-	// For root we always fast return
 	
+	// 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;
+		LEAVE('p', gVFS_RootMount->RootNode);
+		return gVFS_RootMount->RootNode;
 	}
 	
-	// Check if there is anything mounted
-	if(!gMounts)	return NULL;
+	// Check if there is an`ything mounted
+	if(!gVFS_Mounts) {
+		Warning("WTF! There's nothing mounted?");
+		return NULL;
+	}
 	
 	// Find Mountpoint
-	for(mnt = gMounts;
+	for(mnt = gVFS_Mounts;
 		mnt;
 		mnt = mnt->Next)
 	{
@@ -196,12 +232,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;
 	
@@ -219,52 +249,58 @@ 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(curNode->Close)	curNode->Close( curNode );
 			if(TruePath) {
 				free(*TruePath);
 				*TruePath = NULL;
 			}
+			//Log("Permissions fail on '%s'", Path);
 			LEAVE('n');
 			return NULL;
 		}
 		
 		// Check if the node has a FindDir method
-		if(!curNode->FindDir) {
+		if( !curNode->FindDir )
+		{
 			if(curNode->Close)	curNode->Close(curNode);
 			if(TruePath) {
 				free(*TruePath);
 				*TruePath = NULL;
 			}
-			Path[nextSlash] = '/';
+			//Log("FindDir fail on '%s'", Path);
 			LEAVE('n');
 			return NULL;
 		}
-		LOG("FindDir(%p, '%s')", curNode, &Path[ofs]);
+		LOG("FindDir{=%p}(%p, '%s')", curNode->FindDir, curNode, pathEle);
 		// Get Child Node
-		tmpNode = curNode->FindDir(curNode, &Path[ofs]);
+		tmpNode = curNode->FindDir(curNode, pathEle);
 		LOG("tmpNode = %p", tmpNode);
-		if(curNode->Close)
+		if(curNode->Close) {
+			//LOG2("curNode->Close = %p", curNode->Close);
 			curNode->Close(curNode);
+		}
 		curNode = tmpNode;
 		
 		// Error Check
 		if(!curNode) {
-			LOG("Node '%s' not found in dir '%s'", &Path[ofs], Path);
+			LOG("Node '%s' not found in dir '%s'", pathEle, Path);
 			if(TruePath) {
 				free(*TruePath);
 				*TruePath = NULL;
 			}
-			Path[nextSlash] = '/';
+			//Log("Child fail on '%s' ('%s)", Path, pathEle);
 			LEAVE('n');
 			return NULL;
 		}
@@ -275,26 +311,45 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 				free(*TruePath);
 				*TruePath = NULL;
 			}
+			if(!curNode->Read) {
+				Warning("VFS_ParsePath - Read of node %p is NULL (%s)",
+					curNode, Path);
+				if(curNode->Close)	curNode->Close(curNode);
+				// No need to free *TruePath, see above
+				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
+				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;
 			}
 			
+			// Free temp link
+			free(tmp);
+			
 			// Set Path Variable
 			if(TruePath) {
-				*TruePath = tmp;
-				retLength = strlen(tmp);
-			} else {
-				free(tmp);	// Free temp string
+				retLength = strlen(*TruePath);
 			}
 			
 			continue;
@@ -313,11 +368,12 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 		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);
+			*TruePath = NULL;
 			if(curNode->Close)	curNode->Close(curNode);
 			LEAVE('n');
 			return NULL;
@@ -325,9 +381,23 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 		*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;
+	}
+	
+	if( !curNode->FindDir ) {
+		if(curNode->Close)	curNode->Close(curNode);
+		if(TruePath) {
+			free(*TruePath);
+			*TruePath = NULL;
+		}
+		Log("FindDir fail on '%s'", Path);
+		LEAVE('n');
+		return NULL;
 	}
 	
 	// Get last node
@@ -338,6 +408,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 	// Check if file was found
 	if(!tmpNode) {
 		LOG("Node '%s' not found in dir '%s'", &Path[ofs], Path);
+		//Log("Child fail '%s' ('%s')", Path, &Path[ofs]);
 		if(TruePath)	free(*TruePath);
 		if(curNode->Close)	curNode->Close(curNode);
 		LEAVE('n');
@@ -369,10 +440,10 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 }
 
 /**
- * \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 Mode)
 {
 	tVFS_Node	*node;
 	char	*absPath;
@@ -382,6 +453,10 @@ int VFS_Open(char *Path, Uint Mode)
 	
 	// Get absolute path
 	absPath = VFS_GetAbsPath(Path);
+	if(absPath == NULL) {
+		Log_Warning("VFS", "VFS_Open: Path expansion failed '%s'", Path);
+		return -1;
+	}
 	LOG("absPath = \"%s\"", absPath);
 	// Parse path and get mount point
 	node = VFS_ParsePath(absPath, NULL);
@@ -412,6 +487,7 @@ int VFS_Open(char *Path, Uint Mode)
 	}
 	
 	if(!node) {
+		LOG("Cannot find node");
 		LEAVE('i', -1);
 		return -1;
 	}
@@ -425,57 +501,80 @@ int VFS_Open(char *Path, Uint Mode)
 	
 	// Permissions Check
 	if( !VFS_CheckACL(node, i) ) {
-		node->Close( node );
+		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;
-		}
+	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
+	if( i >= 0 ) {
+		LEAVE('x', i);
+		return i;
 	}
-	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;
+}
+
+
+/**
+ * \brief Open a file from an open directory
+ */
+int VFS_OpenChild(Uint *Errno, int FD, const char *Name, Uint Mode)
+{
+	tVFS_Handle	*h;
+	tVFS_Node	*node;
+	 int	i;
+	
+	// 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;
+	}
+	
+	// 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;
+	}
+	
+	// Find Child
+	node = h->Node->FindDir(h->Node, Name);
+	if(!node) {
+		if(Errno)	*Errno = ENOENT;
+		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;
+	
+	// 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;
+	}
+	
+	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
+	if( i >= 0 ) {
+		LEAVE('x', i);
+		return i;
 	}
 	
+	Log_Error("VFS", "VFS_OpenChild - Out of handles");
+	if(Errno)	*Errno = ENFILE;
 	LEAVE('i', -1);
 	return -1;
 }
@@ -491,10 +590,18 @@ 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 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
+	
 	if(h->Node->Close)
 		h->Node->Close( h->Node );
 	
@@ -502,17 +609,16 @@ void VFS_Close(int FD)
 }
 
 /**
- * \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");
 		return -1;
@@ -537,7 +643,8 @@ int VFS_ChDir(char *New)
 	VFS_Close(fd);
 	
 	// Free old working directory
-	if( CFGPTR(CFG_VFS_CWD) )	free( CFGPTR(CFG_VFS_CWD) );
+	if( CFGPTR(CFG_VFS_CWD) )
+		free( CFGPTR(CFG_VFS_CWD) );
 	// Set new
 	CFGPTR(CFG_VFS_CWD) = buf;
 	
@@ -547,24 +654,54 @@ 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);
+	
+	// Free old working directory
+	if( CFGPTR(CFG_VFS_CHROOT) )
+		free( CFGPTR(CFG_VFS_CHROOT) );
+	// Set new
+	CFGPTR(CFG_VFS_CHROOT) = buf;
+	
+	LOG("Updated Root to '%s'", buf);
+	
+	return 1;
 }
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);