Norming eval

4 files changed, 66 insertions, 84 deletions

diff --git a/src/eval/cmd.c b/src/eval/cmd.c
index c786a7b..a35a73d 100644
--- a/src/eval/cmd.c
+++ b/src/eval/cmd.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/14 10:41:31 by charles           #+#    #+#             */
-/*   Updated: 2020/10/08 10:15:07 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/10/09 14:31:45 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,7 @@
 
 pid_t	g_child_pid = -1;
 
-int			wrapped_cmd(t_fork_param_cmd *param)
+static int	st_wrapped_cmd(t_fork_param_cmd *param)
 {
 	int	status;
 
@@ -30,6 +30,12 @@ int			wrapped_cmd(t_fork_param_cmd *param)
 	return (status);
 }
 
+static int	st_split_destroy_ret(int ret, char **strs)
+{
+	ft_split_destroy(strs);
+	return (ret);
+}
+
 int			eval_cmd(int fds[2], t_env env, t_ast *ast)
 {
 	t_fork_param_cmd	param;
@@ -40,31 +46,20 @@ int			eval_cmd(int fds[2], t_env env, t_ast *ast)
 		return (status);
 	if ((argv = preprocess(&ast->cmd_argv, env)) == NULL)
 		return (EVAL_FATAL);
-	/* printf("%p\n", ast->cmd_argv); */
-	/* ast->cmd_argv = NULL; */
 	if (argv[0] == NULL)
-	{
-		ft_split_destroy(argv);
-		return (0);
-	}
+		return (st_split_destroy_ret(0, argv));
 	param.builtin = builtin_search_func(argv[0]);
 	if (param.builtin != NULL && !param.builtin->forked)
 	{
 		status = param.builtin->func(argv, env);
-		ft_split_destroy(argv);
-		return (status);
+		return (st_split_destroy_ret(status, argv));
 	}
-
 	if (param.builtin == NULL
 		&& (status = path_search(env, argv[0], param.exec_path, true)) != 0)
-	{
-		ft_split_destroy(argv);
-		return (status);
-	}
-
+		return (st_split_destroy_ret(status, argv));
 	param.argv = argv;
 	param.env = env;
-	status = fork_wrap(fds, &param, (t_wrapped_func)wrapped_cmd);
+	status = fork_wrap(fds, &param, (t_wrapped_func)st_wrapped_cmd);
 	ft_split_destroy(argv);
 	g_state.last_status = status;
 	return (status);
diff --git a/src/eval/eval.c b/src/eval/eval.c
index 66a535b..0df8b85 100644
--- a/src/eval/eval.c
+++ b/src/eval/eval.c
@@ -6,20 +6,17 @@
 /*   By: charles <me@cacharle.xyz>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/09/13 20:38:06 by charles           #+#    #+#             */
-/*   Updated: 2020/10/07 15:02:21 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/10/09 14:03:31 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "eval.h"
 
-int st_replace(int oldfd, int newfd)
+static int	st_replace(int oldfd, int newfd)
 {
 	if (oldfd != FD_NONE)
-	{
 		dup2(oldfd, newfd);
-		/* close(oldfd); */
-	}
-	return 0;
+	return (0);
 }
 
 /*
@@ -41,7 +38,7 @@ int			fork_wrap(int fds[2], void *passed, t_wrapped_func wrapped)
 		return (EVAL_FATAL);
 	if (pid == 0)
 	{
-			g_state.is_child = true;
+		g_state.is_child = true;
 		if (st_replace(fds[FD_READ], STDIN_FILENO) != 0)
 			exit(EXIT_FAILURE);
 		if (st_replace(fds[FD_WRITE], STDOUT_FILENO) != 0)
diff --git a/src/eval/operation.c b/src/eval/operation.c
index 6ec41f9..19ecec7 100644
--- a/src/eval/operation.c
+++ b/src/eval/operation.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/17 15:27:22 by charles           #+#    #+#             */
-/*   Updated: 2020/10/09 14:00:04 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/10/09 14:54:43 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,63 +33,56 @@ int			eval_operation(int fds[2], t_env env, t_ast *ast)
 	return (eval(right_fds, env, ast->op.right));
 }
 
-int			eval_pipeline(int fds[2], t_env env, t_ast *ast)
-{
-	t_ftlst	*curr;
-	/* t_ftvec	*pids; */
-	int	p[2];
-	int prev_output;
-
-	/* pids = ft_vecnew(16); */
+#define PIPES_PREV_OUTPUT 2
 
