/*\r
* AcessOS Shell Version 3\r
*/\r
-#define USE_READLINE 0\r
+#define USE_READLINE 1\r
#include <acess/sys.h>\r
#include <stdlib.h>\r
#include <stdio.h>\r
#include <string.h>\r
#include "header.h"\r
-\r
-#if USE_READLINE\r
-# include "readline.h"\r
-#endif\r
+#include <readline.h>\r
\r
#define _stdin 0\r
#define _stdout 1\r
#define _stderr 2\r
\r
// ==== PROTOTYPES ====\r
-char *ReadCommandLine(int *Length);\r
-void Parse_Args(char *str, char **dest);\r
+ int Parse_Args(const char *str, char **dest);\r
void CallCommand(char **Args);\r
void Command_Logout(int argc, char **argv);\r
void Command_Clear(int argc, char **argv);\r
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
- int length = 0;\r
int i;\r
int iArgCount = 0;\r
- #if !USE_READLINE\r
- int bCached = 1;\r
- #else\r
- tReadline readline_state = {0};\r
- #endif\r
- \r
- #if USE_READLINE\r
- readline_state.UseHistory = 1;\r
- #endif\r
+ tReadline *readline_state = Readline_Init(1);\r
\r
gasEnvironment = envp;\r
\r
}\r
} \r
\r
- write(_stdout, 22, "Acess Shell Version 3\n");\r
- write(_stdout, 2, "\n");\r
+ printf("Acess Shell Version 3\n\n");\r
for(;;)\r
{\r
// Free last command & arguments\r
- if(saArgs[0]) free(saArgs);\r
- #if !USE_READLINE\r
- if(!bCached) free(sCommandStr);\r
- bCached = 0;\r
- #endif\r
+ if(saArgs[0]) free(saArgs[0]);\r
\r
- write(_stdout, strlen(gsCurrentDirectory), gsCurrentDirectory);\r
- write(_stdout, 2, "$ ");\r
+ printf("%s$ ", gsCurrentDirectory);\r
\r
// Read Command line\r
- #if USE_READLINE\r
- sCommandStr = Readline( &readline_state );\r
- length = strlen(sCommandStr);\r
- #else\r
- sCommandStr = ReadCommandLine( &length );\r
- \r
- if(!sCommandStr) {\r
- write(_stdout, 25, "PANIC: Out of heap space\n");\r
- return -1;\r
- }\r
- \r
- // Check if the command should be cached\r
- if(gasCommandHistory == NULL || strcmp(sCommandStr, gasCommandHistory[giLastCommand]) != 0)\r
- {\r
- if(giLastCommand >= giCommandSpace) {\r
- giCommandSpace += 12;\r
- gasCommandHistory = realloc(gasCommandHistory, giCommandSpace*sizeof(char*));\r
- }\r
- giLastCommand ++;\r
- gasCommandHistory[ giLastCommand ] = sCommandStr;\r
- bCached = 1;\r
- }\r
- #endif\r
+ sCommandStr = Readline( readline_state );\r
+ printf("\n");\r
\r
// Parse Command Line into arguments\r
- Parse_Args(sCommandStr, saArgs);\r
- \r
- // Count Arguments\r
- iArgCount = 0;\r
- while(saArgs[iArgCount]) iArgCount++;\r
+ iArgCount = Parse_Args(sCommandStr, saArgs);\r
\r
// Silently Ignore all empty commands\r
if(saArgs[1][0] == '\0') continue;\r
// Shall we?\r
CallCommand( &saArgs[1] );\r
\r
- #if USE_READLINE\r
free( sCommandStr );\r
- #endif\r
}\r
}\r
\r
/**\r
- * \fn char *ReadCommandLine(int *Length)\r
- * \brief Read from the command line\r
- */\r
-char *ReadCommandLine(int *Length)\r
-{\r
- char *ret;\r
- int len, pos, space = 1023;\r
- char ch;\r
- #if 0\r
- int scrollbackPos = giLastCommand;\r
- #endif\r
- \r
- // Preset Variables\r
- ret = malloc( space+1 );\r
- if(!ret) return NULL;\r
- len = 0; pos = 0;\r
- \r
- // Read In Command Line\r
- do {\r
- read(_stdin, 1, &ch); // Read Character from stdin (read is a blocking call)\r
- \r
- if(ch == '\n') break;\r
- \r
- switch(ch)\r
- {\r
- // Control characters\r
- case '\x1B':\r
- read(_stdin, 1, &ch); // Read control character\r
- switch(ch)\r
- {\r
- //case 'D': if(pos) pos--; break;\r
- //case 'C': if(pos<len) pos++; break;\r
- case '[':\r
- read(_stdin, 1, &ch); // Read control character\r
- switch(ch)\r
- {\r
- #if 0\r
- case 'A': // Up\r
- {\r
- int oldLen = len;\r
- if( scrollbackPos > 0 ) break;\r
- \r
- free(ret);\r
- ret = strdup( gasCommandHistory[--scrollbackPos] );\r
- \r
- len = strlen(ret);\r
- while(pos--) write(_stdout, 3, "\x1B[D");\r
- write(_stdout, len, ret); pos = len;\r
- while(pos++ < oldLen) write(_stdout, 1, " ");\r
- }\r
- break;\r
- case 'B': // Down\r
- {\r
- int oldLen = len;\r
- if( scrollbackPos < giLastCommand-1 ) break;\r
- \r
- free(ret);\r
- ret = strdup( gasCommandHistory[++scrollbackPos] );\r
- \r
- len = strlen(ret);\r
- while(pos--) write(_stdout, 3, "\x1B[D");\r
- write(_stdout, len, ret); pos = len;\r
- while(pos++ < oldLen) write(_stdout, 1, " ");\r
- }\r
- break;\r
- #endif\r
- case 'D': // Left\r
- if(pos == 0) break;\r
- pos --;\r
- write(_stdout, 3, "\x1B[D");\r
- break;\r
- case 'C': // Right\r
- if(pos == len) break;\r
- pos++;\r
- write(_stdout, 3, "\x1B[C");\r
- break;\r
- }\r
- }\r
- break;\r
- \r
- // Backspace\r
- case '\b':\r
- if(len <= 0) break; // Protect against underflows\r
- write(_stdout, 1, &ch);\r
- if(pos == len) { // Simple case of end of string\r
- len --;\r
- pos--;\r
- }\r
- else {\r
- char buf[7] = "\x1B[000D";\r
- buf[2] += ((len-pos+1)/100) % 10;\r
- buf[3] += ((len-pos+1)/10) % 10;\r
- buf[4] += (len-pos+1) % 10;\r
- write(_stdout, len-pos, &ret[pos]); // Move Text\r
- ch = ' '; write(_stdout, 1, &ch); ch = '\b'; // Clear deleted character\r
- write(_stdout, 7, buf); // Update Cursor\r
- // Alter Buffer\r
- memmove(&ret[pos-1], &ret[pos], len-pos);\r
- pos --;\r
- len --;\r
- }\r
- break;\r
- \r
- // Tab\r
- case '\t':\r
- //TODO: Implement Tab-Completion\r
- //Currently just ignore tabs\r
- break;\r
- \r
- default: \r
- // Expand Buffer\r
- if(len+1 > space) {\r
- space += 256;\r
- ret = realloc(ret, space+1);\r
- if(!ret) return NULL;\r
- }\r
- \r
- // Editing inside the buffer\r
- if(pos != len) {\r
- char buf[7] = "\x1B[000D";\r
- buf[2] += ((len-pos)/100) % 10;\r
- buf[3] += ((len-pos)/10) % 10;\r
- buf[4] += (len-pos) % 10;\r
- write(_stdout, 1, &ch); // Print new character\r
- write(_stdout, len-pos, &ret[pos]); // Move Text\r
- write(_stdout, 7, buf); // Update Cursor\r
- memmove( &ret[pos+1], &ret[pos], len-pos );\r
- }\r
- else {\r
- write(_stdout, 1, &ch);\r
- }\r
- ret[pos++] = ch;\r
- len ++;\r
- break;\r
- }\r
- } while(ch != '\n');\r
- \r
- // Cap String\r
- ret[len] = '\0';\r
- printf("\n");\r
- \r
- // Return length\r
- if(Length) *Length = len;\r
- \r
- return ret;\r
-}\r
-\r
-/**\r
- * \fn void Parse_Args(char *str, char **dest)\r
+ * \fn int Parse_Args(const char *str, char **dest)\r
* \brief Parse a string into an argument array\r
*/\r
-void Parse_Args(char *str, char **dest)\r
+int Parse_Args(const char *str, char **dest)\r
{\r
int i = 1;\r
char *buf = malloc( strlen(str) + 1 );\r
\r
if(buf == NULL) {\r
dest[0] = NULL;\r
- Print("Parse_Args: Out of heap space!\n");\r
- return ;\r
+ printf("Parse_Args: Out of heap space!\n");\r
+ return 0;\r
}\r
\r
strcpy(buf, str);\r
if(*buf == '\0') break;\r
}\r
dest[i] = NULL;\r
- if(i == 1) {\r
- free(buf);\r
- dest[0] = NULL;\r
- }\r
+ \r
+ return i;\r
}\r
\r
/**\r
// Check file existence\r
fd = open(sTmpBuffer, OPENFLAG_EXEC);\r
if(fd == -1) {\r
- Print("Unknown Command: `");Print(Args[0]);Print("'\n"); // Error Message\r
+ printf("Unknown Command: `%s'\n", Args[0]); // Error Message\r
return ;\r
}\r
\r
\r
// Check if the file is a directory\r
if(info.flags & FILEFLAG_DIRECTORY) {\r
- Print("`");Print(sTmpBuffer); // Error Message\r
- Print("' is a directory.\n");\r
+ printf("`%s' is a directory.\n", sTmpBuffer);\r
return ;\r
}\r
}\r
\r
// Exhausted path directories\r
if( i == giNumPathDirs ) {\r
- Print("Unknown Command: `");Print(exefile);Print("'\n");\r
+ printf("Unknown Command: `%s'\n", exefile);\r
return ;\r
}\r
}\r
// 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
- Print("Unablt to create process: `");Print(sTmpBuffer);Print("'\n"); // Error Message\r
+ printf("Unable to create process: `%s'\n", sTmpBuffer); // Error Message\r
}\r
else {\r
int status;\r
*/\r
void Command_Help(int argc, char **argv)\r
{\r
- Print("Acess 2 Command Line Interface\n");\r
- Print(" By John Hodge (thePowersGang / [TPG])\n");\r
- Print("\n");\r
- Print("Builtin Commands:\n");\r
- Print(" logout: Return to the login prompt\n");\r
- Print(" exit: Same\n");\r
- Print(" help: Display this message\n");\r
- Print(" clear: Clear the screen\n");\r
- Print(" cd: Change the current directory\n");\r
- Print(" dir: Print the contents of the current directory\n");\r
- //Print("\n");\r
+ printf( "Acess 2 Command Line Interface\n"\r
+ " By John Hodge (thePowersGang / [TPG])\n"\r
+ "\n"\r
+ "Builtin Commands:\n"\r
+ " logout: Return to the login prompt\n"\r
+ " exit: Same\n"\r
+ " help: Display this message\n"\r
+ " clear: Clear the screen\n"\r
+ " cd: Change the current directory\n"\r
+ " dir: Print the contents of the current directory\n");\r
return;\r
}\r
\r
*/\r
void Command_Clear(int argc, char **argv)\r
{\r
- write(_stdout, 4, "\x1B[2J"); //Clear Screen\r
+ write(_stdout, "\x1B[2J", 4); //Clear Screen\r
}\r
\r
/**\r
\r
if(argc < 2)\r
{\r
- Print(gsCurrentDirectory);Print("\n");\r
+ printf("%s\n", gsCurrentDirectory);\r
return;\r
}\r
\r
\r
fp = open(tmpPath, 0);\r
if(fp == -1) {\r
- write(_stdout, 26, "Directory does not exist\n");\r
+ printf("Directory does not exist\n");\r
return;\r
}\r
finfo(fp, &stats, 0);\r
close(fp);\r
\r
if( !(stats.flags & FILEFLAG_DIRECTORY) ) {\r
- write(_stdout, 17, "Not a Directory\n");\r
+ printf("Not a Directory\n");\r
return;\r
}\r
\r
if( finfo(dp, &info, 0) == -1 )\r
{\r
close(dp);\r
- write(_stdout, 34, "stat Failed, Bad File Descriptor\n");\r
+ printf("stat Failed, Bad File Descriptor\n");\r
return;\r
}\r
// Check if it's a directory\r
if(!(info.flags & FILEFLAG_DIRECTORY))\r
{\r
close(dp);\r
- write(_stdout, 27, "Unable to open directory `");\r
- write(_stdout, strlen(tmpPath)+1, tmpPath);\r
- write(_stdout, 20, "', Not a directory\n");\r
+ printf("Unable to open directory `%s', Not a directory\n", tmpPath);\r
return;\r
}\r
\r
\r
fileName = (char*)(tmpPath+dirLen);\r
// Read Directory Content\r
- while( (fp = readdir(dp, fileName)) )\r
+ while( (fp = SysReadDir(dp, fileName)) )\r
{\r
if(fp < 0)\r
{\r
if(fp == -3)\r
- write(_stdout, 42, "Invalid Permissions to traverse directory\n");\r
+ printf("Invalid Permissions to traverse directory\n");\r
break;\r
}\r
// Open File\r
finfo(fp, &info, 0);\r
\r
if(info.flags & FILEFLAG_DIRECTORY)\r
- write(_stdout, 1, "d");\r
+ printf("d");\r
else\r
- write(_stdout, 1, "-");\r
+ printf("-");\r
\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
if(acl.perms & 8) modeStr[8] = 'x'; else modeStr[8] = '-';\r
- write(_stdout, 10, modeStr);\r
+ printf(modeStr);\r
close(fp);\r
\r
// Colour Code\r
if(info.flags & FILEFLAG_DIRECTORY) // Directory: Green\r
- write(_stdout, 6, "\x1B[32m");\r
+ printf("\x1B[32m");\r
// Default: White\r
\r
// Print Name\r
- write(_stdout, strlen(fileName), fileName);\r
+ printf("%s", fileName);\r
\r
// Print slash if applicable\r
if(info.flags & FILEFLAG_DIRECTORY)\r
- write(_stdout, 1, "/");\r
+ printf("/");\r
\r
// Revert Colour\r
- write(_stdout, 6, "\x1B[37m");\r
+ printf("\x1B[37m");\r
\r
// Newline!\r
- write(_stdout, 1, "\n");\r
+ printf("\n");\r
}\r
// Close Directory\r
close(dp);\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au