X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=0494294db84c9bac4882d8d87d6fc85de33074d4;hb=1a96e0dd77d6922078edd703fc7c2e809b9499b8;hp=b9ebd55e8ec5c6bdb512e82938ce61c14d3602bc;hpb=2aef4fc92fe242262a98937fc1b6f5d06ae98afe;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index b9ebd55e..0494294d 100644
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -31,7 +31,8 @@ char *VFS_GetAbsPath(char *Path)
 	char	*ret;
 	 int	pathLen = strlen(Path);
 	 int	read, write;
-	 int	pos, slashNum=0, baseLen;
+	 int	pos, endLen;
+	 int	slashNum = 0;
 	Uint	slashOffsets[MAX_PATH_SLASHES];
 	char	*cwd = CFGPTR(CFG_VFS_CWD);
 	 int	cwdLen;
@@ -52,43 +53,32 @@ char *VFS_GetAbsPath(char *Path)
 	
 	// Check if the path is already absolute
 	if(Path[0] == '/') {
+		endLen = pathLen + 1;
 		ret = malloc(pathLen + 1);
 		if(!ret) {
 			Warning("VFS_GetAbsPath - malloc() returned NULL");
 			return NULL;
 		}
 		strcpy(ret, Path);
-		baseLen = 1;
 	} else {
 		cwdLen = strlen(cwd);
+		endLen = cwdLen + pathLen + 2;
 		// Prepend the current directory
-		ret = malloc(cwdLen+pathLen+2);
+		ret = malloc(endLen);
 		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
-	for(; read < baseLen+pathLen; read = pos+1)
+	read = write = 1;	// Cwd has already been parsed
+	for(; read < endLen; read = pos+1)
 	{
 		pos = strpos( &ret[read], '/' );
 		// If we are in the last section, force a break at the end of the itteration
-		if(pos == -1)	pos = baseLen+pathLen;
+		if(pos == -1)	pos = endLen;
 		else	pos += read;	// Else, Adjust to absolute
 		
-		Log("pos-read = %i", pos-read);
-		
 		// Check Length
 		if(pos - read <= 2)
 		{
@@ -98,9 +88,12 @@ char *VFS_GetAbsPath(char *Path)
 			if(strncmp(&ret[read], "..", pos-read) == 0)
 			{
 				// If there is no higher, silently ignore
-				if(!slashNum)	continue;
+				if(slashNum < 1) {
+					write = 1;
+					continue;
+				}
 				// Reverse write pointer
-				write = slashOffsets[ slashNum-- ];
+				write = slashOffsets[ --slashNum ];
 				continue;
 			}
 		}
@@ -108,22 +101,27 @@ char *VFS_GetAbsPath(char *Path)
 		
 		// Only copy if the positions differ
 		if(read != write) {
+			//Log("write = %i, read = %i, pos-read+1 = %i", write, read, pos-read+1);
 			memcpy( &ret[write], &ret[read], pos-read+1 );
+			//Log("ret = '%s'", ret);
 		}
-		write = pos+1;
+		
 		if(slashNum < MAX_PATH_SLASHES)
-			slashOffsets[ slashNum++ ] = pos;
+			slashOffsets[ slashNum++ ] = write;
 		else {
 			LOG("Path '%s' has too many elements", Path);
 			free(ret);
 			LEAVE('n');
 			return NULL;
 		}
+		
+		// Increment write pointer
+		write += (pos-read)+1;
 	}
 	
 	// `ret` should now be the absolute path
 	LEAVE('s', ret);
-	Log("VFS_GetAbsPath: RETURN '%s'", ret);
+	//Log("VFS_GetAbsPath: RETURN '%s'", ret);
 	return ret;
 }