From b97cf32102225af9c393b53aa7f0a6703ccf2fae Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@portege.thepowersgang.com>
Date: Fri, 25 Sep 2009 20:46:42 +0800
Subject: [PATCH] Added NULL check to VFS_ReadDir

---
 Kernel/vfs/dir.c                          |  2 +-
 Usermode/Applications/CLIShell_src/main.c | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Kernel/vfs/dir.c b/Kernel/vfs/dir.c
index d3214a4b..ba2311e0 100644
--- a/Kernel/vfs/dir.c
+++ b/Kernel/vfs/dir.c
@@ -159,7 +159,7 @@ int VFS_ReadDir(int FD, char *Dest)
 			h->Position += (Uint)tmp;
 		else
 			h->Position ++;
-	} while((Uint)tmp < (Uint)VFS_MAXSKIP);
+	} while(tmp != NULL && (Uint)tmp < (Uint)VFS_MAXSKIP);
 	LOG("tmp = '%s'", tmp);
 	
 	if(!tmp) {
diff --git a/Usermode/Applications/CLIShell_src/main.c b/Usermode/Applications/CLIShell_src/main.c
index 494b25e5..30cf2883 100644
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -335,7 +335,7 @@ void Command_Dir(int argc, char **argv)
 	 int	dp, fp, dirLen;
 	//char	modeStr[11] = "RWXrwxRWX ";
 	char	tmpPath[1024];
-	char	fileName[256];
+	char	*fileName;
 	t_sysFInfo	info;
 	
 	// Generate Directory Path
@@ -381,6 +381,8 @@ void Command_Dir(int argc, char **argv)
 		tmpPath[dirLen++] = '/';
 		tmpPath[dirLen] = '\0';
 	}
+	
+	fileName = (char*)(tmpPath+dirLen);
 	// Read Directory Content
 	while( (fp = readdir(dp, fileName)) )
 	{
@@ -390,8 +392,6 @@ void Command_Dir(int argc, char **argv)
 				write(_stdout, 42, "Invalid Permissions to traverse directory\n");
 			break;
 		}
-		// Create File Path
-		strcpy((char*)(tmpPath+dirLen), fileName);
 		// Open File
 		fp = open(tmpPath, 0);
 		if(fp == -1)	continue;
@@ -400,9 +400,10 @@ void Command_Dir(int argc, char **argv)
 		close(fp);
 		
 		// Colour Code
-		write(_stdout, 6, "\x1B[37m");	//White
-		if(info.flags & FILEFLAG_DIRECTORY)	//Directory Green
+		if(info.flags & FILEFLAG_DIRECTORY)	// Directory: Green
 			write(_stdout, 6, "\x1B[32m");
+		else
+			write(_stdout, 6, "\x1B[37m");	// Default: White
 		
 		//Print Mode
 		#if 0
@@ -418,15 +419,15 @@ void Command_Dir(int argc, char **argv)
 		write(_stdout, 10, modeStr);
 		#endif
 		
-		//Print Name
+		// Print Name
 		write(_stdout, strlen(fileName), fileName);
-		//Print slash if applicable
+		// Print slash if applicable
 		if(info.flags & FILEFLAG_DIRECTORY)
 			write(_stdout, 1, "/");
 		
-		// Revert Colout and end line
+		// Revert Colour and end line
 		write(_stdout, 6, "\x1B[37m");
-		write(_stdout, 2, "\n");
+		write(_stdout, 1, "\n");
 	}
 	// Close Directory
 	close(dp);
-- 
2.20.1