From: John Hodge <tpg@portege.thepowersgang.com>
Date: Sun, 27 Sep 2009 09:03:02 +0000 (+0800)
Subject: Fixed VFS_ChDir to handle symlinks by using VFS_Open
X-Git-Tag: rel0.06~441
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=9b4ce124f950e1bebbf4e011804e0b8ed8472f6a;p=tpg%2Facess2.git

Fixed VFS_ChDir to handle symlinks by using VFS_Open
---

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 7b651322..eebaa82d 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -510,7 +510,8 @@ void VFS_Close(int FD)
 int VFS_ChDir(char *New)
 {
 	char	*buf;
-	tVFS_Node	*node;
+	 int	fd;
+	tVFS_Handle	*h;
 	
 	// Create Absolute
 	buf = VFS_GetAbsPath(New);
@@ -519,23 +520,25 @@ int VFS_ChDir(char *New)
 		return -1;
 	}
 	
-	// Check if path is valid
-	node = VFS_ParsePath(buf, NULL);
-	if(!node) {
+	// Check if path exists
+	fd = VFS_Open(buf, VFS_OPENFLAG_EXEC);
+	if(fd == -1) {
 		Log("VFS_ChDir: Path is invalid");
 		return -1;
 	}
 	
-	// Check if is a directory
-	if( !(node->Flags & VFS_FFLAG_DIRECTORY) ) {
-		Log("VFS_ChDir: Not a directory");
-		if(node->Close)	node->Close(node);
+	// Get node so we can check for directory
+	h = VFS_GetHandle(fd);
+	if( !(h->Node->Flags & VFS_FFLAG_DIRECTORY) ) {
+		Log("VFS_ChDir: Path is not a directory");
+		VFS_Close(fd);
 		return -1;
 	}
-	// Close node
-	if(node->Close)	node->Close(node);
 	
-	// Free old and set new
+	// Close file
+	VFS_Close(fd);
+	
+	// Free working directory and set new one
 	free( CFGPTR(CFG_VFS_CWD) );
 	CFGPTR(CFG_VFS_CWD) = buf;