diff --git a/includes/parser/parsing.h b/includes/parser/parsing.h index 6caa1f8..045e836 100644 --- a/includes/parser/parsing.h +++ b/includes/parser/parsing.h @@ -15,6 +15,6 @@ # include "../minishell.h" -t_ast_n *parser(char *input, char **envp, t_msh *msh); +t_ast_n *parser(char *input, t_msh *msh); #endif diff --git a/srcs/main.c b/srcs/main.c index fe88ab6..64477c8 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -14,25 +14,25 @@ char *powerline(void) { - char *pwd; - char *tilt; + // char *pwd; + // char *tilt; char *input; - - pwd = getcwd(NULL, 0); - if (ft_strncmp(pwd, "/home/", 6) == 0) - { - pwd = pwd + 6; - while (*pwd && (*pwd) != '/') - pwd = pwd + 1; - tilt = " ~"; - } - else - tilt = " "; - printf("%s----------------------------------------------\ -----------------------------------%s", POW5, RESET); - printf("\n%s  MMOAT %s%s%s%s%s %s%s%s ", - POW1, POW2, POW3, POW4, tilt, pwd, RESET, POW5, RESET); - input = readline(""); + // + // pwd = getcwd(NULL, 0); + // if (ft_strncmp(pwd, "/home/", 6) == 0) + // { + // pwd = pwd + 6; + // while (*pwd && (*pwd) != '/') + // pwd = pwd + 1; + // tilt = " ~"; + // } + // else + // tilt = " "; +// printf("%s---------------------------------------------- +//----------------------------------%s", POW5, RESET); +// printf("\n%s  MMOAT %s%s%s%s%s %s%s%s ", +// POW1, POW2, POW3, POW4, tilt, pwd, RESET, POW5, RESET); + input = readline(">> "); if (ft_strlen(input) > 0) add_history(input); return (input); @@ -62,7 +62,7 @@ t_msh *init_msh(char **envp) if (!envp[0]) msh->env = ft_setnewenv(); else - msh->env = copy_env_var(envp, count_var(envp)); + msh->env = init_env(envp); return (msh); } @@ -79,7 +79,7 @@ int main(int ac, char **av, char **envp) while (1) { input = powerline(); - msh->head = parser(input, envp, msh); + msh->head = parser(input, msh); execute_command(msh->head); free(input); } diff --git a/srcs/parsing/ast/ast.c b/srcs/parsing/ast/ast.c index c13549d..f995d71 100644 --- a/srcs/parsing/ast/ast.c +++ b/srcs/parsing/ast/ast.c @@ -14,7 +14,7 @@ // =================================================================== -t_ast_n *create_ast_n(t_node *lst, t_ast_n *parent); +t_ast_n *create_ast_n(t_node *lst, t_ast_n *parent, t_msh *msh); // ==================================================================== @@ -137,7 +137,7 @@ void create_pline(t_ast_n *self, t_node *lst, t_node *token, t_msh *msh) i = 0; while (cpy) { - self->pline[i] = create_ast_n(cpy->node, self, t_msh *msh); + self->pline[i] = create_ast_n(cpy->node, self, msh); cpy = cpy->next; i++; }