X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=9069a73d2cd6d3089e1479124aa99edd691a2009;hb=12e1d80b700a6a47e8506dc23bb6e1d64a172bd4;hp=e075fb7b40bf64da587148df7f67173911599880;hpb=b85919de2b8cc8521807d6d65f2f47e6a4939041;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index e075fb7b..9069a73d 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -2,26 +2,16 @@
  * AcessMicro VFS
  * - Open, Close and ChDir
  */
+#define DEBUG	0
 #include <common.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
-
 // === CONSTANTS ===
 #define	OPEN_MOUNT_ROOT	1
 #define MAX_KERNEL_FILES	128
+#define MAX_PATH_SLASHES	256
 
 // === IMPORTS ===
 extern tVFS_Node	gVFS_MemRoot;
@@ -42,7 +32,7 @@ char *VFS_GetAbsPath(char *Path)
 	 int	pathLen = strlen(Path);
 	 int	read, write;
 	 int	pos, slashNum=0, baseLen;
-	Uint	slashOffsets[256];
+	Uint	slashOffsets[MAX_PATH_SLASHES];
 	char	*cwd = CFGPTR(CFG_VFS_CWD);
 	 int	cwdLen;
 	
@@ -51,6 +41,10 @@ char *VFS_GetAbsPath(char *Path)
 	// Memory File
 	if(Path[0] == '$') {
 		ret = malloc(strlen(Path)+1);
+		if(!ret) {
+			Warning("VFS_GetAbsPath - malloc() returned NULL");
+			return NULL;
+		}
 		strcpy(ret, Path);
 		LEAVE('p', ret);
 		return ret;
@@ -59,25 +53,23 @@ char *VFS_GetAbsPath(char *Path)
 	// Check if the path is already absolute
 	if(Path[0] == '/') {
 		ret = malloc(pathLen + 1);
+		if(!ret) {
+			Warning("VFS_GetAbsPath - malloc() returned NULL");
+			return NULL;
+		}
 		strcpy(ret, Path);
 		baseLen = 1;
 	} else {
 		cwdLen = strlen(cwd);
 		// Prepend the current directory
-		ret = malloc(cwdLen+pathLen+1);
+		ret = malloc(cwdLen+pathLen+2);
 		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[cwdLen] = '/';
+		strcpy(&ret[cwdLen+1], Path);
 	}
 	
 	// Remove . and ..
-	read = write = baseLen;	// Cwd has already been parsed
+	read = write = 1;	// Cwd has already been parsed
 	for(; read < baseLen+pathLen; read = pos+1)
 	{
 		pos = strpos( &ret[read], '/' );
@@ -85,18 +77,21 @@ char *VFS_GetAbsPath(char *Path)
 		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)
 		{
+			//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;
+				if(slashNum < 2)	continue;
 				// Reverse write pointer
-				write = slashOffsets[ slashNum-- ];
+				write = slashOffsets[ --slashNum - 1 ];
 				continue;
 			}
 		}
@@ -104,10 +99,11 @@ char *VFS_GetAbsPath(char *Path)
 		
 		// Only copy if the positions differ
 		if(read != write) {
+			Log("write = %i, read = %i", write, read);
 			memcpy( &ret[write], &ret[read], pos-read+1 );
 		}
 		write = pos+1;
-		if(slashNum < 256)
+		if(slashNum < MAX_PATH_SLASHES)
 			slashOffsets[ slashNum++ ] = pos;
 		else {
 			LOG("Path '%s' has too many elements", Path);
@@ -119,6 +115,7 @@ char *VFS_GetAbsPath(char *Path)
 	
 	// `ret` should now be the absolute path
 	LEAVE('s', ret);
+	Log("VFS_GetAbsPath: RETURN '%s'", ret);
 	return ret;
 }
 
@@ -502,26 +499,37 @@ 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);
-	if(buf == NULL)	return -1;
+	if(buf == NULL) {
+		Log("VFS_ChDir: Path expansion failed");
+		return -1;
+	}
 	
-	// Check if path is valid
-	node = VFS_ParsePath(buf, NULL);
-	if(!node)	return -1;
+	// 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) ) {
-		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
-	free( CFGPTR(CFG_VFS_CWD) );
+	// Close file
+	VFS_Close(fd);
+	
+	// Free old working directory
+	if( CFGPTR(CFG_VFS_CWD) )	free( CFGPTR(CFG_VFS_CWD) );
+	// Set new
 	CFGPTR(CFG_VFS_CWD) = buf;
 	
 	Log("Updated CWD to '%s'", buf);