#include <string.h>\r
#include "header.h"\r
#include <readline.h>\r
+#include <errno.h>\r
+#include <acess/devices/pty.h>\r
\r
#define _stdin 0\r
#define _stdout 1\r
{"help", Command_Help}, {"clear", Command_Clear},\r
{"cd", Command_Cd}, {"dir", Command_Dir}\r
};\r
-static char *cDEFAULT_PATH[] = {"/Acess/Bin"};\r
+static char *cDEFAULT_PATH[] = {"/Acess/Bin","/Acess/SBin"};\r
#define BUILTIN_COUNT (sizeof(cBUILTINS)/sizeof(cBUILTINS[0]))\r
\r
// ==== LOCAL VARIABLES ====\r
- int giNumPathDirs = 1;\r
+ int giNumPathDirs = 2;\r
char **gasPathDirs = cDEFAULT_PATH;\r
char **gasEnvironment;\r
char gsCommandBuffer[1024];\r
\r
gasEnvironment = envp;\r
\r
- Command_Clear(0, NULL);\r
+// Command_Clear(0, NULL);\r
\r
{\r
char *tmp = getenv("CWD");\r
if(saArgs[0]) free(saArgs[0]);\r
\r
printf("%s$ ", gsCurrentDirectory);\r
+ fflush(stdout);\r
\r
// Read Command line\r
sCommandStr = Readline( readline_state );\r
printf("\n");\r
+ if( !sCommandStr ) {\r
+ perror("Readline");\r
+ return 1;\r
+ }\r
\r
// Parse Command Line into arguments\r
iArgCount = Parse_Args(sCommandStr, saArgs);\r
{\r
GeneratePath(exefile, gsCurrentDirectory, sTmpBuffer);\r
// Check file existence\r
- fd = open(sTmpBuffer, OPENFLAG_EXEC);\r
+ fd = _SysOpen(sTmpBuffer, OPENFLAG_EXEC);\r
if(fd == -1) {\r
printf("Unknown Command: `%s'\n", Args[0]); // Error Message\r
return ;\r
}\r
\r
// Get File info and close file\r
- finfo( fd, &info, 0 );\r
- close( fd );\r
+ _SysFInfo( fd, &info, 0 );\r
+ _SysClose( fd );\r
\r
// Check if the file is a directory\r
if(info.flags & FILEFLAG_DIRECTORY) {\r
for( i = 0; i < giNumPathDirs; i++ )\r
{\r
GeneratePath(exefile, gasPathDirs[i], sTmpBuffer);\r
- fd = open(sTmpBuffer, OPENFLAG_EXEC);\r
+ fd = _SysOpen(sTmpBuffer, OPENFLAG_EXEC);\r
if(fd == -1) continue;\r
- finfo( fd, &info, 0 );\r
- close( fd );\r
+ _SysFInfo( fd, &info, 0 );\r
+ _SysClose( fd );\r
if(info.flags & FILEFLAG_DIRECTORY) continue;\r
// Woohoo! We found a valid command\r
break;\r
}\r
\r
// Create new process\r
- pid = clone(CLONE_VM, 0);\r
- // Start Task\r
- if(pid == 0) {\r
- execve(sTmpBuffer, Args, gasEnvironment);\r
- printf("Execve returned, ... oops\n");\r
- exit(-1);\r
- }\r
+ int fds[] = {0, 1, 2};\r
+ int status;\r
+ pid = _SysSpawn(sTmpBuffer, (const char **)Args, (const char **)gasEnvironment, 3, fds, NULL);\r
if(pid <= 0) {\r
printf("Unable to create process: `%s'\n", sTmpBuffer); // Error Message\r
+ status = 0;\r
}\r
else {\r
- int status;\r
- waittid(pid, &status);\r
+ _SysIOCtl(0, PTY_IOCTL_SETPGRP, &pid);\r
+ _SysWaitTID(pid, &status);\r
+ }\r
+ \r
+ // Return terminal to a sane state\r
+ {\r
+ int zero = 0;\r
+ _SysIOCtl(0, PTY_IOCTL_SETPGRP, &zero);\r
+ printf("\x1b[0m");\r
+ }\r
+ // Print a status message if termination was non-clean\r
+ if( status )\r
+ {\r
+ printf("[%i] exited %i\n", pid, status);\r
}\r
}\r
\r
*/\r
void Command_Clear(int argc, char **argv)\r
{\r
- write(_stdout, "\x1B[2J", 4); //Clear Screen\r
+ _SysWrite(_stdout, "\x1B[2J", 4); //Clear Screen\r
}\r
\r
/**\r
\r
GeneratePath(argv[1], gsCurrentDirectory, tmpPath);\r
\r
- fp = open(tmpPath, 0);\r
+ fp = _SysOpen(tmpPath, 0);\r
if(fp == -1) {\r
printf("Directory does not exist\n");\r
return;\r
}\r
- finfo(fp, &stats, 0);\r
- close(fp);\r
+ _SysFInfo(fp, &stats, 0);\r
+ _SysClose(fp);\r
\r
if( !(stats.flags & FILEFLAG_DIRECTORY) ) {\r
printf("Not a Directory\n");\r
strcpy(gsCurrentDirectory, tmpPath);\r
\r
// Register change with kernel\r
- chdir( gsCurrentDirectory );\r
+ _SysChdir( gsCurrentDirectory );\r
}\r
\r
/**\r
*/\r
void Command_Dir(int argc, char **argv)\r
{\r
- int dp, fp, dirLen;\r
+ int dp, fp;\r
char modeStr[11] = "RWXrwxRWX ";\r
- char tmpPath[1024];\r
- char *fileName;\r
+ char fileName[256];\r
t_sysFInfo info;\r
t_sysACL acl;\r
\r
+\r
+ // -- Generate and open directory --\r
// Generate Directory Path\r
+ char tmpPath[1024];\r
if(argc > 1)\r
- dirLen = GeneratePath(argv[1], gsCurrentDirectory, tmpPath);\r
+ GeneratePath(argv[1], gsCurrentDirectory, tmpPath);\r
else\r
- {\r
strcpy(tmpPath, gsCurrentDirectory);\r
- }\r
- dirLen = strlen(tmpPath);\r
- \r
// Open Directory\r
- dp = open(tmpPath, OPENFLAG_READ);\r
- // Check if file opened\r
- if(dp == -1)\r
- {\r
+ dp = _SysOpen(tmpPath, OPENFLAG_READ);\r
+ if(dp == -1) {\r
printf("Unable to open directory `%s', File cannot be found\n", tmpPath);\r
return;\r
}\r
// Get File Stats\r
- if( finfo(dp, &info, 0) == -1 )\r
+ if( _SysFInfo(dp, &info, 0) == -1 )\r
{\r
- close(dp);\r
+ _SysClose(dp);\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
+ _SysClose(dp);\r
printf("Unable to open directory `%s', Not a directory\n", tmpPath);\r
return;\r
}\r
\r
- // Append Shash for file paths\r
- if(tmpPath[dirLen-1] != '/')\r
- {\r
- tmpPath[dirLen++] = '/';\r
- tmpPath[dirLen] = '\0';\r
- }\r
- \r
- fileName = (char*)(tmpPath+dirLen);\r
- // Read Directory Content\r
- while( (fp = SysReadDir(dp, fileName)) )\r
+ // -- Read Directory Contents --\r
+ while( (fp = _SysReadDir(dp, fileName)) )\r
{\r
if(fp < 0)\r
{\r
break;\r
}\r
// Open File\r
- fp = open(tmpPath, 0);\r
+ fp = _SysOpenChild(dp, fileName, 0);\r
if(fp == -1) continue;\r
// Get File Stats\r
- finfo(fp, &info, 0);\r
+ _SysFInfo(fp, &info, 0);\r
\r
if(info.flags & FILEFLAG_DIRECTORY)\r
printf("d");\r
if(acl.perms & 2) modeStr[7] = 'w'; else modeStr[7] = '-';\r
if(acl.perms & 8) modeStr[8] = 'x'; else modeStr[8] = '-';\r
printf(modeStr);\r
- close(fp);\r
+ _SysClose(fp);\r
\r
// Colour Code\r
if(info.flags & FILEFLAG_DIRECTORY) // Directory: Green\r
printf("\n");\r
}\r
// Close Directory\r
- close(dp);\r
+ _SysClose(dp);\r
}\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au