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

diff --git a/Usermode/Applications/CLIShell_src/main.c b/Usermode/Applications/CLIShell_src/main.c
index aa1d9abe..89bfe0d1 100644
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -1,11 +1,17 @@
 /*
  * AcessOS Shell Version 3
  */
+#define USE_READLINE	1
 #include <acess/sys.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "header.h"
 
+#if USE_READLINE
+# include "readline.h"
+#endif
+
 #define _stdin	0
 #define _stdout	1
 #define _stderr	2
@@ -13,42 +19,52 @@
 // ==== PROTOTYPES ====
 char	*ReadCommandLine(int *Length);
 void	Parse_Args(char *str, char **dest);
-void	Command_Colour(int argc, char **argv);
+void	CallCommand(char **Args);
+void	Command_Logout(int argc, char **argv);
 void	Command_Clear(int argc, char **argv);
+void	Command_Help(int argc, char **argv);
 void	Command_Cd(int argc, char **argv);
 void	Command_Dir(int argc, char **argv);
 
 // ==== CONSTANT GLOBALS ====
-char	*cCOLOUR_NAMES[8] = {"black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"};
 struct	{
 	char	*name;
 	void	(*fcn)(int argc, char **argv);
 }	cBUILTINS[] = {
-	{"colour", Command_Colour}, {"clear", Command_Clear},
+	{"exit", Command_Logout},	{"logout", Command_Logout},
+	{"help", Command_Help}, {"clear", Command_Clear},
 	{"cd", Command_Cd}, {"dir", Command_Dir}
 };
+static char	*cDEFAULT_PATH[] = {"/Acess/Bin"};
 #define	BUILTIN_COUNT	(sizeof(cBUILTINS)/sizeof(cBUILTINS[0]))
 
 // ==== LOCAL VARIABLES ====
+ int	giNumPathDirs = 1;
+char	**gasPathDirs = cDEFAULT_PATH;
+char	**gasEnvironment;
 char	gsCommandBuffer[1024];
 char	*gsCurrentDirectory = NULL;
-char	gsTmpBuffer[1024];
 char	**gasCommandHistory;
  int	giLastCommand = 0;
  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];
+	char	*saArgs[32] = {0};
 	 int	length = 0;
-	 int	pid = -1;
+	 int	i;
 	 int	iArgCount = 0;
+	#if !USE_READLINE
 	 int	bCached = 1;
-	t_sysFInfo	info;
+	#else
+	tReadline	*readline_state = Readline_Init(1);
+	#endif
 	
-	//Command_Clear(0, NULL);
+	gasEnvironment = envp;
+	
+	Command_Clear(0, NULL);
 	
 	{
 		char	*tmp = getenv("CWD");
@@ -61,22 +77,31 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}	
 	
