Refactoring redirection out of eval/cmd.c, Added tag check shortcut

1 files changed, 5 insertions, 86 deletions

diff --git a/src/eval/cmd.c b/src/eval/cmd.c
index 958c7ae..9468cb2 100644
--- a/src/eval/cmd.c
+++ b/src/eval/cmd.c
@@ -6,14 +6,12 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/14 10:41:31 by charles           #+#    #+#             */
-/*   Updated: 2020/06/15 10:58:59 by charles          ###   ########.fr       */
+/*   Updated: 2020/06/15 11:09:38 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "eval.h"
 
-#define MS_NO_FD -2
-
 /*
 ** \brief          Wrap a function in a fork
 ** \param fd_in    fork input file descriptor
@@ -35,8 +33,8 @@ int			fork_wrap(
 		return (-1);
 	if (child_pid == 0)
 	{
-		if (dup2(fd_in, STDIN_FILENO) == -1 ||
-			dup2(fd_out, STDOUT_FILENO) == -1)
+		if ((fd_in != MS_NO_FD && dup2(fd_in, STDIN_FILENO) == -1) ||
+			(fd_out != MS_NO_FD && dup2(fd_out, STDOUT_FILENO) == -1))
 			exit(EXIT_FAILURE);
 		if ((status = wrapped(passed)) == -1)
 			exit(EXIT_FAILURE);
@@ -58,85 +56,6 @@ int 		forked_cmd(void *void_param)
 		return (execve(param->exec_path, param->argv, (char**)param->env->data));
 }
 
-bool	redir_has_tag(t_ftlst *redir, enum e_token_tag tags)
-{
-	return (((t_token*)redir->data)->tag & tags);
-}
-
-bool	redir_extract(t_ftlst *redirs, t_env env, int *fd_in, int *fd_out)
-{
-	t_ftlst	*after;
-	t_ftlst	*curr;
-	char	*filename;
-
-	if (redirs == NULL)
-		return (true);
-	if (!redir_has_tag(redirs, TAG_REDIR_IN | TAG_REDIR_OUT | TAG_REDIR_APPEND)
-		|| redirs->next == NULL
-		|| !redir_has_tag(redirs->next, TAG_STR | TAG_STR_SINGLE | TAG_STR_DOUBLE))
-		return (false);
-	curr = redirs->next;
-	while (curr != NULL && redir_has_tag(curr, TAG_STR | TAG_STR_SINGLE | TAG_STR_DOUBLE))
-	{
-		if (curr->next == NULL || redir_has_tag(curr->next, TAG_REDIR_IN | TAG_REDIR_OUT | TAG_REDIR_APPEND))
-		{
-			after = curr->next;
-			curr->next = NULL;
-		}
-		curr = curr->next;
-	}
-	if ((filename = preprocess_filename(&redirs->next, env)) == NULL)
-	{
-		ft_lstdestroy(&redirs, (void (*)(void*))token_destroy);
-		ft_lstdestroy(&after, (void (*)(void*))token_destroy);
-		return (false);
-	}
-	if (redir_has_tag(redirs, TAG_REDIR_IN))
-	{
-		if (*fd_in != STDIN_FILENO)
-			close(*fd_in);
-		if ((*fd_in = open(filename, O_RDONLY)) == -1)
-		{
-			error_eval_put(ERROR_OPEN, filename);
-			ft_lstdestroy(&redirs, (void (*)(void*))token_destroy);
-			ft_lstdestroy(&after, (void (*)(void*))token_destroy);
-			free(filename);
-			return (false);
-		}
-	}
-	else if (redir_has_tag(redirs, TAG_REDIR_OUT))
-	{
-		if (*fd_out != STDOUT_FILENO)
-			close(*fd_out);
-		if ((*fd_out = open(filename,
-					O_WRONLY | O_CREAT | O_TRUNC, 0644)) == -1)
-		{
-			error_eval_put(ERROR_OPEN, filename);
-			ft_lstdestroy(&redirs, (void (*)(void*))token_destroy);
-			ft_lstdestroy(&after, (void (*)(void*))token_destroy);
-			free(filename);
-			return (false);
-		}
-	}
-	else if (redir_has_tag(redirs, TAG_REDIR_APPEND))
-	{
-		if (*fd_out != STDOUT_FILENO)
-			close(*fd_out);
-		if ((*fd_out = open(filename,
-					O_WRONLY | O_APPEND | O_CREAT, 0644)) == -1)
-		{
-			error_eval_put(ERROR_OPEN, filename);
-			ft_lstdestroy(&redirs, (void (*)(void*))token_destroy);
-			ft_lstdestroy(&after, (void (*)(void*))token_destroy);
-			free(filename);
-			return (false);
-		}
-	}
-	ft_lstdestroy(&redirs, (void (*)(void*))token_destroy);
-	free(filename);
-	return (redir_extract(after, env, fd_in, fd_out));
-}
-
 int		eval_cmd(t_env env, t_path path, t_ast *ast)
 {
 	t_fork_param_cmd	param;
@@ -144,8 +63,8 @@ int		eval_cmd(t_env env, t_path path, t_ast *ast)
 	int					fd_out;
 	char				**argv;
 
-	fd_in = STDIN_FILENO;
-	fd_out = STDOUT_FILENO;
+	fd_in = MS_NO_FD;
+	fd_out = MS_NO_FD;
 	if (!redir_extract(ast->redirs, env, &fd_in, &fd_out))
 	{
 		ast->redirs = NULL;