X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=6f0341706e7d5fe3100a78ef1ec5c7a26009cee6;hb=9d3800f60f2212432e550a4e003ae65b498a4d36;hp=1d86910334425e0af7d4f6d2713d4fb8e86de4a4;hpb=7180d8e33801a3205012d27ea5ccb80f70695b5d;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 1d869103..6f034170 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,46 +53,53 @@ 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);
+		if(cwd == NULL) {
+			cwd = "/";
+			cwdLen = 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);
 	}
 	
 	// Remove . and ..
-	read = write = 0;	// 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)
 		{
-			//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 < 2)	continue;
+				if(slashNum < 1) {
+					write = 1;
+					continue;
+				}
 				// Reverse write pointer
-				write = slashOffsets[ --slashNum - 1 ];
+				write = slashOffsets[ --slashNum ];
 				continue;
 			}
 		}
@@ -99,23 +107,28 @@ char *VFS_GetAbsPath(char *Path)
 		
 		// Only copy if the positions differ
 		if(read != write) {
-			Log("write = %i, read = %i", write, read);
+			//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[write] = '\0';	// Cap string (to deal with . or .. being the last terms)
 	// `ret` should now be the absolute path
 	LEAVE('s', ret);
-	Log("VFS_GetAbsPath: RETURN '%s'", ret);
+	//Log("VFS_GetAbsPath: RETURN '%s'", ret);
 	return ret;
 }
 
@@ -528,7 +541,8 @@ int VFS_ChDir(char *New)
 	VFS_Close(fd);
 	
 	// Free old working directory
-	if( CFGPTR(CFG_VFS_CWD) )	free( CFGPTR(CFG_VFS_CWD) );
+	if( CFGPTR(CFG_VFS_CWD) )
+		free( CFGPTR(CFG_VFS_CWD) );
 	// Set new
 	CFGPTR(CFG_VFS_CWD) = buf;