klmp200/fish
1
0
Fork 0
mirror of https://gitlab.com/klmp200/fish.git synced 2025-07-11 12:19:23 +00:00
Code Issues Releases Wiki Activity

Début d'un refactor avec des listes chaînées

Browse Source
This commit is contained in:
Antoine Bartuccio
2017-05-15 16:27:44 +02:00
parent 9a6020d97c
commit 0a26964d62
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fish_shell/fish_core.c
View File

@ -48,31 +48,21 @@ int countSeparators(char *string, char *separators) {
}
WordArray * split(char *string, char *separator){
int array_size = countSeparators(string, separator) + 1;
WordArray *tokens = (WordArray*) malloc(sizeof(WordArray));
WordList *list = createWordList();
char *to_delete = strdup(string);
char *to_delete_bak = to_delete;
char *token = NULL;
int i = 0;
if (tokens != NULL){
tokens->words = (char **) malloc(sizeof(char*) * (array_size + 1));
tokens->words[array_size] = NULL;
tokens->size = array_size;
}
if (tokens == NULL || to_delete == NULL || tokens->words == NULL){
if (to_delete == NULL){
crash();
}
while((token = strsep(&to_delete, separator)) != NULL){
tokens->words[i] = strdup(token);
i++;
}
while((token = strsep(&to_delete, separator)) != NULL)
addWordList(list, token);
free(to_delete_bak);
return tokens;
return wordListToWordArray(list);
}
char *fishReadLine() {