42_adjoly/ft_minipowershell
1
0 Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2026-10-16 11:10:07 +02:00
Code Activity

「🏗️」 wip(exec/exec_cmd): fixing redirections with builtins

Browse Source
This commit is contained in:
y-syo committed 2024-07-18 14:28:19 +02:00
1 parent fb7f5bdbef
commit a401068e3c
5 files changed
+31 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/exec/exec_cmd.c
+20 -1
View File
@@ -6,12 +6,13 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/15 21:03:31 by mmoussou #+# #+# */
/* Updated: 2024/07/16 13:36:06 by mmoussou ### ########.fr */
/* Updated: 2024/07/18 14:27:01 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
#include "builtins.h"
#include "error_msg.h"
void exec_cmd(char *cmd, char **argv, char **env, t_env *env_t)
{
@@ -59,3 +60,21 @@ void __fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
if (exec.status != -1)
exec_cmd(cmd->cmd, cmd->argv, env, env_t);
}
int exec_single_cmd_execution(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
{
int fork_pid;
if (is_in_builtins(cmd->cmd) > 0 && is_in_builtins(cmd->cmd) < 5)
__fork_single_cmd(cmd, env, env_t, exec);
if (is_in_builtins(cmd->cmd) > 0 && is_in_builtins(cmd->cmd) < 5)
return (0);
fork_pid = fork();
if (!fork_pid)
{
__fork_single_cmd(cmd, env, env_t, exec);
free_exec(env_t, env);
exit(get_exit_code(-1));
}
return (fork_pid);
}
src/exec/exec_split_cmd.c
+3 -10
View File
@@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */
/* Updated: 2024/07/16 14:36:38 by adjoly ### ########.fr */
/* Updated: 2024/07/18 14:26:05 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
@@ -50,7 +50,6 @@ int exec_fork_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
int exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
{
t_exec exec;
int fork_pid;
char *input;
input = ft_strdup(cmd->cmd);
@@ -66,14 +65,8 @@ int exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
return (-1);
}
free(input);
if (is_in_builtins(cmd->cmd) > 0)
exec_cmd(cmd->cmd, cmd->argv, env, env_t);
if (is_in_builtins(cmd->cmd) > 0)
return (0);
fork_pid = fork();
if (!fork_pid)
__fork_single_cmd(cmd, env, env_t, exec);
return (fork_pid);
exec.status = exec_single_cmd_execution(cmd, env, env_t, exec);
return (exec.status);
}
t_exec exec_pipe_unforked(t_exec exec, t_list *list_cmd, t_env *env)