-	prev_output = STDIN_FILENO;
-	curr = ast->pipeline;
-
-	while (curr->next != NULL)
-	{
-		pipe(p);
-
-		int pid = fork();
-		if (pid == 0)
-		{
-			g_state.is_child = true;
-			dup2(p[FD_WRITE], STDOUT_FILENO);
-			if (prev_output != STDIN_FILENO)
-			{
-				dup2(prev_output, STDIN_FILENO);
-				close(prev_output);
-			}
-			close(p[FD_READ]);
-			fds[0] = FD_NONE;
-			fds[1] = FD_NONE;
-			exit(eval(fds, env, curr->data));
-		}
-		close(p[FD_WRITE]);
-		if (prev_output != STDIN_FILENO)
-			close(prev_output);
-		prev_output = p[FD_READ];
-		curr = curr->next;
-	}
+static int	st_run_piped(
+	t_env env, t_ast *ast, int pipes[3], bool is_last)
+{
+	pid_t	pid;
+	int		fds[2];
 
-	int pid = fork();
+	if ((pid = fork()) == -1)
+		return (EVAL_FATAL);
 	if (pid == 0)
 	{
 		g_state.is_child = true;
-		if (prev_output != STDIN_FILENO)
+		if (!is_last)
+			dup2(pipes[FD_WRITE], STDOUT_FILENO);
+		if (pipes[PIPES_PREV_OUTPUT] != STDIN_FILENO)
 		{
-			dup2(prev_output, STDIN_FILENO);
-			close(prev_output);
+			dup2(pipes[PIPES_PREV_OUTPUT], STDIN_FILENO);
+			close(pipes[PIPES_PREV_OUTPUT]);
 		}
-		/* close(p[FD_WRITE]); */
+		if (!is_last)
+			close(pipes[FD_READ]);
 		fds[0] = FD_NONE;
 		fds[1] = FD_NONE;
-		exit(eval(fds, env, curr->data));
+		exit(eval(fds, env, ast));
 	}
-	g_child_pid = pid;
-	close(p[FD_READ]);
+	return (pid);
+}
 
-	/* int status = 0; */
+int			eval_pipeline(int fds[2], t_env env, t_ast *ast)
+{
+	t_ftlst	*curr;
+	int		pipes[3];
+	int		pid;
 
+	pipes[PIPES_PREV_OUTPUT] = STDIN_FILENO;
+	curr = ast->pipeline;
+	while (curr->next != NULL)
+	{
+		pipe(pipes);
+		st_run_piped(env, curr->data, pipes, false);
+		close(pipes[FD_WRITE]);
+		if (pipes[PIPES_PREV_OUTPUT] != STDIN_FILENO)
+			close(pipes[PIPES_PREV_OUTPUT]);
+		pipes[PIPES_PREV_OUTPUT] = pipes[FD_READ];
+		curr = curr->next;
+	}
+	pid = st_run_piped(env, curr->data, pipes, true);
+	g_child_pid = pid;
+	close(pipes[FD_READ]);
 	waitpid(pid, &pid, 0);
 	while (wait(NULL) != -1)
 		;
diff --git a/src/eval/redir.c b/src/eval/redir.c
index 0d830e2..9d88b29 100644
--- a/src/eval/redir.c
+++ b/src/eval/redir.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/15 11:05:34 by charles           #+#    #+#             */
-/*   Updated: 2020/09/16 16:17:09 by charles          ###   ########.fr       */
+/*   Updated: 2020/10/09 14:38:16 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -56,6 +56,14 @@ static int	st_open_replace_dispatch(char *filename, int fds[2], enum e_tok tag)
 	return (st_open_replace(filename, fd, oflag));
 }
 
+static int	st_tok_lsts_destroy_ret(
+	int ret, t_tok_lst **tokens1, t_tok_lst **tokens2)
+{
+	tok_lst_destroy(tokens1, free);
+	tok_lst_destroy(tokens2, free);
+	return (ret);
+}
+
 int			redir_extract(t_tok_lst **redirs, t_env env, int fds[2])
 {
 	t_tok_lst	*after;
@@ -65,9 +73,6 @@ int			redir_extract(t_tok_lst **redirs, t_env env, int fds[2])
 
 	if (*redirs == NULL)
 		return (0);
-	if (!((*redirs)->tag & TAG_IS_REDIR) || (*redirs)->next == NULL
-		|| !((*redirs)->next->tag & TAG_IS_STR))
-		return (EVAL_FATAL);
 	curr = (*redirs)->next;
 	after = NULL;
 	while (curr != NULL && curr->tag & TAG_IS_STR)
@@ -80,17 +85,9 @@ int			redir_extract(t_tok_lst **redirs, t_env env, int fds[2])
 		curr = curr->next;
 	}
 	if ((status = preprocess_filename(&(*redirs)->next, env, &filename)))
-	{
-		tok_lst_destroy(redirs, free);
-		tok_lst_destroy(&after, free);
-		return (status);
-	}
+		return (st_tok_lsts_destroy_ret(status, redirs, &after));
 	if ((status = st_open_replace_dispatch(filename, fds, (*redirs)->tag)) != 0)
-	{
-		tok_lst_destroy(redirs, free);
-		tok_lst_destroy(&after, free);
-		return (status);
-	}
+		return (st_tok_lsts_destroy_ret(status, redirs, &after));
 	tok_lst_destroy(redirs, free);
 	free(filename);
 	return (redir_extract(&after, env, fds));