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 5c431bd..24c93dd 100644 (file)
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -48,7 +48,7 @@ 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
@@ -70,7 +70,6 @@ int main(int argc, char *argv[], char *envp[])
                if(saArgs[0])   free(saArgs);\r
                if(!bCached)    free(sCommandStr);\r
                bCached = 0;\r
-               write(_stdout, 1, "\n");\r
                write(_stdout, strlen(gsCurrentDirectory), gsCurrentDirectory);\r
                write(_stdout, 3, "$ ");\r
                \r
@@ -131,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
@@ -155,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
@@ -162,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