export ameliore

ychibani42 · Oct 3, 2022 · 0755447 · 0755447
1 parent 5352c2c
commit 0755447
Show file tree

Hide file tree

Showing 157 changed files with 547 additions and 102 deletions.
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ SRCS_FILES		=		srcs/minishell/minishell.c			\
 						srcs/executor/builtin/pwd/pwd.c		\
 						srcs/executor/builtin/cd/cd.c		\
 						srcs/executor/builtin/export/export.c \
+						srcs/executor/builtin/export/export_utils.c \
 						srcs/executor/builtin/unset/unset.c	\
 						srcs/executor/builtin/exit/exit.c
 

diff --git a/includes/minishell_fonctions.h b/includes/minishell_fonctions.h
@@ -6,7 +6,7 @@
 /*   By: caubry <caubry@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/02 20:42:53 by ychibani          #+#    #+#             */
-/*   Updated: 2022/10/03 14:12:27 by caubry           ###   ########.fr       */
+/*   Updated: 2022/10/03 21:07:33 by caubry           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,26 +27,78 @@ void			__init_structs(t_program_data *data, t_user_input *ui,
 */
 
 int				change_directory(char *path);
+void			ft_cd(t_user_input *ui);
 
 /*
 **		echo
 */
 
 void	ft_echo(t_user_input *ui);
-int				ft_cmd(t_user_input *ui);
+char	*remove_quote(char *str);
+
+/*
+**		env
+*/
+
 void	ft_env(t_user_input *ui);
-void	ft_pwd(void);
-void			ft_cd(t_user_input *ui);
-void	ft_export(t_user_input *ui, char *to_set);
-void	ft_unset(t_user_input *ui);
-void	ft_free(char **to_free, int i);
-void	ft_exit(t_user_input *ui);
+t_env	*ft_init_env(char *var_to_split);
 t_env	**ft_split_env(char	**env);
+
+/*
+**		env_utils
+*/
+
 void	__env_clear(t_env **lst, void (*del)(void*));
-int	ft_var_length(char	*var);
 char	*__strncpy(char *dst, const char *src, size_t dstsize);
+t_env	*__lst_env_new(char *name, char *value, int appear);
 void	__env_lstadd_back(t_env **alst, t_env *new);
-t_env	*ft_init_env(char *var_to_split);
+int		ft_size(char **str);
+
+
+/*
+**		exit
+*/
+
+void	ft_exit(t_user_input *ui);
+
+/*
+**		export
+*/
+
+void	ft_choose_export(t_user_input *ui);
+void	ft_export_arg(t_user_input *ui, char *var);
+void	ft_export_no_arg(t_user_input *ui);
+void	ft_make_export(t_env *search, char *to_set, t_user_input *ui);
+void	ft_changevar(t_env *env, char *var_to_split);
+
+/*
+**		export_utils
+*/
+
+void	ft_free(char **to_free, int i);
+int	ft_var_length(char	*var);
+int	ft_valid_var(char *str);
+void	ft_concat_var(t_env *env, char *var_to_split);
+
+
+/*
+**		pwd
+*/
+
+void	ft_pwd(void);
+
+/*
+**		unset
+*/
+
+void	ft_unset(t_user_input *ui);
+
+/*
+**		exec
+*/
+
+int				ft_cmd(t_user_input *ui);
+
 
 /*
 **		Tokenizer Utils

diff --git a/includes/minishell_structs.h b/includes/minishell_structs.h
@@ -6,7 +6,7 @@
 /*   By: caubry <caubry@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/10 16:28:32 by ychibani          #+#    #+#             */
