Fixed offset issue with slashNum

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

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 1c00a1f..9069a73 100644 (file)
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -66,20 +66,10 @@ char *VFS_GetAbsPath(char *Path)
                strcpy(ret, cwd);
                ret[cwdLen] = '/';
                strcpy(&ret[cwdLen+1], Path);
-       
-               // Pre-fill the slash positions
-               read = 1;       slashNum = 0;
-               while( (pos = strpos( &ret[read], '/' )) != -1 && slashNum < MAX_PATH_SLASHES )
-               {
-                       read += pos+1;
-                       slashOffsets[slashNum++] = pos;
-               }
-                       
-               baseLen = cwdLen+1;
        }
        
        // Remove . and ..
-       read = write = baseLen; // Cwd has already been parsed
+       read = write = 1;       // Cwd has already been parsed
        for(; read < baseLen+pathLen; read = pos+1)
        {
                pos = strpos( &ret[read], '/' );
@@ -87,21 +77,21 @@ char *VFS_GetAbsPath(char *Path)
                if(pos == -1)   pos = baseLen+pathLen;
                else    pos += read;    // Else, Adjust to absolute
                
-               Log("pos-read = %i", pos-read);
+               //Log("pos-read = %i", pos-read);
                
                // Check Length
                if(pos - read <= 2)
                {
-                       Log("&ret[read] = '%s'", &ret[read]);
+                       //Log("&ret[read] = '%s'", &ret[read]);
                        // Current Dir "."
                        if(strncmp(&ret[read], ".", pos-read) == 0)     continue;
                        // Parent ".."
                        if(strncmp(&ret[read], "..", pos-read) == 0)
                        {
                                // If there is no higher, silently ignore
-                               if(!slashNum)   continue;
+                               if(slashNum < 2)        continue;
                                // Reverse write pointer
-                               write = slashOffsets[ slashNum-- ];
+                               write = slashOffsets[ --slashNum - 1 ];
                                continue;
                        }
                }
@@ -109,6 +99,7 @@ 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;