diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-07-20 18:29:03 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-07-20 18:29:03 +0200 |
| commit | e77b1667e23a05f2874f80f5e47e634c58180c37 (patch) | |
| tree | e76c06188cf2081f92c37621f619bbb624f761d6 /src/eval/utils_eval.c | |
| parent | 52bb7cc0f234776cd19c7a608b06578150d4695a (diff) | |
| download | minishell-e77b1667e23a05f2874f80f5e47e634c58180c37.tar.gz minishell-e77b1667e23a05f2874f80f5e47e634c58180c37.tar.bz2 minishell-e77b1667e23a05f2874f80f5e47e634c58180c37.zip | |
Fixing glob by removing chdir, Changed cmd variables
Diffstat (limited to 'src/eval/utils_eval.c')
| -rw-r--r-- | src/eval/utils_eval.c | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/eval/utils_eval.c b/src/eval/utils_eval.c index 374411e..5fefe70 100644 --- a/src/eval/utils_eval.c +++ b/src/eval/utils_eval.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/07/20 13:07:25 by nahaddac #+# #+# */ -/* Updated: 2020/07/20 14:51:40 by nahaddac ### ########.fr */ +/* Updated: 2020/07/20 17:53:18 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,18 +17,38 @@ t_ftlst *split_token(t_ftlst **lst, enum e_token_tag tag) { t_ftlst *curr; t_ftlst *start; + enum e_token_tag curr_tag; start = *lst; curr = *lst; - while (curr != NULL || ((t_token *)curr->data)->tag & tag) + t_ftlst *prev = curr; + while (curr != NULL) { - if (curr->next == NULL || (!(((t_token *)curr->next->data)->tag & tag))) + curr_tag = ((t_token *)curr->data)->tag; + if (!(curr_tag & TAG_STICK) || !(curr_tag & TAG_IS_STR)) { - *lst = curr->next; - curr->next = NULL; - return start; + *lst = prev->next; + prev->next = NULL; + return start; } + prev = curr; curr = curr->next; } - return start; + return start; + + + + /* if (curr != NULL) */ + /* curr_tag = ((t_token *)curr->data)->tag; */ + /* while (curr != NULL && curr_tag & TAG_STICK && curr_tag & TAG_IS_STR) */ + /* { */ + /* curr = curr->next; */ + /* curr_tag = ((t_token *)curr->data)->tag; */ + /* if (curr == NULL || !(curr_tag & TAG_STICK) || !(curr_tag & TAG_IS_STR)) */ + /* { */ + /* *lst = curr->next; */ + /* curr->next = NULL; */ + /* } */ + /* } */ + /* return start; */ } |