Added "Free Me" Flag to VFS_ReadDir

[tpg/acess2.git] / Usermode / Applications / CLIShell_src / main.c

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