From 47a68b82e0463f5dfd4bd8a9c4b32b4c5fbcb610 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Mon, 22 Jul 2024 15:07:59 +0200
Subject: Fix errors and make the parser work

---
 src/parse_cmd.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'src/parse_cmd.c')

diff --git a/src/parse_cmd.c b/src/parse_cmd.c
index 4fa2bc2..0173caa 100644
--- a/src/parse_cmd.c
+++ b/src/parse_cmd.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/08 15:06:25 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/09 19:22:51 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/10 13:26:17 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,8 @@ static t_redirection	*collect_redirs(t_token **tokens);
 static t_assign			**collect_assigns(t_token **tokens);
 static char				**collect_args(t_token **tokens);
 static t_assign			*to_assign(char *str);
+static void				set_redir(t_redirection *redir, int type,
+							char *specifier);
 
 t_node	*parse_cmd(t_token *tokens)
 {
@@ -33,6 +35,7 @@ static t_redirection	*collect_redirs(t_token **tokens)
 {
 	t_redirection	*result;
 	t_token			*cur;
+	int				idx;
 
 	cur = *tokens;
 	result = malloc(sizeof(t_redirection) * 2);
@@ -41,24 +44,18 @@ static t_redirection	*collect_redirs(t_token **tokens)
 		// free all tokens
 		return (NULL);
 	}
-	result[0].specifier = NULL;
-	result[0].type = 0;
-	result[1].specifier = NULL;
-	result[1].type = 0;
+	set_redir(&result[0], 0, NULL);
+	set_redir(&result[1], 0, NULL);
 	while (cur != NULL && cur->next != NULL)
 	{
 		if (cur->type == REDIR_TOKEN && cur->next->type == STRING_TOKEN)
 		{
 			if (cur->content.redir_type & (INPUT_FILE | INPUT_LIMITER))
-			{
-				result[0].type = cur->content.redir_type;
-				result[0].specifier = cur->next->content.string;
-			}
+				idx = 0;
 			else if (cur->content.redir_type & (OUTPUT_APPEND | OUTPUT_OVERRIDE))
-			{
-				result[1].type = cur->content.redir_type;
-				result[1].specifier = cur->next->content.string;
-			}
+				idx = 1;
+			set_redir(&result[idx], cur->content.redir_type,
+				cur->next->content.string);
 			cur = cur->next;
 			free_token_and_connect(cur->previous);
 			if (cur->next != NULL)
@@ -170,3 +167,9 @@ static char	**collect_args(t_token **tokens)
 	result[i] = NULL;
 	return (result);
 }
+
+static void	set_redir(t_redirection *redir, int type, char *specifier)
+{
+	redir->type = type;
+	redir->specifier = specifier;
+}
-- 
cgit v1.2.3