-	write(_stdout, 1, "\n");
-	write(_stdout, 22, "Acess Shell Version 3\n");
-	write(_stdout,  2, "\n");
+	printf("Acess Shell Version 3\n\n");
 	for(;;)
 	{
 		// Free last command & arguments
 		if(saArgs[0])	free(saArgs);
+		#if !USE_READLINE
 		if(!bCached)	free(sCommandStr);
 		bCached = 0;
-		write(_stdout, 1, "\n");
-		write(_stdout, strlen(gsCurrentDirectory), gsCurrentDirectory);
-		write(_stdout, 3, "$ ");
+		#endif
+		
+		printf("%s$ ", gsCurrentDirectory);
 		
 		// Read Command line
+		#if USE_READLINE
+		sCommandStr = Readline( readline_state );
+		printf("\n");
+		length = strlen(sCommandStr);
+		#else
 		sCommandStr = ReadCommandLine( &length );
 		
+		if(!sCommandStr) {
+			printf("PANIC: Out of heap space\n");
+			return -1;
+		}
+		
 		// Check if the command should be cached
 		if(gasCommandHistory == NULL || strcmp(sCommandStr, gasCommandHistory[giLastCommand]) != 0)
 		{
@@ -88,6 +113,7 @@ int main(int argc, char *argv[], char *envp[])
 			gasCommandHistory[ giLastCommand ] = sCommandStr;
 			bCached = 1;
 		}
+		#endif
 		
 		// Parse Command Line into arguments
 		Parse_Args(sCommandStr, saArgs);
@@ -100,49 +126,26 @@ int main(int argc, char *argv[], char *envp[])
 		if(saArgs[1][0] == '\0')	continue;
 		
 		// Check Built-In Commands
-		//  [HACK] Mem Usage - Use Length in place of `i'
-		for(length=0;length<BUILTIN_COUNT;length++)
+		for( i = 0; i < BUILTIN_COUNT; i++ )
 		{
-			if(strcmp(saArgs[1], cBUILTINS[length].name) == 0)
+			if( strcmp(saArgs[1], cBUILTINS[i].name) == 0 )
 			{
-				cBUILTINS[length].fcn(iArgCount-1, &saArgs[1]);
+				cBUILTINS[i].fcn(iArgCount-1, &saArgs[1]);
 				break;
 			}
 		}
+		if(i != BUILTIN_COUNT)	continue;
 		
-		if(length != BUILTIN_COUNT)	continue;
-		
-		// - Calling a file
-		GeneratePath(saArgs[1], gsCurrentDirectory, gsTmpBuffer);
-		// Use length in place of fp
-		length = open(gsTmpBuffer, 0);
-		// Check file existence
-		if(length == -1) {
-			Print("Unknown Command: `");Print(saArgs[1]);Print("'\n");	// Error Message
-			continue;
-		}
-		// Check if the file is a directory
-		finfo( length, &info, 0 );
-		close( length );
-		if(info.flags & FILEFLAG_DIRECTORY) {
-			Print("`");Print(saArgs[1]);	// Error Message
-			Print("' is a directory.\n");
-			continue;
-		}
-		// Load new executable
-		pid = clone(CLONE_VM, 0);
-		if(pid == 0)	execve(gsTmpBuffer, &saArgs[1], envp);
-		if(pid <= 0) {
-			Print("Unablt to create process: `");Print(gsTmpBuffer);Print("'\n");	// Error Message
-			//SysDebug("pid = %i\n", pid);
-		}
-		else {
-			 int	status;
-			waittid(pid, &status);
-		}
+		// Shall we?
+		CallCommand( &saArgs[1] );
+		
+		#if USE_READLINE
+		free( sCommandStr );
+		#endif
 	}
 }
 
