From ec9177a513d1fdd510abcb70a9640d1bd94023f5 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 15 Jun 2020 11:01:03 +0200 Subject: Fixing leaks (need refactoring) --- src/main.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index e81c634..ec99f51 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 11:45:44 by cacharle #+# #+# */ -/* Updated: 2020/06/14 21:21:01 by charles ### ########.fr */ +/* Updated: 2020/06/15 11:00:03 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -81,34 +81,34 @@ int main(int argc, char **argv, char **envp) /* free(j); */ t_ftlst *args = NULL; - ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "echo"))); - ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "bonjour"))); - ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "je"))); + /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "echo"))); */ + /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "bonjour"))); */ + /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "je"))); */ - /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "cat"))); */ - /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-e"))); */ + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "cat"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-e"))); /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "ls"))); */ /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-a"))); */ /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-l"))); */ - /* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$$LFS$TERM$TERM."))); */ - /* ft_lstpush_back(&args, 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"))); */ + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$$LFS$TERM$TERM."))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "*/*.c"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "src/*.c include/*.h"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$A$B"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "\\$TERM"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$TER\\M"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "\\\\"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_SINGLE, "''''$TEST\\TEST"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE, ",$TEST,$B,"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE , "$TEST"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); + ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_SINGLE, "$TEST"))); t_ftlst *redirs = NULL; - /* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_IN, NULL))); */ - /* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "bonjour"))); */ + ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_IN, NULL))); + ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "bonjour"))); ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_OUT, NULL))); ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "yo"))); @@ -117,6 +117,7 @@ int main(int argc, char **argv, char **envp) ast->redirs = redirs; printf("eval %d\n", eval_cmd(env, path, ast)); + ast_destroy(ast); /* char **as = preprocess(l, env); */ -- cgit