Usermode/CLIShell - Fixed not catching execve returning

[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 4378d1d..89bfe0d 100644 (file)
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -49,7 +49,7 @@ char  **gasCommandHistory;
  int   giCommandSpace = 0;\r
 \r
 // ==== CODE ====\r
-int main(int argc, char *argv[], char *envp[])\r
+int main(int argc, char *argv[], char **envp)\r
 {\r
        char    *sCommandStr;\r
        char    *saArgs[32] = {0};\r
@@ -391,8 +391,11 @@ void CallCommand(char **Args)
        // Create new process\r
        pid = clone(CLONE_VM, 0);\r
        // Start Task\r
-       if(pid == 0)\r
+       if(pid == 0) {\r
                execve(sTmpBuffer, Args, gasEnvironment);\r
+               printf("Execve returned, ... oops\n");\r
+               exit(-1);\r
+       }\r
        if(pid <= 0) {\r
                printf("Unable to create process: `%s'\n", sTmpBuffer); // Error Message\r
        }\r
@@ -553,19 +556,19 @@ void Command_Dir(int argc, char **argv)
                \r
                // Print Mode\r
                // - Owner\r
-               acl.group = 0;  acl.id = info.uid;\r
+               acl.object = 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
                // - Group\r
-               acl.group = 1;  acl.id = info.gid;\r
+               acl.object = info.gid | 0x80000000;\r
                _SysGetACL(fp, &acl);\r
                if(acl.perms & 1)       modeStr[3] = 'r';       else    modeStr[3] = '-';\r
                if(acl.perms & 2)       modeStr[4] = 'w';       else    modeStr[4] = '-';\r
                if(acl.perms & 8)       modeStr[5] = 'x';       else    modeStr[5] = '-';\r
                // - World\r
-               acl.group = 1;  acl.id = -1;\r
+               acl.object = 0xFFFFFFFF;\r
                _SysGetACL(fp, &acl);\r
                if(acl.perms & 1)       modeStr[6] = 'r';       else    modeStr[6] = '-';\r
                if(acl.perms & 2)       modeStr[7] = 'w';       else    modeStr[7] = '-';\r