Cleaning up and Debugging (Exposed by AcessNative mostly)

[tpg/acess2.git] / Kernel / vfs / open.c

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 9aeca95..600cedc 100644 (file)
--- 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);
@@ -80,7 +78,7 @@ char *VFS_GetAbsPath(const char *Path)
                strcpy(ret, cwd);
                ret[cwdLen] = '/';
                strcpy(&ret[cwdLen+1], Path);
-               //Log("ret = '%s'\n", ret);
+               //Log("ret = '%s'", ret);
        }
        
        // Parse Path
@@ -510,7 +508,7 @@ int VFS_Open(const char *Path, Uint Mode)
        }
        
        i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
-       if( i > 0 ) {
+       if( i >= 0 ) {
                LEAVE('x', i);
                return i;
        }
@@ -570,7 +568,7 @@ int VFS_OpenChild(Uint *Errno, int FD, const char *Name, Uint Mode)
        }
        
        i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
-       if( i > 0 ) {
+       if( i >= 0 ) {
                LEAVE('x', i);
                return i;
        }
@@ -592,7 +590,7 @@ void VFS_Close(int FD)
        // Get handle
        h = VFS_GetHandle(FD);
        if(h == NULL) {
-               Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x\n", FD);
+               Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x", FD);
                return;
        }