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 some things.

Browse Source
This commit is contained in:
y-syo
2024-06-18 20:31:40 +02:00
parent 8ec6d94a52
commit 2dc8817d98
1 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
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/13 14:11:18 by mmoussou ### ########.fr */ /* Updated: 2024/06/18 20:29:40 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,10 +14,16 @@
char *get_cmd_local_path(char *cmd, t_env *env) char *get_cmd_local_path(char *cmd, t_env *env)
{ {
(void) cmd; char *path;
(void) env;
// TODO : get pwd, append cmd, done. path = env_get_value("PWD", env);
return (NULL); if (!path)
return (NULL);
path = ft_strjoin_free_s1(path, "/");
if (!path)
return (NULL);
path = ft_strjoin_free_s1(path, cmd);
return (path);
} }
int switch_cmd_path(t_cmd *cmd, t_env *env) int switch_cmd_path(t_cmd *cmd, t_env *env)
@ -36,27 +42,26 @@ int exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t)
int fork_pid; int fork_pid;
int status; int status;
status = dup2(cmd->infile, STDIN_FILENO);
if (status == -1)
return (-1);
if (cmd->outfile != STDOUT_FILENO)
status = dup2(STDOUT_FILENO, cmd->outfile);
else
status = dup2(STDOUT_FILENO, STDIN_FILENO);
if (status == -1)
return (-1);
status = switch_cmd_path(cmd, env_t);
if (status == -1)
return (-1);
fork_pid = fork(); fork_pid = fork();
if (fork_pid == -1) if (fork_pid == -1)
return (-1); return (-1);
if (!fork_pid) if (!fork_pid)
status = execve(cmd->cmd, cmd->argv, env); {
if (!fork_pid) status = dup2(cmd->infile, STDIN_FILENO);
if (status == -1)
return (-1);
if (cmd->outfile != STDOUT_FILENO)
status = dup2(STDOUT_FILENO, cmd->outfile);
else
status = dup2(STDOUT_FILENO, STDIN_FILENO);
if (status == -1)
return (-1);
status = switch_cmd_path(cmd, env_t);
if (status == -1)
return (-1);
execve(cmd->cmd, cmd->argv, env);
exit(-1); exit(-1);
else }
waitpid(fork_pid, NULL, 0);
return (0); return (0);
} }
@ -65,25 +70,23 @@ int exec_last_cmd(t_cmd *cmd, char **env, t_env *env_t)
int fork_pid; int fork_pid;
int status; int status;
status = dup2(cmd->infile, STDIN_FILENO);
if (status == -1)
return (-1);
status = dup2(STDOUT_FILENO, cmd->outfile);
if (status == -1)
return (-1);
status = switch_cmd_path(cmd, env_t);
if (status == -1)
return (-1);
fork_pid = fork(); fork_pid = fork();
if (fork_pid == -1) if (fork_pid == -1)
return (-1); return (-1);
if (!fork_pid) if (!fork_pid)
{ {
status = dup2(cmd->infile, STDIN_FILENO);
if (status == -1)
return (-1);
status = dup2(STDOUT_FILENO, cmd->outfile);
if (status == -1)
return (-1);
status = switch_cmd_path(cmd, env_t);
if (status == -1)
return (-1);
status = execve(cmd->cmd, cmd->argv, env); status = execve(cmd->cmd, cmd->argv, env);
exit(-1); exit(-1);
} }
else
waitpid(fork_pid, NULL, 0);
return (0); return (0);
} }
@ -91,6 +94,7 @@ int exec_split_cmd(t_list *list_cmd, t_env *env)
{ {
char **env_array; char **env_array;
int status; int status;
int return_code;
env_array = env_get(env); env_array = env_get(env);
if (!env_array) if (!env_array)
@ -109,5 +113,18 @@ 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);
waitpid(-1, &return_code, 0);
if (WIFEXITED(return_code))
printf("minishell: %d\n", WEXITSTATUS(return_code));
else
{
if (WIFSIGNALED(return_code))
{
if (WCOREDUMP(return_code))
printf("minishell: %d\n", WTERMSIG(return_code));
else
printf("minishell: %d\n", WTERMSIG(return_code));
}
}
return (0); return (0);
} }