X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FCLIShell_src%2Fmain.c;h=6de92df42d99804328e83ec3cf86e74025ad2b8c;hb=5cab4c07bc13888dc7956194ef9595508072a4eb;hp=501359a8f45b87b0fdae5ffa99f541663da61a38;hpb=98ea056d588fc2041d1816e67d18d2dd9364da1a;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/CLIShell_src/main.c b/Usermode/Applications/CLIShell_src/main.c
index 501359a8..6de92df4 100644
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -8,6 +8,8 @@
 #include <string.h>
 #include "header.h"
 #include <readline.h>
+#include <errno.h>
+#include <acess/devices/pty.h>
 
 #define _stdin	0
 #define _stdout	1
@@ -31,11 +33,11 @@ struct	{
 	{"help", Command_Help}, {"clear", Command_Clear},
 	{"cd", Command_Cd}, {"dir", Command_Dir}
 };
-static char	*cDEFAULT_PATH[] = {"/Acess/Bin"};
+static char	*cDEFAULT_PATH[] = {"/Acess/Bin","/Acess/SBin"};
 #define	BUILTIN_COUNT	(sizeof(cBUILTINS)/sizeof(cBUILTINS[0]))
 
 // ==== LOCAL VARIABLES ====
- int	giNumPathDirs = 1;
+ int	giNumPathDirs = 2;
 char	**gasPathDirs = cDEFAULT_PATH;
 char	**gasEnvironment;
 char	gsCommandBuffer[1024];
@@ -55,7 +57,7 @@ int main(int argc, char *argv[], char **envp)
 	
 	gasEnvironment = envp;
 	
-	Command_Clear(0, NULL);
+//	Command_Clear(0, NULL);
 	
 	{
 		char	*tmp = getenv("CWD");
@@ -80,6 +82,10 @@ int main(int argc, char *argv[], char **envp)
 		// Read Command line
 		sCommandStr = Readline( readline_state );
 		printf("\n");
+		if( !sCommandStr ) {
+			perror("Readline");
+			return 1;
+		}
 		
 		// Parse Command Line into arguments
 		iArgCount = Parse_Args(sCommandStr, saArgs);
@@ -208,14 +214,28 @@ void CallCommand(char **Args)
 	
 	// Create new process
 	int fds[] = {0, 1, 2};
+	 int	status;
 	pid = _SysSpawn(sTmpBuffer, (const char **)Args, (const char **)gasEnvironment, 3, fds, NULL);
 	if(pid <= 0) {
 		printf("Unable to create process: `%s'\n", sTmpBuffer);	// Error Message
+		status = 0;
 	}
 	else {
-		 int	status;
+		_SysIOCtl(0, PTY_IOCTL_SETPGRP, &pid);
 		_SysWaitTID(pid, &status);
 	}
+	
+	// Return terminal to a sane state
+	{
+		int zero = 0;
+		_SysIOCtl(0, PTY_IOCTL_SETPGRP, &zero);
+		printf("\x1b[0m");
+	}
+	// Print a status message if termination was non-clean
+	if( status )
+	{
+		printf("[%i] exited %i\n", pid, status);
+	}
 }
 
 /**