From dcd623639fed9272795897a281d2cce5dfc26772 Mon Sep 17 00:00:00 2001
From: yosyo <mmoussou@student.42angouleme.fr>
Date: Mon, 15 Jul 2024 21:06:03 +0200
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=9C=8F=EF=B8=8F=E3=80=8D=20norm(exe?=
 =?UTF-8?q?c):=20normed=20project.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/execution.h       |  5 +++-
 src/exec/exec_cmd.c       | 62 +++++++++++++++++++++++++++++++++++++++
 src/exec/exec_split_cmd.c | 50 +------------------------------
 3 files changed, 67 insertions(+), 50 deletions(-)
 create mode 100644 src/exec/exec_cmd.c

diff --git a/include/execution.h b/include/execution.h
index e3a9b14..a7365bd 100644
--- a/include/execution.h
+++ b/include/execution.h
@@ -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
  *
diff --git a/src/exec/exec_cmd.c b/src/exec/exec_cmd.c
new file mode 100644
index 0000000..5bb4438
--- /dev/null
+++ b/src/exec/exec_cmd.c
@@ -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);
+}
diff --git a/src/exec/exec_split_cmd.c b/src/exec/exec_split_cmd.c
index b36ff99..7aab704 100644
--- a/src/exec/exec_split_cmd.c
+++ b/src/exec/exec_split_cmd.c
@@ -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;