+#if !USE_READLINE
 /**
  * \fn char *ReadCommandLine(int *Length)
  * \brief Read from the command line
@@ -152,51 +155,135 @@ char *ReadCommandLine(int *Length)
 	char	*ret;
 	 int	len, pos, space = 1023;
 	char	ch;
+	#if 0
+	 int	scrollbackPos = giLastCommand;
+	#endif
 	 
 	// Preset Variables
 	ret = malloc( space+1 );
-	len = 0;
-	pos = 0;
+	if(!ret)	return NULL;
+	len = 0;	pos = 0;
 		
 	// Read In Command Line
 	do {
-		read(_stdin, 1, &ch);	// Read Character from stdin (read is a blocking call)
-		// Ignore control characters
-		if(ch < 0)	continue;
+		ch = getchar();	// Read Character from stdin (read is a blocking call)
+		if(ch == '\n')	break;
+		
+		switch(ch)
+		{
+		// Control characters
+		case '\x1B':
+			ch = getchar();	// Read control character
+			switch(ch)
+			{
+			//case 'D':	if(pos)	pos--;	break;
+			//case 'C':	if(pos<len)	pos++;	break;
+			case '[':
+				ch = getchar();	// Read control character
+				switch(ch)
+				{
+				#if 0
+				case 'A':	// Up
+					{
+						 int	oldLen = len;
+						if( scrollbackPos > 0 )	break;
+						
+						free(ret);
+						ret = strdup( gasCommandHistory[--scrollbackPos] );
+						
+						len = strlen(ret);
+						while(pos--)	printf("\x1B[D");
+						write(_stdout, len, ret);	pos = len;
+						while(pos++ < oldLen)	write(_stdout, 1, " ");
+					}
+					break;
+				case 'B':	// Down
+					{
+						 int	oldLen = len;
+						if( scrollbackPos < giLastCommand-1 )	break;
+						
+						free(ret);
+						ret = strdup( gasCommandHistory[++scrollbackPos] );
+						
+						len = strlen(ret);
+						while(pos--)	write(_stdout, 3, "\x1B[D");
+						write(_stdout, len, ret);	pos = len;
+						while(pos++ < oldLen)	write(_stdout, 1, " ");
+					}
+					break;
+				#endif
+				case 'D':	// Left
+					if(pos == 0)	break;
+					pos --;
+					printf("\x1B[D");
+					break;
+				case 'C':	// Right
+					if(pos == len)	break;
+					pos++;
+					printf("\x1B[C");
+					break;
+				}
+			}
+			break;
+		
 		// Backspace
-		if(ch == '\b') {
-			if(len <= 0)		continue;	// Protect against underflows
+		case '\b':
+			if(len <= 0)		break;	// Protect against underflows
+			putchar(ch);
 			if(pos == len) {	// Simple case of end of string
-				len --;	pos--;
-			} else {
+				len --;
+				pos--;
+			}
+			else {
+				printf("%.*s ", len-pos, &ret[pos]);	// Move Text
+				printf("\x1B[%iD", len-pos+1);
+				// Alter Buffer
 				memmove(&ret[pos-1], &ret[pos], len-pos);
 				pos --;
 				len --;
 			}
-			write(_stdout, 1, &ch);
-			continue;
-		}
-		// Expand Buffer
-		if(len > space) {
-			space += 256;
-			ret = realloc(ret, space+1);
-			if(!ret)	return NULL;
-		}
+			break;
+		
+		// Tab
+		case '\t':
+			//TODO: Implement Tab-Completion
+			//Currently just ignore tabs
+			break;
 		
-		write(_stdout, 1, &ch);
-		ret[pos++] = ch;
-		len ++;
+		default:		
+			// Expand Buffer
+			if(len+1 > space) {
+				space += 256;
+				ret = realloc(ret, space+1);
+				if(!ret)	return NULL;
+			}
+			
+			// Editing inside the buffer
+			if(pos != len) {
+				putchar(ch);	// Print new character
+				printf("%.*s", len-pos, &ret[pos]);	// Move Text
+				printf("\x1B[%iD", len-pos);
+				memmove( &ret[pos+1], &ret[pos], len-pos );
+			}
+			else {
+				putchar(ch);
+			}
+			ret[pos++] = ch;
+			len ++;
+			break;
+		}
 	} while(ch != '\n');
 	
-	// Remove newline
-	pos --;
-	ret[pos] = '\0';
+	// Cap String
+	ret[len] = '\0';
+	printf("\n");
 	
 	// Return length
 	if(Length)	*Length = len;
 	
 	return ret;
 }
+#endif
 
 /**
  * \fn void Parse_Args(char *str, char **dest)
@@ -207,6 +294,12 @@ void Parse_Args(char *str, char **dest)
 	 int	i = 1;
 	char	*buf = malloc( strlen(str) + 1 );
 	
+	if(buf == NULL) {
+		dest[0] = NULL;
+		printf("Parse_Args: Out of heap space!\n");
+		return ;
+	}
+	
 	strcpy(buf, str);
 	dest[0] = buf;
 	
@@ -238,71 +331,115 @@ void Parse_Args(char *str, char **dest)
 }
 
 /**
- * \fn void Command_Colour(int argc, char **argv)
- * \brief 
+ * \fn void CallCommand(char **Args)
  */
