export builtin

headers/minishell_prototypes.h

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/08 02:59:58 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/02 00:37:39 by lperrey          ###   ########.fr       */
+/*   Updated: 2021/12/04 15:46:00 by lperrey          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -58,10 +58,11 @@ int		builtin_cd(int argc, char *argv[], t_all *c);
 int		builtin_pwd(int argc, char *argv[], t_all *c);
 int		builtin_export(int argc, char *argv[], t_all *c);
 int		builtin_unset(int argc, char *argv[], t_all *c);
+char	*ft_getenv(char *env_var);
+size_t	ft_getenv_position(char *env_var);
 int		builtin_exit(int argc, char *argv[], t_all *c);
 int		builtin_env(int argc, char *argv[], t_all *c);
 int		builtin_echo(int argc, char *argv[], t_all *c);
-int		getenv_position(char **envp, char *name);
 
 // Free
 int		exit_free(t_all *c, int exit_status);

srcs/builtins/export.c

@@ -1,33 +1,119 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   export.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/12/03 13:36:54 by lperrey           #+#    #+#             */
+/*   Updated: 2021/12/04 16:07:21 by lperrey          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
 
 #include "minishell.h"
 
-int	getenv_position(char **envp, char *name) // TODO : virer arg envp et utiliser "extern **environ" à la place
+char		*ft_getenv(char *env_var);
+size_t		ft_getenv_position(char *env_var);
+
+static int	change_env_value(char *arg);
+
+// in complete shell, must mark all arguments for export
+// (Not implemented in minishell)
+int	builtin_export(int argc, char *argv[], t_all *c)
 {
 	int	i;
 
-	i = 0;
+	(void)argc;
-	while (envp[i] && ft_strncmp(envp[i], name, ft_strlen(name)))
+	i = 1;
+	while (argv[i])
+	{
+		if (ft_strchr(argv[i], '='))
+		{
+			if (!change_env_value(argv[i]))
+				return (EXIT_FAILURE);
+			if (ft_strncmp(argv[i], "PATH=", 5) == 0)
+				c->path = retrieve_path();
+		}
 		i++;
-	return (i);
+	}
+	return (EXIT_SUCCESS);
 }
 
-int	builtin_export(int argc, char *argv[], t_all *c)
+static int	change_env_value(char *arg)
 {
-	char		**var;
+	char	**var_split;
-	int			env_position;
+	int		env_position;
 
-	(void)argc;
+	var_split = ft_split(arg, '=');
-	(void)c;
+	if (!var_split)
-	if (!ft_strchr(argv[1], '='))
+		return (ft_reti_perror(-1, "builtin_export, ft_split()"));
-		return (0);
+	env_position = ft_getenv_position(var_split[0]);
-	var = ft_split(argv[1], '=');
+	ft_free_2d_arr(var_split);
-	env_position = getenv_position(environ, var[0]);
+	if (environ[env_position] == NULL)
-	if (environ[env_position] == '\0')
+	{
 		environ = ft_resize_2d_arr(environ, 1);
-	environ[env_position] = ft_strdup(argv[1]);
+		if (!environ)
-	if (!ft_strncmp(var[0], "PATH", 4 + 1)) // TODO : NON. Ce n'est pas la fin de la string donc "strlen() + 1" n'est pas adapté
+			return (ft_reti_perror(-1, "builtin_export, ft_resize_2d_arr()"));
-		c->path = retrieve_path();
+	}
-	// free var
+	environ[env_position] = ft_strdup(arg);
+	if (!environ[env_position])
+		return (ft_reti_perror(-1, "builtin_export, ft_strdup()"));
 	return (0);
 }
 
+/*
+** Search for an environement variable,
+** and return a pointer to the first character after "env_var=" .
+** Return NULL if env_var not found.
+*/
+char	*ft_getenv(char *env_var)
+{
+	int		i;
+	char	*tmp;
+	size_t	env_var_len;
+
+	env_var_len = ft_strlen(env_var);
+	i = 0;
+	tmp = NULL;
+	while (!tmp && environ[i])
+	{
+		if (environ[i][env_var_len] == '=')
+		{
+			if (ft_strncmp(environ[i], env_var, env_var_len) == 0)
+				tmp = &environ[i][env_var_len + 1];
+			else
+				i++;
+		}
+		else
+			i++;
+	}
+	return (tmp);
+}
+
+/*
+** Like ft_getenv(), but return position of env_var instead of value.
+** If env_var not found, return last position of **environ (== NULL)
+*/
+size_t	ft_getenv_position(char *env_var)
+{
+	int		i;
+	int		found;
+	size_t	env_var_len;
+
+	env_var_len = ft_strlen(env_var);
+	i = 0;
+	found = 0;
+	while (!found && environ[i])
+	{
+		if (environ[i][env_var_len] == '=')
+		{
+			if (ft_strncmp(environ[i], env_var, env_var_len) == 0)
+				found = 1;
+			else
+				i++;
+		}
+		else
+			i++;
+	}
+	return (i);
+}

srcs/builtins/unset.c

@@ -11,7 +11,7 @@ int	builtin_unset(int argc, char *argv[], t_all *c)
 	i = 1;
 	while (argv[i])
 	{
-		env_position = getenv_position(environ, argv[i]);
+		env_position = ft_getenv_position(argv[i]);
 		free(environ[env_position]);
 		while (environ[env_position])
 		{

srcs/init.c

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/08 09:22:12 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/02 01:38:22 by lperrey          ###   ########.fr       */
+/*   Updated: 2021/12/04 15:11:20 by lperrey          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,7 +36,6 @@ int	init(t_all *c)
 	return (1);
 }
 
-// done : TODO : Un appel à builtin_export() modifiant $PATH doit aussi entrainer un appel à "c->path = retrieve_path()"
 char	**retrieve_path(void)
 {
 	char	*path;