-/*   Updated: 2022/10/03 13:59:43 by caubry           ###   ########.fr       */
+/*   Updated: 2022/10/03 20:02:28 by caubry           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,6 +23,8 @@ typedef struct s_env
 {
 	char			*name;
 	char			*value;
+	int				env;
+	int				order;
 	struct s_env	*next;
 }	t_env;
 

diff --git a/libft/char/ft_isalnum.d b/libft/char/ft_isalnum.d
@@ -0,0 +1,3 @@
+char/ft_isalnum.o: char/ft_isalnum.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/char/ft_isalnum.o b/libft/char/ft_isalnum.o
diff --git a/libft/char/ft_isalpha.d b/libft/char/ft_isalpha.d
@@ -0,0 +1 @@
+char/ft_isalpha.o: char/ft_isalpha.c
diff --git a/libft/char/ft_isalpha.o b/libft/char/ft_isalpha.o
diff --git a/libft/char/ft_isascii.d b/libft/char/ft_isascii.d
@@ -0,0 +1 @@
+char/ft_isascii.o: char/ft_isascii.c
diff --git a/libft/char/ft_isascii.o b/libft/char/ft_isascii.o
diff --git a/libft/char/ft_isdigit.d b/libft/char/ft_isdigit.d
@@ -0,0 +1,3 @@
+char/ft_isdigit.o: char/ft_isdigit.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/char/ft_isdigit.o b/libft/char/ft_isdigit.o
diff --git a/libft/char/ft_isprint.d b/libft/char/ft_isprint.d
@@ -0,0 +1,3 @@
+char/ft_isprint.o: char/ft_isprint.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/char/ft_isprint.o b/libft/char/ft_isprint.o
diff --git a/libft/char/ft_tolower.d b/libft/char/ft_tolower.d
@@ -0,0 +1 @@
+char/ft_tolower.o: char/ft_tolower.c
diff --git a/libft/char/ft_tolower.o b/libft/char/ft_tolower.o
diff --git a/libft/char/ft_toupper.d b/libft/char/ft_toupper.d
@@ -0,0 +1 @@
+char/ft_toupper.o: char/ft_toupper.c
diff --git a/libft/char/ft_toupper.o b/libft/char/ft_toupper.o
diff --git a/libft/fd/ft_putchar_fd.d b/libft/fd/ft_putchar_fd.d
@@ -0,0 +1,3 @@
+fd/ft_putchar_fd.o: fd/ft_putchar_fd.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/fd/ft_putchar_fd.o b/libft/fd/ft_putchar_fd.o
diff --git a/libft/fd/ft_putendl_fd.d b/libft/fd/ft_putendl_fd.d
@@ -0,0 +1,3 @@
+fd/ft_putendl_fd.o: fd/ft_putendl_fd.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/fd/ft_putendl_fd.o b/libft/fd/ft_putendl_fd.o
diff --git a/libft/fd/ft_putnbr_fd.d b/libft/fd/ft_putnbr_fd.d
@@ -0,0 +1,3 @@
+fd/ft_putnbr_fd.o: fd/ft_putnbr_fd.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/fd/ft_putnbr_fd.o b/libft/fd/ft_putnbr_fd.o
diff --git a/libft/fd/ft_putstr_fd.d b/libft/fd/ft_putstr_fd.d
@@ -0,0 +1,3 @@
+fd/ft_putstr_fd.o: fd/ft_putstr_fd.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/fd/ft_putstr_fd.o b/libft/fd/ft_putstr_fd.o
diff --git a/libft/fd/gnl.d b/libft/fd/gnl.d
@@ -0,0 +1,2 @@
+fd/gnl.o: fd/gnl.c includes/libft.h includes/libft_defines.h \
+ includes/libft_structs.h includes/libft_fonctions.h
diff --git a/libft/fd/gnl.o b/libft/fd/gnl.o
diff --git a/libft/libft.a b/libft/libft.a
diff --git a/libft/lists/ft_lstadd_back.d b/libft/lists/ft_lstadd_back.d
@@ -0,0 +1,3 @@
+lists/ft_lstadd_back.o: lists/ft_lstadd_back.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstadd_back.o b/libft/lists/ft_lstadd_back.o
diff --git a/libft/lists/ft_lstadd_front.d b/libft/lists/ft_lstadd_front.d
@@ -0,0 +1,3 @@
+lists/ft_lstadd_front.o: lists/ft_lstadd_front.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstadd_front.o b/libft/lists/ft_lstadd_front.o
diff --git a/libft/lists/ft_lstclear.d b/libft/lists/ft_lstclear.d
@@ -0,0 +1,3 @@
+lists/ft_lstclear.o: lists/ft_lstclear.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstclear.o b/libft/lists/ft_lstclear.o
diff --git a/libft/lists/ft_lstdelone.d b/libft/lists/ft_lstdelone.d
@@ -0,0 +1,3 @@
+lists/ft_lstdelone.o: lists/ft_lstdelone.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstdelone.o b/libft/lists/ft_lstdelone.o
diff --git a/libft/lists/ft_lstiter.d b/libft/lists/ft_lstiter.d
@@ -0,0 +1,3 @@
+lists/ft_lstiter.o: lists/ft_lstiter.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstiter.o b/libft/lists/ft_lstiter.o
diff --git a/libft/lists/ft_lstlast.d b/libft/lists/ft_lstlast.d
@@ -0,0 +1,3 @@
+lists/ft_lstlast.o: lists/ft_lstlast.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstlast.o b/libft/lists/ft_lstlast.o
diff --git a/libft/lists/ft_lstmap.d b/libft/lists/ft_lstmap.d
@@ -0,0 +1,3 @@
+lists/ft_lstmap.o: lists/ft_lstmap.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstmap.o b/libft/lists/ft_lstmap.o
diff --git a/libft/lists/ft_lstnew.d b/libft/lists/ft_lstnew.d
@@ -0,0 +1,3 @@
+lists/ft_lstnew.o: lists/ft_lstnew.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstnew.o b/libft/lists/ft_lstnew.o
diff --git a/libft/lists/ft_lstsize.d b/libft/lists/ft_lstsize.d
@@ -0,0 +1,3 @@
+lists/ft_lstsize.o: lists/ft_lstsize.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/lists/ft_lstsize.o b/libft/lists/ft_lstsize.o
diff --git a/libft/memory/ft_calloc.d b/libft/memory/ft_calloc.d
@@ -0,0 +1,3 @@
+memory/ft_calloc.o: memory/ft_calloc.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/memory/ft_calloc.o b/libft/memory/ft_calloc.o
diff --git a/libft/memory/ft_memchr.d b/libft/memory/ft_memchr.d
@@ -0,0 +1,3 @@
+memory/ft_memchr.o: memory/ft_memchr.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/memory/ft_memchr.o b/libft/memory/ft_memchr.o
diff --git a/libft/memory/ft_memcmp.d b/libft/memory/ft_memcmp.d
@@ -0,0 +1,3 @@
+memory/ft_memcmp.o: memory/ft_memcmp.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/memory/ft_memcmp.o b/libft/memory/ft_memcmp.o
diff --git a/libft/memory/ft_memcpy.d b/libft/memory/ft_memcpy.d
@@ -0,0 +1,3 @@
+memory/ft_memcpy.o: memory/ft_memcpy.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/memory/ft_memcpy.o b/libft/memory/ft_memcpy.o
diff --git a/libft/memory/ft_memmove.d b/libft/memory/ft_memmove.d
@@ -0,0 +1,3 @@
+memory/ft_memmove.o: memory/ft_memmove.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/memory/ft_memmove.o b/libft/memory/ft_memmove.o
diff --git a/libft/memory/ft_memset.d b/libft/memory/ft_memset.d
@@ -0,0 +1,3 @@
+memory/ft_memset.o: memory/ft_memset.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/memory/ft_memset.o b/libft/memory/ft_memset.o
diff --git a/libft/printf/ft_conv_fct.d b/libft/printf/ft_conv_fct.d
@@ -0,0 +1,3 @@
+printf/ft_conv_fct.o: printf/ft_conv_fct.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/printf/ft_conv_fct.o b/libft/printf/ft_conv_fct.o
diff --git a/libft/printf/ft_printf.d b/libft/printf/ft_printf.d
@@ -0,0 +1,3 @@
+printf/ft_printf.o: printf/ft_printf.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/printf/ft_printf.o b/libft/printf/ft_printf.o
diff --git a/libft/printf/ft_treat_format.d b/libft/printf/ft_treat_format.d
@@ -0,0 +1,3 @@
+printf/ft_treat_format.o: printf/ft_treat_format.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/printf/ft_treat_format.o b/libft/printf/ft_treat_format.o
diff --git a/libft/stdlib/ft_atoi.d b/libft/stdlib/ft_atoi.d
@@ -0,0 +1,3 @@
+stdlib/ft_atoi.o: stdlib/ft_atoi.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/stdlib/ft_atoi.o b/libft/stdlib/ft_atoi.o
diff --git a/libft/stdlib/ft_itoa.d b/libft/stdlib/ft_itoa.d
@@ -0,0 +1,3 @@
+stdlib/ft_itoa.o: stdlib/ft_itoa.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/stdlib/ft_itoa.o b/libft/stdlib/ft_itoa.o
diff --git a/libft/string/ft_bzero.d b/libft/string/ft_bzero.d
@@ -0,0 +1,3 @@
+string/ft_bzero.o: string/ft_bzero.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_bzero.o b/libft/string/ft_bzero.o
diff --git a/libft/string/ft_split.d b/libft/string/ft_split.d
@@ -0,0 +1,3 @@
+string/ft_split.o: string/ft_split.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_split.o b/libft/string/ft_split.o
diff --git a/libft/string/ft_strchr.d b/libft/string/ft_strchr.d
@@ -0,0 +1,3 @@
+string/ft_strchr.o: string/ft_strchr.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strchr.o b/libft/string/ft_strchr.o
diff --git a/libft/string/ft_strcmp.d b/libft/string/ft_strcmp.d
@@ -0,0 +1 @@
+string/ft_strcmp.o: string/ft_strcmp.c
diff --git a/libft/string/ft_strcmp.o b/libft/string/ft_strcmp.o
diff --git a/libft/string/ft_strdup.d b/libft/string/ft_strdup.d
@@ -0,0 +1,3 @@
+string/ft_strdup.o: string/ft_strdup.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strdup.o b/libft/string/ft_strdup.o
diff --git a/libft/string/ft_striteri.d b/libft/string/ft_striteri.d
@@ -0,0 +1,3 @@
+string/ft_striteri.o: string/ft_striteri.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_striteri.o b/libft/string/ft_striteri.o
diff --git a/libft/string/ft_strjoin.d b/libft/string/ft_strjoin.d
@@ -0,0 +1,3 @@
+string/ft_strjoin.o: string/ft_strjoin.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strjoin.o b/libft/string/ft_strjoin.o
diff --git a/libft/string/ft_strlcat.d b/libft/string/ft_strlcat.d
@@ -0,0 +1,3 @@
+string/ft_strlcat.o: string/ft_strlcat.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strlcat.o b/libft/string/ft_strlcat.o
diff --git a/libft/string/ft_strlcpy.d b/libft/string/ft_strlcpy.d
@@ -0,0 +1,3 @@
+string/ft_strlcpy.o: string/ft_strlcpy.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strlcpy.o b/libft/string/ft_strlcpy.o
diff --git a/libft/string/ft_strlen.d b/libft/string/ft_strlen.d
@@ -0,0 +1,3 @@
+string/ft_strlen.o: string/ft_strlen.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strlen.o b/libft/string/ft_strlen.o
diff --git a/libft/string/ft_strmapi.d b/libft/string/ft_strmapi.d
@@ -0,0 +1,3 @@
+string/ft_strmapi.o: string/ft_strmapi.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strmapi.o b/libft/string/ft_strmapi.o
diff --git a/libft/string/ft_strncmp.d b/libft/string/ft_strncmp.d
@@ -0,0 +1,3 @@
+string/ft_strncmp.o: string/ft_strncmp.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strncmp.o b/libft/string/ft_strncmp.o
diff --git a/libft/string/ft_strnstr.d b/libft/string/ft_strnstr.d
@@ -0,0 +1,3 @@
+string/ft_strnstr.o: string/ft_strnstr.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strnstr.o b/libft/string/ft_strnstr.o
diff --git a/libft/string/ft_strrchr.d b/libft/string/ft_strrchr.d
@@ -0,0 +1,3 @@
+string/ft_strrchr.o: string/ft_strrchr.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strrchr.o b/libft/string/ft_strrchr.o
diff --git a/libft/string/ft_strtrim.d b/libft/string/ft_strtrim.d
@@ -0,0 +1,3 @@
+string/ft_strtrim.o: string/ft_strtrim.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_strtrim.o b/libft/string/ft_strtrim.o
diff --git a/libft/string/ft_substr.d b/libft/string/ft_substr.d
@@ -0,0 +1,3 @@
+string/ft_substr.o: string/ft_substr.c includes/libft.h \
+ includes/libft_defines.h includes/libft_structs.h \
+ includes/libft_fonctions.h
diff --git a/libft/string/ft_substr.o b/libft/string/ft_substr.o
diff --git a/minishell b/minishell
diff --git a/srcs/clean/clean_exit.d b/srcs/clean/clean_exit.d
@@ -0,0 +1,5 @@
+srcs/clean/clean_exit.o: srcs/clean/clean_exit.c includes/minishell.h \
+ libft/includes/libft.h libft/includes/libft_defines.h \
+ libft/includes/libft_structs.h libft/includes/libft_fonctions.h \
+ includes/minishell_enums.h includes/minishell_defines.h \
+ includes/minishell_structs.h includes/minishell_fonctions.h
diff --git a/srcs/clean/clean_exit.o b/srcs/clean/clean_exit.o
diff --git a/srcs/clean/cleaner_prog.d b/srcs/clean/cleaner_prog.d
@@ -0,0 +1,5 @@
+srcs/clean/cleaner_prog.o: srcs/clean/cleaner_prog.c includes/minishell.h \
+ libft/includes/libft.h libft/includes/libft_defines.h \
+ libft/includes/libft_structs.h libft/includes/libft_fonctions.h \
+ includes/minishell_enums.h includes/minishell_defines.h \
+ includes/minishell_structs.h includes/minishell_fonctions.h
diff --git a/srcs/clean/cleaner_prog.o b/srcs/clean/cleaner_prog.o
diff --git a/srcs/executor/builtin/cd/cd.c b/srcs/executor/builtin/cd/cd.c
@@ -6,7 +6,7 @@
 /*   By: caubry <caubry@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/28 15:21:14 by caubry            #+#    #+#             */
