aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authornass1pro <nass1pro@gmail.com>2020-06-16 11:49:29 +0200
committerCharles <sircharlesaze@gmail.com>2020-06-16 13:56:35 +0200
commitb805f77cc96b1ff5482aa2ee2004bf74ebe402f0 (patch)
treef6b06a3fffa9fb81a47910919b616a5f1fadf6d2 /src/main.c
parent9b4703d4d841366f018555d3b9d5f9377ae5dab1 (diff)
downloadminishell-b805f77cc96b1ff5482aa2ee2004bf74ebe402f0.tar.gz
minishell-b805f77cc96b1ff5482aa2ee2004bf74ebe402f0.tar.bz2
minishell-b805f77cc96b1ff5482aa2ee2004bf74ebe402f0.zip
Test travis
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c
index 55f50c0..6a6692a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/28 11:45:44 by cacharle #+# #+# */
-/* Updated: 2020/06/16 10:11:30 by charles ### ########.fr */
+/* Updated: 2020/06/16 13:47:30 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -26,7 +26,7 @@ void token_debug(void *v)
t_token *t;
t= v;
- printf("[%4d] (%s)\n", t->tag, t->content);
+ printf("[%4d %d] (%s)\n", t->tag, !!(t->tag & TAG_STICK), t->content);
}
int main(int argc, char **argv, char **envp)
@@ -36,24 +36,23 @@ int main(int argc, char **argv, char **envp)
env = env_from_array(envp);
path = path_update(NULL, env_search(env, "PATH"));
-
+ /* printf("%s\n", argv[2]); */
if (argc == 3 && ft_strcmp(argv[1], "-c") == 0)
{
t_ftlst *lex_out = lexer(ft_strdup(argv[2]));
- ft_lstiter(lex_out, token_debug);
+ /* ft_lstiter(lex_out, token_debug); */
t_ret *parser_out = parse(lex_out);
- /* printf("%p\n", parser_out->ast->cmd_argv); */
- /* printf("%p\n", parser_out->ast->redirs); */
-
+ /* printf("===cmd_argv===\n"); */
/* ft_lstiter(parser_out->ast->cmd_argv, token_debug); */
+ /* printf("===redirs===\n"); */
/* ft_lstiter(parser_out->ast->redirs, token_debug); */
- //int eval_out = eval_cmd(env, path, parser_out->ast);
- //(void)eval_out;
+ int eval_out = eval_cmd(env, path, parser_out->ast);
+ (void)eval_out;
}
ft_htdestroy(path, free);