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);

98
src/Integrated.c
View File

@ -18,7 +18,6 @@ const char* GetHomeDir(void)
return homeDir;
}
// Checks for commands that are built into Pish
void IntegratedCheck(CommandStruct *command)
{
@ -31,7 +30,6 @@ void IntegratedCheck(CommandStruct* command)
return;
}
// Prints a prompt and then reads a command from the terminal
void GetInput(char *inputString)
{
@ -89,15 +87,24 @@ void ReadPishrc(CommandStruct* command, char* inputString)
}
assert(close(fd) >= 0);
}
// i/o redirection
// 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
// TODO: Check command->argv[] for symbol instead
if (strchr(inputString, '>') != NULL)
{
newfd = open((command, O_CREAT |O_TRUNC | O_WRONLY, 0644)) <0) {
// 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);
@ -108,46 +115,57 @@ if (strchr(inputString, '>' )!= NULL)
} // 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);
}
// 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)
{
}
// TODO: Check for pipe symbol
// Check in command->argv[] instead
// 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);
}
// 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
if(strchr(command, '|') != NULL)
{
}
// TODO: Check pipe already exists above, maybe loop?
// if (strchr(command, '|') != NULL)
// {
// ;
// }
// check append
if (strpbrk(command, ">>") != NULL)
{
// 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;
}
// 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;
// }