Norme pour tout les builtins et env, et correction export

builtins/cd.c

@@ -6,15 +6,30 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/20 14:27:36 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/28 13:37:18 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 20:13:05 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "../minishell.h"
 
-int	move_folder(char **args, int fd)
+int	make_move(char *path, int fd)
 {
 	char	*join;
+
+	join = ft_strjoin("/", path);
+	join = ft_strfjoin(get_pwd(fd), join);
+	if (chdir(join) == 0)
+	{
+		free(join);
+		return (0);
+	}
+	free(join);
+	write(2, "No suck file or directory", 25);
+	return (1);
+}
+
+int	move_folder(char **args, int fd)
+{
 	char	*path;
 
 	if (args[1] != NULL)
@@ -31,34 +46,5 @@ int	move_folder(char **args, int fd)
 		return (1);
 	}
 	else
-	{
+		return (make_move(path, fd));
-		join = ft_strjoin("/", path);
-		join = ft_strfjoin(get_pwd(fd), join);
-		if (chdir(join) == 0)
-		{
-			free(join);
-			return (0);
-		}
-		free(join);
-		write(2, "No suck file or directory", 25);
-		return (1);
-	}
 }
-
-/*int main(int argc, char *argv[]) {
-   char cwd[PATH_MAX];
-   if (getcwd(cwd, sizeof(cwd)) != NULL) {
-       printf("%s\n", cwd);
-   } else {
-       perror("getcwd() error");
-       return 1;
-   }
-   move_folder(argv[1], 1);
-   if (getcwd(cwd, sizeof(cwd)) != NULL) {
-       printf("%s\n", cwd);
-   } else {
-       perror("getcwd() error");
-       return 1;
-   }
-   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 15:06:50 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 20:08:56 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,12 +36,6 @@ int	ft_exit(char **args)
 	if (args[1] != NULL)
 		return (error(1, "too many arguments", NULL));
 	if (err > 0)
-		return(error(err, "numeric argument required", args[0]));
+		return (error(err, "numeric argument required", args[0]));
 	return ((ft_atoi(args[0]) % 256 + 256) % 256);
 }
-
-/*int	main(int argc, char *argv[])
-{
-	(void)argc;
-	return(ft_exit(argv + 1, 1));
-}*/ 

builtins/export.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:27:08 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/09 14:58:11 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 19:58:25 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -42,38 +42,49 @@ void	print_export(t_list **env, int fd)
 	}
 }
 
+int	set_key_value_export(t_list **env, char *args, char **key, char **value)
+{
+	*key = ft_strndup(args, ft_strnchr(args, '='));
+	if (*key == NULL)
+		return (1);
+	if (ft_strlen(*key) == 0)
+		return (1);
+	if (possible_key(*key) == 2)
+	{
+		(*key)[ft_strlen(*key) - 1] = '\0';
+		if (get_value_by_key(*key, env) == NULL)
+			*value = ft_strdup(ft_strchr(args, '=') + 1);
+		else
+			*value = ft_strjoin(get_value_by_key(*key, env),
+					ft_strchr(args, '=') + 1);
+	}
+	else
+		*value = ft_strdup(ft_strchr(args, '=') + 1);
+	return (0);
+}
+
 int	add_export(t_list **env, char *args, int fd)
 {
 	char	*key;
 	char	*value;
 
-	key = args;
 	if (ft_strchr(args, '=') != NULL)
 	{
-		key = ft_strndup(args, ft_strnchr(args, '='));
+		if (set_key_value_export(env, args, &key, &value))
-		if (key == NULL)
-			return (1);
-		if (ft_strlen(key) == 0)
 			return (error(args, fd));
-		if (possible_key(key) == 2)
-		{
-			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;
 	}
 	else
 	{
+		key = ft_strdup(args);
 		value = get_value_by_key(key, env);
-		if (ft_strlen(value) == 0)
+		if (value != NULL)
-			value = NULL;
+			value = ft_strdup(value);
-		if(possible_key(key) == 2)
+		if (possible_key(key) == 2)
 			return (error(key, fd));
 	}
 	if (!possible_key(key))
-		return (error(key, fd));
+		return (error(args, fd));
-	create_value_by_key_dup(key, value, env);
+	create_value_by_key(key, value, env);
 	return (0);
 }
 

builtins/pwd.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 16:09:11 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/21 15:11:38 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/09 20:00:19 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

env.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/09 15:06:44 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 19:01:05 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -48,7 +48,7 @@ char	*get_value_by_key(char *key, t_list **head)
 			return (((t_env *)current->content)->value);
 		current = current->next;
 	}
-	return ("");
+	return (NULL);
 }
 
 int	set_value_by_key(char *key, char *value, t_list **head)

env2.c

@@ -1,11 +1,12 @@
+/* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
 /*   env2.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2023/02/17 17:22:01 by erey-bet          #+#    #+#             */
+/*   Created: 2023/03/09 19:59:03 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/17 17:24:57 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 19:59:10 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

env3.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 17:25:09 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/09 14:57:26 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 19:58:55 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -93,11 +93,13 @@ int	possible_key(char *key)
 
 	i = -1;
 	if (ft_isdigit(key[i + 1]))
-			return (0);
+		return (0);
 	while (key[++i + 1])
 		if (!ft_isalnum(key[i]) && key[i] != '_')
 			return (0);
 	if (key[i] == '+')
 		return (2);
+	else if (!ft_isalnum(key[i]) && key[i] != '_')
+		return (0);
 	return (1);
 }