Kinou/Minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ret

Browse Source
This commit is contained in:
kinou-p 2022-04-16 02:51:17 +02:00
parent ec1272258d
commit 4495ac459c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
srcs/main.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/06 13:27:11 by apommier #+# #+# */ /* Created: 2022/03/06 13:27:11 by apommier #+# #+# */
/* Updated: 2022/04/16 02:42:24 by apommier ### ########.fr */ /* Updated: 2022/04/16 02:50:22 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -53,10 +53,10 @@ void print_prompt(char **path)
{ {
char *input; char *input;
t_cmd *cmd; t_cmd *cmd;
int i; int err_var;
input = 0; input = 0;
i = 0; err_var = 0;
cmd = 0; cmd = 0;
while (1) while (1)
{ {
@ -71,11 +71,12 @@ void print_prompt(char **path)
}*/ }*/
if (ft_strlen(input) && next_space(input, 0) && input) if (ft_strlen(input) && next_space(input, 0) && input)
{ {
cmd = set_cmd(input, path, i); cmd = set_cmd(input, path, err_var);
if (cmd) if (cmd)
{ {
cmd->err_var = 0; //cmd->err_var = 0;
execute(cmd, path); execute(cmd, path);
err_var = cmd->err_var;
path = ft_dup_double(cmd->env); path = ft_dup_double(cmd->env);
free_cmd(cmd); free_cmd(cmd);
cmd = 0; cmd = 0;
@ -83,7 +84,6 @@ void print_prompt(char **path)
else else
ft_putstr_fd("Minishell: error while parsing command\n", 2); ft_putstr_fd("Minishell: error while parsing command\n", 2);
} }
i++;
free(input); free(input);
} }
} }

5
srcs/set_cmd/set_cmd.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/08 15:19:42 by apommier #+# #+# */ /* Created: 2022/03/08 15:19:42 by apommier #+# #+# */
/* Updated: 2022/04/16 02:39:13 by apommier ### ########.fr */ /* Updated: 2022/04/16 02:50:09 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -119,8 +119,7 @@ t_cmd *set_cmd(char *input, char **env, int nb)
cmd->s_cmds = calloc(sizeof(t_s_cmd), double_size(cmds) + 1); cmd->s_cmds = calloc(sizeof(t_s_cmd), double_size(cmds) + 1);
if (!cmd->s_cmds) if (!cmd->s_cmds)
return (0); return (0);
if (nb == 0) cmd->err_var = nb;
cmd->err_var = 0;
cmd->path = 0; cmd->path = 0;
//cmd->s_cmds[double_size(cmds)] = NULL; //cmd->s_cmds[double_size(cmds)] = NULL;
cmd->path = get_path(env); cmd->path = get_path(env);