merge master into fmoenne_indahouse

1 files changed, 47 insertions, 3 deletions

diff --git a/src/ft_s_init.c b/src/ft_s_init.c
index 46dac90..88a3817 100644
--- a/src/ft_s_init.c
+++ b/src/ft_s_init.c
@@ -11,6 +11,7 @@
 /* ************************************************************************** */
 
 #include <libft.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -18,9 +19,48 @@
 #include "ft_m_funptr.h"
 #include "ft_s_init.h"
 
+static char
+	**ft_dupenv_del(char **nenvp,
+					uint64_t i)
+{
+	while (i > 0)
+	{
+		ft_memdel((void*)&nenvp[i]);
+		i--;
+	}
+	ft_memdel((void*)&nenvp);
+	return (NULL);
+}
+
+static char
+	**ft_dupenv(char *const envp[])
+{
+	uint64_t	i;
+	char		**nenvp;
+
+	i = 0;
+	while (envp[i])
+	{
+		i++;
+	}
+	if (!(nenvp = (char**)malloc((i + 1) * sizeof(char*))))
+	{
+		return (NULL);
+	}
+	i = 0;
+	while (envp[i])
+	{
+		if (!(nenvp[i] = ft_strdup(envp[i])))
+			return (ft_dupenv_del(nenvp, i));
+		i++;
+	}
+	nenvp[i] = NULL;
+	return (nenvp);
+}
+
 t_msh
-	*ft_init_msh(const char *argv[],
-				char *envp[])
+	*ft_init_msh(char *const argv[],
+				char *const envp[])
 {
 	t_msh	*msh;
 
@@ -30,12 +70,16 @@ t_msh
 		return (NULL);
 	if (!(msh->shname = ft_strdup(argv[0])))
 		return (NULL);
+	/* TODO: shname: care about "./", try with symlinks */
 	msh->cwd = NULL;
 	msh->cwd = getcwd(NULL, 0);
 	/* TODO: handle getcwd failed */
-	msh->envp = envp;
+	msh->envp = NULL;
+	if (!(msh->envp = ft_dupenv(envp)))
+		return (NULL);
 	msh->ret = 0;
 	ft_init_buptr(msh);
 	msh->curr = NULL;
+	msh->vars = NULL;
 	return (msh);
 }