starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: starnakin:e2c43eb97317c9b02330ff2122c81dc310c1f878
Branches Tags
starnakin:master
starnakin:camille
..
compare: starnakin:0694b36a72a7843ce094e7655a6af73a51a93d14
Branches Tags
starnakin:master
starnakin:camille

No commits in common. "e2c43eb97317c9b02330ff2122c81dc310c1f878" and "0694b36a72a7843ce094e7655a6af73a51a93d14" have entirely different histories.
e2c43eb973 ... 0694b36a72

1 changed files with 7 additions and 12 deletions
Show Stats Expand all files Collapse all files

19
execution/execution.c
View File

@ -11,7 +11,6 @@
/* ************************************************************************** */ /* ************************************************************************** */
#include "execution_private.h" #include "execution_private.h"
#include <unistd.h>
static int ft_own_cmd(t_data *data, t_cmd *cmd) static int ft_own_cmd(t_data *data, t_cmd *cmd)
{ {
@ -42,7 +41,7 @@ static int ft_own_cmd(t_data *data, t_cmd *cmd)
return (return_code); return (return_code);
} }
static bool ft_executor(t_cmd *cmd, char **env) static int ft_executor(t_cmd *cmd, char **env)
{ {
if (cmd->fd_in[0] == -1 || cmd->fd_out[0] == -1 || cmd->executable == NULL) if (cmd->fd_in[0] == -1 || cmd->fd_out[0] == -1 || cmd->executable == NULL)
return (0); return (0);
@ -53,15 +52,11 @@ static bool ft_executor(t_cmd *cmd, char **env)
{ {
dup2(cmd->fd_in[0], 0); dup2(cmd->fd_in[0], 0);
dup2(cmd->fd_out[0], 1); dup2(cmd->fd_out[0], 1);
if (cmd->fd_in[1] != -1) if (cmd->fd_in[0] > 2)
dup2(cmd->fd_in[1], 0); close(cmd->fd_in[0]);
if (cmd->fd_out[1] != -1) if (cmd->fd_out[0] > 2)
dup2(cmd->fd_out[1], 1); close(cmd->fd_out[0]);
ft_closer(cmd->fd_in);
ft_closer(cmd->fd_out);
execve(cmd->executable, cmd->args, env); execve(cmd->executable, cmd->args, env);
ft_eprintf("minishell: permission denied: %s\n", cmd->executable);
return (1);
} }
return (0); return (0);
} }
@ -83,9 +78,9 @@ static int ft_cmd_executor(t_data *data, t_cmd *cmd)
if (env == NULL) if (env == NULL)
return (1); return (1);
exit_code = ft_executor(cmd, env); exit_code = ft_executor(cmd, env);
ft_freer_tab_ultimate(1, env); if (exit_code == -1)
if (exit_code == 1)
return (1); return (1);
ft_freer_tab_ultimate(1, env);
} }
if (ft_gen_exit_code(data)) if (ft_gen_exit_code(data))
return (1); return (1);