X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=0820102575b4cc3db96e40b88f1edfb761e953b0;hb=f3d0d7fcf0496a63625c92e5ab95471e202e958e;hp=b0de784122ef81cd484b394f1fb2768821c45dc8;hpb=3e26f25f924611d86e26de937434e5edd2569c5e;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index b0de7841..08201025 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -15,8 +15,6 @@
 // === IMPORTS ===
 extern tVFS_Node	gVFS_MemRoot;
 extern tVFS_Mount	*gVFS_RootMount;
-
-extern tVFS_Handle	*VFS_GetHandle(int FD);
 extern int	VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
 
 // === CODE ===
@@ -32,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);
@@ -43,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);
@@ -63,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);
@@ -442,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;
@@ -510,7 +508,7 @@ int VFS_Open(char *Path, Uint Mode)
 	}
 	
 	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
-	if( i > 0 ) {
+	if( i >= 0 ) {
 		LEAVE('x', i);
 		return i;
 	}
@@ -524,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;
@@ -570,7 +568,7 @@ int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode)
 	}
 	
 	i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
-	if( i > 0 ) {
+	if( i >= 0 ) {
 		LEAVE('x', i);
 		return i;
 	}