diff --git a/srcs/.nfs000000000c6b84180000000b b/srcs/.nfs000000000c6b84180000000b new file mode 100644 index 0000000..01942e6 Binary files /dev/null and b/srcs/.nfs000000000c6b84180000000b differ diff --git a/srcs/.nfs000000000c6b841e0000000c b/srcs/.nfs000000000c6b841e0000000c new file mode 100644 index 0000000..03a1cdd Binary files /dev/null and b/srcs/.nfs000000000c6b841e0000000c differ diff --git a/srcs/env.c b/srcs/env.c index a9b669f..1726e7c 100644 --- a/srcs/env.c +++ b/srcs/env.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/24 10:58:36 by marde-vr #+# #+# */ -/* Updated: 2024/04/25 18:55:17 by marde-vr ### ########.fr */ +/* Updated: 2024/04/26 10:26:03 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -75,7 +75,7 @@ void print_env_declare(t_msh *msh, t_env *env_orig) } env = env->next; } - free_env_cpy(env); + free_env_cpy(start); } void delete_from_env(t_msh *msh, char *name) diff --git a/srcs/exec_bonus.c b/srcs/exec_bonus.c index fa8f4cd..953ca24 100755 --- a/srcs/exec_bonus.c +++ b/srcs/exec_bonus.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */ -/* Updated: 2024/04/25 19:20:22 by tomoron ### ########.fr */ +/* Updated: 2024/04/26 10:34:15 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -72,7 +72,8 @@ int exec(t_msh *msh, char **cmd_args, int i, int cmd_count) void exec_command(t_msh *msh, int i, int cmd_count) { - if(msh->out_fd != -1 || msh->in_fd != -1) + g_return_code = 0; + if(msh->out_fd != -1 && msh->in_fd != -1) { msh->fds[i] = ft_calloc(2, sizeof(int *)); if (!msh->fds[i]) @@ -82,7 +83,6 @@ void exec_command(t_msh *msh, int i, int cmd_count) if ((msh->tokens && msh->tokens->value) || is_parenthesis(msh->cmds)) exec(msh, get_cmd_args(msh), i, cmd_count); } - g_return_code = 0; remove_command_from_msh(msh); } diff --git a/srcs/export.c b/srcs/export.c index 00baa79..ce17e72 100755 --- a/srcs/export.c +++ b/srcs/export.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/18 18:29:20 by marde-vr #+# #+# */ -/* Updated: 2024/04/25 18:59:15 by marde-vr ### ########.fr */ +/* Updated: 2024/04/26 10:29:05 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -88,6 +88,7 @@ int ft_export(t_msh *msh, t_token *cmd, t_env *env) { int error; + error = 0; if (cmd && !cmd->next) { print_env_declare(msh, env); diff --git a/srcs/main.c b/srcs/main.c index a4af8c8..78b8235 100755 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ -/* Updated: 2024/04/25 18:38:02 by tomoron ### ########.fr */ +/* Updated: 2024/04/26 10:24:46 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -98,6 +98,7 @@ int init_minishell(t_msh **msh, int argc, char **argv, char **envp) (*msh)->env = get_env(envp); (*msh)->env = add_shlvl((*msh)->env); rl_catch_signals = 0; + g_return_code = 0; signal(SIGINT, signal_handler_interactive); signal(SIGQUIT, signal_handler_interactive); return (0);