git.ucc.asn.au / tpg / acess2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed bit arithmatic
[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 30cf288..24c93dd 100644 (file)
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -1,9 +1,9 @@
 /*\r
- AcessOS Shell Version 2\r
-- Based on IOOS CLI Shell\r
-*/\r
+ * AcessOS Shell Version 3\r
+ */\r
 #include <acess/sys.h>\r
 #include <stdlib.h>\r
+#include <stdio.h>\r
 #include "header.h"\r
 \r
 #define _stdin 0\r
@@ -31,7 +31,7 @@ struct        {
 \r
 // ==== LOCAL VARIABLES ====\r
 char   gsCommandBuffer[1024];\r
-char   *gsCurrentDirectory = "/";\r
+char   *gsCurrentDirectory = NULL;\r
 char   gsTmpBuffer[1024];\r
 char   **gasCommandHistory;\r
  int   giLastCommand = 0;\r
@@ -48,11 +48,21 @@ int main(int argc, char *argv[], char *envp[])
         int    bCached = 1;\r
        t_sysFInfo      info;\r
        \r
-       //Command_Clear(0, NULL);\r
+       Command_Clear(0, NULL);\r
+       \r
+       {\r
+               char    *tmp = getenv("CWD");\r
+               if(tmp) {\r
+                       gsCurrentDirectory = malloc(strlen(tmp)+1);\r
+                       strcpy(gsCurrentDirectory, tmp);\r
+               } else {\r
+                       gsCurrentDirectory = malloc(2);\r
+                       strcpy(gsCurrentDirectory, "/");\r
+               }\r
+       }       \r
        \r
        write(_stdout, 1, "\n");\r
-       write(_stdout, 36, "Acess Shell Version 3\n");\r
-       write(_stdout, 30, " Based on CLI Shell for IOOS\n");\r
+       write(_stdout, 22, "Acess Shell Version 3\n");\r
        write(_stdout,  2, "\n");\r
        for(;;)\r
        {\r
@@ -120,6 +130,7 @@ int main(int argc, char *argv[], char *envp[])
                }\r
                // Load new executable\r
                pid = clone(CLONE_VM, 0);\r
+               printf("pid = %i\n", pid);\r
                if(pid == 0)    execve(gsTmpBuffer, &saArgs[1], envp);\r
                if(pid <= 0) {\r
                        Print("Unablt to create process: `");Print(gsTmpBuffer);Print("'\n");   // Error Message
@@ -144,6 +155,7 @@ char *ReadCommandLine(int *Length)
         \r
        // Preset Variables\r
        ret = malloc( space+1 );\r
+       if(!ret)        return NULL;\r
        len = 0;\r
        pos = 0;\r
                \r
@@ -151,7 +163,22 @@ char *ReadCommandLine(int *Length)
        do {\r
                read(_stdin, 1, &ch);   // Read Character from stdin (read is a blocking call)\r
                // Ignore control characters\r
-               if(ch < 0)      continue;\r
+               if(ch == '\x1B') {\r
+                       read(_stdin, 1, &ch);   // Read control character\r
+                       switch(ch)\r
+                       {\r
+                       case 'D':       if(pos) pos--;  break;\r
+                       case 'C':       if(pos<len)     pos++;  break;\r
+                       case '[':\r
+                               read(_stdin, 1, &ch);   // Read control character\r
+                               switch(ch)\r
+                               {\r
+                               case 'D':       if(pos) pos--;  break;\r
+                               case 'C':       if(pos<len)     pos++;  break;\r
+                               }\r
+                       }\r
+                       continue;\r
+               }\r
                // Backspace\r
                if(ch == '\b') {\r
                        if(len <= 0)            continue;       // Protect against underflows\r
@@ -325,7 +352,12 @@ void Command_Cd(int argc, char **argv)
                return;\r
        }\r
        \r
+       free(gsCurrentDirectory);\r
+       gsCurrentDirectory = malloc(strlen(tmpPath)+1);\r
        strcpy(gsCurrentDirectory, tmpPath);\r
+       \r
+       // Register change with kernel\r
+       chdir( gsCurrentDirectory );\r
 }\r
 \r
 /**\r
@@ -333,10 +365,11 @@ void Command_Cd(int argc, char **argv)
 void Command_Dir(int argc, char **argv)\r
 {\r
         int    dp, fp, dirLen;\r
-       //char  modeStr[11] = "RWXrwxRWX ";\r
+       char    modeStr[11] = "RWXrwxRWX ";\r
        char    tmpPath[1024];\r
        char    *fileName;\r
        t_sysFInfo      info;\r
+       t_sysACL        acl;\r
        \r
        // Generate Directory Path\r
        if(argc > 1)\r
@@ -397,36 +430,47 @@ void Command_Dir(int argc, char **argv)
                if(fp == -1)    continue;\r
                // Get File Stats\r
                finfo(fp, &info, 0);\r
+               \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
+               if(acl.perms & 2)       modeStr[1] = 'w';       else    modeStr[1] = '-';\r
+               if(acl.perms & 8)       modeStr[2] = 'x';       else    modeStr[2] = '-';\r
+               acl.group = 1;  acl.id = info.gid;\r
+               _SysGetACL(fp, &acl);\r
+               if(acl.perms & 1)       modeStr[3] = 'r';       else    modeStr[3] = '-';\r
+               if(acl.perms & 1)       modeStr[4] = 'w';       else    modeStr[4] = '-';\r
+               if(acl.perms & 1)       modeStr[5] = 'x';       else    modeStr[5] = '-';\r
+               acl.group = 1;  acl.id = -1;\r
+               _SysGetACL(fp, &acl);\r
+               if(acl.perms & 1)       modeStr[6] = 'r';       else    modeStr[6] = '-';\r
+               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
                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
-               \r
-               //Print Mode\r
-               #if 0\r
-               if(stats.st_mode & 0400)        modeStr[0] = 'R';       else    modeStr[0] = '-';\r
-               if(stats.st_mode & 0200)        modeStr[1] = 'W';       else    modeStr[1] = '-';\r
-               if(stats.st_mode & 0100)        modeStr[2] = 'X';       else    modeStr[2] = '-';\r
-               if(stats.st_mode & 0040)        modeStr[3] = 'R';       else    modeStr[3] = '-';\r
-               if(stats.st_mode & 0020)        modeStr[4] = 'W';       else    modeStr[4] = '-';\r
-               if(stats.st_mode & 0010)        modeStr[5] = 'X';       else    modeStr[5] = '-';\r
-               if(stats.st_mode & 0004)        modeStr[6] = 'R';       else    modeStr[6] = '-';\r
-               if(stats.st_mode & 0002)        modeStr[7] = 'W';       else    modeStr[7] = '-';\r
-               if(stats.st_mode & 0001)        modeStr[8] = 'X';       else    modeStr[8] = '-';\r
-               write(_stdout, 10, modeStr);\r
-               #endif\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
                \r
-               // Revert Colour and end line\r
+               // Revert Colour\r
                write(_stdout, 6, "\x1B[37m");\r
+               \r
+               // Newline!\r
                write(_stdout, 1, "\n");\r
        }\r
        // Close Directory\r
Acess2 is a semi-POSIX-compatible home-brew OS.

UCC git Repository :: git.ucc.asn.au