X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FCLIShell_src%2Fmain.c;h=aa1d9abec48744cd0f5182998adb526848ee1439;hb=f6b468cee21ebf1c9b98efec5315950aa043ead5;hp=e806a53746edd71dae3974467f5bc9ba45607dca;hpb=6098f7e3a0a3247c9517f9b04be814d16a98a564;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/CLIShell_src/main.c b/Usermode/Applications/CLIShell_src/main.c
index e806a537..aa1d9abe 100644
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -412,8 +412,12 @@ void Command_Dir(int argc, char **argv)
 		// Get File Stats
 		finfo(fp, &info, 0);
 		
-		//Print Mode
-		//#if 0
+		if(info.flags & FILEFLAG_DIRECTORY)
+			write(_stdout, 1, "d");
+		else
+			write(_stdout, 1, "-");
+		
+		// Print Mode
 		acl.group = 0;	acl.id = info.uid;
 		_SysGetACL(fp, &acl);
 		if(acl.perms & 1)	modeStr[0] = 'r';	else	modeStr[0] = '-';
@@ -430,16 +434,16 @@ void Command_Dir(int argc, char **argv)
 		if(acl.perms & 1)	modeStr[7] = 'w';	else	modeStr[7] = '-';
 		if(acl.perms & 1)	modeStr[8] = 'x';	else	modeStr[8] = '-';
 		write(_stdout, 10, modeStr);
-		//#endif
 		close(fp);
 		
 		// Colour Code
 		if(info.flags & FILEFLAG_DIRECTORY)	// Directory: Green
 			write(_stdout, 6, "\x1B[32m");
-		else
-			write(_stdout, 6, "\x1B[37m");	// Default: White
+		// Default: White
+		
 		// Print Name
 		write(_stdout, strlen(fileName), fileName);
+		
 		// Print slash if applicable
 		if(info.flags & FILEFLAG_DIRECTORY)
 			write(_stdout, 1, "/");
@@ -447,10 +451,8 @@ void Command_Dir(int argc, char **argv)
 		// Revert Colour
 		write(_stdout, 6, "\x1B[37m");
 		
-		// Put Size
-		printf("\n", info.size);
-		
-		//write(_stdout, 1, "\n");
+		// Newline!
+		write(_stdout, 1, "\n");
 	}
 	// Close Directory
 	close(dp);