X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2FCLIShell_src%2Fmain.c;h=89bfe0d1af7428b0118c369f32857bd37d5f8d2a;hb=4d45d15216040b78b91af7469a796797b6b03c4f;hp=807527b1e59c69ef94afe34ba4a9327ce7ee4e5d;hpb=6c7e82169e66197939b83945812b02787ed0f52e;p=tpg%2Facess2.git

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