-void Command_Colour(int argc, char **argv)
+void CallCommand(char **Args)
 {
-	int fg, bg;
-	char	clrStr[6] = "\x1B[37m";
+	t_sysFInfo	info;
+	 int	pid = -1;
+	 int	fd = 0;
+	char	sTmpBuffer[1024];
+	char	*exefile = Args[0];
 	
-	// Verify Arg Count
-	if(argc < 2)
+	if(exefile[0] == '/'
+	|| (exefile[0] == '.' && exefile[1] == '/')
+	|| (exefile[0] == '.' && exefile[1] == '.' && exefile[2] == '/')
+		)
 	{
-		Print("Please specify a colour\n");
-		goto usage;
-	}
-	
-	// Check Colour
-	for(fg=0;fg<8;fg++)
-		if(strcmp(cCOLOUR_NAMES[fg], argv[1]) == 0)
-			break;
-
-	// Foreground a valid colour
-	if(fg == 8) {
-		Print("Unknown Colour '");Print(argv[1]);Print("'\n");
-		goto usage;
+		GeneratePath(exefile, gsCurrentDirectory, sTmpBuffer);
+		// Check file existence
+		fd = open(sTmpBuffer, OPENFLAG_EXEC);
+		if(fd == -1) {
+			printf("Unknown Command: `%s'\n", Args[0]);	// Error Message
+			return ;
+		}
+		
+		// Get File info and close file
+		finfo( fd, &info, 0 );
+		close( fd );
+		
+		// Check if the file is a directory
+		if(info.flags & FILEFLAG_DIRECTORY) {
+			printf("`%s' is a directory.\n", sTmpBuffer);
+			return ;
+		}
 	}
-	// Set Foreground
-	clrStr[3] = '0' + fg;
-	write(_stdout, 6, clrStr);
-	
-	// Need to Set Background?
-	if(argc > 2)
+	else
 	{
-		for(bg=0;bg<8;bg++)
-			if(strcmp(cCOLOUR_NAMES[bg], argv[2]) == 0)
-				break;
-	
-		// Valid colour
-		if(bg == 8)
+		 int	i;
+		
+		// Check all components of $PATH
+		for( i = 0; i < giNumPathDirs; i++ )
 		{
-			Print("Unknown Colour '");Print(argv[2]);Print("'\n");
-			goto usage;
+			GeneratePath(exefile, gasPathDirs[i], sTmpBuffer);
+			fd = open(sTmpBuffer, OPENFLAG_EXEC);
+			if(fd == -1)	continue;
+			finfo( fd, &info, 0 );
+			close( fd );
+			if(info.flags & FILEFLAG_DIRECTORY)	continue;
+			// Woohoo! We found a valid command
+			break;
+		}
+		
+		// Exhausted path directories
+		if( i == giNumPathDirs ) {
+			printf("Unknown Command: `%s'\n", exefile);
+			return ;
 		}
+	}
 	
-		clrStr[2] = '4';
-		clrStr[3] = '0' + bg;
-		write(_stdout, 6, clrStr);
+	// Create new process
+	pid = clone(CLONE_VM, 0);
+	// Start Task
+	if(pid == 0) {
+		execve(sTmpBuffer, Args, gasEnvironment);
+		printf("Execve returned, ... oops\n");
+		exit(-1);
 	}
-	// Return
-	return;
-
-	// Function Usage (Requested via a Goto (I know it's ugly))
-usage:
-	Print("Valid Colours are ");
-	for(fg=0;fg<8;fg++)
-	{
-		Print(cCOLOUR_NAMES[fg]);
-		write(_stdout, 3, ", ");
+	if(pid <= 0) {
+		printf("Unable to create process: `%s'\n", sTmpBuffer);	// Error Message
+	}
+	else {
+		 int	status;
+		waittid(pid, &status);
 	}
-	write(_stdout, 4, "\b\b\n");
+}
+
+/**
+ * \fn void Command_Logout(int argc, char **argv)
+ * \brief Exit the shell, logging the user out
+ */
+void Command_Logout(int argc, char **argv)
+{
+	exit(0);
+}
+
+/**
+ * \fn void Command_Colour(int argc, char **argv)
+ * \brief Displays the help screen
+ */
+void Command_Help(int argc, char **argv)
+{
+	printf( "Acess 2 Command Line Interface\n"
+		" By John Hodge (thePowersGang / [TPG])\n"
+		"\n"
+		"Builtin Commands:\n"
+		" logout: Return to the login prompt\n"
+		" exit:   Same\n"
+		" help:   Display this message\n"
+		" clear:  Clear the screen\n"
+		" cd:     Change the current directory\n"
+		" dir:    Print the contents of the current directory\n");
 	return;
 }
 
+/**
+ * \fn void Command_Clear(int argc, char **argv)
+ * \brief Clear the screen
+ */
 void Command_Clear(int argc, char **argv)
 {
-	write(_stdout, 4, "\x1B[2J");	//Clear Screen
+	write(_stdout, "\x1B[2J", 4);	//Clear Screen
 }
 
 /**
@@ -317,7 +454,7 @@ void Command_Cd(int argc, char **argv)
 	
 	if(argc < 2)
 	{
-		Print(gsCurrentDirectory);Print("\n");
+		printf("%s\n", gsCurrentDirectory);
 		return;
 	}
 	
@@ -325,23 +462,28 @@ void Command_Cd(int argc, char **argv)
 	
 	fp = open(tmpPath, 0);
 	if(fp == -1) {
-		write(_stdout, 26, "Directory does not exist\n");
+		printf("Directory does not exist\n");
 		return;
 	}
 	finfo(fp, &stats, 0);
 	close(fp);
 	
 	if( !(stats.flags & FILEFLAG_DIRECTORY) ) {
-		write(_stdout, 17, "Not a Directory\n");
+		printf("Not a Directory\n");
 		return;
 	}
 	
 	free(gsCurrentDirectory);
 	gsCurrentDirectory = malloc(strlen(tmpPath)+1);
 	strcpy(gsCurrentDirectory, tmpPath);
+	
+	// Register change with kernel
+	chdir( gsCurrentDirectory );
 }
 
 /**
+ * \fn void Command_Dir(int argc, char **argv)
+ * \brief Print the contents of a directory
  */
 void Command_Dir(int argc, char **argv)
 {
@@ -366,26 +508,21 @@ void Command_Dir(int argc, char **argv)
 	// Check if file opened
 	if(dp == -1)
 	{
-		//printf("Unable to open directory `%s', File cannot be found\n", tmpPath);
-		write(_stdout, 27, "Unable to open directory `");
-		write(_stdout, strlen(tmpPath)+1, tmpPath);
-		write(_stdout, 25, "', File cannot be found\n");
+		printf("Unable to open directory `%s', File cannot be found\n", tmpPath);
 		return;
 	}
 	// Get File Stats
 	if( finfo(dp, &info, 0) == -1 )
 	{
 		close(dp);
-		write(_stdout, 34, "stat Failed, Bad File Descriptor\n");
+		printf("stat Failed, Bad File Descriptor\n");
 		return;
 	}
 	// Check if it's a directory
 	if(!(info.flags & FILEFLAG_DIRECTORY))
 	{
 		close(dp);
-		write(_stdout, 27, "Unable to open directory `");
-		write(_stdout, strlen(tmpPath)+1, tmpPath);
-		write(_stdout, 20, "', Not a directory\n");
+		printf("Unable to open directory `%s', Not a directory\n", tmpPath);
 		return;
 	}
 	
@@ -403,7 +540,7 @@ void Command_Dir(int argc, char **argv)
 		if(fp < 0)
 		{
 			if(fp == -3)
-				write(_stdout, 42, "Invalid Permissions to traverse directory\n");
+				printf("Invalid Permissions to traverse directory\n");
 			break;
 		}
 		// Open File
@@ -413,46 +550,49 @@ void Command_Dir(int argc, char **argv)
 		finfo(fp, &info, 0);
 		
 		if(info.flags & FILEFLAG_DIRECTORY)
-			write(_stdout, 1, "d");
+			printf("d");
 		else
-			write(_stdout, 1, "-");
+			printf("-");
 		
 		// Print Mode
-		acl.group = 0;	acl.id = info.uid;
+		// - Owner
+		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] = '-';
-		acl.group = 1;	acl.id = info.gid;
+		// - Group
+		acl.object = info.gid | 0x80000000;
 		_SysGetACL(fp, &acl);
 		if(acl.perms & 1)	modeStr[3] = 'r';	else	modeStr[3] = '-';
-		if(acl.perms & 1)	modeStr[4] = 'w';	else	modeStr[4] = '-';
-		if(acl.perms & 1)	modeStr[5] = 'x';	else	modeStr[5] = '-';
-		acl.group = 1;	acl.id = -1;
+		if(acl.perms & 2)	modeStr[4] = 'w';	else	modeStr[4] = '-';
+		if(acl.perms & 8)	modeStr[5] = 'x';	else	modeStr[5] = '-';
+		// - World
+		acl.object = 0xFFFFFFFF;
 		_SysGetACL(fp, &acl);
 		if(acl.perms & 1)	modeStr[6] = 'r';	else	modeStr[6] = '-';
-		if(acl.perms & 1)	modeStr[7] = 'w';	else	modeStr[7] = '-';
-		if(acl.perms & 1)	modeStr[8] = 'x';	else	modeStr[8] = '-';
-		write(_stdout, 10, modeStr);
+		if(acl.perms & 2)	modeStr[7] = 'w';	else	modeStr[7] = '-';
+		if(acl.perms & 8)	modeStr[8] = 'x';	else	modeStr[8] = '-';
+		printf(modeStr);
 		close(fp);
 		
 		// Colour Code
 		if(info.flags & FILEFLAG_DIRECTORY)	// Directory: Green
-			write(_stdout, 6, "\x1B[32m");
+			printf("\x1B[32m");
 		// Default: White
 		
 		// Print Name
-		write(_stdout, strlen(fileName), fileName);
+		printf("%s", fileName);
 		
 		// Print slash if applicable
 		if(info.flags & FILEFLAG_DIRECTORY)
-			write(_stdout, 1, "/");
+			printf("/");
 		
 		// Revert Colour
-		write(_stdout, 6, "\x1B[37m");
+		printf("\x1B[37m");
 		
 		// Newline!
-		write(_stdout, 1, "\n");
+		printf("\n");
 	}
 	// Close Directory
 	close(dp);