Merge branch 'sadjigui'
This commit is contained in:
commit
7f1f57de51
@ -22,7 +22,7 @@ int print_env(t_cmd *cmd)
|
||||
ft_putstr_fd("Minishell: env: '", 2);
|
||||
ft_putstr_fd(cmd->current_s_cmd->args[1], 2);
|
||||
ft_putstr_fd("': No such file or directory\n", 2);
|
||||
return (check_return(cmd, 127));
|
||||
return (check_return(cmd->current_s_cmd, 127));
|
||||
}
|
||||
else if (cmd->env)
|
||||
{
|
||||
@ -33,12 +33,11 @@ int print_env(t_cmd *cmd)
|
||||
i++;
|
||||
}
|
||||
}
|
||||
return (check_return(cmd, 0));
|
||||
return (check_return(cmd->current_s_cmd, 0));
|
||||
}
|
||||
|
||||
int ft_pwd(t_s_cmd *cmd)
|
||||
{
|
||||
(void)cmd;
|
||||
int i;
|
||||
char p[1024];
|
||||
char *str;
|
||||
|
||||
@ -65,7 +65,7 @@ int size_path(char **str)
|
||||
|
||||
int check_return(t_s_cmd *cmd, int var)
|
||||
{
|
||||
if (cmd->big_cmd->current_s_cmd->child)
|
||||
if (cmd->child)
|
||||
{
|
||||
cmd->big_cmd->err_var = var;
|
||||
return (var);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user