Fixing glob by removing chdir, Changed cmd variables

2 files changed, 62 insertions, 15 deletions

diff --git a/src/eval/cmd.c b/src/eval/cmd.c
index c81c349..951b845 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/07/20 14:53:40 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/07/20 18:22:14 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -93,7 +93,7 @@ int			eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast)
 	t_fork_param_cmd	param;
 	char				**argv;
 	char 				*id;
-	t_ftlst 			*tmp;
+	/* t_ftlst 			*tmp; */
 
 	if (!redir_extract(ast->redirs, env, fds))
 	{
@@ -103,21 +103,48 @@ int			eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast)
 	ast->redirs = NULL;
 	if ((param.env_local = env_from_array((char*[]){NULL})) == NULL)
 		return (-1);
-	// TODO generate token list after `=` for variable value preprocessing
+
 	while (ast->cmd_argv != NULL
 		&& ((t_token*)ast->cmd_argv->data)->tag & TAG_IS_STR
 		&& utils_start_with_valid_identifier(((t_token*)ast->cmd_argv->data)->content))
 	{
+		t_ftlst *start;
+
 		id = ((t_token*)ast->cmd_argv->data)->content;
 		*ft_strchr(id, '=') = '\0';
 		((t_token*)ast->cmd_argv->data)->content = ft_strchr(id, '\0') + 1;
-		tmp = split_token(&ast->cmd_argv, TAG_STICK);
-		preprocess(tmp, env);
-		ft_lstiter(tmp, token_debug);
+		if (*((t_token*)ast->cmd_argv->data)->content == '\0')
+			ft_lstpop_front(&ast->cmd_argv, NULL);
+		else
+		{
+			t_ftlst *curr = ast->cmd_argv;
+			t_ftlst *prev = curr;
+
+			while (curr != NULL
+					&& ((t_token*)curr->data)->tag & TAG_STICK && ((t_token*)curr->data)->tag & TAG_IS_STR)
+			{
+				prev = curr;
+				curr = curr->next;
+			}
+			if (curr != NULL && ((t_token*)curr->data)->tag & TAG_IS_STR)
+			{
+				prev = curr;
+				curr = curr->next;
+			}
+
+			start = ast->cmd_argv;
+			ast->cmd_argv = prev->next;
+			prev->next = NULL;
+		}
+
+		/* ft_lstiter(start, token_debug); */
+		/* puts(""); */
+		/* ft_lstiter(ast->cmd_argv, token_debug); */
+
+		char **strs = preprocess(&start, env);
 
-		if (env_export(param.env_local,id, ((t_token*)ast->cmd_argv->data)->content) == NULL)
+		if (env_export(param.env_local, id, strs[0]) == NULL)
 			return (-1);
-		ft_lstpop_front(&ast->cmd_argv, (void (*)(void*))token_destroy);
 	}
 	if (ast->cmd_argv == NULL) // FIXME special env not passed to child processes
 	{
diff --git a/src/eval/utils_eval.c b/src/eval/utils_eval.c
index 374411e..5fefe70 100644
--- a/src/eval/utils_eval.c
+++ b/src/eval/utils_eval.c
@@ -6,7 +6,7 @@
 /*   By: nahaddac <nahaddac@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/07/20 13:07:25 by nahaddac          #+#    #+#             */
-/*   Updated: 2020/07/20 14:51:40 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/07/20 17:53:18 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,18 +17,38 @@ t_ftlst                 *split_token(t_ftlst **lst, enum e_token_tag tag)
 {
     t_ftlst             *curr;
     t_ftlst             *start;
+	enum e_token_tag	curr_tag;
 
     start = *lst;
     curr = *lst;
-    while (curr != NULL || ((t_token *)curr->data)->tag & tag)
+	t_ftlst  *prev = curr;
+	while (curr != NULL)
 	{
-		if (curr->next == NULL || (!(((t_token *)curr->next->data)->tag & tag)))
+		curr_tag = ((t_token *)curr->data)->tag;
+		if (!(curr_tag & TAG_STICK) || !(curr_tag & TAG_IS_STR))
 		{
-            *lst = curr->next;
-			curr->next = NULL;
-            return start;
+			*lst = prev->next;
+			prev->next = NULL;
+			return start;
 		}
+		prev = curr;
 		curr = curr->next;
 	}
-    return start;
+	return start;
+
+
+
+	/* if (curr != NULL) */
+	/* 	curr_tag = ((t_token *)curr->data)->tag; */
+    /* while (curr != NULL && curr_tag & TAG_STICK && curr_tag & TAG_IS_STR) */
+	/* { */
+	/* 	curr = curr->next; */
+	/* 	curr_tag = ((t_token *)curr->data)->tag; */
+	/* 	if (curr == NULL || !(curr_tag & TAG_STICK) || !(curr_tag & TAG_IS_STR)) */
+	/* 	{ */
+    /*         *lst = curr->next; */
+	/* 		curr->next = NULL; */
+	/* 	} */
+	/* } */
+    /* return start; */
 }