Trianta/pish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added comments and tips for code

Browse Source
This commit is contained in:
TriantaTV 2022-10-27 19:57:26 -05:00
parent 9f28625f1a
commit 72c42aa825
2 changed files with 132 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Integrated.h
View File

@ -4,6 +4,7 @@
#include "Common.h"
const char* GetHomeDir(void);
void ioRedirection(char *inputString, CommandStruct *command);
void IntegratedCheck(CommandStruct* command);
void GetInput(char* inputString);
void ParseInput(char* inputString, CommandStruct* command);

148
src/Integrated.c
View File

@ -11,16 +11,15 @@
#include "Integrated.h"
// Gets home directory location of user
const char* GetHomeDir(void)
const char *GetHomeDir(void)
{
char* homeDir = (getpwuid(getuid()))->pw_dir;
char *homeDir = (getpwuid(getuid()))->pw_dir;
strcat(homeDir, "/.pishrc");
return homeDir;
}
// Checks for commands that are built into Pish
void IntegratedCheck(CommandStruct* command)
void IntegratedCheck(CommandStruct *command)
{
if (strcmp(command->argv[0], "exit") == 0)
exit(0);
@ -31,32 +30,31 @@ void IntegratedCheck(CommandStruct* command)
return;
}
// Prints a prompt and then reads a command from the terminal
void GetInput(char* inputString)
void GetInput(char *inputString)
{
char c;
char* prompt = "pish%>";
char *prompt = "pish%>";
printf("%s ", prompt);
// assert(scanf("%[^\n]s", inputString) == 1);
scanf("%1000[^\n]s", inputString);
while((c = getchar()) != '\n' && c != EOF)
/* discard */ ;
while ((c = getchar()) != '\n' && c != EOF)
/* discard */;
return;
}
// Splits a string separated by spaces into an array of strings
void ParseInput(char* inputString, CommandStruct* command)
void ParseInput(char *inputString, CommandStruct *command)
{
//Parse command
int* argc = &(command->argc);
char* token = strtok(inputString, " ");
// Parse command
int *argc = &(command->argc);
char *token = strtok(inputString, " ");
command->argv[*argc] = token;
(*argc)++;
while (token != NULL)
{
//This only holds 1 command at a time then it overrides
//Will need modified
// This only holds 1 command at a time then it overrides
// Will need modified
token = strtok(NULL, " ");
command->argv[*argc] = token;
(*argc)++;
@ -64,11 +62,11 @@ void ParseInput(char* inputString, CommandStruct* command)
}
// Reads ~/.pishrc and runs each command in the file
void ReadPishrc(CommandStruct* command, char* inputString)
void ReadPishrc(CommandStruct *command, char *inputString)
{
char buffer[1];
int forkID;
int* argc = &(command->argc);
int *argc = &(command->argc);
int fd = open(GetHomeDir(), O_RDONLY | O_CREAT);
assert(fd > -1);
while (read(fd, buffer, 1) > 0)
@ -89,65 +87,85 @@ void ReadPishrc(CommandStruct* command, char* inputString)
}
assert(close(fd) >= 0);
}
// i/o redirection
void ioRedirection(char* inputString, CommandStruct* command)
// TODO: Work on one symbol at a time
// inputString may not be useful here, only *command
// Try to add a layer of abstraction where possible
// I.E. think about using function instead for checking
void ioRedirection(char *inputString, CommandStruct *command)
{
int newfd;
// check command standard output
if (strchr(inputString, '>' )!= NULL)
// TODO: Check command->argv[] for symbol instead
if (strchr(inputString, '>') != NULL)
{
newfd = open((command, O_CREAT |O_TRUNC | O_WRONLY, 0644)) <0) {
//failed
// TODO: Throwing an error here and line 108 for using command
// Check if targeting a specific string in command->argv works
newfd = (open((command, O_CREAT |O_TRUNC | O_WRONLY, 0644)) < 0);
// No if statement for fail checking, brackets just exist here
{
// failed
perror(command);
exit(1);
}
// copies the new file descriptor
dup2(newfd,1);
}//this is supposed to close if statement??
dup2(newfd, 1);
} // this is supposed to close if statement??
// check command standard input
if(strchr(inputString, '<') != NULL)
{
newfd = open((command, O_CREAT |O_TRUNC | O_WRONLY, 0644)) <0) {
//failed
perror(command);
exit(1);
}
dup2(newfd,0);
}
// check command standard input
// if (strchr(inputString, '<') != NULL)
// {
// newfd = open((command, O_CREAT |O_TRUNC | O_WRONLY, 0644)) < 0);
// // No if statement for fail checking, brackets just exist here
// {
// // failed
// perror(command);
// exit(1);
// }
// dup2(newfd, 0);
// }
//check pipe
if(strchr(command, '|') != NULL)
{
}
//check append
if (strpbrk(command, ">>") != NULL)
newfd = open((command, O_CREAT |O_TRUNC | O_WRONLY, 0644)) <0) {
//failed
perror(command);
exit(1);
}
dup2(newfd,0);
}
//check pipe
if(strchr(command, '|') != NULL)
{
}
//check append
if (strpbrk(command, ">>") != NULL)
{
}
// check pipe
// TODO: Check for pipe symbol
// Check in command->argv[] instead
// if (strchr(command, '|') != NULL)
// {
// ;
// }
// check append
// TODO: Implement append
// if (strpbrk(command, ">>") != NULL)
// {
// newfd = open((command, O_CREAT |O_TRUNC | O_WRONLY, 0644)) < 0);
// // No if statement for fail checking, brackets just exist here
// {
// // failed
// perror(command);
// exit(1);
// }
// dup2(newfd, 0);
// }
// check pipe
// TODO: Check pipe already exists above, maybe loop?
// if (strchr(command, '|') != NULL)
// {
// ;
// }
// check append
// TODO: Check append already exists above, maybe loop?
// if (strpbrk(command, ">>") != NULL)
// {
// ;
// }
}
//Environment varibles
void varibles(char str, int count)
{
char var[1000];
var[count]= str;
}
// Environment varibles
// TODO: Add this function to CommandStruct
// Environment Variables can just be a part of the struct
// void varibles(char str, int count)
// {
// char var[1000];
// var[count] = str;
// }