error correction
This commit is contained in:
@@ -15,6 +15,6 @@
|
|||||||
|
|
||||||
# include "../minishell.h"
|
# include "../minishell.h"
|
||||||
|
|
||||||
t_ast_n *parser(char *input, char **envp, t_msh *msh);
|
t_ast_n *parser(char *input, t_msh *msh);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
40
srcs/main.c
40
srcs/main.c
@@ -14,25 +14,25 @@
|
|||||||
|
|
||||||
char *powerline(void)
|
char *powerline(void)
|
||||||
{
|
{
|
||||||
char *pwd;
|
// char *pwd;
|
||||||
char *tilt;
|
// char *tilt;
|
||||||
char *input;
|
char *input;
|
||||||
|
//
|
||||||
pwd = getcwd(NULL, 0);
|
// pwd = getcwd(NULL, 0);
|
||||||
if (ft_strncmp(pwd, "/home/", 6) == 0)
|
// if (ft_strncmp(pwd, "/home/", 6) == 0)
|
||||||
{
|
// {
|
||||||
pwd = pwd + 6;
|
// pwd = pwd + 6;
|
||||||
while (*pwd && (*pwd) != '/')
|
// while (*pwd && (*pwd) != '/')
|
||||||
pwd = pwd + 1;
|
// pwd = pwd + 1;
|
||||||
tilt = " ~";
|
// tilt = " ~";
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
tilt = " ";
|
// tilt = " ";
|
||||||
printf("%s----------------------------------------------\
|
// printf("%s----------------------------------------------
|
||||||
----------------------------------%s", POW5, RESET);
|
//----------------------------------%s", POW5, RESET);
|
||||||
printf("\n%s MMOAT %s%s%s%s%s %s%s%s ",
|
// printf("\n%s MMOAT %s%s%s%s%s %s%s%s ",
|
||||||
POW1, POW2, POW3, POW4, tilt, pwd, RESET, POW5, RESET);
|
// POW1, POW2, POW3, POW4, tilt, pwd, RESET, POW5, RESET);
|
||||||
input = readline("");
|
input = readline(">> ");
|
||||||
if (ft_strlen(input) > 0)
|
if (ft_strlen(input) > 0)
|
||||||
add_history(input);
|
add_history(input);
|
||||||
return (input);
|
return (input);
|
||||||
@@ -62,7 +62,7 @@ t_msh *init_msh(char **envp)
|
|||||||
if (!envp[0])
|
if (!envp[0])
|
||||||
msh->env = ft_setnewenv();
|
msh->env = ft_setnewenv();
|
||||||
else
|
else
|
||||||
msh->env = copy_env_var(envp, count_var(envp));
|
msh->env = init_env(envp);
|
||||||
return (msh);
|
return (msh);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@ int main(int ac, char **av, char **envp)
|
|||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
input = powerline();
|
input = powerline();
|
||||||
msh->head = parser(input, envp, msh);
|
msh->head = parser(input, msh);
|
||||||
execute_command(msh->head);
|
execute_command(msh->head);
|
||||||
free(input);
|
free(input);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
i = 0;
|
||||||
while (cpy)
|
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;
|
cpy = cpy->next;
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user