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

「✏️」 norm(exec): normed project.

Browse Source
This commit is contained in:
yosyo
2024-07-15 21:06:03 +02:00
parent 01e0f4fd92
commit dcd623639f
3 changed files with 67 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/execution.h
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/29 13:20:22 by mmoussou #+# #+# */
/* Updated: 2024/07/15 19:28:57 by mmoussou ### ########.fr */
/* Updated: 2024/07/15 21:04:19 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
@ -39,6 +39,9 @@ void __close(void *content);
int check_file(char *cmd, char *input);
void free_exec(t_env *env, char **env_array);
void exec_cmd(char *cmd, char **argv, char **env, t_env *env_t);
void __fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec);
/**
* @brief spawn a heredoc
*

62
src/exec/exec_cmd.c Normal file
View File

@ -0,0 +1,62 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* exec_cmd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/15 21:03:31 by mmoussou #+# #+# */
/* Updated: 2024/07/15 21:04:44 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
#include "builtins.h"
void exec_cmd(char *cmd, char **argv, char **env, t_env *env_t)
{
int i;
i = is_in_builtins(cmd);
if (i)
{
if (i == 5)
ft_echo(argv + 1);
if (i == 2)
ft_cd(env_t, argv[1]);
if (i == 6)
ft_pwd();
if (i == 4)
ft_export(argv + 1, env_t);
if (i == 3)
ft_unset(argv[1], env_t);
if (i == 7)
ft_env(env_t);
if (i == 1)
ft_exit(argv, ft_arrlen(argv), env, env_t);
}
else
{
ft_envclear(&env_t, free);
execve(cmd, argv, env);
}
}
void __fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
{
exec.status = dup2(cmd->infile, STDIN_FILENO);
if (cmd->infile != STDIN_FILENO)
close(cmd->infile);
if (exec.status == -1)
exit(-1);
exec.status = dup2(cmd->outfile, STDOUT_FILENO);
if (cmd->outfile != STDOUT_FILENO)
close(cmd->outfile);
if (exec.pipe_fd[0] != -1)
close(exec.pipe_fd[0]);
if (exec.pipe_fd[0] != -1)
close(exec.pipe_fd[1]);
if (exec.status != -1)
exec_cmd(cmd->cmd, cmd->argv, env, env_t);
exit(-1);
}

50
src/exec/exec_split_cmd.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */
/* Updated: 2024/07/15 20:58:56 by mmoussou ### ########.fr */
/* Updated: 2024/07/15 21:03:12 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,54 +17,6 @@
void __sig(int status);
void exec_cmd(char *cmd, char **argv, char **env, t_env *env_t)
{
int i;
i = is_in_builtins(cmd);
if (i)
{
if (i == 5)
ft_echo(argv + 1);
if (i == 2)
ft_cd(env_t, argv[1]);
if (i == 6)
ft_pwd();
if (i == 4)
ft_export(argv + 1, env_t);
if (i == 3)
ft_unset(argv[1], env_t);
if (i == 7)
ft_env(env_t);
if (i == 1)
ft_exit(argv, ft_arrlen(argv), env, env_t);
}
else
{
ft_envclear(&env_t, free);
execve(cmd, argv, env);
}
}
void __fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
{
exec.status = dup2(cmd->infile, STDIN_FILENO);
if (cmd->infile != STDIN_FILENO)
close(cmd->infile);
if (exec.status == -1)
exit(-1);
exec.status = dup2(cmd->outfile, STDOUT_FILENO);
if (cmd->outfile != STDOUT_FILENO)
close(cmd->outfile);
if (exec.pipe_fd[0] != -1)
close(exec.pipe_fd[0]);
if (exec.pipe_fd[0] != -1)
close(exec.pipe_fd[1]);
if (exec.status != -1)
exec_cmd(cmd->cmd, cmd->argv, env, env_t);
exit(-1);
}
int exec_fork_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
{
t_exec exec;