/*\r
- AcessOS Shell Version 2\r
-- Based on IOOS CLI Shell\r
-*/\r
+ * AcessOS Shell Version 3\r
+ */\r
#include <acess/sys.h>\r
#include <stdlib.h>\r
+#include <stdio.h>\r
#include "header.h"\r
\r
#define _stdin 0\r
void Parse_Args(char *str, char **dest);\r
void Command_Colour(int argc, char **argv);\r
void Command_Clear(int argc, char **argv);\r
-//void Command_Ls(int argc, char **argv);\r
void Command_Cd(int argc, char **argv);\r
-//void Command_Cat(int argc, char **argv);\r
+void Command_Dir(int argc, char **argv);\r
\r
// ==== CONSTANT GLOBALS ====\r
char *cCOLOUR_NAMES[8] = {"black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"};\r
char *name;\r
void (*fcn)(int argc, char **argv);\r
} cBUILTINS[] = {\r
- {"colour", Command_Colour}, {"clear", Command_Clear}, {"cd", Command_Cd}\r
+ {"colour", Command_Colour}, {"clear", Command_Clear},\r
+ {"cd", Command_Cd}, {"dir", Command_Dir}\r
};\r
#define BUILTIN_COUNT (sizeof(cBUILTINS)/sizeof(cBUILTINS[0]))\r
\r
// ==== LOCAL VARIABLES ====\r
char gsCommandBuffer[1024];\r
-char *gsCurrentDirectory = "/";\r
+char *gsCurrentDirectory = NULL;\r
char gsTmpBuffer[1024];\r
char **gasCommandHistory;\r
int giLastCommand = 0;\r
\r
//Command_Clear(0, NULL);\r
\r
+ {\r
+ char *tmp = getenv("CWD");\r
+ if(tmp) {\r
+ gsCurrentDirectory = malloc(strlen(tmp)+1);\r
+ strcpy(gsCurrentDirectory, tmp);\r
+ } else {\r
+ gsCurrentDirectory = malloc(2);\r
+ strcpy(gsCurrentDirectory, "/");\r
+ }\r
+ } \r
+ \r
write(_stdout, 1, "\n");\r
- write(_stdout, 36, "Acess Shell Version 3\n");\r
- write(_stdout, 30, " Based on CLI Shell for IOOS\n");\r
+ write(_stdout, 22, "Acess Shell Version 3\n");\r
write(_stdout, 2, "\n");\r
for(;;)\r
{\r
if(saArgs[0]) free(saArgs);\r
if(!bCached) free(sCommandStr);\r
bCached = 0;\r
+ write(_stdout, 1, "\n");\r
write(_stdout, strlen(gsCurrentDirectory), gsCurrentDirectory);\r
write(_stdout, 3, "$ ");\r
\r
continue;\r
}\r
// Check if the file is a directory\r
- finfo( length, &info );
+ finfo( length, &info, 0 );
close( length );\r
if(info.flags & FILEFLAG_DIRECTORY) {\r
Print("`");Print(saArgs[1]); // Error Message\r
Print("' is a directory.\n");\r
continue;\r
}\r
+ // Load new executable\r
pid = clone(CLONE_VM, 0);\r
- if(pid == 0) execve(gsTmpBuffer, &saArgs[1], NULL);\r
+ if(pid == 0) execve(gsTmpBuffer, &saArgs[1], envp);\r
if(pid <= 0) {\r
Print("Unablt to create process: `");Print(gsTmpBuffer);Print("'\n"); // Error Message
//SysDebug("pid = %i\n", pid);\r
}\r
else {\r
- int status\r
- waitpid(pid, &status);\r
+ int status;\r
+ waittid(pid, &status);\r
}\r
}\r
}\r
write(_stdout, 26, "Directory does not exist\n");\r
return;\r
}\r
- finfo(fp, &stats);\r
+ finfo(fp, &stats, 0);\r
close(fp);\r
\r
if( !(stats.flags & FILEFLAG_DIRECTORY) ) {\r
return;\r
}\r
\r
+ free(gsCurrentDirectory);\r
+ gsCurrentDirectory = malloc(strlen(tmpPath)+1);\r
strcpy(gsCurrentDirectory, tmpPath);\r
}\r
\r
+/**\r
+ */\r
+void Command_Dir(int argc, char **argv)\r
+{\r
+ int dp, fp, dirLen;\r
+ char modeStr[11] = "RWXrwxRWX ";\r
+ char tmpPath[1024];\r
+ char *fileName;\r
+ t_sysFInfo info;\r
+ t_sysACL acl;\r
+ \r
+ // Generate Directory Path\r
+ if(argc > 1)\r
+ dirLen = 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
+ //printf("Unable to open directory `%s', File cannot be found\n", tmpPath);\r
+ write(_stdout, 27, "Unable to open directory `");\r
+ write(_stdout, strlen(tmpPath)+1, tmpPath);\r
+ write(_stdout, 25, "', File cannot be found\n");\r
+ return;\r
+ }\r
+ // Get File Stats\r
+ if( finfo(dp, &info, 0) == -1 )\r
+ {\r
+ close(dp);\r
+ write(_stdout, 34, "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
+ 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 = readdir(dp, fileName)) )\r
+ {\r
+ if(fp < 0)\r
+ {\r
+ if(fp == -3)\r
+ write(_stdout, 42, "Invalid Permissions to traverse directory\n");\r
+ break;\r
+ }\r
+ // Open File\r
+ fp = open(tmpPath, 0);\r
+ if(fp == -1) continue;\r
+ // Get File Stats\r
+ finfo(fp, &info, 0);\r
+ \r
+ if(info.flags & FILEFLAG_DIRECTORY)\r
+ write(_stdout, 1, "d");\r
+ else\r
+ write(_stdout, 1, "-");\r
+ \r
+ // Print Mode\r
+ acl.group = 0; acl.id = 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
+ acl.group = 1; acl.id = info.gid;\r
+ _SysGetACL(fp, &acl);\r
+ if(acl.perms & 1) modeStr[3] = 'r'; else modeStr[3] = '-';\r
+ if(acl.perms & 1) modeStr[4] = 'w'; else modeStr[4] = '-';\r
+ if(acl.perms & 1) modeStr[5] = 'x'; else modeStr[5] = '-';\r
+ acl.group = 1; acl.id = -1;\r
+ _SysGetACL(fp, &acl);\r
+ if(acl.perms & 1) modeStr[6] = 'r'; else modeStr[6] = '-';\r
+ if(acl.perms & 1) modeStr[7] = 'w'; else modeStr[7] = '-';\r
+ if(acl.perms & 1) modeStr[8] = 'x'; else modeStr[8] = '-';\r
+ write(_stdout, 10, modeStr);\r
+ close(fp);\r
+ \r
+ // Colour Code\r
+ if(info.flags & FILEFLAG_DIRECTORY) // Directory: Green\r
+ write(_stdout, 6, "\x1B[32m");\r
+ // Default: White\r
+ \r
+ // Print Name\r
+ write(_stdout, strlen(fileName), fileName);\r
+ \r
+ // Print slash if applicable\r
+ if(info.flags & FILEFLAG_DIRECTORY)\r
+ write(_stdout, 1, "/");\r
+ \r
+ // Revert Colour\r
+ write(_stdout, 6, "\x1B[37m");\r
+ \r
+ // Newline!\r
+ write(_stdout, 1, "\n");\r
+ }\r
+ // Close Directory\r
+ close(dp);\r
+}\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au