X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=f1a16f3f4c3a8f7b496babefbceea684be69a11e;hb=HEAD;hp=03d8b2b1d3e0fa54068fb4edc4f1f7ee2c3ed58f;hpb=17637d37f347ede8f7dcd0c5ce92f0579d32a6ff;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
deleted file mode 100644
index 03d8b2b1..00000000
--- a/Kernel/vfs/open.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- * Acess2 VFS
- * - Open, Close and ChDir
- */
-#define DEBUG	0
-#include <acess.h>
-#include "vfs.h"
-#include "vfs_int.h"
-#include "vfs_ext.h"
-
-// === CONSTANTS ===
-#define	OPEN_MOUNT_ROOT	1
-#define MAX_PATH_SLASHES	256
-#define MAX_NESTED_LINKS	4
-#define MAX_PATH_LEN	255
-
-// === IMPORTS ===
-extern tVFS_Node	gVFS_MemRoot;
-extern tVFS_Mount	*gVFS_RootMount;
-extern int	VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
-
-// === CODE ===
-/**
- * \fn char *VFS_GetAbsPath(const char *Path)
- * \brief Create an absolute path from a relative one
- */
-char *VFS_GetAbsPath(const char *Path)
-{
-	char	*ret;
-	 int	pathLen = strlen(Path);
-	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);
-	
-	// Memory File
-	if(Path[0] == '$') {
-		ret = malloc(strlen(Path)+1);
-		if(!ret) {
-			Log_Warning("VFS", "VFS_GetAbsPath: malloc() returned NULL");
-			return NULL;
-		}
-		strcpy(ret, Path);
-		LEAVE('p', ret);
-		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) {
-			Log_Warning("VFS", "VFS_GetAbsPath: malloc() returned NULL");
-			return NULL;
-		}
-		strcpy(ret, Path);
-	} else {
-		if(cwd == NULL) {
-			cwd = "/";
-			cwdLen = 1;
-		}
-		else {
-			cwdLen = strlen(cwd);
-		}
-		// Prepend the current directory
-		ret = malloc( cwdLen + 1 + pathLen + 1 );
-		strcpy(ret, cwd);
-		ret[cwdLen] = '/';
-		strcpy(&ret[cwdLen+1], Path);
-		//Log("ret = '%s'", ret);
-	}
-	
-	// Parse Path
-	pathComps[iPos++] = tmpStr = ret+1;
-	while(*tmpStr)
-	{
-		if(*tmpStr++ == '/')
-		{
-			pathComps[iPos++] = tmpStr;
-			if(iPos == MAX_PATH_SLASHES) {
-				LOG("Path '%s' has too many elements", Path);
-				free(ret);
-				LEAVE('n');
-				return NULL;
-			}
-		}
-	}
-	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;
-		}
-		// .
-		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 = 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;
-	
-	LEAVE('s', ret);
-	//Log("VFS_GetAbsPath: RETURN '%s'", ret);
-	return ret;
-}
-
-/**
- * \fn char *VFS_ParsePath(const char *Path, char **TruePath)
- * \brief Parses a path, resolving sysmlinks and applying permissions
- */
-tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
-{
-	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] == '$') {
-		if(TruePath) {
-			*TruePath = malloc(strlen(Path)+1);
-			strcpy(*TruePath, Path);
-		}
-		curNode = gVFS_MemRoot.FindDir(&gVFS_MemRoot, Path);
-		LEAVE('p', curNode);
-		return curNode;
-	}
-
-restart_parse:	
-	// For root we always fast return
-	if(Path[0] == '/' && Path[1] == '\0') {
-		if(TruePath) {
-			*TruePath = malloc( gVFS_RootMount->MountPointLen+1 );
-			strcpy(*TruePath, gVFS_RootMount->MountPoint);
-		}
-		LEAVE('p', gVFS_RootMount->RootNode);
-		return gVFS_RootMount->RootNode;
-	}
-	
-	// Check if there is anything mounted
-	if(!gVFS_Mounts) {
-		Log_Error("VFS", "VFS_ParsePath - No filesystems mounted");
-		return NULL;
-	}
-	
-	// Find Mountpoint
-	longestMount = gVFS_RootMount;
-	for(mnt = gVFS_Mounts; mnt; mnt = mnt->Next)
-	{
-		// Quick Check
-		if( Path[mnt->MountPointLen] != '/' && Path[mnt->MountPointLen] != '\0')
-			continue;
-		// Length Check - If the length is smaller than the longest match sofar
-		if(mnt->MountPointLen < longestMount->MountPointLen)	continue;
-		// String Compare
-		cmp = strcmp(Path, mnt->MountPoint);
-		
-		#if OPEN_MOUNT_ROOT
-		// Fast Break - Request Mount Root
-		if(cmp == 0) {
-			if(TruePath) {
-				*TruePath = malloc( mnt->MountPointLen+1 );
-				strcpy(*TruePath, mnt->MountPoint);
-			}
-			LEAVE('p', mnt->RootNode);
-			return mnt->RootNode;
-		}
-		#endif
-		// Not a match, continue
-		if(cmp != '/')	continue;
-		longestMount = mnt;
-	}
-	
-	// Save to shorter variable
-	mnt = longestMount;
-	
-	LOG("mnt = {MountPoint:\"%s\"}", mnt->MountPoint);
-	
-	// Initialise String
-	if(TruePath)
-	{
-		// Assumes that the resultant path (here) will not be > strlen(Path) + 1
-		*TruePath = malloc( strlen(Path) + 1 );
-		strcpy(*TruePath, mnt->MountPoint);
-		retLength = mnt->MountPointLen;
-	}
-	
-	curNode = mnt->RootNode;
-	curNode->ReferenceCount ++;	
-	// Parse Path
-	ofs = mnt->MountPointLen+1;
-	for(; (nextSlash = strpos(&Path[ofs], '/')) != -1; ofs += nextSlash + 1)
-	{
-		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) ) {
-			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->Close)	curNode->Close(curNode);
-			if(TruePath) {
-				free(*TruePath);
-				*TruePath = NULL;
-			}
-			//Log("FindDir fail on '%s'", Path);
-			LEAVE('n');
-			return NULL;
-		}
-		LOG("FindDir{=%p}(%p, '%s')", curNode->FindDir, curNode, pathEle);
-		// Get Child Node
-		tmpNode = curNode->FindDir(curNode, pathEle);
-		LOG("tmpNode = %p", tmpNode);
-		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'", pathEle, Path);
-			if(TruePath) {
-				free(*TruePath);
-				*TruePath = NULL;
-			}
-			//Log("Child fail on '%s' ('%s)", Path, pathEle);
-			LEAVE('n');
-			return NULL;
-		}
-		
-		// Handle Symbolic Links
-		if(curNode->Flags & VFS_FFLAG_SYMLINK) {
-			if(TruePath) {
-				free(*TruePath);
-				*TruePath = NULL;
-			}
-			if(!curNode->Read) {
-				Log_Warning("VFS", "VFS_ParsePath - Read of symlink node %p'%s' is NULL",
-					curNode, Path);
-				if(curNode->Close)	curNode->Close(curNode);
-				// No need to free *TruePath, it should already be NULL
-				LEAVE('n');
-				return NULL;
-			}
-			
-			if(iNestedLinks > MAX_NESTED_LINKS) {
-				if(curNode->Close)	curNode->Close(curNode);
-				LEAVE('n');
-				return NULL;
-			}
-			
-			// 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 ) {
-					if(curNode->Close)	curNode->Close(curNode);
-					Log_Warning("VFS", "VFS_ParsePath - Symlinked path too long");
-					LEAVE('n');
-					return NULL;
-				}
-				curNode->Read( curNode, 0, curNode->Size, path_buffer );
-				path_buffer[ curNode->Size ] = '\0';
-				strcat(path_buffer, Path + ofs+nextSlash);
-				
-				Path = path_buffer;
-//				Log_Debug("VFS", "VFS_ParsePath: Symlink translated to '%s'", Path);
-				iNestedLinks ++;
-			}
-
-			// EVIL: Goto :)
-			goto restart_parse;
-		}
-		
-		// Handle Non-Directories
-		if( !(curNode->Flags & VFS_FFLAG_DIRECTORY) )
-		{
-			Log_Warning("VFS", "VFS_ParsePath - Path segment is not a directory");
-			if(TruePath)	free(*TruePath);
-			LEAVE('n');
-			return NULL;
-		}
-		
-		// Check if path needs extending
-		if(!TruePath)	continue;
-		
-		// Increase buffer space
-		tmp = realloc( *TruePath, retLength + strlen(pathEle) + 1 + 1 );
-		// Check if allocation succeeded
-		if(!tmp) {
-			Log_Warning("VFS", "VFS_ParsePath - Unable to reallocate true path buffer");
-			free(*TruePath);
-			*TruePath = NULL;
-			if(curNode->Close)	curNode->Close(curNode);
-			LEAVE('n');
-			return NULL;
-		}
-		*TruePath = tmp;
-		// Append to path
-		(*TruePath)[retLength] = '/';
-		strcpy(*TruePath+retLength+1, pathEle);
-		
-		LOG("*TruePath = '%s'", *TruePath);
-		
-		// - Extend Path
-		retLength += nextSlash + 1;
-	}
-	
-	if( !curNode->FindDir ) {
-		if(curNode->Close)	curNode->Close(curNode);
-		if(TruePath) {
-			free(*TruePath);
-			*TruePath = NULL;
-		}
-		Log_Warning("VFS", "VFS_ParsePath - FindDir doesn't exist for element of '%s'", Path);
-		LEAVE('n');
-		return NULL;
-	}
-	
-	// Get last node
-	LOG("VFS_ParsePath: FindDir(%p, '%s')", curNode, &Path[ofs]);
-	tmpNode = curNode->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);
-		//Log("Child fail '%s' ('%s')", Path, &Path[ofs]);
-		if(TruePath)	free(*TruePath);
-		if(curNode->Close)	curNode->Close(curNode);
-		LEAVE('n');
-		return NULL;
-	}
-	
-	if(TruePath)
-	{
-		// Increase buffer space
-		tmp = realloc(*TruePath, retLength + strlen(&Path[ofs]) + 1 + 1);
-		// Check if allocation succeeded
-		if(!tmp) {
-			Log_Warning("VFS", "VFS_ParsePath -  Unable to reallocate true path buffer");
-			free(*TruePath);
-			if(tmpNode->Close)	tmpNode->Close(curNode);
-			LEAVE('n');
-			return NULL;
-		}
-		*TruePath = tmp;
-		// Append to path
-		(*TruePath)[retLength] = '/';
-		strcpy(*TruePath + retLength + 1, &Path[ofs]);
-		// - Extend Path
-		//retLength += strlen(tmpNode->Name) + 1;
-	}
-	
-	LEAVE('p', tmpNode);
-	return tmpNode;
-}
-
-/**
- * \fn int VFS_Open(const char *Path, Uint Mode)
- * \brief Open a file
- */
-int VFS_Open(const char *Path, Uint Mode)
-{
-	tVFS_Node	*node;
-	char	*absPath;
-	 int	i;
-	
-	ENTER("sPath xMode", Path, Mode);
-	
-	// 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);
-	// Free generated path
-	free(absPath);
-	
-	if(!node) {
-		LOG("Cannot find node");
-		LEAVE_RET('i', -1);
-	}
-	
-	// Check for symlinks
-	if( !(Mode & VFS_OPENFLAG_NOLINK) && (node->Flags & VFS_FFLAG_SYMLINK) )
-	{
-		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->Read ) {
-			Log_Warning("VFS", "VFS_Open - No read method on symlink");
-			LEAVE_RET('i', -1);
-		}
-		// Read symlink's path
-		node->Read( node, 0, node->Size, tmppath );
-		tmppath[ node->Size ] = '\0';
-		if(node->Close)	node->Close( node );
-		// Open the target
-		node = VFS_ParsePath(tmppath, NULL);
-		if(!node) {
-			LOG("Cannot find symlink target node (%s)", tmppath);
-			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);
-	
-	// Permissions Check
-	if( !VFS_CheckACL(node, i) ) {
-		if(node->Close)	node->Close( node );
-		Log_Log("VFS", "VFS_Open: Permissions Failed");
-		LEAVE_RET('i', -1);
-	}
-	
-	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
-	if( i < 0 ) {
-		Log_Notice("VFS", "VFS_Open: Out of handles");
-		LEAVE_RET('i', -1);
-	}
-	
-	LEAVE_RET('x', i);	
-}
-
-
-/**
- * \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_RET('i', -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_RET('i', -1);
-	}
-	
-	// Find Child
-	node = h->Node->FindDir(h->Node, Name);
-	if(!node) {
-		if(Errno)	*Errno = ENOENT;
-		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;
-	
-	// 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_RET('i', -1);
-	}
-	
-	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
-	if( i >= 0 ) {
-		LEAVE_RET('x', i);
-	}
-	
-	Log_Error("VFS", "VFS_OpenChild - Out of handles");
-	if(Errno)	*Errno = ENFILE;
-	LEAVE_RET('i', -1);
-}
-
-/**
- * \fn void VFS_Close(int FD)
- * \brief Closes an open file handle
- */
-void VFS_Close(int FD)
-{
-	tVFS_Handle	*h;
-	
-	// Get handle
-	h = VFS_GetHandle(FD);
-	if(h == NULL) {
-		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 );
-	
-	h->Node = NULL;
-}
-
-/**
- * \brief Change current working directory
- */
-int VFS_ChDir(const char *Dest)
-{
-	char	*buf;
-	 int	fd;
-	tVFS_Handle	*h;
-	
-	// Create Absolute
-	buf = VFS_GetAbsPath(Dest);
-	if(buf == NULL) {
-		Log("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");
-		return -1;
-	}
-	
-	// 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 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);
-	
-	return 1;
-}
-
-/**
- * \fn int VFS_ChRoot(char *New)
- * \brief Change current root directory
- */
-int VFS_ChRoot(const char *New)
-{
-	char	*buf;
-	 int	fd;
-	tVFS_Handle	*h;
-	
-	if(New[0] == '/' && New[1] == '\0')
-		return 1;	// What a useless thing to ask!
-	
-	// 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;
-	}
-	
-	// 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);