Correction des bugs vus aux corrections

Makefile

@@ -2,19 +2,77 @@
 #                                                       VARIABLE                                                       #
 ########################################################################################################################
 
-SRCS		:=	main.c
+SRCS		:=	backslash.c			\
+				expand_var_utils.c	\
+				expand_var_utils2.c	\
+				init.c				\
+				main.c				\
+				parser_utils.c		\
+				redir.c				\
+				split.c				\
+				utils.c				\
+				expand_var.c		\
+				format_redir.c		\
+				init_utils.c		\
+				init_utils2.c		\
+				parser.c			\
+				pre_check.c			\
+				redir_utils.c		\
+				trim.c				\
+				trim_utils.c		\
+				free_func.c			\
+				header.c
+
+EXEC		:=	built_cd.c				\
+				built_cd_back.c			\
+				built_exit.c			\
+				built_exit_free.c		\
+				built_export.c			\
+				built_export_add.c		\
+				built_export_checker.c	\
+				built_export_utils.c	\
+				exec_main.c				\
+				exec_error.c			\
+				exec_utils.c			\
+				built_echo.c			\
+				built_pwd.c				\
+				exec_redir.c			\
+				exec_wait.c				\
+				built_env.c				\
+				built_export_no_arg.c	\
+				built_unset.c			\
+				exec_redir_utils.c		\
+				heredoc.c				\
+				signals_main.c
+
+
+VALGRIND	:=	valgrind --suppressions=valgrind_ignore_leaks.txt --leak-check=full --show-leak-kinds=all\
+				--track-fds=yes --show-mismatched-frees=yes --read-var-info=yes -s --trace-children=yes
+
+IGN_LEAK	:=	valgrind_ignore_leaks.txt
 
 SRCS_D		:=	srcs/
 
 OBJS_D		:=	objs/
 
-OBJS		:=	$(SRCS:%.c=$(OBJS_D)%.o)
+EXEC_D		:=	exec/
 
-HEAD		:=	includes/minishell.h
+OBJS		:=	$(SRCS:%.c=$(OBJS_D)%.o)\
+
+OBJS_E		:=	$(EXEC:%.c=$(OBJS_D)%.o)\
+
+HEAD		:=	includes/minishell.h	\
+				includes/parser.h		\
+				includes/builtins.h
 
 HEAD_D		:=	.
 
-CFLAGS		:=	-Wall -Wextra -Werror -g3
+ifeq ($(shell uname), Darwin)
+READLINE_DIR	=	$(shell brew --prefix readline)
+endif
+READLINE_LIB	=	-lreadline -lhistory -L $(READLINE_DIR)/lib
+
+CFLAGS		:=	-Wall -Wextra -Werror -g3 -I$(READLINE_DIR)/include
 
 NAME		:=	minishell
 
@@ -35,22 +93,46 @@ LIB_A		:=	$(addprefix $(LIB_D), $(LIB))
 ########################################################################################################################
 #                                                        RULES                                                         #
 ########################################################################################################################
-
 all			:	lib
 				$(MAKE) $(NAME)
 
 lib			:
 				$(MAKE) -C $(LIB_D)
 
