debug env list WIP

srcs/exec.c

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/11/27 15:32:29 by tmaze             #+#    #+#             */
-/*   Updated: 2019/01/07 18:57:22 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/01/09 14:56:30 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,12 +14,46 @@
 
 #define S_BIN	2
 
-int	exec_cmd(char **argv, char **env)
+char	**envlsttotab(t_list *env)
 {
-	size_t				i;
-	static t_builtin	builtins[S_BIN] = {{"echo", &cmd_echo}, {"cd", &cmd_cd}};
+	size_t		i;
+	size_t		env_size;
+	t_list		*tmp;
+	char		**ret;
 
-	/*, {"setenv", &cmd_senv}, {"unsetenv", &cmd_senv}, {"env", &cmd_env}}; */
+	i = 0;
+	tmp = env;
+	env_size = ft_lstsize(env);
+	if ((ret = (char**)ft_memalloc(sizeof(char*) * (env_size + 1))) == NULL)
+		return (NULL);
+	while (i <= env_size)
+		ret[i++] = NULL;
+	i = 0;
+	while (tmp)
+	{
+		if ((ret[i] = ft_strnew(ft_strlen(((t_envelem*)(tmp->content))->key)
+				+ ft_strlen(((t_envelem*)(tmp->content))->val) + 1)) == NULL)
+		{
+			ft_del_words_tables(&ret);
+			return (NULL);
+		}
+		i++;
+		tmp = tmp->next;
+	}
+	return (ret);
+}
+
+/*
+** , {"setenv", &cmd_senv}, {"unsetenv", &cmd_senv}, {"env", &cmd_env}};
+*/
+
+int		exec_cmd(char **argv, t_list *env)
+{
+	int					ret;
+	char				**env_tab;
+	size_t				i;
+	static t_builtin	builtins[S_BIN] = {{"echo", &cmd_echo},
+											{"cd", &cmd_cd}};
 
 	i = 0;
 	while (i < S_BIN)
@@ -28,7 +62,15 @@ int	exec_cmd(char **argv, char **env)
 			return ((*(builtins[i].f))(argv, env));
 		i++;
 	}
-	execve(argv[0], argv, env);
-	ft_putendl("minishell: error");
-	return (1);
+	if ((env_tab = envlsttotab(env)) == NULL)
+		return (2);
+	if ((ret = fork()) == 0)
+	{
+		execve(argv[0], argv, env_tab);
+		ft_putendl("minishell: error");
+		exit(-1);
+	}
+	waitpid(ret, NULL, 0);
+	ft_del_words_tables(&env_tab);
+	return (0);
 }