BIENTOT FINI POTO PAVAAAARRDDDD

builtins/env.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:56:02 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/23 16:50:01 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 15:04:47 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,11 +18,14 @@ int	print_env(t_list **env, int fd)
 
 	current = *env;
 	while (current->next != NULL)
+	{
+		if (((t_env *)(current->content))->original)
 		{
 			ft_putstr_fd(((t_env *)(current->content))->key, fd);
 			ft_putstr_fd("=", fd);
 			ft_putstr_fd(((t_env *)(current->content))->value, fd);
 			write(fd, "\n", 1);
+		}
 		current = current->next;
 	}
 	return (0);

builtins/exit.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/24 10:17:59 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/28 14:55:39 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/02/28 15:06:50 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,7 +34,7 @@ int	ft_exit(char **args)
 	if (err == 1) 
 		return (error(err, "numeric argument required", args[0]));
 	if (args[1] != NULL)
-		return (error(-1, "too many arguments", NULL));
+		return (error(1, "too many arguments", NULL));
 	if (err > 0)
 		return(error(err, "numeric argument required", args[0]));
 	return ((ft_atoi(args[0]) % 256 + 256) % 256);

builtins/export.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:27:08 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/28 14:37:38 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 14:58:11 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,38 +29,50 @@ void	print_export(t_list **env, int fd)
 	{
 		write(fd, "declare -x ", 11);
 		ft_putstr_fd(((t_env *)(current->content))->key, fd);
+		if (((t_env *)(current->content))->value != NULL)
+		{
 			ft_putstr_fd("=", fd);
 			write(fd, "\"", 1);
 			ft_putstr_fd(((t_env *)(current->content))->value, fd);
 			write(fd, "\"\n", 2);
+		}
+		else
+			write(fd, "\n", 2);
 		current = current->next;
 	}
 }
 
-int	add_export(t_list **env, char *args, int fd, int *err)
+int	add_export(t_list **env, char *args, int fd)
 {
 	char	*key;
 	char	*value;
 
 	key = args;
-	value = "";
 	if (ft_strchr(args, '=') != NULL)
 	{
 		key = ft_strndup(args, ft_strnchr(args, '='));
 		if (key == NULL)
 			return (1);
 		if (ft_strlen(key) == 0)
+			return (error(args, fd));
+		if (possible_key(key) == 2)
 		{
-			error(args, fd);
-			return (1);
+			key[ft_strlen(key) - 1] = '\0';
+			value = ft_strjoin(get_value_by_key(key, env), ft_strchr(args, '=') + 1);
 		}
+		else
 			value = ft_strchr(args, '=') + 1;
 	}
-	if (!possible_key(key))
+	else 
 	{
-		*err = error(key, fd);
-		return (1);
+		value = get_value_by_key(key, env);
+		if (ft_strlen(value) == 0)
+			value = NULL;
+		if(possible_key(key) == 2)
+			return (error(key, fd));
 	}
+	if (!possible_key(key))
+		return (error(key, fd));
 	create_value_by_key_dup(key, value, env);
 	return (0);
 }
@@ -77,7 +89,7 @@ int	export(t_list **env, char **args, int fd)
 	{
 		i = -1;
 		while (args[++i])
-			if (add_export(env, args[i], fd, &err) == 1)
+			if (add_export(env, args[i], fd) == 1)
 				err = 1;
 	}
 	return (err);

env.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/23 13:34:41 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 15:06:44 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -80,6 +80,7 @@ int	create_value_by_key(char *key, char *value, t_list **head)
 		return (1);
 	content->key = key;
 	content->value = value;
+	content->original = 0;
 	add_sort(head, content);
 	return (0);
 }
@@ -104,6 +105,7 @@ t_list	**init_env(char **env)
 			return (NULL);
 		var->key = get_key(env[i]);
 		var->value = get_value(env[i]);
+		var->original = 1;
 		add_sort(head, var);
 	}
 	return (head);

env3.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 17:25:09 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/28 12:46:33 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 14:57:26 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -44,19 +44,22 @@ int	create_value_by_key_dup(char *key, char *value, t_list **env)
 	char	*key_dup;
 	char	*value_dup;
 
+	if (set_value_by_key(key, value, env) == 0)
+		return (0);
 	key_dup = ft_strdup(key);
 	if (key_dup == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
 		return (1);
-	}
+	if (value != NULL)
+	{
 		value_dup = ft_strdup(value);
 		if (value_dup == NULL)
 		{
 			free(key);
-		ft_eprintf("minishell: malloc failed\n");
 			return (1);
 		}
+	}
+	else
+		value_dup = value;
 	if (create_value_by_key(key_dup, value_dup, env))
 		return (1);
 	return (0);
@@ -91,8 +94,10 @@ int	possible_key(char *key)
 	i = -1;
 	if (ft_isdigit(key[i + 1]))
 			return (0);
-	while (key[++i])
+	while (key[++i + 1])
 		if (!ft_isalnum(key[i]) && key[i] != '_')
 			return (0);
+	if (key[i] == '+')
+		return (2);
 	return (1);
 }