X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=1845b7a43cc55ca97935b4e636f37921fefe756e;hb=7b8c541cd83b70296325dbbf047d682fd7b03c22;hp=02f1a7bcbcb34898886cc993b0ff8be4408ecf24;hpb=ee9c3126fc8c693418a9f1216245a0576c0582d4;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 02f1a7bc..1845b7a4 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -20,7 +20,7 @@ extern tVFS_Mount	*gVFS_RootMount;
 extern int	VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
 
 // === PROTOTYPES ===
- int	VFS_int_CreateHandle( tVFS_Node *Node, int Mode );
+ int	VFS_int_CreateHandle( tVFS_Node *Node, tVFS_Mount *Mount, int Mode );
 
 // === CODE ===
 /**
@@ -166,7 +166,7 @@ char *VFS_GetAbsPath(const char *Path)
  * \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_Node *VFS_ParsePath(const char *Path, char **TruePath, tVFS_Mount **MountPoint)
 {
 	tVFS_Mount	*mnt, *longestMount;
 	 int	cmp, retLength = 0;
@@ -185,6 +185,9 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath)
 			strcpy(*TruePath, Path);
 		}
 		curNode = gVFS_MemRoot.FindDir(&gVFS_MemRoot, Path);
+		if(MountPoint) {
+			*MountPoint = NULL;
+		}
 		LEAVE('p', curNode);
 		return curNode;
 	}
@@ -196,6 +199,7 @@ restart_parse:
 			*TruePath = malloc( gVFS_RootMount->MountPointLen+1 );
 			strcpy(*TruePath, gVFS_RootMount->MountPoint);
 		}
+		if(MountPoint)	*MountPoint = gVFS_RootMount;
 		LEAVE('p', gVFS_RootMount->RootNode);
 		return gVFS_RootMount->RootNode;
 	}
@@ -225,6 +229,8 @@ restart_parse:
 				*TruePath = malloc( mnt->MountPointLen+1 );
 				strcpy(*TruePath, mnt->MountPoint);
 			}
+			if(MountPoint)
+				*MountPoint = mnt;
 			LEAVE('p', mnt->RootNode);
 			return mnt->RootNode;
 		}
@@ -399,7 +405,7 @@ restart_parse:
 	}
 	
 	// Get last node
-	LOG("VFS_ParsePath: FindDir(%p, '%s')", curNode, &Path[ofs]);
+	LOG("FindDir(%p, '%s')", curNode, &Path[ofs]);
 	tmpNode = curNode->FindDir(curNode, &Path[ofs]);
 	LOG("tmpNode = %p", tmpNode);
 	if(curNode->Close)	curNode->Close(curNode);
@@ -432,6 +438,10 @@ restart_parse:
 		// - Extend Path
 		//retLength += strlen(tmpNode->Name) + 1;
 	}
+
+	if( MountPoint ) {
+		*MountPoint = mnt;
+	}
 	
 	LEAVE('p', tmpNode);
 	return tmpNode;
@@ -440,9 +450,12 @@ restart_parse:
 /**
  * \brief Create and return a handle number for the given node and mode
  */
-int VFS_int_CreateHandle( tVFS_Node *Node, int Mode )
+int VFS_int_CreateHandle( tVFS_Node *Node, tVFS_Mount *Mount, int Mode )
 {
 	 int	i;
+	
+	ENTER("pNode pMount iMode", Node, Mount, Mode);
+
 	i = 0;
 	i |= (Mode & VFS_OPENFLAG_EXEC) ? VFS_PERM_EXECUTE : 0;
 	i |= (Mode & VFS_OPENFLAG_READ) ? VFS_PERM_READ : 0;
@@ -465,6 +478,8 @@ int VFS_int_CreateHandle( tVFS_Node *Node, int Mode )
 		LEAVE_RET('i', -1);
 	}
 
+	VFS_GetHandle(i)->Mount = Mount;
+
 	LEAVE_RET('x', i);
 }
 
@@ -475,6 +490,7 @@ int VFS_int_CreateHandle( tVFS_Node *Node, int Mode )
 int VFS_Open(const char *Path, Uint Mode)
 {
 	tVFS_Node	*node;
+	tVFS_Mount	*mnt;
 	char	*absPath;
 	
 	ENTER("sPath xMode", Path, Mode);
@@ -487,7 +503,7 @@ int VFS_Open(const char *Path, Uint Mode)
 	}
 	LOG("absPath = \"%s\"", absPath);
 	// Parse path and get mount point
-	node = VFS_ParsePath(absPath, NULL);
+	node = VFS_ParsePath(absPath, NULL, &mnt);
 	// Free generated path
 	free(absPath);
 	
@@ -514,15 +530,15 @@ int VFS_Open(const char *Path, Uint Mode)
 		tmppath[ node->Size ] = '\0';
 		if(node->Close)	node->Close( node );
 		// Open the target
-		node = VFS_ParsePath(tmppath, NULL);
+		node = VFS_ParsePath(tmppath, NULL, &mnt);
 		if(!node) {
 			LOG("Cannot find symlink target node (%s)", tmppath);
 			errno = ENOENT;
 			LEAVE_RET('i', -1);
 		}
 	}
-	
-	LEAVE_RET('x', VFS_int_CreateHandle(node, Mode));	
+
+	LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Mode));
 }
 
 
@@ -558,7 +574,7 @@ int VFS_OpenChild(int FD, const char *Name, Uint Mode)
 		LEAVE_RET('i', -1);
 	}
 
-	LEAVE_RET('x', VFS_int_CreateHandle(node, Mode));	
+	LEAVE_RET('x', VFS_int_CreateHandle(node, h->Mount, Mode));
 }
 
 int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode)
@@ -566,7 +582,7 @@ int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode)
 	tVFS_Mount	*mnt;
 	tVFS_Node	*node;
 
-	ENTER("iMount iInode xMode", Mount, Inode, Mode);
+	ENTER("iMount XInode xMode", Mount, Inode, Mode);
 	
 	// Get mount point
 	mnt = VFS_GetMountByIdent(Mount);
@@ -578,6 +594,7 @@ int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode)
 	
 	// Does the filesystem support this?
 	if( !mnt->Filesystem->GetNodeFromINode ) {
+		LOG("Filesystem does not support inode accesses");
 		errno = ENOENT;
 		LEAVE_RET('i', -1);
 	}
@@ -585,11 +602,12 @@ int VFS_OpenInode(Uint32 Mount, Uint64 Inode, int Mode)
 	// Get node
 	node = mnt->Filesystem->GetNodeFromINode(mnt->RootNode, Inode);
 	if( !node ) {
+		LOG("Unable to find inode");
 		errno = ENOENT;
 		LEAVE_RET('i', -1);
 	}
 	
-	LEAVE_RET('x', VFS_int_CreateHandle(node, Mode));
+	LEAVE_RET('x', VFS_int_CreateHandle(node, mnt, Mode));
 }
 
 /**
@@ -633,14 +651,14 @@ int VFS_ChDir(const char *Dest)
 	// Create Absolute
 	buf = VFS_GetAbsPath(Dest);
 	if(buf == NULL) {
-		Log("VFS_ChDir: Path expansion failed");
+		Log_Notice("VFS", "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");
+		Log_Notice("VFS", "VFS_ChDir: Path is invalid");
 		return -1;
 	}