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

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index bd43a5f3..5d1d9fa7 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -4,23 +4,18 @@
  */
 #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
 
 // === IMPORTS ===
 extern tVFS_Node	gVFS_MemRoot;
 extern tVFS_Mount	*gVFS_RootMount;
-
-// === GLOBALS ===
-tVFS_Handle	*gaUserHandles = (void*)MM_PPD_VFS;
-tVFS_Handle	*gaKernelHandles = (void*)MM_KERNEL_VFS;
+extern int	VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
 
 // === CODE ===
 /**
@@ -35,9 +30,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 +41,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);
@@ -66,7 +61,7 @@ char *VFS_GetAbsPath(const char *Path)
 	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);
@@ -83,7 +78,7 @@ char *VFS_GetAbsPath(const char *Path)
 		strcpy(ret, cwd);
 		ret[cwdLen] = '/';
 		strcpy(&ret[cwdLen+1], Path);
-		//Log("ret = '%s'\n", ret);
+		//Log("ret = '%s'", ret);
 	}
 	
 	// Parse Path
@@ -445,10 +440,10 @@ tVFS_Node *VFS_ParsePath(const 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;
@@ -458,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);
@@ -508,50 +507,10 @@ int VFS_Open(char *Path, Uint Mode)
 		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;
-		}
-	}
-	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;
-		}
+	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
+	if( i >= 0 ) {
+		LEAVE('x', i);
+		return i;
 	}
 	
 	Log("VFS_Open: Out of handles");
@@ -563,7 +522,7 @@ int VFS_Open(char *Path, Uint Mode)
 /**
  * \brief Open a file from an open directory
  */
-int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode)
+int VFS_OpenChild(Uint *Errno, int FD, const char *Name, Uint Mode)
 {
 	tVFS_Handle	*h;
 	tVFS_Node	*node;
@@ -608,50 +567,10 @@ int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode)
 		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;
-		}
-	}
-	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;
-		}
+	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");
@@ -671,7 +590,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;
 	}
 	
@@ -692,7 +611,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;
@@ -738,7 +657,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;
@@ -783,32 +702,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);