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

Merge branch 'sli' into 'master' 

Perfect logic is perfect and beyond perfection since there is no memory leak

See merge request !8
This commit is contained in:
Antoine Bartuccio 2017-05-26 16:39:16 +00:00
parent ace3a81850 17d9364f37
commit 99b847d43a
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fish_shell/fish_commands.c
View File

@ -33,9 +33,11 @@ builtinCommand **getBuiltinCommands(){
int fishCd(WordArray *args) { int fishCd(WordArray *args) {
if (args->size < 2){ if (args->size < 2){
fprintf(stderr, "fish: Où sont les arguments de ta commande \"cd\" connard ?!\n"); fprintf(stderr, "fish: Où sont les arguments de ta commande \"cd\" connard ?!\n");
return EXIT_FAILURE;
} else { } else {
if (chdir(args->words[1]) != 0){ if (chdir(args->words[1]) != 0){
perror("fish"); perror("fish");
return EXIT_FAILURE;
} }
} }
freeWordArray(args); freeWordArray(args);

27
fish_shell/fish_core.c
View File

@ -156,33 +156,38 @@ int fishExecute(WordList *list) {
int signal = 1; int signal = 1;
splited = parseWordList(list, &op); splited = parseWordList(list, &op);
array = wordListToWordArray(list);
signal = loadRightCommand(array);
if (signal == EXIT_SIGNAL){
if (splited != NULL) freeWordList(splited);
if (array != NULL) freeWordArray(array);
return signal;
}
switch (op) { switch (op) {
case AND: case AND:
signal = fishExecute(list);
if (!signal) signal = fishExecute(splited); if (!signal) signal = fishExecute(splited);
else { else {
if (splited != NULL) freeWordList(splited); if (splited != NULL) freeWordList(splited);
splited = NULL;
} }
break; break;
case REVERSE_AND: case REVERSE_AND:
if (signal) signal = fishExecute(splited); signal = fishExecute(list);
if (signal && signal != EXIT_SIGNAL) signal = fishExecute(splited);
else { else {
if (splited != NULL) freeWordList(splited); if (splited != NULL) freeWordList(splited);
splited = NULL;
} }
break; break;
case OR: case OR:
signal = fishExecute(splited); signal = fishExecute(list);
if (signal != EXIT_SIGNAL) signal = fishExecute(splited);
break; break;
default: default:
break; array = wordListToWordArray(list);
signal = loadRightCommand(array);
splited = NULL;
} }
if (signal == EXIT_SIGNAL){
if (splited != NULL) freeWordList(splited);
if (array != NULL) freeWordArray(array);
}
return signal; return signal;
} }