-/*   Updated: 2022/09/28 16:01:27 by caubry           ###   ########.fr       */
+/*   Updated: 2022/10/03 19:21:00 by caubry           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -32,7 +32,7 @@ void	ft_cd(t_user_input *ui)
 	test = getcwd(NULL, 0);
 	oldpwd = _strjoin(__strdup("oldpwd="), test);
 	free(test);
-	ft_export(ui, oldpwd);
+	ft_export_arg(ui, oldpwd);
 	if (!path)
 		chdir(getenv("HOME"));
 	else
@@ -45,7 +45,7 @@ void	ft_cd(t_user_input *ui)
 	}
 	test = getcwd(NULL, 0);
 	pwd = _strjoin(__strdup("pwd="), test);
-	ft_export(ui, pwd);
+	ft_export_arg(ui, pwd);
 	free(test);
 	free(pwd);
 	free(oldpwd);

diff --git a/srcs/executor/builtin/cd/cd.d b/srcs/executor/builtin/cd/cd.d
@@ -0,0 +1,6 @@
+srcs/executor/builtin/cd/cd.o: srcs/executor/builtin/cd/cd.c \
+ includes/minishell.h libft/includes/libft.h \
+ libft/includes/libft_defines.h libft/includes/libft_structs.h \
+ libft/includes/libft_fonctions.h includes/minishell_enums.h \
+ includes/minishell_defines.h includes/minishell_structs.h \
+ includes/minishell_fonctions.h
diff --git a/srcs/executor/builtin/cd/cd.o b/srcs/executor/builtin/cd/cd.o
diff --git a/srcs/executor/builtin/echo/echo.c b/srcs/executor/builtin/echo/echo.c
@@ -6,7 +6,7 @@
 /*   By: caubry <caubry@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/27 10:36:31 by caubry            #+#    #+#             */
