X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FCLIShell_src%2Fmain.c;h=6de92df42d99804328e83ec3cf86e74025ad2b8c;hb=13078002b01ee4f63eb2001d2ef479a2a006ea32;hp=30cf2883eb008608c98702f757dc2fa632555941;hpb=b97cf32102225af9c393b53aa7f0a6703ccf2fae;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/CLIShell_src/main.c b/Usermode/Applications/CLIShell_src/main.c
index 30cf2883..6de92df4 100644
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -1,201 +1,131 @@
 /*
- AcessOS Shell Version 2
-- Based on IOOS CLI Shell
-*/
+ * AcessOS Shell Version 3
+ */
+#define USE_READLINE	1
 #include <acess/sys.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "header.h"
+#include <readline.h>
+#include <errno.h>
+#include <acess/devices/pty.h>
 
 #define _stdin	0
 #define _stdout	1
 #define _stderr	2
 
 // ==== PROTOTYPES ====
-char	*ReadCommandLine(int *Length);
-void	Parse_Args(char *str, char **dest);
-void	Command_Colour(int argc, char **argv);
+ int	Parse_Args(const char *str, char **dest);
+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","/Acess/SBin"};
 #define	BUILTIN_COUNT	(sizeof(cBUILTINS)/sizeof(cBUILTINS[0]))
 
 // ==== LOCAL VARIABLES ====
+ int	giNumPathDirs = 2;
+char	**gasPathDirs = cDEFAULT_PATH;
+char	**gasEnvironment;
 char	gsCommandBuffer[1024];
-char	*gsCurrentDirectory = "/";
-char	gsTmpBuffer[1024];
+char	*gsCurrentDirectory = NULL;
 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];
-	 int	length = 0;
-	 int	pid = -1;
+	char	*saArgs[32] = {0};
+	 int	i;
 	 int	iArgCount = 0;
-	 int	bCached = 1;
-	t_sysFInfo	info;
+	tReadline	*readline_state = Readline_Init(1);
+	
+	gasEnvironment = envp;
 	
-	//Command_Clear(0, NULL);
+//	Command_Clear(0, NULL);
+	
+	{
+		char	*tmp = getenv("CWD");
+		if(tmp) {
+			gsCurrentDirectory = malloc(strlen(tmp)+1);
+			strcpy(gsCurrentDirectory, tmp);
+		} else {
+			gsCurrentDirectory = malloc(2);
+			strcpy(gsCurrentDirectory, "/");
+		}
+	}	
 	
-	write(_stdout, 1, "\n");
-	write(_stdout, 36, "Acess Shell Version 3\n");
-	write(_stdout, 30, " Based on CLI Shell for IOOS\n");
-	write(_stdout,  2, "\n");
+	printf("Acess Shell Version 3\n\n");
 	for(;;)
 	{
 		// Free last command & arguments
-		if(saArgs[0])	free(saArgs);
-		if(!bCached)	free(sCommandStr);
-		bCached = 0;
-		write(_stdout, strlen(gsCurrentDirectory), gsCurrentDirectory);
-		write(_stdout, 3, "$ ");
+		if(saArgs[0])	free(saArgs[0]);
 		
-		// Read Command line
-		sCommandStr = ReadCommandLine( &length );
+		printf("%s$ ", gsCurrentDirectory);
+		fflush(stdout);
 		
-		// Check if the command should be cached
-		if(gasCommandHistory == NULL || strcmp(sCommandStr, gasCommandHistory[giLastCommand]) != 0)
-		{
-			if(giLastCommand >= giCommandSpace) {
-				giCommandSpace += 12;
-				gasCommandHistory = realloc(gasCommandHistory, giCommandSpace*sizeof(char*));
-			}
-			giLastCommand ++;
-			gasCommandHistory[ giLastCommand ] = sCommandStr;
-			bCached = 1;
+		// Read Command line
+		sCommandStr = Readline( readline_state );
+		printf("\n");
+		if( !sCommandStr ) {
+			perror("Readline");
+			return 1;
 		}
 		
 		// Parse Command Line into arguments
-		Parse_Args(sCommandStr, saArgs);
-		
-		// Count Arguments
-		iArgCount = 0;
-		while(saArgs[iArgCount])	iArgCount++;
+		iArgCount = Parse_Args(sCommandStr, saArgs);
 		
 		// Silently Ignore all empty commands
 		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);
-		}
-	}
-}
-
-/**
- * \fn char *ReadCommandLine(int *Length)
- * \brief Read from the command line
- */
-char *ReadCommandLine(int *Length)
-{
-	char	*ret;
-	 int	len, pos, space = 1023;
-	char	ch;
-	 
-	// Preset Variables
-	ret = malloc( space+1 );
-	len = 0;
-	pos = 0;
+		// Shall we?
+		CallCommand( &saArgs[1] );
 		
-	// 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;
-		// Backspace
-		if(ch == '\b') {
-			if(len <= 0)		continue;	// Protect against underflows
-			if(pos == len) {	// Simple case of end of string
-				len --;	pos--;
-			} else {
-				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;
-		}
-		
-		write(_stdout, 1, &ch);
-		ret[pos++] = ch;
-		len ++;
-	} while(ch != '\n');
-	
-	// Remove newline
-	pos --;
-	ret[pos] = '\0';
-	
-	// Return length
-	if(Length)	*Length = len;
-	
-	return ret;
+		free( sCommandStr );
+	}
 }
 
 /**
- * \fn void Parse_Args(char *str, char **dest)
+ * \fn int Parse_Args(const char *str, char **dest)
  * \brief Parse a string into an argument array
  */
