X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=ac47683f0631bf201991aae00531cdc19dd7fba2;hb=156885e938b60fee9d061d989ae7711c9aeea493;hp=c0bbbed8faca0da6c291665ef56a4f954479d1b8;hpb=0e47c27c2e1ef15f2f8d03194f0ab7c900c65b13;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index c0bbbed8..ac47683f 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -3,7 +3,7 @@
  * - Open, Close and ChDir
  */
 #define DEBUG	0
-#include <common.h>
+#include <acess.h>
 #include "vfs.h"
 #include "vfs_int.h"
 #include "vfs_ext.h"
@@ -15,7 +15,7 @@
 
 // === IMPORTS ===
 extern tVFS_Node	gVFS_MemRoot;
-extern tVFS_Mount	*gRootMount;
+extern tVFS_Mount	*gVFS_RootMount;
 
 // === GLOBALS ===
 tVFS_Handle	*gaUserHandles = (void*)MM_PPD_VFS;
@@ -30,9 +30,12 @@ char *VFS_GetAbsPath(char *Path)
 {
 	char	*ret;
 	 int	pathLen = strlen(Path);
-	 int	read, write;
-	 int	pos, slashNum=1, baseLen;
-	Uint	slashOffsets[MAX_PATH_SLASHES] = {0};
+	char	*pathComps[MAX_PATH_SLASHES];
+	char	*tmpStr;
+	int		iPos = 0;
+	int		iPos2 = 0;
+	char	*chroot = CFGPTR(CFG_VFS_CHROOT);
+	 int	chrootLen;
 	char	*cwd = CFGPTR(CFG_VFS_CWD);
 	 int	cwdLen;
 	
@@ -50,6 +53,14 @@ 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);
@@ -58,64 +69,99 @@ char *VFS_GetAbsPath(char *Path)
 			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'\n", ret);
 	}
 	
-	// Remove . and ..
-	read = write = 1;	// Cwd has already been parsed
-	for(; read < baseLen+pathLen; read = pos+1)
+	// Parse Path
+	pathComps[iPos++] = tmpStr = ret+1;
+	while(*tmpStr)
 	{
-		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)
+		if(*tmpStr++ == '/')
 		{
-			//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 < 2)	continue;
-				// Reverse write pointer
-				write = slashOffsets[ --slashNum - 1 ];
-				continue;
+			pathComps[iPos++] = tmpStr;
+			if(iPos == MAX_PATH_SLASHES) {
+				LOG("Path '%s' has too many elements", Path);
+				free(ret);
+				LEAVE('n');
+				return NULL;
 			}
 		}
-		
-		
-		// Only copy if the positions differ
-		if(read != write) {
-			Log("write = %i, read = %i", write, read);
-			memcpy( &ret[write], &ret[read], pos-read+1 );
+	}
+	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;
 		}
-		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;
+		// .
+		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;
 	
-	// `ret` should now be the absolute path
 	LEAVE('s', ret);
-	Log("VFS_GetAbsPath: RETURN '%s'", ret);
+	//Log("VFS_GetAbsPath: RETURN '%s'", ret);
 	return ret;
 }
 
@@ -126,7 +172,7 @@ char *VFS_GetAbsPath(char *Path)
 tVFS_Node *VFS_ParsePath(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;
@@ -148,18 +194,21 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 	
 	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;
+	if(!gVFS_Mounts) {
+		Warning("WTF! There's nothing mounted?");
+		return NULL;
+	}
 	
 	// Find Mountpoint
-	for(mnt = gMounts;
+	for(mnt = gVFS_Mounts;
 		mnt;
 		mnt = mnt->Next)
 	{
@@ -189,7 +238,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 	
 	// Sanity Check
 	/*if(!longestMount) {
-		Log("VFS_GetTruePath - ERROR: No Root Node\n");
+		Log("VFS_ParsePath - ERROR: No Root Node\n");
 		return NULL;
 	}*/
 	
@@ -220,23 +269,26 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 	
 		// 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;
 		}
@@ -244,8 +296,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 		// Get Child Node
 		tmpNode = curNode->FindDir(curNode, &Path[ofs]);
 		LOG("tmpNode = %p", tmpNode);
-		if(curNode->Close)
-			curNode->Close(curNode);
+		if(curNode->Close)	curNode->Close(curNode);
 		curNode = tmpNode;
 		
 		// Error Check
@@ -255,6 +306,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 				free(*TruePath);
 				*TruePath = NULL;
 			}
+			//Log("Child fail on '%s' ('%s)", Path, &Path[ofs]);
 			Path[nextSlash] = '/';
 			LEAVE('n');
 			return NULL;
@@ -267,6 +319,13 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 				*TruePath = NULL;
 			}
 			tmp = malloc( curNode->Size + 1 );
+			if(!curNode->Read) {
+				Warning("VFS_ParsePath - Read of node %p is NULL (%s)",
+					curNode, Path);
+				if(curNode->Close)	curNode->Close(curNode);
+				LEAVE('n');
+				return NULL;
+			}
 			curNode->Read( curNode, 0, curNode->Size, tmp );
 			tmp[ curNode->Size ] = '\0';
 			
@@ -275,6 +334,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
 			
 			// Error Check
 			if(!curNode) {
+				Log("Symlink fail '%s'", tmp);
 				free(tmp);	// Free temp string
 				LEAVE('n');
 				return NULL;
@@ -329,6 +389,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');
@@ -403,6 +464,7 @@ int VFS_Open(char *Path, Uint Mode)
 	}
 	
 	if(!node) {
+		LOG("Cannot find node");
 		LEAVE('i', -1);
 		return -1;
 	}
@@ -416,7 +478,8 @@ 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;
 	}
@@ -467,6 +530,7 @@ int VFS_Open(char *Path, Uint Mode)
 		}
 	}
 	
+	Log("VFS_Open: Out of handles");
 	LEAVE('i', -1);
 	return -1;
 }
@@ -493,17 +557,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(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;
@@ -528,7 +591,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;
 	
@@ -537,6 +601,55 @@ int VFS_ChDir(char *New)
 	return 1;
 }
 
+/**
+ * \fn int VFS_ChRoot(char *New)
+ * \brief Change current root directory
+ */
+int VFS_ChRoot(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;
+}
+
 /**
  * \fn tVFS_Handle *VFS_GetHandle(int FD)
  * \brief Gets a pointer to the handle information structure
@@ -559,3 +672,7 @@ tVFS_Handle *VFS_GetHandle(int FD)
 	if(h->Node == NULL)	return NULL;
 	return h;
 }
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);