-/*   Updated: 2022/09/29 10:31:25 by caubry           ###   ########.fr       */
+/*   Updated: 2022/10/03 18:33:04 by caubry           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,7 +18,9 @@ int	check_quote(char *str, int i, char *quote)
 		&& (*quote == 0 || *quote == str[i]))
 	{
 		if (*quote == 0)
+		{
 			*quote = str[i];
+		}
 		else
 			*quote = 0;
 		i++;
@@ -48,6 +50,11 @@ char	*remove_quote(char *str)
 			j++;
 			i++;
 		}
+		if (str[i] && str[i] == quote)
+		{
+			quote = 0;
+			i++;
+		}
 	}
 	no_quote[j] = '\0';
 	free (str);

diff --git a/srcs/executor/builtin/echo/echo.d b/srcs/executor/builtin/echo/echo.d
@@ -0,0 +1,6 @@
+srcs/executor/builtin/echo/echo.o: srcs/executor/builtin/echo/echo.c \
+ includes/minishell.h libft/includes/libft.h \
+ libft/includes/libft_defines.h libft/includes/libft_structs.h \
+ libft/includes/libft_fonctions.h includes/minishell_enums.h \
+ includes/minishell_defines.h includes/minishell_structs.h \
+ includes/minishell_fonctions.h
diff --git a/srcs/executor/builtin/echo/echo.o b/srcs/executor/builtin/echo/echo.o
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fd/gnl.o: fd/gnl.c includes/libft.h includes/libft_defines.h \
		includes/libft_structs.h includes/libft_fonctions.h