42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-03-15 19:36:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🔨」 fix(exec_cmd): fixed waitpid, now wait for all process, not just first one (and minor fixes)

Browse Source
This commit is contained in:
yosyo
2024-06-21 10:01:05 +02:00
parent 59a2ce8838
commit 87f031c87f
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/exec/exec_split_cmd.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */ /* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */
/* Updated: 2024/06/18 20:29:40 by mmoussou ### ########.fr */ /* Updated: 2024/06/21 09:58:27 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -42,6 +42,9 @@ int exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t)
int fork_pid; int fork_pid;
int status; int status;
status = switch_cmd_path(cmd, env_t);
if (status == -1 || access(cmd->cmd, X_OK))
return (-1);
fork_pid = fork(); fork_pid = fork();
if (fork_pid == -1) if (fork_pid == -1)
return (-1); return (-1);
@ -49,16 +52,13 @@ int exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t)
{ {
status = dup2(cmd->infile, STDIN_FILENO); status = dup2(cmd->infile, STDIN_FILENO);
if (status == -1) if (status == -1)
return (-1); exit(-1);
if (cmd->outfile != STDOUT_FILENO) if (cmd->outfile != STDOUT_FILENO)
status = dup2(STDOUT_FILENO, cmd->outfile); status = dup2(STDOUT_FILENO, cmd->outfile);
else else
status = dup2(STDOUT_FILENO, STDIN_FILENO); status = dup2(STDOUT_FILENO, STDIN_FILENO);
if (status == -1) if (status == -1)
return (-1); exit(-1);
status = switch_cmd_path(cmd, env_t);
if (status == -1)
return (-1);
execve(cmd->cmd, cmd->argv, env); execve(cmd->cmd, cmd->argv, env);
exit(-1); exit(-1);
} }
@ -70,6 +70,9 @@ int exec_last_cmd(t_cmd *cmd, char **env, t_env *env_t)
int fork_pid; int fork_pid;
int status; int status;
status = switch_cmd_path(cmd, env_t);
if (status == -1 || access(cmd->cmd, X_OK))
return (-1);
fork_pid = fork(); fork_pid = fork();
if (fork_pid == -1) if (fork_pid == -1)
return (-1); return (-1);
@ -77,14 +80,11 @@ int exec_last_cmd(t_cmd *cmd, char **env, t_env *env_t)
{ {
status = dup2(cmd->infile, STDIN_FILENO); status = dup2(cmd->infile, STDIN_FILENO);
if (status == -1) if (status == -1)
return (-1); exit(-1);
status = dup2(STDOUT_FILENO, cmd->outfile); status = dup2(STDOUT_FILENO, cmd->outfile);
if (status == -1) if (status == -1)
return (-1); exit(-1);
status = switch_cmd_path(cmd, env_t); execve(cmd->cmd, cmd->argv, env);
if (status == -1)
return (-1);
status = execve(cmd->cmd, cmd->argv, env);
exit(-1); exit(-1);
} }
return (0); return (0);
@ -95,10 +95,12 @@ int exec_split_cmd(t_list *list_cmd, t_env *env)
char **env_array; char **env_array;
int status; int status;
int return_code; int return_code;
int i;
env_array = env_get(env); env_array = env_get(env);
if (!env_array) if (!env_array)
return (-1); return (-1);
i = ft_lstsize(list_cmd);
while (list_cmd->next) while (list_cmd->next)
{ {
status = exec_single_cmd(list_cmd->content, env_array, env); status = exec_single_cmd(list_cmd->content, env_array, env);
@ -113,7 +115,11 @@ int exec_split_cmd(t_list *list_cmd, t_env *env)
ft_free("a", &env_array); ft_free("a", &env_array);
if (status == -1) if (status == -1)
return (-1); return (-1);
while (i)
{
waitpid(-1, &return_code, 0); waitpid(-1, &return_code, 0);
i--;
}
if (WIFEXITED(return_code)) if (WIFEXITED(return_code))
printf("minishell: %d\n", WEXITSTATUS(return_code)); printf("minishell: %d\n", WEXITSTATUS(return_code));
else else