klmp200
/
fish
mirror of https://gitlab.com/klmp200/fish.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'sli' into 'master' 

Vrai opérateur ET et implémentation du reverse ET

See merge request !6
This commit is contained in:
Antoine Bartuccio 2017-05-18 00:11:59 +00:00
parent 2ea166e43d 7eada756e5
commit 24d7e29fdd
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fish_shell/fish_commands.c
View File

@ -55,7 +55,7 @@ int fishHelp(WordArray *args) {
}
int fishExit(WordArray *args) {
freeWordArray(args);
args->size = args->size;
return EXIT_SIGNAL;
}

8
fish_shell/fish_core.c
View File

@ -171,6 +171,12 @@ int fishExecute(WordList *list) {
if (splited != NULL) freeWordList(splited);
}
break;
case REVERSE_AND:
if (signal) signal = fishExecute(splited);
else {
if (splited != NULL) freeWordList(splited);
}
break;
case OR:
signal = fishExecute(splited);
break;
@ -194,11 +200,13 @@ int loadRightCommand(WordArray *array){
WordList * parseWordList(WordList *list, shell_operator *an_operator) {
char *op_str[] = {
(char*) ";",
(char*) "||",
(char*) "&&"
};
shell_operator op[] = {
OR,
REVERSE_AND,
AND
};
WordList *newList = NULL;

3
fish_shell/fish_types.h
View File

@ -14,7 +14,8 @@ typedef enum {
PIPE,
BACKGROUND_PROCESS,
AND,
OR
OR,
REVERSE_AND
} shell_operator ;
typedef struct {