-void Parse_Args(char *str, char **dest)
+int Parse_Args(const 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 0;
+	}
+	
 	strcpy(buf, str);
 	dest[0] = buf;
 	
@@ -220,78 +150,129 @@ void Parse_Args(char *str, char **dest)
 		if(*buf == '\0')	break;
 	}
 	dest[i] = NULL;
-	if(i == 1) {
-		free(buf);
-		dest[0] = NULL;
-	}
+	
+	return i;
 }
 
 /**
- * \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 = _SysOpen(sTmpBuffer, OPENFLAG_EXEC);
+		if(fd == -1) {
+			printf("Unknown Command: `%s'\n", Args[0]);	// Error Message
+			return ;
+		}
+		
+		// Get File info and close file
+		_SysFInfo( fd, &info, 0 );
+		_SysClose( 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 = _SysOpen(sTmpBuffer, OPENFLAG_EXEC);
+			if(fd == -1)	continue;
+			_SysFInfo( fd, &info, 0 );
+			_SysClose( 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
+	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;
 	}
-	// Return
-	return;
-
-	// Function Usage (Requested via a Goto (I know it's ugly))
-usage:
-	Print("Valid Colours are ");
-	for(fg=0;fg<8;fg++)
+	else {
+		_SysIOCtl(0, PTY_IOCTL_SETPGRP, &pid);
+		_SysWaitTID(pid, &status);
+	}
+	
+	// Return terminal to a sane state
 	{
-		Print(cCOLOUR_NAMES[fg]);
-		write(_stdout, 3, ", ");
+		int zero = 0;
+		_SysIOCtl(0, PTY_IOCTL_SETPGRP, &zero);
+		printf("\x1b[0m");
 	}
-	write(_stdout, 4, "\b\b\n");
+	// Print a status message if termination was non-clean
+	if( status )
+	{
+		printf("[%i] exited %i\n", pid, status);
+	}
+}
+
+/**
+ * \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
+	_SysWrite(_stdout, "\x1B[2J", 4);	//Clear Screen
 }
 
 /**
@@ -306,129 +287,134 @@ void Command_Cd(int argc, char **argv)
 	
 	if(argc < 2)
 	{
-		Print(gsCurrentDirectory);Print("\n");
+		printf("%s\n", gsCurrentDirectory);
 		return;
 	}
 	
 	GeneratePath(argv[1], gsCurrentDirectory, tmpPath);
 	
-	fp = open(tmpPath, 0);
+	fp = _SysOpen(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);
+	_SysFInfo(fp, &stats, 0);
+	_SysClose(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
+	_SysChdir( gsCurrentDirectory );
 }
 
 /**
+ * \fn void Command_Dir(int argc, char **argv)
+ * \brief Print the contents of a directory
  */
 void Command_Dir(int argc, char **argv)
 {
-	 int	dp, fp, dirLen;
-	//char	modeStr[11] = "RWXrwxRWX ";
-	char	tmpPath[1024];
-	char	*fileName;
+	 int	dp, fp;
+	char	modeStr[11] = "RWXrwxRWX ";
+	char	fileName[256];
 	t_sysFInfo	info;
+	t_sysACL	acl;
 	
+
+	// -- Generate and open directory --
 	// Generate Directory Path
+	char	tmpPath[1024];
 	if(argc > 1)
-		dirLen = GeneratePath(argv[1], gsCurrentDirectory, tmpPath);
+		GeneratePath(argv[1], gsCurrentDirectory, tmpPath);
 	else
-	{
 		strcpy(tmpPath, gsCurrentDirectory);
-	}
-	dirLen = strlen(tmpPath);
-	
 	// Open Directory
-	dp = open(tmpPath, OPENFLAG_READ);
-	// 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");
+	dp = _SysOpen(tmpPath, OPENFLAG_READ);
+	if(dp == -1) {
+		printf("Unable to open directory `%s', File cannot be found\n", tmpPath);
 		return;
 	}
 	// Get File Stats
-	if( finfo(dp, &info, 0) == -1 )
+	if( _SysFInfo(dp, &info, 0) == -1 )
 	{
-		close(dp);
-		write(_stdout, 34, "stat Failed, Bad File Descriptor\n");
+		_SysClose(dp);
+		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");
+		_SysClose(dp);
+		printf("Unable to open directory `%s', Not a directory\n", tmpPath);
 		return;
 	}
 	
-	// Append Shash for file paths
-	if(tmpPath[dirLen-1] != '/')
-	{
-		tmpPath[dirLen++] = '/';
-		tmpPath[dirLen] = '\0';
-	}
-	
-	fileName = (char*)(tmpPath+dirLen);
-	// Read Directory Content
-	while( (fp = readdir(dp, fileName)) )
+	// -- Read Directory Contents --
+	while( (fp = _SysReadDir(dp, fileName)) )
 	{
 		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
-		fp = open(tmpPath, 0);
+		fp = _SysOpenChild(dp, fileName, 0);
 		if(fp == -1)	continue;
 		// Get File Stats
-		finfo(fp, &info, 0);
-		close(fp);
+		_SysFInfo(fp, &info, 0);
 		
-		// Colour Code
-		if(info.flags & FILEFLAG_DIRECTORY)	// Directory: Green
-			write(_stdout, 6, "\x1B[32m");
+		if(info.flags & FILEFLAG_DIRECTORY)
+			printf("d");
 		else
-			write(_stdout, 6, "\x1B[37m");	// Default: White
+			printf("-");
+		
+		// Print Mode
+		// - 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] = '-';
+		// - Group
+		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.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] = '-';
+		if(acl.perms & 8)	modeStr[8] = 'x';	else	modeStr[8] = '-';
+		printf(modeStr);
+		_SysClose(fp);
 		
-		//Print Mode
-		#if 0
-		if(stats.st_mode & 0400)	modeStr[0] = 'R';	else	modeStr[0] = '-';
-		if(stats.st_mode & 0200)	modeStr[1] = 'W';	else	modeStr[1] = '-';
-		if(stats.st_mode & 0100)	modeStr[2] = 'X';	else	modeStr[2] = '-';
-		if(stats.st_mode & 0040)	modeStr[3] = 'R';	else	modeStr[3] = '-';
-		if(stats.st_mode & 0020)	modeStr[4] = 'W';	else	modeStr[4] = '-';
-		if(stats.st_mode & 0010)	modeStr[5] = 'X';	else	modeStr[5] = '-';
-		if(stats.st_mode & 0004)	modeStr[6] = 'R';	else	modeStr[6] = '-';
-		if(stats.st_mode & 0002)	modeStr[7] = 'W';	else	modeStr[7] = '-';
-		if(stats.st_mode & 0001)	modeStr[8] = 'X';	else	modeStr[8] = '-';
-		write(_stdout, 10, modeStr);
-		#endif
+		// Colour Code
+		if(info.flags & FILEFLAG_DIRECTORY)	// Directory: Green
+			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
+		printf("\x1B[37m");
 		
-		// Revert Colour and end line
-		write(_stdout, 6, "\x1B[37m");
-		write(_stdout, 1, "\n");
+		// Newline!
+		printf("\n");
 	}
 	// Close Directory
-	close(dp);
+	_SysClose(dp);
 }