diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-06-14 16:07:19 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-06-14 16:07:19 +0200 |
| commit | 47fff4418d3a83ae214429f395232c3536ff03c4 (patch) | |
| tree | 8dd1021d3ae899b80cf052ae42a40c4bc965c654 /src/main.c | |
| parent | 26ddbd7146f65a2cf100713f422a9ab5b1890620 (diff) | |
| download | minishell-47fff4418d3a83ae214429f395232c3536ff03c4.tar.gz minishell-47fff4418d3a83ae214429f395232c3536ff03c4.tar.bz2 minishell-47fff4418d3a83ae214429f395232c3536ff03c4.zip | |
Added eval cmd and error handling draft, Updated preprocessing for list
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 40 |
1 files changed, 21 insertions, 19 deletions
@@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 11:45:44 by cacharle #+# #+# */ -/* Updated: 2020/06/14 10:36:06 by charles ### ########.fr */ +/* Updated: 2020/06/14 16:04:41 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -79,27 +79,29 @@ int main(int argc, char **argv, char **envp) /* char *j = ms_glob("|)}>#*.c"); */ /* printf("%s\n", j); */ /* free(j); */ - t_ftvec *v = ft_vecnew(32); - ft_vecpush(v, token_new(TAG_STR, "$TERM$LFS$TERM$TERM.")); - ft_vecpush(v, token_new(TAG_STR, "$$LFS$TERM$TERM.")); - ft_vecpush(v, token_new(TAG_STR, "*/*.c$TERM")); - ft_vecpush(v, token_new(TAG_STR, "src/*.c include/*.h")); - ft_vecpush(v, token_new(TAG_STR, "$A$B")); - ft_vecpush(v, token_new(TAG_STR, "\\$TERM")); - ft_vecpush(v, token_new(TAG_STR, "$TER\\M")); - ft_vecpush(v, token_new(TAG_STR, "\\\\")); - ft_vecpush(v, token_new(TAG_STR_SINGLE, "''''$TEST\\TEST")); - ft_vecpush(v, token_new(TAG_STR_DOUBLE, ",$TEST,$B,")); - ft_vecpush(v, token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST")); - ft_vecpush(v, token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST")); - ft_vecpush(v, token_new(TAG_STR_DOUBLE , "$TEST")); - ft_vecpush(v, token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST")); - ft_vecpush(v, token_new(TAG_STR_SINGLE, "$TEST")); - char **as = preprocess(v, env); + t_ftlst *l = NULL; + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "$TERM$LFS$TERM$TERM."))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "$$LFS$TERM$TERM."))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "*/*.c"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "src/*.c include/*.h"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "$A$B"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "\\$TERM"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "$TER\\M"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR, "\\\\"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR_SINGLE, "''''$TEST\\TEST"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR_DOUBLE, ",$TEST,$B,"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR_DOUBLE , "$TEST"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); + ft_lstpush_back(&l, ft_lstnew(token_new(TAG_STR_SINGLE, "$TEST"))); + char **as = preprocess(l, env); + /* printf("%p\n", as); */ + /* printf("%p\n", *as); */ char **tmp = as; while (*as != NULL) puts(*as++); - ft_split_destroy(tmp); + /* ft_split_destroy(tmp); */ ft_vecdestroy(env, free); return (0); } |