-$(NAME)		:	$(OBJS_D) $(OBJS) $(LIB_A) $(HEAD)
-				$(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LIB_A)
+leaks		:	all $(IGN_LEAK)
+				$(VALGRIND) ./$(NAME)
+
+$(NAME)		:	$(OBJS_D) $(OBJS) $(OBJS_E) $(LIB_A) $(HEAD)
+				$(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(OBJS_E) $(LIB_A) -lm ${READLINE_LIB}
 
 $(OBJS)		:	$(OBJS_D)%.o: $(SRCS_D)%.c $(HEAD) $(LIB_H)
-				$(CC) $(CFLAGS) -I/usr/include -Isuper_libft -c $< -o $@
+				$(CC) $(CFLAGS) -Isuper_libft -c $< -o $@
+
+$(OBJS_E)	:	$(OBJS_D)%.o: $(EXEC_D)%.c $(HEAD) $(LIB_H)
+				$(CC) $(CFLAGS) -Isuper_libft -c $< -o $@
 
 $(OBJS_D)	:
 				@mkdir -p $(OBJS_D)
 
+$(IGN_LEAK)		:
+				@echo "{"                                > $(IGN_LEAK)
+				@echo "    leak readline"                    >> $(IGN_LEAK)
+				@echo "        Memcheck:Leak"                >> $(IGN_LEAK)
+				@echo "        ..."                        >> $(IGN_LEAK)
+				@echo "        fun:readline"                 >> $(IGN_LEAK)
+				@echo "}"                                >> $(IGN_LEAK)
+				@echo "{"                                >> $(IGN_LEAK)
+				@echo "    leak add_history"                >> $(IGN_LEAK)
+				@echo "        Memcheck:Leak"                >> $(IGN_LEAK)
+				@echo "        ..."                        >> $(IGN_LEAK)
+				@echo "        fun:add_history"            >> $(IGN_LEAK)
+				@echo "}"                                >> $(IGN_LEAK)
+				@echo "{"                                >> $(IGN_LEAK)
+				@echo "    leak readline_internal_char"    >> $(IGN_LEAK)
+				@echo "        Memcheck:Leak"                >> $(IGN_LEAK)
+				@echo "        ..."                        >> $(IGN_LEAK)
+				@echo "        fun:readline_internal_char"    >> $(IGN_LEAK)
+				@echo "}"                                >> $(IGN_LEAK)
 ########################################################################################################################
 #                                                        COMMANDS                                                      #
 ########################################################################################################################
@@ -62,7 +144,8 @@ clean		:
 fclean		:	clean
 				$(RM) $(NAME) $(NAME_B)
 				$(MAKE) fclean -C super_libft
+				$(RM) $(IGN_LEAK)
 
 re			:	fclean all
 
-.PHONY: all clean fclean re lib
+.PHONY: all clean fclean re lib

data/header2.txt

@@ -0,0 +1,6 @@
+    __  ____       _                       _________
+   /  |/  (_)___  (_)___ ___  ____  ____  / __/ __( )
+  / /|_/ / / __ \/ / __ `__ \/ __ \/ __ \/ /_/ /_ |/
+ / /  / / / / / / / / / / / / /_/ / / / / __/ __/
+/_/  /_/_/_/ /_/_/_/ /_/ /_/\____/_/ /_/_/ /_/
+by Grebrune & Beroy

exec/built_cd.c

@@ -0,0 +1,108 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   built_cd.c                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: grebrune <grebrune@student.42lyon.fr>      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/14 15:49:11 by grebrune          #+#    #+#             */
+/*   Updated: 2024/07/08 20:13:12 by grebrune         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "../includes/minishell.h"
+
+int	cd_error(t_head *head)
+{
+	if (head->cmd->next || (head->cmd->arg[1] && head->cmd->arg[1][0] == 0))
+		return (1);
+	if (head->cmd->arg[1] && head->cmd->arg[2])
+		return (write(2, "bash: cd: too many arguments\n", 29), g_error = 1, 1);
+	return (0);
+}
+
+void	cd_rep_or_new(t_head *head, char *n_pwd, char *old_pwd)
+{
+	if (replace_value(head, n_pwd, "PWD"))
+	{
+		new_pwd(head, n_pwd, "PWD");
+		free(n_pwd);
+	}
+	if (replace_value(head, old_pwd, "OLDPWD"))
+	{
+		new_pwd(head, old_pwd, "OLDPWD");
+		free(old_pwd);
+	}
+}
+
+int	ft_cd(t_head *head)
+{
+	int		err;
+	char	*new;
+	char	*old;
+
+	old = NULL;
+	if (cd_error(head))
+		return (1);
+	new = cd_relative(head);
+	if (!new)
+		return (2);
+	err = get_path(&old);
+	if (err == 2)
+		return (2);
+	err = chdir(new);
+	if (err != 0)
+		return (cd_chdir_error(head, old, new), 1);
+	cd_rep_or_new(head, new, old);
+	return (0);
+}
+
+char	*cd_relative(t_head *head)
+{
+	char	*new;
+
+	new = NULL;
+	if (!head->cmd->arg[1])
+		return (cd_find_var(head, "HOME"));
+	if (0 == ft_strcmp(head->cmd->arg[1], "../")
+		|| 0 == ft_strcmp(head->cmd->arg[1], ".."))
+		return (cd_back_trim());
+	if (0 == ft_strcmp(head->cmd->arg[1], "~/")
+		|| 0 == ft_strcmp(head->cmd->arg[1], "~"))
+		return (cd_tild_trim(head));
+	if (0 == ft_strcmp(head->cmd->arg[1], "-"))
+		return (cd_find_var(head, "OLDPWD"));
+	if (!ft_strncmp(head->cmd->arg[1], "~/", 2))
+		return (cat_of_tild(head, head->cmd->arg[1]));
+	if (!ft_strncmp(head->cmd->arg[1], "/home", 5))
+		return (ft_strdup(head->cmd->arg[1]));
+	if (get_path(&new) == 2)
+		return (NULL);
+	new = cd_cat_backslash(new, head->cmd->arg[1]);
+	if (!new)
+		return (write(2, "Crash of Malloc\n", 16), NULL);
+	return (new);
+}
+
+char	*cd_find_var(t_head *head, char *name)
+{
+	t_env	*env;
+	char	*str;
+
+	str = NULL;
+	env = head->env;
+	while (env)
+	{
+		if (ft_strcmp(env->name, name) == 0)
+		{
+			str = ft_strdup(env->value);
+			if (!str)
+				return (write(2, "Crash of Malloc\n", 16), NULL);
+			break ;
+		}
+		env = env->next;
+	}
+	if (!str)
+		return (cd_not_found(name), NULL);
+	return (str);
+}

exec/built_cd_back.c

@@ -0,0 +1,102 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   built_cd_back.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: grebrune <grebrune@student.42lyon.fr>      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/21 14:35:38 by grebrune          #+#    #+#             */
+/*   Updated: 2024/07/08 20:13:12 by grebrune         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "../includes/minishell.h"
+
+char	*cd_tild_trim(t_head *head)
+{
+	char	*pwd;
+	char	*new;
+
+	pwd = cd_find_var(head, "USER");
+	if (!pwd)
+		return (NULL);
+	new = ft_strjoin("/home/", pwd);
+	if (!new)
+		return (free(pwd), write(2, "Crash of Malloc\n", 16), NULL);
+	return (free(pwd), new);
+}
+
+char	*cd_back_trim(void)
+{
+	char	*pwd;
+	char	*new;
+	int		i;
+	int		x;
+
+	i = 0;
+	pwd = NULL;
+	if (get_path(&pwd) == 2)
+		return (NULL);
+	while (pwd && pwd[i])
+		i++;
+	while (pwd && pwd[i] != '/')
+		i--;
+	new = malloc(sizeof(char) * (i + 1));
+	if (!new)
+		return (free(pwd), write(2, "Crash of Malloc\n", 16), NULL);
+	x = 0;
+	while (x < i)
+	{
+		new[x] = pwd[x];
+		x++;
+	}
+	new[x] = 0;
+	return (free(pwd), new);
+}
+
+void	cd_not_found(char *name)
+{
+	write(2, "bash: cd: ", 10);
+	write(2, name, ft_strlen(name));
+	write(2, " not set\n", 9);
+}
+
+void	cd_chdir_error(t_head *head, char *old_pwd, char *new_pwd)
+{
+	DIR	*ptr_dir;
+
+	g_error = 1;
+	ptr_dir = opendir(head->cmd->arg[1]);
+	perror("bash: cd");
+	closedir(ptr_dir);
+	free(old_pwd);
+	free(new_pwd);
+}
+
+char	*cd_cat_backslash(char *path, char *dir)
+{
+	char	*dest;
+	size_t	i;
+	size_t	x;
+
+	dest = ft_calloc(sizeof (char), (ft_strlen(dir) + ft_strlen(path) + 2));
+	if (!dest)
+		return (NULL);
+	i = 0;
+	while (path && path[i])
+	{
+		dest[i] = path[i];
+		i++;
+	}
+	x = 0;
+	dest[i++] = '/';
+	while (dir && dir[x])
+	{
+		dest[i] = dir[x];
+		i++;
+		x++;
+	}
+	dest[i] = '\0';
+	free(path);
+	return (dest);
+}