X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=9069a73d2cd6d3089e1479124aa99edd691a2009;hb=12e1d80b700a6a47e8506dc23bb6e1d64a172bd4;hp=2a3359f82df442ceb0c232fac738493049f651a1;hpb=adb29253f0019e76dd73b657404d38b7d414fcd2;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 2a3359f8..9069a73d 100644
--- 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,18 +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);
+		
 		// Check Length
 		if(pos - read <= 2)
 		{
+			//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;
 			}
 		}
@@ -106,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;
@@ -121,6 +115,7 @@ char *VFS_GetAbsPath(char *Path)
 	
 	// `ret` should now be the absolute path
 	LEAVE('s', ret);
+	Log("VFS_GetAbsPath: RETURN '%s'", ret);
 	return ret;
 }