Debug

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

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index eebaa82..1b51b85 100644 (file)
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -2,26 +2,16 @@
  * AcessMicro VFS
  * - Open, Close and ChDir
  */
+#define DEBUG  0
 #include <common.h>
 #include "vfs.h"
 #include "vfs_int.h"
 #include "vfs_ext.h"
 
-#define DEBUG  0
-
-#if DEBUG
-#else
-# undef ENTER
-# undef LOG
-# undef LEAVE
-# define ENTER(...)
-# define LOG(...)
-# define LEAVE(...)
-#endif
-
 // === CONSTANTS ===
 #define        OPEN_MOUNT_ROOT 1
 #define MAX_KERNEL_FILES       128
+#define MAX_PATH_SLASHES       256
 
 // === IMPORTS ===
 extern tVFS_Node       gVFS_MemRoot;
@@ -42,7 +32,7 @@ char *VFS_GetAbsPath(char *Path)
         int    pathLen = strlen(Path);
         int    read, write;
         int    pos, slashNum=0, baseLen;
-       Uint    slashOffsets[256];
+       Uint    slashOffsets[MAX_PATH_SLASHES];
        char    *cwd = CFGPTR(CFG_VFS_CWD);
         int    cwdLen;
        
@@ -72,16 +62,20 @@ char *VFS_GetAbsPath(char *Path)
        } else {
                cwdLen = strlen(cwd);
                // Prepend the current directory
-               ret = malloc(cwdLen+pathLen+1);
+               ret = malloc(cwdLen+pathLen+2);
                strcpy(ret, cwd);
-               strcpy(&ret[cwdLen], Path);
+               ret[cwdLen] = '/';
+               strcpy(&ret[cwdLen+1], Path);
        
                // Pre-fill the slash positions
-               pos = 0;
-               while( (pos = strpos( &ret[pos+1], '/' )) != -1 )
-                       slashOffsets[slashNum++] = pos;
+               read = 1;       slashNum = 0;
+               while( (pos = strpos( &ret[read], '/' )) != -1 && slashNum < MAX_PATH_SLASHES )
+               {
+                       read += pos+1;
+                       slashOffsets[slashNum++] = read;
+               }
                        
-               baseLen = cwdLen;
+               baseLen = cwdLen+1;
        }
        
        // Remove . and ..
@@ -93,9 +87,12 @@ char *VFS_GetAbsPath(char *Path)
                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)
                {
+                       Log("&ret[read] = '%s'", &ret[read]);
                        // Current Dir "."
                        if(strncmp(&ret[read], ".", pos-read) == 0)     continue;
                        // Parent ".."
@@ -112,10 +109,11 @@ char *VFS_GetAbsPath(char *Path)
                
                // Only copy if the positions differ
                if(read != write) {
+                       Log("write = %i, read = %i", write, read);
                        memcpy( &ret[write], &ret[read], pos-read+1 );
                }
                write = pos+1;
-               if(slashNum < 256)
+               if(slashNum < MAX_PATH_SLASHES)
                        slashOffsets[ slashNum++ ] = pos;
                else {
                        LOG("Path '%s' has too many elements", Path);
@@ -127,6 +125,7 @@ char *VFS_GetAbsPath(char *Path)
        
        // `ret` should now be the absolute path
        LEAVE('s', ret);
+       Log("VFS_GetAbsPath: RETURN '%s'", ret);
        return ret;
 }
 
@@ -538,8 +537,9 @@ int VFS_ChDir(char *New)
        // Close file
        VFS_Close(fd);
        
-       // Free working directory and set new one
-       free( CFGPTR(CFG_VFS_CWD) );
+       // Free old working directory
+       if( CFGPTR(CFG_VFS_CWD) )       free( CFGPTR(CFG_VFS_CWD) );
+       // Set new
        CFGPTR(CFG_VFS_CWD) = buf;
        
        Log("Updated CWD to '%s'", buf);