Added export/unset builtin error message and status code

1 files changed, 14 insertions, 9 deletions

diff --git a/src/builtin/unset.c b/src/builtin/unset.c
index b1e2d5b..b7b6d58 100644
--- a/src/builtin/unset.c
+++ b/src/builtin/unset.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 17:10:51 by charles           #+#    #+#             */
-/*   Updated: 2020/06/17 12:41:45 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/07/15 13:14:38 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,18 +20,23 @@
 int	builtin_unset(char **argv, t_env env)
 {
 	size_t	i;
+	int		found_index;
+	int		status;
 
-	if (argv[1] == NULL)
-		return (1);
+	status = 0;
 	i = 0;
-	while (i < env->size)
+	while (argv[++i] != NULL)
 	{
-		if (env_keycmp(env->data[i],argv[1]) == 0)
+		if (!utils_valid_identifier(argv[i]))
 		{
-			ft_vecremove(env, i, free);
-			return (0);
+			error_put_invalid_identifier("unset", argv[i]);
+			status = 1;
+			continue; // put invalid identifier
 		}
-		i++;
+		found_index = env_search_index(env, argv[i]);
+		if (found_index == -1)
+			continue;
+		ft_vecremove(env, found_index, free);
 	}
-	return (1);
+	return (status);
 }