X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=74427b56ed6b13adcba04dd5b7138add1ed9f8c6;hb=fbb51904de075386178cc6bb14717132d3b2153d;hp=7382a0c8705fef38ced66a70c3e2286839b1bb53;hpb=900f2d7853a5dd5d0f1a27c2374ecda434d6d866;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 7382a0c8..74427b56 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;
@@ -39,7 +39,6 @@ char *VFS_GetAbsPath(char *Path)
 	char	*cwd = CFGPTR(CFG_VFS_CWD);
 	 int	cwdLen;
 	
-	
 	ENTER("sPath", Path);
 	
 	// Memory File
@@ -54,6 +53,7 @@ char *VFS_GetAbsPath(char *Path)
 		return ret;
 	}
 	
+	// - Fetch ChRoot
 	if( chroot == NULL ) {
 		chroot = "";
 		chrootLen = 0;
@@ -63,13 +63,12 @@ char *VFS_GetAbsPath(char *Path)
 	
 	// Check if the path is already absolute
 	if(Path[0] == '/') {
-		ret = malloc(chrootLen + pathLen + 1);
+		ret = malloc(pathLen + 1);
 		if(!ret) {
 			Warning("VFS_GetAbsPath - malloc() returned NULL");
 			return NULL;
 		}
-		strcpy(ret, chroot);
-		strcpy(ret+chrootLen, Path);
+		strcpy(ret, Path);
 	} else {
 		if(cwd == NULL) {
 			cwd = "/";
@@ -153,6 +152,14 @@ char *VFS_GetAbsPath(char *Path)
 	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;
@@ -165,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;
@@ -187,21 +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) {
+	if(!gVFS_Mounts) {
 		Warning("WTF! There's nothing mounted?");
 		return NULL;
 	}
 	
 	// Find Mountpoint
-	for(mnt = gMounts;
+	for(mnt = gVFS_Mounts;
 		mnt;
 		mnt = mnt->Next)
 	{
@@ -543,17 +550,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;
@@ -659,3 +665,7 @@ tVFS_Handle *VFS_GetHandle(int FD)
 	if(h->Node == NULL)	return NULL;
 	return h;
 }
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);