Update 'README.md'

2023-03-28 13:37:24 +00:00 · 2023-03-28 13:35:22 +00:00 · 2023-03-28 13:33:08 +00:00 · 2023-03-28 13:31:54 +00:00 · 2023-03-28 13:31:36 +00:00 · 2023-03-28 13:31:14 +00:00
71 changed files with 1994 additions and 1089 deletions
--- a/32
+++ b/32
@ -1,13 +1,37 @@
-UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_split_quoted.c utils/ft_strshift.c utils/ft_quote_remover.c utils/ft_str_is_empty.c
-SRCS = ${UTILS_SRC} main.c file.c infile.c outfile.c heredoc.c syntatics.c cmd.c cmds.c env.c execution.c spacer.c env_fill.c
+UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_split_quoted.c utils/ft_strshift.c utils/ft_quote_remover.c utils/ft_str_is_empty.c utils/ft_atoi_check.c ./utils/ft_get_executable.c ./utils/fd.c
+
+BUILTINS_SRC = builtins/pwd.c \
+			   builtins/export.c \
+			   builtins/env.c \
+			   builtins/cd.c \
+			   builtins/exit.c \
+			   builtins/unset.c \
+			   builtins/echo.c 
+
+SRCS = ${BUILTINS_SRC} \
+	   ${UTILS_SRC} \
+	   main.c \
+	   ./cmd/cmd.c \
+	   ./env/env1.c \
+	   ./env/env2.c \
+	   ./env/env3.c \
+	   ./env/env_fill.c \
+	   ./data/data.c \
+	   ./execution/execution.c \
+	   ./syntax/syntax.c \
+	   ./format/format.c \
+	   ./redirection/heredoc.c \
+	   ./redirection/file.c \
+	   ./redirection/redirection.c \
+	   ./parse/parse.c

 OBJS = ${SRCS:.c=.o}

 NAME = minishell

-CC = gcc
+CC = clang

-CFLAGS = -Werror -Wextra -g
+CFLAGS = -Werror -Wextra -Wall -g

 LIBS = libftx/libftx.a

--- a/README.md
+++ b/README.md
@ -0,0 +1,40 @@
+# Minishell
+
+Minishell is a 42 School project that involves creating a minimalistic shell in C language. The shell should be able to handle basic commands, manage environment variables and implement several built-in functions.
+
+## Features
+
+- Prompt management (display, editing, history)
+- Command execution (with or without arguments)
+- Basic shell operations (pipes, redirections)
+- Environment variables management (listing, setting, unsetting)
+- Built-in functions management (echo, cd, env, exit, export, pwd, unset)
+
+## Getting started
+
+1. Clone this repository: `git clone https://github.com/<your_username>/minishell.git`
+2. `cd` into the cloned directory: `cd minishell`
+3. Run the `make` command to compile the program: `make`
+4. Start the shell by running the executable: `./minishell`
+
+## Usage
+
+Once the shell is started, you can enter commands as you would with any other shell. The following are some examples of commands that can be executed:
+
+- Display the working directory: `pwd`
+- Change directory: `cd <directory_name>`
+- Print the value of an environment variable: `echo $<variable_name>`
+- Set an environment variable: `export <variable_name>=<value>`
+- Unset an environment variable: `unset <variable_name>`
+- Display a list of environment variables: `env`
+- Exit the shell: `exit`
+
+## Resources
+
+- ![The project subject](./subject.pdf)
+- The C library documentation for the standard library functions used in the program
+- bash man
+
+## Authors
+
+This project was created by [Camille CHAUVET](mailto:camille@chauvet.pro) and [Xamora](mailto:ogame.xamora@42l.fr). If you have any questions or suggestions, feel free to contact us.
--- a/builtins/builtins.h
+++ b/builtins/builtins.h
@ -0,0 +1,14 @@
+#ifndef BUILTINS_H
+# define BUILTINS_H
+# include "../libftx/libft/list.h"
+
+int			echo(int fd, char **strs);
+int			pwd(int fd);
+char		*get_pwd(int fd);
+int			print_env(t_list **env, int fd);
+int			ft_export(t_list **env, char **args, int fd);
+int			move_folder(char **args, int fd);
+int			unset(t_list **env, char **args, int fd);
+int			ft_exit(char **args);
+
+#endif
--- a/builtins/builtins_private.h
+++ b/builtins/builtins_private.h
@ -0,0 +1,10 @@
+#ifndef BUILTINS_PRIVATE_H
+# define BUILTINS_PRIVATE_H
+# include <limits.h>
+# include "../libftx/libftx.h"
+# include "../env/env.h"
+# include "../utils/utils.h"
+
+char	*get_pwd(int fd);
+
+#endif
--- a/builtins/cd.c
+++ b/builtins/cd.c
@ -0,0 +1,55 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   cd.c                                               :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/20 14:27:36 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/03/13 15:11:07 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+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 such file or directory\n", 26);
+	return (1);
+}
+
+int	move_folder(char **args, int fd)
+{
+	char	*path;
+
+	if (args[1] != NULL)
+	{
+		write(2, "cd: too many argument\n", 22);
+		return (1);
+	}
+	path = args[0];
+	if (!path)
+	{
+		write(2, "No such file or directory\n", 26);
+		return (1);
+	}
+	if (path[0] == '/' || ft_strncmp(path, "..", ft_strlen(path)) == 0)
+	{
+		if (chdir(path) == 0)
+			return (0);
+		write(2, "No such file or directory\n", 26);
+		return (1);
+	}
+	else
+		return (make_move(path, fd));
+}
--- a/builtins/echo.c
+++ b/builtins/echo.c
@ -0,0 +1,66 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   echo.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/17 13:09:08 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/03/13 16:50:40 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	is_space(char c)
+{
+	return (c == ' ' || c == '\f' || c == '\v' || c == '\t'
+		|| c == '\r' || c == '\n');
+}
+
+int	check_argument(char *str, int *check_backslash_n)
+{
+	int	i;
+
+	i = -1;
+	while (str[++i])
+		if (str[i] != '-' && str[i] != 'n')
+			return (1);
+	if (ft_strnstr(str, "n", ft_strlen(str)))
+		*check_backslash_n = 1;
+	else
+		return (1);
+	return (0);
+}
+
+int	echo(int fd, char **strs)
+{
+	int		check_backslash_n;
+	int		check_start_write;
+	int		i;
+
+	check_backslash_n = 0;
+	check_start_write = 0;
+	i = -1;
+	while (strs[++i])
+	{
+		while (is_space(*strs[i]))
+			strs[i]++;
+		if (check_start_write == 1 || check_argument(strs[i], &check_backslash_n))
+		{
+			check_start_write = 1;
+			ft_putstr_fd(strs[i], fd);
+			if (strs[i + 1] != NULL)
+				write(fd, " ", 1);
+		}
+	}
+	if (!check_backslash_n)
+		write(fd, "\n", 1);
+	return (0);
+}
+
+/*int	main(int argc, char *argv[])
+{
+	echo(1, argv + 1);
+	return (0);
+}*/
--- a/builtin/export.c
+++ b/builtin/export.c
@ -1,40 +1,41 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   export.c                                           :+:      :+:    :+:   */
+/*   env.c                                              :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2023/02/14 14:27:08 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/14 14:52:50 by cchauvet         ###   ########.fr       */
+/*   Created: 2023/02/14 14:56:02 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/09 15:04:47 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

-#include "../minishell.h"
+#include "./builtins_private.h"

-int	main(char **env)
+int	print_env(t_list **env, int fd)
 {
-	t_list	**env_lst;
 	t_list	*current;
-	char	*key;
-	char	*value;

-	env_lst = init_env(env);
-	current = *env_lst;
-	while (current != NULL)
+	current = *env;
+	while (current->next != NULL)
 	{
-		value = ft_strchr(current->content, '=') + 1;
-		key = ft_strndup(current->content,
-				ft_strlen(current->content) - ft_strlen(value));
-		if (key == NULL)
+		if (((t_env *)(current->content))->original)
 		{
-			ft_lstclear(env_lst, env_del);
-			return (1);
+			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);
 		}
-		ft_printf("declare -x %s=\"%s\"\n", key, value);
-		free(key);
 		current = current->next;
 	}
-	ft_lstclear(env_lst, env_del);
 	return (0);
 }
+
+/*int	main(int argc, char *argv[], char **env)
+{
+	t_list **be;
+
+	be = init_env(env);
+	print_env(be, 1);
+	return (0);
+}*/
--- a/builtins/exit.c
+++ b/builtins/exit.c
@ -0,0 +1,45 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   exit.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/24 10:17:59 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/03/10 14:52:22 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+static int	error(int err, char *reason, char *problem)
+{
+	ft_putstr_fd("minishell: exit ", 2);
+	if (problem != NULL)
+	{
+		ft_putstr_fd(problem, 2);
+		write(2, ": ", 3);
+	}
+	ft_putstr_fd(reason, 2);
+	return (err);
+}
+
+int	ft_exit(char **args)
+{
+	int	err;
+
+	if (args[0] == NULL)
+	{
+		write(1, "exit\n", 6);
+		return (0);
+	}
+	err = ft_atoi_check(args[0]);
+	if (err == 1)
+		return (error(err, "numeric argument required", args[0]));
+	if (args[1] != NULL)
+		return (error(1, "too many arguments", NULL));
+	if (err > 0)
+		return (error(err, "numeric argument required", args[0]));
+	write(1, "exit\n", 6);
+	return ((ft_atoi(args[0]) % 256 + 256) % 256);
+}
--- a/builtins/export.c
+++ b/builtins/export.c
@ -0,0 +1,107 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   export.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/14 14:27:08 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/13 13:23:56 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+static int	error(char *str)
+{
+	write(2, "bash: export: `", 15);
+	write(2, str, ft_strlen(str));
+	write(2, "': not a valid identifier\n", 26);
+	return (1);
+}
+
+void	print_export(t_list **env, int fd)
+{
+	t_list	*current;
+
+	current = *env;
+	while (current->next != NULL)
+	{
+		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	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)
+{
+	char	*key;
+	char	*value;
+
+	if (ft_strchr(args, '=') != NULL)
+	{
+		if (set_key_value_export(env, args, &key, &value))
+			return (error(args));
+	}
+	else
+	{
+		key = ft_strdup(args);
+		value = get_value_by_key(key, env);
+		if (value != NULL)
+			value = ft_strdup(value);
+		if (possible_key(key) == 2)
+			return (error(key));
+	}
+	if (!possible_key(key))
+		return (error(args));
+	create_value_by_key(key, value, env);
+	return (0);
+}
+
+int	ft_export(t_list **env, char **args, int fd)
+{
+	int	err;
+	int	i;
+
+	err = 0;
+	if (args[0] == NULL)
+		print_export(env, fd);
+	else
+	{
+		i = -1;
+		while (args[++i])
+			if (add_export(env, args[i]) == 1)
+				err = 1;
+	}
+	return (err);
+}
--- a/builtins/pwd.c
+++ b/builtins/pwd.c
@ -0,0 +1,41 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   pwd.c                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/17 16:09:11 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/03/09 20:00:19 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	pwd(int fd)
+{
+	char	path[PATH_MAX];
+
+	if (getcwd(path, sizeof(path)) != NULL)
+		ft_putendl_fd(path, fd);
+	else
+	{
+		ft_putendl_fd("Error getcwd", fd);
+		return (1);
+	}
+	return (0);
+}
+
+char	*get_pwd(int fd)
+{
+	char	*str;
+
+	str = ft_calloc(PATH_MAX, sizeof(char *));
+	if (getcwd(str, PATH_MAX) != NULL)
+		return (str);
+	else
+	{
+		ft_putendl_fd("Error getcwd", fd);
+		return (NULL);
+	}
+}
--- a/builtins/unset.c
+++ b/builtins/unset.c
@ -0,0 +1,35 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   unset.c                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/22 13:28:27 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/02/23 15:49:21 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	error(char *str, int fd)
+{
+	write(fd, "bash: unset: `", 14);
+	write(fd, str, ft_strlen(str));
+	write(fd, "': not a valid identifier", 25);
+	return (1);
+}
+
+int	unset(t_list **env, char **args, int fd)
+{
+	int	i;
+	int	err;
+
+	i = -1;
+	err = 0;
+	while (args[++i])
+		if (delete_by_key(args[i], env))
+			if (!possible_key(args[i]))
+				err = error(args[i], fd);
+	return (err);
+}
--- a/cmd/cmd.c
+++ b/cmd/cmd.c
@ -6,12 +6,11 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 14:18:21 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 18:25:14 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 22:27:28 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

-#include "libftx/libftx.h"
-#include "minishell.h"
+#include "cmd_private.h"

 void	ft_cmddel(void *ptr)
 {
@ -20,35 +19,15 @@ void	ft_cmddel(void *ptr)
 	content = (t_cmd *) ptr;
 	if (content->args != NULL)
 		ft_freer_tab_ultimate(1, content->args);
-	if (content->executable != NULL)
+	if (content->own_cmd == false && content->executable != NULL)
 		free(content->executable);
+	if (content->fd_in[0] > 2)
+		close(content->fd_in[0]);
+	if (content->fd_out[0] > 2)
+		close(content->fd_out[0]);
+	if (content->fd_in[1] > 2)
+		close(content->fd_in[1]);
+	if (content->fd_out[1] > 2)
+		close(content->fd_out[1]);
 	free(content);
 }
-
-int	ft_cmd_filler(t_list *element, char **args, t_list **env)
-{
-	t_cmd	*content;
-	char	*temp;
-	size_t	i;
-
-	if (args == NULL)
-		return (1);
-	content = (t_cmd *)element->content;
-	i = 0;
-	while (args[i] != NULL)
-	{
-		temp = ft_env_filler(env, args[i]);
-		if (temp == NULL)
-		{
-			ft_eprintf("minishell: malloc failed\n");
-			return (1);
-		}
-		free(args[i]);
-		args[i] = temp;
-		ft_quote_remover(temp);
-		i++;
-	}
-	content->args = args;
-	content->executable = args[0];
-	return (0);
-}
--- a/cmd/cmd.h
+++ b/cmd/cmd.h
@ -0,0 +1,18 @@
+#ifndef CMD_H
+# define CMD_H
+# include <stdbool.h>
+# include "../data/data.h"
+
+typedef struct s_cmd
+{
+	int		fd_in[2];
+	int		fd_out[2];
+	int		pid;
+	char	*executable;
+	char	**args;
+	bool	own_cmd;
+}	t_cmd;
+
+void		ft_cmddel(void *content);
+
+#endif
--- a/cmd/cmd_private.h
+++ b/cmd/cmd_private.h
@ -0,0 +1,8 @@
+#ifndef CMD_PRIVATE_H
+# define CMD_PRIVATE_H
+# include <sys/types.h>
+# include <sys/wait.h>
+# include "./cmd.h"
+# include "../libftx/libftx.h"
+# include "../data/data.h"
+#endif
--- a/cmds.c
+++ b/cmds.c
@ -1,114 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   cmds.c                                             :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2023/02/15 14:17:26 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 15:20:29 by cchauvet         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libftx/libftx.h"
-#include "minishell.h"
-
-static int	ft_cmds_init(t_list **cmds, size_t len)
-{
-	t_cmd	*content;
-	t_list	*current;
-	size_t	i;
-
-	*cmds = malloc(sizeof(t_list));
-	current = *cmds;
-	i = 0;
-	while (i < len)
-	{
-		content = malloc(sizeof(t_cmd));
-		if (content == NULL)
-		{
-			ft_lstclear(cmds, ft_cmddel);
-			return (1);
-		}
-		content->args = NULL;
-		content->executable = NULL;
-		content->fd_in = -1;
-		content->fd_out = -1;
-		current->content = content;
-		if (!((i + 1) < len))
-		{
-			current->next = NULL;
-			return (0);
-		}
-		current->next = malloc(sizeof(t_list));
-		if (current->next == NULL)
-			ft_lstclear(cmds, ft_cmddel);
-		current = current->next;
-		i++;
-	}
-	return (0);
-}
-
-static int	ft_cmds_prep(t_list **cmds, const char *line, int infile, int outfile)
-{
-	size_t	len;
-	t_cmd	*cmd;
-	t_list	*current;
-
-	len = ft_seglen_quoted(line, '|');
-	if (len == 0)
-		return (0);
-	if (ft_cmds_init(cmds, ft_seglen_quoted(line, '|')))
-	{
-		free(cmds);
-		return (1);
-	}
-	cmd = (t_cmd *)(*cmds)->content;
-	cmd->fd_in = infile;
-	current = *cmds;
-	while (current->next != NULL)
-		current = current->next;
-	cmd = (t_cmd *) current->content;
-	cmd->fd_out = outfile;
-	return (0);
-}
-
-static int	ft_cmds_fill(t_list **cmds, t_list **env, const char *line)
-{
-	char	**tab;
-	char	**args;
-	t_list	*current;
-	size_t	i;
-
-	tab = ft_split_quoted(line, '|');
-	if (tab == NULL)
-		return (1);
-	i = 0;
-	current = *cmds;
-	while (tab[i] != NULL)
-	{
-		args = ft_split_quoted(tab[i], ' ');
-		if (ft_cmd_filler(current, args, env) == 1)
-		{
-			ft_lstclear(cmds, ft_cmddel);
-			ft_freer_tab_ultimate(2, args, tab);
-			return (1);
-		}
-		current = current->next;
-		i++;
-	}
-	ft_freer_tab_ultimate(1, tab);
-	return (0);
-}
-
-t_list	**ft_parse_cmds(char *line, t_list **env, int infile, int outfile)
-{
-	t_list	**cmds;
-
-	cmds = malloc(sizeof(t_list *));
-	if (ft_cmds_prep(cmds, line, infile, outfile) == 1)
-		return (NULL);
-	if (ft_cmds_fill(cmds, env, line) == 1)
-		return (NULL);
-	return (cmds);
-}
--- a/data/data.c
+++ b/data/data.c
@ -0,0 +1,9 @@
+#include "./data_private.h"
+#include "data.h"
+
+t_data	*ft_get_data()
+{
+	static t_data	data;
+
+	return (&data);
+}
--- a/data/data.h
+++ b/data/data.h
@ -0,0 +1,15 @@
+#ifndef DATA_H
+# define DATA_H
+# include "../libftx/libft/list.h"
+
+typedef struct s_data
+{
+	t_list	**env;
+	t_list	**cmds;
+	int		exit_code;
+	int		child_pid;
+}	t_data;
+
+t_data	*ft_get_data(void);
+
+#endif
--- a/data/data_private.h
+++ b/data/data_private.h
@ -0,0 +1,6 @@
+#ifndef DATA_PRIVATE_H
+# define DATA_PRIVATE_H
+# include "../libftx/libftx.h"
+# include "./data.h"
+
+#endif
--- a/env/env.h
+++ b/env/env.h
@ -0,0 +1,26 @@
+#ifndef ENV_H
+# define ENV_H
+# include <stdbool.h>
+# include "../libftx/libft/list.h"
+# include "../data/data.h"
+
+typedef struct s_env
+{
+	char	*key;
+	char	*value;
+	bool	original;
+}	t_env;
+
+char		*ft_env_filler(t_data *data, const char *str);
+void		env_del(void *content);
+t_list		**init_env(char **env);
+char		**env_to_strs(t_list **head);
+int			create_value_by_key(char *key, char *value, t_list **head);
+int			create_value_by_key_dup(char *key, char *value, t_list **head);
+int			set_value_by_key(char *key, char *value, t_list **head);
+char		*get_value_by_key(char *key, t_list **head);
+void		env_del(void *ptr);
+int			delete_by_key(char *key, t_list **head);
+int			possible_key(char *key);
+
+#endif
--- a/env/env1.c
+++ b/env/env1.c
@ -6,146 +6,11 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/17 13:05:29 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/09 19:01:05 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

-#include "minishell.h"
-
-int	get_index(char *s, char c)
-{
-	int	i;
-
-	i = -1;
-	while (s[++i])
-		if (s[i] == c)
-			return (i);
-	return (-1);
-}
-
-void	print_export(t_list **head, int fd)
-{
-	t_list	*current;
-
-	current = *head;
-	while (current->next != NULL)
-	{
-		write(fd, "declare -x ", 11);
-		ft_putstr_fd(((t_env*)(current->content))->key, fd);
-		ft_putstr_fd("=", fd);
-		write(fd, "\"", 1);
-		ft_putstr_fd(((t_env*)(current->content))->value, fd);
-		write(fd, "\"\n", 2);
-		current = current->next;
-	}
-}
-
-void	print_env(t_list **head, int fd)
-{
-	t_list	*current;
-
-	current = *head;
-	while (current->next != NULL)
-	{
-		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;
-	}
-}
-
-int	strcmp_alphabet(char *s1, char *s2)
-{
-	int	i;
-
-	if (!s1 || !s2)
-		return (-2);
-	i = 0;
-	while (s1[i] && s2[i])
-	{
-		if (s1[i] < s2[i])
-			return (0);
-		else if (s1[i] > s2[i])
-			return (1);
-		i++;
-	}
-	return (-1);
-}
-
-void	ft_double_swap(void *a, void *b)
-{
-	void	*c;
-
-	c = a;
-	a = b;
-	b = c;
-}
-
-void	exchange(void *a, void *b, void *c)
-{
-	void	*d;
-
-	d = a;
-	a = b;
-	b = c;
-	c = d;
-}
-
-char	*get_value(char *str)
-{
-	char	*s;
-	int		i;
-	int		start;
-
-	s = ft_calloc(ft_strlen(str), sizeof(char));
-	start = get_index(str, '=');
-	i = start;
-	while (str[++i])
-		s[i - start - 1] = str[i];
-	return (s);
-}
-
-void	env_del(void *ptr)
-{
-	t_env	*content;
-
-	content = ptr;
-	free(content->key);
-	free(content->value);
-	free(content);
-}
-
-char	*get_key(char *str)
-{
-	char	*s;
-	int		i;
-
-	s = ft_calloc(ft_strlen(str), sizeof(char));
-	i = -1;
-	while (str[++i] != '=')
-		s[i] = str[i];
-	return (s);
-}
-
-void	swap_env_3(void **a, void **b, void **c)
-{
-	void	*d;
-
-	d = *a;
-	*a = *b;
-	*b = *c;
-	*c = d;
-}
-
-void	swap_env(void **a, void **b)
-{
-	void	*c;
-
-	c = *a;
-	*a = *b;
-	*b = c;
-}
+#include "env_private.h"

 void	add_sort(t_list **head, t_env *var)
 {
@ -153,7 +18,8 @@ void	add_sort(t_list **head, t_env *var)
 	t_env	*last;

 	current = *head;
-	while (current->next != NULL && strcmp_alphabet(var->key, ((t_env*)(current->content))->key) != 0)
+	while (current->next != NULL
+		&& ft_strcmp(var->key, ((t_env *)(current->content))->key) > 0)
 		current = current->next;
 	if (current->content == NULL)
 		current->content = var;
@ -214,29 +80,11 @@ 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);
 }

-char	**env_to_strs(t_list **head)
-{
-	t_list	*current;
-	t_env	*content;
-	char	**env;
-	int		i;
-
-	current = *head;
-	env = ft_calloc(ft_lstsize(*head), sizeof(char *));
-	i = 0;
-	while (current->content)
-	{
-		content = current->content;
-		env[i++] = ft_strmerger(3, content->key, "=", content->value);
-		current = current->next;
-	}
-	return (env);
-}
-
 t_list	**init_env(char **env)
 {
 	t_list	**head;
@ -257,16 +105,8 @@ 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);
 }
-
-/*int	main(int argc, char *argv[], char **env)
-{
-	t_list	**new;
-
-	new = init_env(env);
-	ft_printf("%S", env_to_strs(new));
-	return (0);
-}*/
--- a/env/env2.c
+++ b/env/env2.c
@ -0,0 +1,77 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env2.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/09 19:59:03 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/03/09 19:59:10 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "env_private.h"
+
+int	get_index(char *s, char c)
+{
+	int	i;
+
+	i = -1;
+	while (s[++i])
+		if (s[i] == c)
+			return (i);
+	return (-1);
+}
+
+void	swap_env_3(void **a, void **b, void **c)
+{
+	void	*d;
+
+	d = *a;
+	*a = *b;
+	*b = *c;
+	*c = d;
+}
+
+void	swap_env(void **a, void **b)
+{
+	void	*c;
+
+	c = *a;
+	*a = *b;
+	*b = c;
+}
+
+void	env_del(void *ptr)
+{
+	t_env	*content;
+
+	if (ptr == NULL)
+		return ;
+	content = ptr;
+	if (content->key != NULL)
+		free(content->key);
+	if (content->key != NULL)
+		free(content->value);
+	if (content != NULL)
+		free(content);
+}
+
+char	**env_to_strs(t_list **head)
+{
+	t_list	*current;
+	t_env	*content;
+	char	**env;
+	int		i;
+
+	current = *head;
+	env = ft_calloc(ft_lstsize(*head), sizeof(char *));
+	i = 0;
+	while (current->content)
+	{
+		content = current->content;
+		env[i++] = ft_strmerger(3, content->key, "=", content->value);
+		current = current->next;
+	}
+	return (env);
+}
--- a/env/env3.c
+++ b/env/env3.c
@ -0,0 +1,104 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env3.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/17 17:25:09 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/03/09 19:58:55 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "env_private.h"
+
+char	*get_value(char *str)
+{
+	char	*s;
+	int		i;
+	int		start;
+
+	s = ft_calloc(ft_strlen(str), sizeof(char));
+	start = get_index(str, '=');
+	i = start;
+	while (str[++i])
+		s[i - start - 1] = str[i];
+	return (s);
+}
+
+char	*get_key(char *str)
+{
+	char	*s;
+	int		i;
+
+	s = ft_calloc(ft_strlen(str), sizeof(char));
+	i = -1;
+	while (str[++i] != '=')
+		s[i] = str[i];
+	return (s);
+}
+
+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)
+		return (1);
+	if (value != NULL)
+	{
+		value_dup = ft_strdup(value);
+		if (value_dup == NULL)
+		{
+			free(key);
+			return (1);
+		}
+	}
+	else
+		value_dup = value;
+	if (create_value_by_key(key_dup, value_dup, env))
+		return (1);
+	return (0);
+}
+
+int	delete_by_key(char *key, t_list **head)
+{
+	t_list	*last;
+	t_list	*current;
+
+	current = *head;
+	while (current->next != NULL)
+	{
+		if (ft_strcmp(((t_env *)current->content)->key, key) == 0)
+		{
+			if (last->next != NULL)
+				last->next = current->next;
+			else
+				*head = current->next;
+			return (0);
+		}
+		last = current;
+		current = current->next;
+	}
+	return (1);
+}
+
+int	possible_key(char *key)
+{
+	int		i;
+
+	i = -1;
+	if (ft_isdigit(key[i + 1]))
+		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);
+}
--- a/env/env_fill.c
+++ b/env/env_fill.c
@ -6,47 +6,85 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 16:29:08 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 13:41:51 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/20 15:39:28 by starnakin        ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

-#include "libftx/libftx.h"
-#include "minishell.h"
-#include "utils/utils.h"
+#include "./env_private.h"
+#include "env.h"

-static char	*ft_get_value(t_list **env, const char *str, size_t start,
-		size_t stop)
+static char	*ft_getkey(const char *str)
+{
+	size_t	i;
+	char	*key;
+
+	if (ft_strncmp(str, "$$", 2) == 0)
+		key = ft_strdup("$");
+	else if (ft_strncmp(str, "$?", 2) == 0)
+		key = ft_strdup("?");
+	else if (str[1] == '\0')
+		key = ft_strdup("");
+	else
+	{
+		i = 1;
+		while (str[i] != '\0' && !ft_is_in("$?\'\"", str[i]))
+			i++;
+		key = ft_strndup(str + 1, i - 1);
+	}
+	if (key == NULL)
+		ft_eprintf("minishell: malloc failed\n");
+	return (key);
+}
+
+static char	*ft_getvalue(t_data *data, char *key)
+{
+	char	*value;
+
+	if (ft_strcmp(key, "?") == 0)
+		value = ft_itoa(data->exit_code);
+	else if (ft_strcmp(key, "$") == 0)
+		value = ft_strdup("PID");
+	else if (key[0] == '\0')
+		value = ft_strdup("$");
+	else
+	{
+		value = get_value_by_key(key, data->env);
+		if (value == NULL)
+			value = ft_strdup("");
+		else
+			value = ft_strdup(value);
+	}
+	if (value == NULL)
+		ft_eprintf("minishell: malloc failed\n");
+	return (value);
+}
+
+static char	*ft_getvalue_by_str(t_data *data, const char *str,
+		size_t	*key_len)
 {
 	char	*key;
 	char	*value;

-	key = ft_strndup(str + start, stop);
+	key = ft_getkey(str);
 	if (key == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
 		return (NULL);
-	}
-	value = get_value_by_key(key, env);
-	if (value == NULL)
-		value = "";
+	*key_len = ft_strlen(key) + 1;
+	value = ft_getvalue(data, key);
 	free(key);
 	return (value);
 }

-char	*ft_env_filler(t_list **env, const char *str)
+char	*ft_env_filler(t_data *data, const char *str)
 {
-	size_t	i;
-	size_t	y;
 	char	*out;
 	char	*temp;
 	char	*value;
+	size_t	key_len;
+	size_t	i;

 	out = ft_strdup(str);
 	if (out == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
 		return (NULL);
-	}
 	i = 0;
 	while (out[i] != '\0')
 	{
@ -54,23 +92,18 @@ char	*ft_env_filler(t_list **env, const char *str)
 			i++;
 		while (out[i] == '$')
 		{
-			y = i + 1;
-			while (out[y] != '\0' && out[y] != '$' && out[y] != ' ')
-				y++;
-			value = ft_get_value(env, out, i + 1, y - i - 1);
+			value = ft_getvalue_by_str(data, out + i, &key_len);
 			if (value == NULL)
 				return (NULL);
-			temp = ft_strreplace(out, value, i, y);
+			temp = ft_strreplace(out, value, i, key_len + i);
+			i = i + ft_strlen(value);
 			free(out);
+			free(value);
 			if (temp == NULL)
-			{
-				ft_eprintf("minishell: malloc failed\n");
 				return (NULL);
-			}
 			out = temp;
 		}
-		if (out[i] != '\0')
-			i++;
+		i++;
 	}
 	return (out);
 }
--- a/env/env_private.h
+++ b/env/env_private.h
@ -0,0 +1,14 @@
+#ifndef ENV_PRIVATE_H
+# define ENV_PRIVATE_H
+# include "./env.h"
+# include "../libftx/libftx.h"
+# include "../utils/utils.h"
+
+void		swap_env_3(void **a, void **b, void **c);
+void		swap_env(void **a, void **b);
+char		*get_value(char *str);
+char		*get_key(char *str);
+int			get_index(char *str, char c);
+char		*ft_env_filler(t_data *data, const char *str);
+
+#endif
--- a/execution.c
+++ b/execution.c
@ -1,116 +0,0 @@
-#include "libftx/libftx.h"
-#include "minishell.h"
-#include "utils/utils.h"
-#include <unistd.h>
-
-static char	*ft_get_executable_path(char *executable_name, t_list **env)
-{
-	char	*path;
-	char	*temp;
-	char	**tab;
-	size_t	i;
-
-	path = NULL;
-	if (executable_name[0] == '.' || executable_name[0] == '/')
-	{
-		path = ft_strdup(executable_name);
-		if (path == NULL)
-		{
-			ft_eprintf("minishell: malloc failed\n");
-			return (NULL);
-		}
-		if (access(path, X_OK) == 0)
-		{
-			ft_eprintf("minishell: %s: permission denied\n", path);
-			return (NULL);
-		}
-	}
-	else
-	{
-		tab = ft_split(get_value_by_key("PATH", env), ':');
-		if (tab == NULL)
-			return (NULL);
-		i = 0;
-		while (tab[i] != NULL)
-		{
-			temp = ft_strmerger(3, tab[i], "/", executable_name);
-			if (temp == NULL)
-			{
-				ft_freer_tab_ultimate(1, tab);
-				free(executable_name);
-				ft_eprintf("minishell: malloc failed\n");
-			}
-			if (access(temp, X_OK) == 0)
-			{
-				path = temp;
-				break ;
-			}
-			free(temp);
-			i++;
-		}
-		if (path == NULL)
-		{
-			ft_eprintf("%s: command not found\n", executable_name);
-		}
-		ft_freer_tab_ultimate(1, tab);
-	}
-	return (path);
-}
-
-static int	ft_excutor(t_cmd *cmd, t_list **env)
-{
-	int		pid;
-	int		return_value;
-	char	**tab;
-
-	if (cmd->fd_in == -1 || cmd->fd_out == -1)
-		return (1);
-	pid = fork();
-	if (pid == -1)
-		return (1);
-	if (pid == 0)
-	{
-		tab = env_to_strs(env);
-		if (tab == NULL)
-			return (1);
-		tab = NULL;
-		dup2(cmd->fd_out, 1);
-		dup2(cmd->fd_in, 0);
-		execve(cmd->executable, cmd->args, tab);
-	}
-	else
-		waitpid(pid, &return_value, 0);
-	return (return_value);
-}
-
-int	ft_cmds_executor(t_list **cmds, t_list **env)
-{
-	t_cmd	*content;
-	t_list	*current;
-	int		fds[2];
-
-	current = *cmds;
-	while (current != NULL)
-	{
-		content = current->content;
-		if (current->next != NULL)
-		{
-			if (pipe(fds) == -1)
-			{
-				ft_eprintf("minishell: pipe failed\n");
-				return (1);
-			}
-			content->fd_out = fds[1];
-			((t_cmd *) current->next->content)->fd_in = fds[0];
-		}
-		content->executable = ft_get_executable_path(content->executable, env);
-		if (content->executable != NULL)
-			ft_excutor(content, env);
-		if (content->fd_in != 0)
-			close(content->fd_in);
-		if (content->fd_out != 1 && content->fd_out != 2)
-			close(content->fd_out);
-		current = current->next;
-	}
-	return (0);
-}
--- a/execution/execution.c
+++ b/execution/execution.c
@ -0,0 +1,120 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   execution.c                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/21 12:45:16 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/28 14:56:05 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "execution_private.h"
+
+static int	ft_own_cmd(t_data *data, t_cmd *cmd)
+{
+	int	return_code;
+
+	return_code = -1;
+	if (ft_strcmp(cmd->executable, "pwd") == 0)
+		return_code = pwd(cmd->fd_out[0]);
+	else if (ft_strcmp(cmd->executable, "env") == 0)
+		return_code = print_env(data->env, cmd->fd_out[0]);
+	else if (ft_strcmp(cmd->executable, "export") == 0)
+		return_code = (ft_export(data->env,cmd->args + 1, cmd->fd_out[0]));
+	else if (ft_strcmp(cmd->executable, "cd") == 0)
+		return_code = (move_folder(cmd->args + 1, cmd->fd_out[0]));
+	else if (ft_strcmp(cmd->executable, "unset") == 0)
+		return_code = (unset(data->env, cmd->args, cmd->fd_out[0]));
+	else if (ft_strcmp(cmd->executable, "echo") == 0)
+		return_code = (echo(cmd->fd_out[0], cmd->args + 1));
+	else if (ft_strcmp(cmd->executable, "exit") == 0)
+	{
+		return_code = ft_exit(cmd->args + 1);
+		if (return_code >= 0)
+		{
+			data->exit_code = return_code;
+			return (-1);
+		}
+	}
+	data->exit_code = return_code;
+	return (return_code);
+}
+
+static bool	ft_executor(t_cmd *cmd, char **env, int fd)
+{
+	if (cmd->fd_in[0] == -1 || cmd->fd_out[0] == -1 || cmd->executable == NULL)
+		return (0);
+	cmd->pid = fork();
+	ft_get_data()->child_pid = cmd->pid;
+	if (cmd->pid == -1)
+		return (1);
+	if (cmd->pid == 0)
+	{
+		dup2(cmd->fd_in[0], 0);
+		dup2(cmd->fd_out[0], 1);
+		if (fd != -1)
+			close(fd);
+		ft_closer(cmd->fd_in);
+		ft_closer(cmd->fd_out);
+		execve(cmd->executable, cmd->args, env);
+		ft_eprintf("minishell: permission denied: %s\n", cmd->executable);
+		return (1);
+	}
+	return (0);
+}
+
+static int	ft_cmd_executor(t_data *data, t_cmd *cmd, int fd)
+{
+	int		exit_code;
+	char	**env;
+
+	if (cmd->own_cmd == 1)
+	{
+		exit_code = ft_own_cmd(data, cmd);
+		ft_closer(cmd->fd_in);
+		ft_closer(cmd->fd_out);
+		if (exit_code == -1)
+			return (1);
+	}
+	else
+	{
+		env = env_to_strs(data->env);
+		if (env == NULL)
+			return (1);
+		exit_code = ft_executor(cmd, env, fd);
+		ft_closer(cmd->fd_in);
+		ft_closer(cmd->fd_out);
+		ft_freer_tab_ultimate(1, env);
+		if (exit_code == 1)
+			return (1);
+	}
+	return (0);
+}
+
+int	ft_cmds_executor(t_data *data)
+{
+	int		fds[2];
+	t_list	*current;
+	t_cmd	*content;
+
+	current = *data->cmds;
+	while (current != NULL)
+	{
+		content = current->content;
+		fds[0] = -1;
+		fds[1] = -1;
+		if (current->next != NULL)
+		{
+			if (pipe(fds) == -1)
+				return (1);
+			ft_add_fd(content->fd_out, fds[1]);
+			ft_add_fd(((t_cmd *) (current->next->content))->fd_in, fds[0]);
+		}
+		if (ft_cmd_executor(data, content, fds[0]))
+			return (1);
+		current = current->next;
+	}
+	return (0);
+}
--- a/execution/execution.h
+++ b/execution/execution.h
@ -0,0 +1,7 @@
+#ifndef EXECUTION_H
+# define EXECUTION_H
+# include "../data/data.h"
+
+int	ft_cmds_executor(t_data *data);
+
+#endif
--- a/execution/execution_private.h
+++ b/execution/execution_private.h
@ -0,0 +1,11 @@
+#ifndef EXECUTION_PRIVATE_H
+# define EXECUTION_PRIVATE_H
+# include "../data/data.h"
+# include "../libftx/libftx.h"
+# include "../cmd/cmd.h"
+# include "../env/env.h"
+# include "../builtins/builtins.h"
+
+void	ft_closer(int fds[2]);
+void	ft_add_fd(int fds[2], int fd);
+#endif
--- a/format/format.c
+++ b/format/format.c
@ -10,9 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */

-#include "libftx/libftx.h"
-#include "minishell.h"
-#include "utils/utils.h"
+#include "./format_private.h"

 static char	*ft_spacer_after(const char *str)
 {
@ -26,11 +24,13 @@ static char	*ft_spacer_after(const char *str)
 	i = 1;
 	while (out[i] != '\0')
 	{
-		while (ft_is_in_quote(out, i))
+		while (ft_is_in_quote(out, i - 1))
 			i++;
+		if (out[i] == '\0')
+			break ;
 		if (ft_is_in("><|", out[i - 1]))
 		{
-			while (str[i] == out[i - 1])
+			while (out[i] == out[i - 1])
 				i++;
 			temp = ft_strreplace(out, " ", i, i);
 			free(out);
@ -38,7 +38,8 @@ static char	*ft_spacer_after(const char *str)
 			if (out == NULL)
 				return (NULL);
 		}
-		i++;
+		if (out[i] != '\0')
+			i++;
 	}
 	return (out);
 }
@ -57,6 +58,8 @@ static char	*ft_spacer_before(const char *str)
 	{
 		while (ft_is_in_quote(out, i))
 			i++;
+		if (out[i] == '\0')
+			break ;
 		if (ft_is_in("><|", out[i + 1]))
 		{
 			while (out[i] == ' ')
@ -84,6 +87,8 @@ static void	ft_space_simplifier(char *str)
 	{
 		if (ft_is_in_quote(str, i))
 			i++;
+		if (str[i] != '\0')
+			break ;
 		y = 0;
 		while (str[y + i] == ' ')
 			y++;
@ -96,7 +101,7 @@ static void	ft_space_simplifier(char *str)
 	}
 }

-char	*ft_normalizer(char *str)
+char	*ft_formater(t_data *data, const char *str)
 {
 	char	*out;
 	char	*temp;
@ -113,5 +118,7 @@ char	*ft_normalizer(char *str)
 	ft_space_simplifier(out);
 	if (out[ft_strlen(out) - 1] == ' ')
 		out[ft_strlen(out) - 1] = '\0';
-	return (out);
+	temp = ft_env_filler(data, out);
+	free(out);
+	return (temp);
 }
--- a/format/format.h
+++ b/format/format.h
@ -0,0 +1,7 @@
+#ifndef FORMAT_H
+# define FORMAT_H
+# include "../data/data.h"
+
+char	*ft_formater(t_data *data, const char *str);
+
+#endif
--- a/format/format_private.h
+++ b/format/format_private.h
@ -0,0 +1,6 @@
+#ifndef FORMAT_PRIVATE_H
+# define FORMAT_PRIVATE_H
+# include "../libftx/libftx.h"
+# include "../utils/utils.h"
+
+#endif
--- a/infile.c
+++ b/infile.c
@ -1,113 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   infile.c                                           :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2023/02/15 17:52:10 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 13:19:09 by cchauvet         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libftx/libftx.h"
-#include "minishell.h"
-#include "utils/utils.h"
-
-static int	ft_infile_is_valid(const char *line)
-{
-	char	**tab;
-	size_t	i;
-
-	tab = ft_split_quoted(line, ' ');
-	if (tab == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
-		return (0);
-	}
-	if (tab[0] == NULL)
-		return (1);
-	i = 0;
-	while (tab[i + 1] != NULL)
-		i++;
-	if (tab[i][0] == '<')
-	{
-		ft_eprintf("minishell: %s: must be followed by an infile\n", tab[i]);
-		ft_freer_tab_ultimate(1, tab);
-		return (0);
-	}
-	ft_freer_tab_ultimate(1, tab);
-	return (1);
-}
-
-static int	ft_get_infile(const char *line)
-{
-	size_t	i;
-	int		fd;
-	char	**tab;
-
-	tab = ft_split_quoted(line, ' ');
-	if (tab == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
-		return (-2);
-	}
-	fd = 0;
-	i = 0;
-	while (tab[i + 1] != NULL)
-	{
-		if (tab[i][0] == '<')
-			if (fd != 0)
-				close(fd);
-		if (ft_strcmp("<", tab[i]) == 0)
-			fd = ft_file_is_readable(ft_quote_remover(tab[i + 1]));
-		else if (ft_strcmp("<<", tab[i]) == 0)
-			fd = ft_heredoc(tab[i + 1]);
-		i++;
-	}
-	ft_freer_tab_ultimate(1, tab);
-	return (fd);
-}
-
-static int	ft_remove_infile(char *line)
-{
-	size_t	i;
-	size_t	y;
-	char	**tab;
-
-	tab = ft_split_quoted(line, ' ');
-	if (tab == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
-		return (1);
-	}
-	i = 0;
-	y = 0;
-	while (tab[i] != NULL)
-	{
-		if (tab[i][0] == '<')
-		{
-			ft_strshift(line + y, -1 * (ft_strlen(tab[i]) + 1));
-			i++;
-			ft_strshift(line + y, -1 * (ft_strlen(tab[i]) + 1));
-		}
-		else
-			y = y + ft_strlen(tab[i]);
-		i++;
-	}
-	ft_freer_tab_ultimate(1, tab);
-	return (0);
-}
-
-int	ft_infile(char *line)
-{
-	int	fd;
-
-	if (ft_infile_is_valid(line) == 0)
-		return (-2);
-	fd = ft_get_infile(line);
-	if (fd == -2)
-		return (-2);
-	ft_remove_infile(line);
-	return (fd);
-}
--- a/libftx/extra/ft_ultoa.o
+++ b/libftx/extra/ft_ultoa.o
--- a/libftx/gnl/Makefile
+++ b/libftx/gnl/Makefile
@ -36,4 +36,4 @@ fclean: clean

 re: fclean all

-.PHONY: all bonus clean fclean re
+.PHONY: all clean fclean re
--- a/libftx/gnl/get_next_line_utils.o
+++ b/libftx/gnl/get_next_line_utils.o
--- a/libftx/libft/libft.h
+++ b/libftx/libft/libft.h
@ -14,6 +14,7 @@
 # define LIBFT_H
 # include <stdlib.h>
 # include <unistd.h>
+# include "./list.h"

 void	*ft_cancel(void **tab, size_t len);
 int		ft_atoi(const char *nptr);
@ -52,20 +53,4 @@ void	ft_putstr_fd(char *s, int fd);
 void	ft_putendl_fd(char *s, int fd);
 void	ft_putnbr_fd(int n, int fd);

-typedef struct s_list
-{
-	void			*content;
-	struct s_list	*next;
-}	t_list;
-
-t_list	*ft_lstnew(void *content);
-void	ft_lstadd_front(t_list **lst, t_list *nouveau);
-int		ft_lstsize(t_list *lst);
-t_list	*ft_lstlast(t_list *lst);
-void	ft_lstadd_back(t_list **lst, t_list *nouveau);
-void	ft_lstdelone(t_list *lst, void (*del)(void *));
-void	ft_lstclear(t_list **lst, void (*del)(void *));
-void	ft_lstiter(t_list *lst, void (*f)(void *));
-t_list	*ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *));
-
 #endif
--- a/libftx/libft/list.h
+++ b/libftx/libft/list.h
@ -0,0 +1,20 @@
+#ifndef LIST_H
+# define LIST_H
+
+typedef struct s_list
+{
+	void			*content;
+	struct s_list	*next;
+}	t_list;
+
+t_list	*ft_lstnew(void *content);
+void	ft_lstadd_front(t_list **lst, t_list *nouveau);
+int		ft_lstsize(t_list *lst);
+t_list	*ft_lstlast(t_list *lst);
+void	ft_lstadd_back(t_list **lst, t_list *nouveau);
+void	ft_lstdelone(t_list *lst, void (*del)(void *));
+void	ft_lstclear(t_list **lst, void (*del)(void *));
+void	ft_lstiter(t_list *lst, void (*f)(void *));
+t_list	*ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *));
+
+#endif
--- a/libftx/libftx.h
+++ b/libftx/libftx.h
@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 16:24:42 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 13:28:19 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

@ -15,10 +15,13 @@
 # include <stdlib.h>
 # include <unistd.h>
 # include <stdarg.h>
+# include "./libft/libft.h"

 char	*ft_ultoa_base(unsigned long long n, char *base);
 int		ft_printf(const char *format, ...);
 int		ft_eprintf(const char *format, ...);
+int		ft_dprintf(int fd, const char *format, ...);
+int		ft_dprintf(int fd, const char *format, ...);
 char	*get_next_line(int fd);
 size_t	ft_random_generator(size_t start, size_t stop);
 void	ft_freer_tab_ultimate(size_t len, ...);
@ -37,57 +40,41 @@ void	ft_swap(void *a, void *b);
 void	ft_swap_int(int *a, int *b);
 void	ft_swap_char(char *a, char *b);

-void	*ft_cancel(void **tab, size_t len);
-int		ft_atoi(const char *nptr);
-void	ft_bzero(void *s, size_t n);
-void	*ft_calloc(size_t nmemb, size_t size);
-int		ft_isalnum(int c);
-int		ft_isalpha(int c);
-int		ft_isascii(int c);
-int		ft_isdigit(int c);
-int		ft_isprint(int c);
-void	*ft_memchr(const void *s, int c, size_t n);
-int		ft_memcmp(const void *s1, const void *s2, size_t n);
-void	*ft_memcpy(void *dest, const void *src, size_t n);
-void	*ft_memmove(void *dest, const void *src, size_t n);
-void	*ft_memset(void *s, int c, size_t n);
-char	*ft_strchr(const char *s, int c);
-char	*ft_strdup(const char *s);
-size_t	ft_strlcat(char *dst, const char *src, size_t size);
-size_t	ft_strlcpy(char *dst, const char *src, size_t size);
-size_t	ft_strlen(const char *s);
-int		ft_strncmp(const char *s1, const char *s2, size_t n);
-char	*ft_strnstr(const char *big, const char *little, size_t len);
-char	*ft_strrchr(const char *s, int c);
-int		ft_tolower(int c);
-int		ft_toupper(int c);
+/* void	*ft_cancel(void **tab, size_t len); */
+/* int		ft_atoi(const char *nptr); */
+/* void	ft_bzero(void *s, size_t n); */
+/* void	*ft_calloc(size_t nmemb, size_t size); */
+/* int		ft_isalnum(int c); */
+/* int		ft_isalpha(int c); */
+/* int		ft_isascii(int c); */
+/* int		ft_isdigit(int c); */
+/* int		ft_isprint(int c); */
+/* void	*ft_memchr(const void *s, int c, size_t n); */
+/* int		ft_memcmp(const void *s1, const void *s2, size_t n); */
+/* void	*ft_memcpy(void *dest, const void *src, size_t n); */
+/* void	*ft_memmove(void *dest, const void *src, size_t n); */
+/* void	*ft_memset(void *s, int c, size_t n); */
+/* char	*ft_strchr(const char *s, int c); */
+/* char	*ft_strdup(const char *s); */
+/* size_t	ft_strlcat(char *dst, const char *src, size_t size); */
+/* size_t	ft_strlcpy(char *dst, const char *src, size_t size); */
+/* size_t	ft_strlen(const char *s); */
+/* int		ft_strncmp(const char *s1, const char *s2, size_t n); */
+/* char	*ft_strnstr(const char *big, const char *little, size_t len); */
+/* char	*ft_strrchr(const char *s, int c); */
+/* int		ft_tolower(int c); */
+/* int		ft_toupper(int c); */

-char	*ft_substr(char const *s, unsigned int start, size_t len);
-char	*ft_strjoin(char const *s1, char const *s2);
-char	*ft_strtrim(char const *s1, char const *set);
-char	**ft_split(char const *s, char c);
-char	*ft_itoa(int n);
-char	*ft_strmapi(char const *s, char (*f)(unsigned int, char));
-void	ft_striteri(char *s, void (*f)(unsigned int, char*));
-void	ft_putchar_fd(char c, int fd);
-void	ft_putstr_fd(char *s, int fd);
-void	ft_putendl_fd(char *s, int fd);
-void	ft_putnbr_fd(int n, int fd);
-
-typedef struct s_list
-{
-	void			*content;
-	struct s_list	*next;
-}	t_list;
-
-t_list	*ft_lstnew(void *content);
-void	ft_lstadd_front(t_list **lst, t_list *nouveau);
-int		ft_lstsize(t_list *lst);
-t_list	*ft_lstlast(t_list *lst);
-void	ft_lstadd_back(t_list **lst, t_list *nouveau);
-void	ft_lstdelone(t_list *lst, void (*del)(void *));
-void	ft_lstclear(t_list **lst, void (*del)(void *));
-void	ft_lstiter(t_list *lst, void (*f)(void *));
-t_list	*ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *));
+/* char	*ft_substr(char const *s, unsigned int start, size_t len); */
+/* char	*ft_strjoin(char const *s1, char const *s2); */
+/* char	*ft_strtrim(char const *s1, char const *set); */
+/* char	**ft_split(char const *s, char c); */
+/* char	*ft_itoa(int n); */
+/* char	*ft_strmapi(char const *s, char (*f)(unsigned int, char)); */
+/* void	ft_striteri(char *s, void (*f)(unsigned int, char*)); */
+/* void	ft_putchar_fd(char c, int fd); */
+/* void	ft_putstr_fd(char *s, int fd); */
+/* void	ft_putendl_fd(char *s, int fd); */
+/* void	ft_putnbr_fd(int n, int fd); */

 #endif
--- a/libftx/printf/ft_printf.c
+++ b/libftx/printf/ft_printf.c
@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/06 22:01:28 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/10/12 16:34:31 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 13:27:31 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

@ -22,3 +22,14 @@ int	ft_printf(const char *format, ...)
 	va_end(va);
 	return (i);
 }
+
+int	ft_dprintf(int fd, const char *format, ...)
+{
+	va_list	va;
+	int		i;
+
+	va_start(va, format);
+	i = ft_vdprintf(fd, format, va);
+	va_end(va);
+	return (i);
+}
--- a/libftx/printf/ft_printf.h
+++ b/libftx/printf/ft_printf.h
@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 16:29:18 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 13:27:51 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

@ -32,6 +32,7 @@ int		ft_dprintarg(int fd, int c, va_list va);
 int		ft_dprintstrtab(int fd, char **tab);

 int		ft_printf(const char *format, ...);
+int		ft_dprintf(int fd, const char *format, ...);	
 int		ft_eprintf(const char *format, ...);

 int		ft_vdprintf(int fd, const char *format, va_list va);
--- a/main.c
+++ b/main.c
@ -6,145 +6,176 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 16:06:02 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/28 14:35:13 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

+#include "data/data.h"
+#include "execution/execution.h"
+#include "libftx/libft/libft.h"
+#include "libftx/libft/list.h"
 #include "libftx/libftx.h"
 #include "minishell.h"
+#include <signal.h>
+#include <stdlib.h>
+#include <sys/wait.h>

-static char	*ft_get_user_input(t_list **env)
+static char	*ft_get_user_input()
 {
 	char	*line;
 	char	*prompt;
+	char	*pwd;

-	prompt = ft_strmerger(2, get_value_by_key("PWD", env), "$ ");
+	pwd = get_pwd(2);
+	if (pwd == NULL)
+		return (NULL);
+	prompt = ft_strmerger(2, pwd, "$ ");
+	free(pwd);
 	if (prompt == NULL)
 	{
 		ft_eprintf("minishell: malloc failed\n");
 		return (NULL);
 	}
 	line = readline(prompt);
-	add_history(line);
+	if (line != NULL && ft_strcmp(line, "") != 0)
+		add_history(line);
 	free(prompt);
+	if (line == NULL)
+		ft_printf("exit\n");
 	return (line);
 }

-static int	ft_minishell(t_list **env, char *line)
+static void	ft_cmds_waiter(t_data *data)
+{
+	t_list	*current;
+	t_cmd	*content;
+	int		exit_status;
+
+	current = *data->cmds;
+	while (current != NULL)
+	{
+		content = current->content;
+		if (content->own_cmd == 0 && content->pid != -1)
+		{
+			waitpid(content->pid, &exit_status, 0);
+			if (WIFSIGNALED(exit_status))
+			{
+				if (WTERMSIG(exit_status) == SIGKILL)
+					data->exit_code = 131;
+				else //(WTERMSIG(exit_status) == SIGINT)
+					data->exit_code = 130;
+			}
+			else
+				data->exit_code = WEXITSTATUS(exit_status);
+		}
+		current = current->next;
+	}
+	data->child_pid = 0;
+}
+
+static int	ft_minishell(t_data *data, char *line)
 {
-	t_list	**cmds;
 	char	*line_clean;
-	int		infile;
-	int		outfile;

-	line_clean = ft_normalizer(line);
-	if (line_clean == NULL)
-		return (1);
-	if (ft_syntatic_verif(line_clean))
+	if (ft_syntax_verif(data, line))
+		return (0);
+	line_clean = ft_formater(data, line);
+	if (line_clean == NULL || line_clean[0] == '\0')
+		return (0);
+	if (ft_cmds_parser(data, line_clean))
 	{
 		free(line_clean);
-		return (1);
+		return (0);
 	}
-	outfile = ft_outfile(line_clean);
-	if (outfile == -2)
-	{
-		free(line_clean);
+	free(line_clean);
+	if (ft_cmds_executor(data) == 1)
 		return (1);
-	}
-	infile = ft_infile(line_clean);
-	if (infile == -2)
-	{
-		close(outfile);
-		free(line_clean);
-		return (1);
-	}
-	cmds = ft_parse_cmds(line_clean, env, infile, outfile);
-	if (cmds == NULL)
-	{
-		close(outfile);
-		close(infile);
-		ft_lstclear(cmds, ft_cmddel);
-		free(cmds);
-		free(line_clean);
-		return (1);
-	}
-	if (ft_cmds_executor(cmds, env) == 1)
-	{
-		close(outfile);
-		close(infile);
-		ft_lstclear(cmds, ft_cmddel);
-		free(cmds);
-		free(line_clean);
-		return (1);
-	}
+	ft_cmds_waiter(data);
+	ft_lstclear(data->cmds, ft_cmddel);
 	return (0);
 }

-#if DEBUG
-
-int	main(int ac, char **av, char **env)
+void	ft_ctrlc(int num)
 {
-	t_data	data;
+	t_data	*data;

-	if (ac == 1)
-		return (1);
-	data.env = init_env(env);
-	if (data.env == NULL)
-		return (1);
-		free(data.env);
-		return (1);
-	}
-	if (ft_minishell(data.env, av[1]) == 1)
+	if (num == SIGQUIT)
+		return ;
+	data = ft_get_data();
+	data->exit_code = 130;
+	if (*ft_get_heredoc() != -1)
 	{
-		ft_lstclear(data.env, env_del);
-		free(data.env);
-		return (1);
+		close(*ft_get_heredoc());
+		*ft_get_heredoc() = -1;
+	}
+	else
+	{
+		if (data->child_pid > 1)
+		{
+			data->child_pid = 0;
+			ft_putchar_fd('\n', 1);
+		}
+		else
+		{
+			rl_replace_line("", 0);
+			rl_on_new_line();
+			ft_putchar_fd('\n', 1);
+			rl_redisplay();
+		}
 	}
-	ft_lstclear(data.env, env_del);
-	free(data.env);
-	free(line);
-	return (0);
 }

-#else
-
+void	ft_quit(int num)
+{
+	t_data	*data;

+	(void) num;
+	data = ft_get_data();
+	data->exit_code = 131;
+	if (data->child_pid > 1)
+	{
+		ft_printf("Quit (core dumped)\n");
+		data->child_pid = 0;
+	}
+	else
+	{
+		rl_replace_line("", 0);
+		rl_redisplay();
+	}
+}

 int	main(int ac, char **av, char **env)
 {
-	t_data	data;
+	t_data	*data;
 	char	*line;

-	data.env = init_env(env);
-	if (data.env == NULL)
+	(void) ac;
+	(void) av;
+	signal(SIGINT, ft_ctrlc);
+	signal(SIGQUIT, ft_quit);
+	data = ft_get_data();
+	data->exit_code = 0;
+	data->child_pid = 0;
+	data->cmds = malloc(sizeof(t_cmd *));
+	if (data->cmds == NULL)
 		return (1);
-	line = ft_get_user_input(data.env);
-	if (line == NULL)
-	{
-		ft_lstclear(data.env, env_del);
-		free(data.env);
+	*data->cmds = NULL;
+	data->env = init_env(env);
+	if (data->env == NULL)
 		return (1);
-	}
+	line = ft_get_user_input();
 	while (line != NULL)
 	{
-		if (ft_minishell(data.env, line) == 1)
-		{
-			ft_lstclear(data.env, env_del);
-			free(data.env);
-			free(line);
-			return (1);
-		}
+		if (ft_minishell(data, line) == 1)
+			break ;
 		free(line);
-		line = ft_get_user_input(data.env);
+		line = ft_get_user_input();
 		if (line == NULL)
-		{
-			ft_lstclear(data.env, env_del);
-			free(data.env);
-			return (1);
-		}
+			break ;
 	}
-	ft_lstclear(data.env, env_del);
-	free(data.env);
+	ft_lstclear(data->cmds, ft_cmddel);
+	free(data->cmds);
+	ft_lstclear(data->env, env_del);
+	free(data->env);
+	return (data->exit_code);
 }
-
-#endif
--- a/minishell.h
+++ b/minishell.h
@ -6,62 +6,27 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 14:29:56 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/09 14:59:49 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

 #ifndef MINISHELL_H
 # define MINISHELL_H
-# include "libftx/libftx.h"
-# include "utils/utils.h"
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <sys/wait.h>
-# include <stdio.h>
+# include "./env/env.h"
+# include "./cmd/cmd.h"
+# include "./parse/parse.h"
+# include "./syntax/syntax.h"
+# include "./execution/execution.h"
+# include "./builtins/builtins.h"
+# include "./format/format.h"
+# include "./redirection/redirection.h"
+# include "./libftx/libftx.h"
+# include "./utils/utils.h"
+# include "./data/data.h"
 # include <readline/readline.h>
 # include <readline/history.h>
-# define DEBUG 0
-t_list		**init_env(char **env);
-int			set_value_by_key(char *key, char *value, t_list **env);
-char		*get_value_by_key(char *key, t_list **head);
-int			ft_syntatic_verif(const char *str);
-int			ft_file_is_readable(const char *path);
-int			ft_file_is_writable(const char *path);
-int			ft_file_is_appendable(const char *path);
-char		*ft_get_file_path(const char *infile);
-int			ft_infile(char *line);
-int			ft_outfile(char *line);
-int			ft_heredoc(char *stop);
-size_t		ft_seglen_quoted(const char *str, char c);
-int			ft_cmds_executor(t_list **cmds, t_list **env);
-char		**ft_split_quoted(const char *s, char c);
-void		ft_cmddel(void *content);
-void		env_del(void *content);
-t_list		**ft_parse_cmds(char *line, t_list **env, int infile, int outfile);
-int			ft_cmd_filler(t_list *current, char **args, t_list **env);
-char		*ft_normalizer(char *str);
-char		*ft_env_filler(t_list **env, const char *str);
-char		**env_to_strs(t_list **head);
-
-typedef struct s_cmd
-{
-	int		fd_in;
-	int		fd_out;
-	char	*executable;
-	char	**args;
-}	t_cmd;
-
-typedef struct s_data
-{
-	t_list	**env;
-	int		heredoc;
-}	t_data;
-
-typedef struct s_env
-{
-	void	*key;
-	void	*value;
-}	t_env;
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/wait.h>

 #endif
--- a/outfile.c
+++ b/outfile.c
@ -1,112 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   outfile.c                                          :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2023/02/15 18:01:07 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/17 13:19:46 by cchauvet         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libftx/libftx.h"
-#include "minishell.h"
-
-static int	ft_outfile_is_valid(const char *line)
-{
-	char	**tab;
-	size_t	i;
-
-	tab = ft_split_quoted(line, ' ');
-	if (tab == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
-		return (0);
-	}
-	if (tab[0] == NULL)
-		return (1);
-	i = 0;
-	while (tab[i + 1] != NULL)
-		i++;
-	if (tab[i][0] == '>')
-	{
-		ft_eprintf("minishell: %s: must be followed by an infile\n", tab[i]);
-		ft_freer_tab_ultimate(1, tab);
-		return (0);
-	}
-	ft_freer_tab_ultimate(1, tab);
-	return (1);
-}
-
-static int	ft_get_outfile(const char *line)
-{
-	size_t	i;
-	int		fd;
-	char	**tab;
-
-	tab = ft_split_quoted(line, ' ');
-	if (tab == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
-		return (-2);
-	}
-	fd = 1;
-	i = 0;
-	while (tab[i + 1] != NULL)
-	{
-		if (tab[i][0] == '>')
-			if (fd != 1)
-				close(fd);
-		if (ft_strcmp(">", tab[i]) == 0)
-			fd = ft_file_is_writable(ft_quote_remover(tab[i + 1]));
-		else if (ft_strcmp(">>", tab[i]) == 0)
-			fd = ft_file_is_appendable(ft_quote_remover(tab[i + 1]));
-		i++;
-	}
-	ft_freer_tab_ultimate(1, tab);
-	return (fd);
-}
-
-static int	ft_remove_outfile(char *line)
-{
-	size_t	i;
-	size_t	y;
-	char	**tab;
-
-	tab = ft_split_quoted(line, ' ');
-	if (tab == NULL)
-	{
-		ft_eprintf("minishell: malloc failed\n");
-		return (1);
-	}
-	i = 0;
-	y = 0;
-	while (tab[i] != NULL)
-	{
-		if (tab[i][0] == '>')
-		{
-			ft_strshift(line + y, -1 * (ft_strlen(tab[i]) + 1));
-			i++;
-			ft_strshift(line + y, -1 * (ft_strlen(tab[i]) + 1));
-		}
-		else
-			y = y + ft_strlen(tab[i]);
-		i++;
-	}
-	ft_freer_tab_ultimate(1, tab);
-	return (0);
-}
-
-int	ft_outfile(char *line)
-{
-	int	fd;
-
-	if (ft_outfile_is_valid(line) == 0)
-		return (-2);
-	fd = ft_get_outfile(line);
-	if (fd == -2)
-		return (-2);
-	ft_remove_outfile(line);
-	return (fd);
-}
--- a/parse/parse.c
+++ b/parse/parse.c
@ -0,0 +1,123 @@
+#include "./parse_private.h"
+
+static int	ft_args_parse(char *cmd_str, t_cmd *cmd)
+{
+	char	**tab;
+	size_t	i;
+
+	tab = ft_split_quoted(cmd_str, ' ');
+	if (tab == NULL)
+		return (1);
+	i = 0;
+	while (tab[i] != NULL)
+	{
+		ft_quote_remover(tab[i]);
+		i++;
+	}
+	cmd->args = tab;
+	return (0);
+}
+
+static int	ft_executable_parse(t_data *data, t_cmd *cmd)
+{
+	bool	own;
+	char	*path;
+
+	path = cmd->args[0];
+	own = 0;
+	if (cmd->args[0] == NULL)
+	{
+		ft_closer(cmd->fd_in);
+		ft_closer(cmd->fd_out);
+	}
+	else if (ft_strcmp(cmd->args[0], "env") == 0)
+		own = 1;
+	else if (ft_strcmp(cmd->args[0], "export") == 0)
+		own = 1;
+	else if (ft_strcmp(cmd->args[0], "echo") == 0)
+		own = 1;
+	else if (ft_strcmp(cmd->args[0], "unset") == 0)
+		own = 1;
+	else if (ft_strcmp(cmd->args[0], "exit") == 0)
+		own = 1;
+	else if (ft_strcmp(cmd->args[0], "pwd") == 0)
+		own = 1;
+	else if (ft_strcmp(cmd->args[0], "cd") == 0)
+		own = 1;
+	else
+	{
+		path = ft_get_executable(data, cmd->args[0]);
+		if (path == NULL)
+			return (1);
+	}
+	cmd->own_cmd = own;
+	cmd->executable = path;
+	return (0);
+}
+
+int	ft_cmd_parser(t_data *data, char *cmd_str)
+{
+	t_cmd	*cmd;
+	t_list	*element;
+
+	cmd = ft_calloc(sizeof(t_cmd), 1);
+	if (cmd == NULL)
+	{
+		ft_eprintf("minishell: malloc failed\n");
+		return (1);
+	}
+	if (ft_redirection(data, cmd, cmd_str))
+	{
+		ft_cmddel(cmd);
+		return (0);
+	}
+	if (ft_args_parse(cmd_str, cmd))
+	{
+		ft_cmddel(cmd);
+		return (1);
+	}
+	if (ft_executable_parse(data, cmd))
+	{
+		ft_cmddel(cmd);
+		return (1);
+	}
+	element = ft_lstnew(cmd);
+	if (element == NULL)
+	{
+		ft_cmddel(cmd);
+		return (1);
+	}
+	ft_lstadd_back(data->cmds, element);
+	return (0);
+}
+
+int	ft_cmds_parser(t_data *data, const char *line)
+{
+	char	**tab;
+	size_t	i;
+
+	tab = ft_split_quoted(line, '|');
+	if (tab == NULL)
+	{
+		ft_freer_tab_ultimate(1, tab);
+		ft_eprintf("minishell: malloc failed\n");
+		return (1);
+	}
+	i = 0;
+	while (tab[i] != NULL)
+	{
+		if (ft_cmd_parser(data, tab[i]))
+		{
+			ft_freer_tab_ultimate(1, tab);
+			return (1);
+		}
+		i++;
+	}
+	if (*data->cmds != NULL)
+	{
+		ft_add_fd(((t_cmd *)(*data->cmds)->content)->fd_in, 0);
+		ft_add_fd(((t_cmd *)(ft_lstlast(*data->cmds))->content)->fd_out, 1);
+	}
+	ft_freer_tab_ultimate(1, tab);
+	return (0);
+}
--- a/parse/parse.h
+++ b/parse/parse.h
@ -0,0 +1,7 @@
+#ifndef PARSE_H
+# define PARSE_H
+# include "../data/data.h"
+
+int	ft_cmds_parser(t_data *data, const char *line);
+
+#endif
--- a/parse/parse_private.h
+++ b/parse/parse_private.h
@ -0,0 +1,9 @@
+#ifndef PARSE_PRIVATE_H
+# define PARSE_PRIVATE_H
+# include "../redirection/redirection.h"
+# include "../libftx/libftx.h"
+# include "../utils/utils.h"
+# include "../env/env.h"
+# include "../data/data.h"
+# include "../cmd/cmd.h"
+#endif
--- a/redirection/file.c
+++ b/redirection/file.c
@ -10,10 +10,9 @@
 /*                                                                            */
 /* ************************************************************************** */

-#include "minishell.h"
-#include <unistd.h>
+#include "./redirection_private.h"

-int	ft_file_is_readable(const char *path)
+int	ft_file_is_readable(t_data *data, const char *path)
 {
 	int	readable;
 	int	fd;
@ -21,59 +20,61 @@ int	ft_file_is_readable(const char *path)
 	fd = open(path, O_RDONLY);
 	if (fd == -1)
 	{
+		data->exit_code = 1;
 		ft_eprintf("minishell: %s: No such file or directory\n", path);
-		return (-1);
+		return (0);
 	}
 	readable = read(fd, "", 0);
 	if (readable == -1)
 	{
+		data->exit_code = 1;
 		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (-1);
+		return (0);
 	}
-	return (fd);
+	close(fd);
+	return (1);
 }

-int	ft_file_is_writable(const char *path)
+int	ft_file_is_writable(t_data *data, const char *path)
 {
 	int	writeable;
 	int	fd;

-	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0644);
 	if (fd == -1)
 	{
+		data->exit_code = 1;
 		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (-1);
+		return (0);
 	}
 	writeable = write(fd, "", 0);
 	if (writeable == -1)
 	{
+		data->exit_code = 1;
 		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (-1);
+		return (0);
 	}
 	return (fd);
 }

-int	ft_file_is_appendable(const char *path)
+int	ft_file_is_appendable(t_data *data, const char *path)
 {
 	int	writeable;
 	int	fd;

-	fd = open(path, O_WRONLY | O_CREAT | O_APPEND, 0644);
+	fd = open(path, O_WRONLY | O_APPEND | O_CREAT, 0644);
 	if (fd == -1)
 	{
+		data->exit_code = 1;
 		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (-1);
+		return (0);
 	}
 	writeable = write(fd, "", 0);
 	if (writeable == -1)
 	{
+		data->exit_code = 1;
 		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (-1);
+		return (0);
 	}
 	return (fd);
 }
-
-int	ft_file_is_executable(const char *path)
-{
-	return (access(path, X_OK) == 0);
-}
--- a/redirection/heredoc.c
+++ b/redirection/heredoc.c
@ -10,27 +10,48 @@
 /*                                                                            */
 /* ************************************************************************** */

-#include "libftx/libftx.h"
-#include "minishell.h"
+#include "./redirection_private.h"

-int	ft_heredoc(char *stop)
+int	*ft_get_heredoc()
 {
-	int		fds[2];
-	char	*line;
+	static int	heredoc = -1;

-	pipe(fds);
-	line = readline("> ");
+	return (&heredoc);
+}
+
+int	ft_heredoc(t_data *data, char *stop)
+{
+	char	*line;
+	char	*line_clean;
+	int		fds[2];
+
+	if (pipe(fds) == -1)
+		return (-2);
+	*ft_get_heredoc() = dup(0);
+	ft_printf("> ");
+	line = get_next_line(*ft_get_heredoc());
 	while (line != NULL)
 	{
+		line[ft_strlen(line) - 1] = '\0';
 		if (ft_strcmp(line, stop) == 0)
 		{
 			free(line);
 			break ;
 		}
-		ft_putendl_fd(line, fds[1]);
+		line_clean = ft_env_filler(data, line);
 		free(line);
-		line = readline("> ");
+		ft_putendl_fd(line_clean, fds[1]);
+		free(line_clean);
+		ft_printf("> ");
+		line = get_next_line(*ft_get_heredoc());
+		if (line == NULL && *ft_get_heredoc() == -1)
+		{
+			close(fds[0]);
+			close(fds[1]);
+			return (-2);
+		}
 	}
 	close(fds[1]);
+	*ft_get_heredoc() = -1;
 	return (fds[0]);
 }
--- a/redirection/redirection.c
+++ b/redirection/redirection.c
@ -0,0 +1,120 @@
+#include "redirection_private.h"
+
+int	ft_replace_file(t_data *data, char **tab)
+{
+	size_t	i;
+	char	*redirection;
+
+	i = 0;
+	while (tab[i] != NULL)
+	{
+		if (ft_is_in("<>", tab[i][0]))
+		{
+			i++;
+			redirection = ft_env_filler(data, tab[i]);
+			if (redirection == NULL)
+				return (1);
+			free(tab[i]);
+			tab[i] = redirection;
+			ft_quote_remover(tab[i]);
+		}
+		i++;
+	}
+	return (0);
+}
+
+void	ft_remove_redirection(char *cmd_str)
+{
+	size_t	i;
+	ssize_t	start;
+	ssize_t	stop;
+
+	i = 0;
+	while (cmd_str[i] != '\0')
+	{
+		start = -1;
+		while ((ft_is_in_quote(cmd_str, i) || !ft_is_in("<>", cmd_str[i]))
+			&& cmd_str[i] != '\0')
+			i++;
+		if (ft_is_in("<>", cmd_str[i]))
+			start = i;
+		if (start == -1)
+			continue ;
+		while (cmd_str[i] == cmd_str[start])
+			i++;
+		while (cmd_str[i] == ' ')
+			i++;
+		while (cmd_str[i] != '\0' && (cmd_str[i] != ' ' || ft_is_in_quote(cmd_str, i)))
+			i++;
+		stop = i - start;
+		if (start != -1)
+		{
+			ft_strshift(cmd_str + start, -1 * stop);
+			i = start;
+		}
+	}
+}
+
+int	ft_set_redirection(t_data *data, t_cmd *cmd, char **tab)
+{
+	size_t	i;
+
+	i = 0;
+	while (tab[i + 1] != NULL)
+	{
+		ft_quote_remover(tab[i + 1]);
+		if (ft_strcmp(tab[i], "<<") == 0)
+		{
+			cmd->fd_in[0] = ft_heredoc(data, tab[i + 1]);
+			if (cmd->fd_in[0] == -2)
+				return (1);
+		}
+		else if (ft_strcmp(tab[i], "<") == 0)
+		{
+			if (ft_file_is_readable(data, tab[i + 1]))
+				cmd->fd_in[0] = open(tab[i + 1], O_RDONLY);
+			else
+				return (1);
+		}
+		else if(ft_strcmp(tab[i], ">") == 0)
+		{
+			if (ft_file_is_writable(data, tab[i + 1]))
+				cmd->fd_out[0] = open(tab[i + 1], O_WRONLY | O_TRUNC | O_CREAT, 0644);
+			else
+				return (1);
+		}
+		else if(ft_strcmp(tab[i], ">>") == 0)
+		{
+			if (ft_file_is_appendable(data, tab[i + 1]))
+				cmd->fd_out[0] = open(tab[i + 1], O_WRONLY | O_APPEND | O_CREAT, 0644);
+			else
+				return (1);
+		}
+		i++;
+	}
+	return (0);
+}
+
+int	ft_redirection(t_data *data, t_cmd *cmd, char *cmd_str)
+{
+	char	**tab;
+
+	cmd->fd_in[0] = -1;
+	cmd->fd_in[1] = -1;
+	cmd->fd_out[0] = -1;
+	cmd->fd_out[1] = -1;
+	tab = ft_split_quoted(cmd_str, ' ');
+	if (tab == NULL)
+	{
+		ft_eprintf("minishell: malloc failed\n");
+		return (1);
+	}
+	ft_remove_redirection(cmd_str);
+	if (ft_set_redirection(data, cmd, tab))
+	{
+		ft_freer_tab_ultimate(1, tab);
+		return (1);
+	}
+	ft_freer_tab_ultimate(1, tab);
+	return (0);
+}
--- a/redirection/redirection.h
+++ b/redirection/redirection.h
@ -0,0 +1,9 @@
+#ifndef REDIRECTION_H
+# define REDIRECTION_H
+# include "../data/data.h"
+# include "../cmd/cmd.h"
+
+int			ft_redirection(t_data *data, t_cmd *cmd, char *cmd_str);
+int			*ft_get_heredoc(void);
+
+#endif
--- a/redirection/redirection_private.h
+++ b/redirection/redirection_private.h
@ -0,0 +1,18 @@
+#ifndef REDIRECTIONS_PRIVATE
+# define REDIRECTIONS_PRIVATE
+# include <sys/stat.h>
+# include <fcntl.h>
+# include <stddef.h>
+# include <unistd.h>
+# include "../libftx/libftx.h"
+# include "../data/data.h"
+# include "../env/env.h"
+# include "../utils/utils.h"
+# include "../cmd/cmd.h"
+
+int			ft_file_is_readable(t_data *data, const char *path);
+int			ft_file_is_writable(t_data *data, const char *path);
+int			ft_file_is_appendable(t_data *data, const char *path);
+int			ft_heredoc(t_data *data, char *stop);
+
+#endif
--- a/subject.pdf
+++ b/subject.pdf
--- a/syntatics.c
+++ b/syntatics.c
@ -1,98 +0,0 @@
-#include "libftx/libftx.h"
-#include "minishell.h"
-#include "utils/utils.h"
-
-static int	ft_quote_verif(const char *str)
-{
-	if (ft_is_in_quote(str, ft_strlen(str)))
-	{
-		ft_eprintf("minishell: Quote is note closed");
-		return (1);
-	}
-	else
-		return (0);
-}
-
-static int	ft_pipe_is_alone(const char *str)
-{
-	size_t	i;
-	int		check;
-
-	check = 0;
-	i = 0;
-	while (str[i] != '\0')
-	{
-		while (str[i] == ' ')
-			i++;
-		if (str[i] == '\0')
-			break ;
-		if (str[i] != '|')
-			check = 1;
-		else
-		{
-			if (check == 0)
-			{
-				ft_eprintf("minishell: Pipe must be followed and ");
-				ft_eprintf("preced by a command or redirection\n");
-				return (1);
-			}
-			check = 0;
-		}
-		i++;
-	}
-	if (check == 0)
-	{
-		ft_eprintf("minishell: Pipe must be followed and ");
-		ft_eprintf("preced by a command or redirection\n");
-	}
-	return (check == 0);
-}
-
-static int	ft_special_char_dub(const char *str)
-{
-	size_t	i;
-	size_t	y;
-
-	i = 0;
-	while (str[i] != '\0')
-	{
-		while (ft_is_in_quote(str, i))
-			i++;
-		if (ft_is_in("|<>", str[i]))
-		{
-			y = 0;
-			while (str[i] == str[i + y])
-				y++;
-			if ((y > 2 && (str[i] == '>' || str[i] == '<'))
-				|| (y > 1 && str[i] == '|'))
-			{
-				ft_eprintf("minishell: to many %c in a row", str, str[i]);
-				return (1);
-			}
-			i = i + y;
-		}
-		else
-			i++;
-	}
-	return (0);
-}
-
-int	ft_empty_verif(const char *str)
-{
-	size_t	i;
-
-	i = 0;
-	while (str[i] == ' ')
-		i++;
-	if (str[i] == '\0')
-		ft_eprintf("minishell: %s: command not found \n", str);
-	return (str[i] == '\0');
-}
-
-int	ft_syntatic_verif(const char *str)
-{
-	return (ft_quote_verif(str)
-		|| ft_empty_verif(str)
-		|| ft_pipe_is_alone(str)
-		|| ft_special_char_dub(str));
-}
--- a/syntax/syntax.c
+++ b/syntax/syntax.c
@ -0,0 +1,115 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   syntatics.c                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/21 13:00:05 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/21 23:40:20 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "../libftx/libftx.h"
+#include "../utils/utils.h"
+
+static int	ft_quote_verif(const char *str)
+{
+	if (ft_is_in_quote(str, ft_strlen(str)))
+	{
+		ft_eprintf("minishell: Quote is not closed\n");
+		return (1);
+	}
+	else
+		return (0);
+}
+
+static int	ft_pipe_is_alone(const char *str)
+{
+	size_t	i;
+	int		check;
+
+	check = 0;
+	i = 0;
+	while (str[i] != '\0')
+	{
+		while (str[i] == ' ')
+			i++;
+		while (ft_is_in_quote(str, i))
+			i++;
+		if (str[i] == '\0')
+			break ;
+		if (str[i] != '|')
+			check = 1;
+		else
+		{
+			if (check == 0)
+			{
+				ft_eprintf("minishell: Pipe must be followed and ");
+				ft_eprintf("preced by a command or redirection\n");
+				return (1);
+			}
+			check = 0;
+		}
+		i++;
+	}
+	if (check == 0)
+	{
+		ft_eprintf("minishell: Pipe must be followed and ");
+		ft_eprintf("preced by a command or redirection\n");
+	}
+	return (check == 0);
+}
+
+static int	ft_special_char_dub(const char *str)
+{
+	size_t	i;
+	size_t	y;
+
+	i = 0;
+	while (str[i] != '\0')
+	{
+		while (ft_is_in_quote(str, i))
+			i++;
+		if (ft_is_in("|<>", str[i]))
+		{
+			y = 0;
+			while (str[i] == str[i + y])
+				y++;
+			if ((y > 2 && (str[i] == '>' || str[i] == '<'))
+				|| (y > 1 && str[i] == '|'))
+			{
+				ft_eprintf("minishell: too many %s in a row\n", str);
+				return (1);
+			}
+			i = i + y;
+		}
+		else if (str[i] != '\0')
+			i++;
+	}
+	return (0);
+}
+
+static int	ft_empty_verif(const char *str)
+{
+	size_t	i;
+
+	i = 0;
+	while (str[i] == ' ')
+		i++;
+	return (str[i] == '\0');
+}
+
+int	ft_syntax_verif(t_data *data, const char *str)
+{
+	if (ft_empty_verif(str))
+		return (1);
+	if (ft_quote_verif(str)
+		|| ft_pipe_is_alone(str)
+		|| ft_special_char_dub(str))
+	{
+		data->exit_code = 2;
+		return (1);
+	}
+	return (0);
+}
--- a/syntax/syntax.h
+++ b/syntax/syntax.h
@ -0,0 +1,7 @@
+#ifndef SYNTAX_H
+# define SYNTAX_H
+# include "../data/data.h"
+
+int	ft_syntax_verif(t_data *data, const char *str);
+
+#endif
--- a/1
+++ b/1
@ -1 +0,0 @@
-bozt
--- a/1
+++ b/1
--- a/utils/fd.c
+++ b/utils/fd.c
@ -0,0 +1,24 @@
+#include "./utils.h"
+#include <stdio.h> 
+
+void	ft_closer(int fds[2])
+{
+	if (fds[0] > 2)
+	{
+		//dprintf(2, "close(%d)\n", fds[0]);
+		close(fds[0]);
+	}
+	if (fds[1] > 2)
+	{
+		//dprintf(2, "close(%d)\n", fds[1]);
+		close(fds[1]);
+	}
+}
+
+void	ft_add_fd(int fds[2], int fd)
+{
+	if (fds[0] == -1)
+		fds[0] = fd;
+	else
+		fds[1] = fd;
+}
--- a/utils/ft_atoi_check.c
+++ b/utils/ft_atoi_check.c
@ -0,0 +1,50 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_atoi_check.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/07/21 08:21:05 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/02/28 13:52:13 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "utils.h"
+
+static int	ft_isspace(char c)
+{
+	if (c == ' ' || c == '\f'
+		||c == '\n' || c == '\r' || c == '\t' || c == '\v')
+		return (1);
+	return (0);
+}
+
+int	ft_atoi_check(const char *nptr)
+{
+	long	result;
+	int		sign;
+
+	while (ft_isspace(*nptr))
+		nptr++;
+	sign = 1;
+	if (*nptr == '+' || *nptr == '-')
+	{
+		if (*nptr == '-')
+			sign = -1;
+		nptr++;
+	}
+	result = 0;
+	while (*nptr >= '0' && *nptr <= '9')
+	{
+		result = result * 10 + *nptr++ - '0';
+		if ((result > 2147483647 && sign == 1)
+			|| (result > 2147483647 && sign == 1))
+			return (2);
+	}
+	if (*nptr--)
+		return (1);
+	if (*nptr == '-' || *nptr == '+')
+		return (1);
+	return (0);
+}
--- a/utils/ft_change_exit_code.c
+++ b/utils/ft_change_exit_code.c
@ -1,26 +1,27 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   env.c                                              :+:      :+:    :+:   */
+/*   ft_change_exit_code.c                              :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2023/02/14 14:56:02 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/14 14:58:40 by cchauvet         ###   ########.fr       */
+/*   Created: 2023/02/24 19:04:04 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/24 19:05:57 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

 #include "../minishell.h"

-int	main(char **env)
+int	ft_change_exit_code(t_data *data, int new_value)
 {
-	t_list	**head;
-	t_list	*current;
+	char	*exit_code_str;

-	while (current != NULL)
+	data->exit_code = new_value;
+	exit_code_str = ft_itoa(new_value);
+	if (exit_code_str == NULL)
 	{
-		ft_putendl_fd(1, current->content);
-		current = current->next;
+		ft_eprintf("minishell: malloc failed\n");
+		return (1);
 	}
 	return (0);
 }
--- a/utils/ft_get_executable.c
+++ b/utils/ft_get_executable.c
@ -0,0 +1,83 @@
+#include "./utils.h"
+#include <unistd.h>
+
+char	*ft_get_executable_with_path(t_data *data, const char *name)
+{
+	char	*path;
+
+	if (access(name, F_OK) != 0)
+	{
+		data->exit_code = 127;
+		ft_eprintf("minishell: %s bash: No such file or directery\n");
+		return (NULL);
+	}
+	if (access(name, X_OK) != 0)
+	{
+		data->exit_code = 126;
+		ft_eprintf("minishell: %s: permission denied\n", name);
+		return (NULL);
+	}
+	path = ft_strdup(name);
+	if (path == NULL)
+	{
+		ft_eprintf("minishell: malloc failed\n");
+		return (NULL);
+	}
+	return (path);
+}
+
+char	*ft_get_executable_without_path(t_data *data, const char *name)
+{
+	char	**tab;
+	char	*paths;
+	char	*path;
+	size_t	i;
+
+	path = NULL;
+	paths = get_value_by_key("PATH", data->env);
+	if (paths == NULL)
+	{
+		data->exit_code = 127;
+		ft_eprintf("minishell: %s: command not found\n", name);
+		return (NULL);
+	}
+	tab = ft_split(paths, ':');
+	if (tab == NULL)
+	{
+		ft_eprintf("minishell: malloc failed\n");
+		return (NULL);
+	}
+	i = 0;
+	while (tab[i] != NULL)
+	{
+		path = ft_strmerger(3, tab[i], "/", name);
+		if (path == NULL)
+		{
+			ft_eprintf("minishell: malloc failed\n");
+			break ;
+		}
+		if (access(path, X_OK) == 0)
+			break ;
+		free(path);
+		path = NULL;
+		i++;
+	}
+	ft_freer_tab_ultimate(1, tab);
+	if (path == NULL)
+	{
+		data->exit_code = 127;
+		ft_eprintf("minishell: %s: command not found\n", name);
+	}
+	return (path);
+}
+
+char	*ft_get_executable(t_data *data, const char *name)
+{
+	char	*path;
+
+	if (name[0] == '.' || name[0] == '/')
+		path = ft_get_executable_with_path(data, name);
+	else
+		path = ft_get_executable_without_path(data, name);
+	return (path);
+}
--- a/utils/ft_getstr.o
+++ b/utils/ft_getstr.o
--- a/utils/ft_is_in_quote.c
+++ b/utils/ft_is_in_quote.c
@ -1,29 +1,45 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_is_in_quote.c                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/21 12:59:34 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/21 23:08:10 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "utils.h"

 int	ft_is_in_quote(const char *str, size_t n)
 {
-	size_t	double_quoted;
-	size_t	simple_quoted;
 	size_t	i;

-	double_quoted = 0;
-	simple_quoted = 0;
 	i = 0;
 	while (str[i] != '\0' && i < n)
 	{
-		if (str[i] == '"')
-		{
-			if (simple_quoted == 0)
-				double_quoted = !double_quoted;
-			
-		}
 		if (str[i] == '\'')
 		{
-			if (double_quoted == 0)
-				simple_quoted = !simple_quoted;
-			
+			i++;
+			while (str[i] != '\'' && str[i] != '\0')
+			{
+				if (i == n)
+					return (1);
+				i++;
+			}
+		}
+		if (str[i] == '"')
+		{
+			i++;
+			while (str[i] != '"' && str[i] != '\0')
+			{
+				if (i == n)
+					return (2);
+				i++;
+			}
 		}
 		i++;
 	}
-	return (simple_quoted == 1 + (double_quoted == 1) * 2);
+	return (0);
 }
--- a/utils/ft_printn.o
+++ b/utils/ft_printn.o
--- a/utils/ft_quote_remover.c
+++ b/utils/ft_quote_remover.c
@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 14:12:00 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 13:20:50 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 14:33:28 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

@ -19,6 +19,7 @@ char	*ft_quote_remover(char *str)
 	ssize_t	stop;

 	start = -1;
+	stop = -1;
 	i = 0;
 	while (str[i] != '\0')
 	{
@ -27,17 +28,18 @@ char	*ft_quote_remover(char *str)
 			if (start == -1)
 				start = i;
 			else if (str[i] == str[start])
-			{
 				stop = i;
-				break ;
-			}
 		}
-		i++;
-	}
-	if (start != -1)
-	{
-		ft_strshift(str, -1);
-		ft_strshift(str + stop - 1, -1);
+		if (stop != -1)
+		{
+			ft_strshift(str + start, -1);
+			ft_strshift(str + stop - 1, -1);
+			start = -1;
+			stop = -1;
+			i = i - 1;
+		}
+		else
+			i++;
 	}
 	return (str);
 }
--- a/utils/ft_strnchr.c
+++ b/utils/ft_strnchr.c
@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strnchr.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/21 12:59:06 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/21 12:59:07 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "utils.h"

 ssize_t	ft_strnchr(const char *str, char c)
--- a/utils/ft_strncpy.c
+++ b/utils/ft_strncpy.c
@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strncpy.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/21 12:59:16 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/21 12:59:19 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "utils.h"

 size_t	ft_strncpy(char *dst, const char *src, size_t n)
--- a/utils/ft_strreplace.c
+++ b/utils/ft_strreplace.c
@ -1,11 +1,25 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strreplace.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/21 12:46:20 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/21 12:58:44 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "utils.h"

-char	*ft_strreplace(const char *str, const char *fill, size_t start, size_t stop)
+char	*ft_strreplace(const char *str, const char *fill,
+		size_t start, size_t stop)
 {
 	char	*out;
 	size_t	sum;

-	out = malloc((ft_strlen(str) + ft_strlen(fill) - (stop - start) + 1 * sizeof(char)));
+	out = malloc((ft_strlen(str) + ft_strlen(fill) -\
+				(stop - start) + 1 * sizeof(char)));
 	if (out == NULL)
 		return (NULL);
 	ft_strncpy(out, str, start);
--- a/utils/tags
+++ b/utils/tags
@ -0,0 +1,68 @@
+!_TAG_EXTRA_DESCRIPTION	anonymous	/Include tags for non-named objects like lambda/
+!_TAG_EXTRA_DESCRIPTION	fileScope	/Include tags of file scope/
+!_TAG_EXTRA_DESCRIPTION	pseudo	/Include pseudo tags/
+!_TAG_EXTRA_DESCRIPTION	subparser	/Include tags generated by subparsers/
+!_TAG_FIELD_DESCRIPTION	epoch	/the last modified time of the input file (only for F\/file kind tag)/
+!_TAG_FIELD_DESCRIPTION	file	/File-restricted scoping/
+!_TAG_FIELD_DESCRIPTION	input	/input file/
+!_TAG_FIELD_DESCRIPTION	name	/tag name/
+!_TAG_FIELD_DESCRIPTION	pattern	/pattern/
+!_TAG_FIELD_DESCRIPTION	typeref	/Type and name of a variable or typedef/
+!_TAG_FIELD_DESCRIPTION!C++	name	/aliased names/
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_KIND_DESCRIPTION!C	d,macro	/macro definitions/
+!_TAG_KIND_DESCRIPTION!C	e,enumerator	/enumerators (values inside an enumeration)/
+!_TAG_KIND_DESCRIPTION!C	f,function	/function definitions/
+!_TAG_KIND_DESCRIPTION!C	g,enum	/enumeration names/
+!_TAG_KIND_DESCRIPTION!C	h,header	/included header files/
+!_TAG_KIND_DESCRIPTION!C	m,member	/struct, and union members/
+!_TAG_KIND_DESCRIPTION!C	s,struct	/structure names/
+!_TAG_KIND_DESCRIPTION!C	t,typedef	/typedefs/
+!_TAG_KIND_DESCRIPTION!C	u,union	/union names/
+!_TAG_KIND_DESCRIPTION!C	v,variable	/variable definitions/
+!_TAG_KIND_DESCRIPTION!C++	c,class	/classes/
+!_TAG_KIND_DESCRIPTION!C++	d,macro	/macro definitions/
+!_TAG_KIND_DESCRIPTION!C++	e,enumerator	/enumerators (values inside an enumeration)/
+!_TAG_KIND_DESCRIPTION!C++	f,function	/function definitions/
+!_TAG_KIND_DESCRIPTION!C++	g,enum	/enumeration names/
+!_TAG_KIND_DESCRIPTION!C++	h,header	/included header files/
+!_TAG_KIND_DESCRIPTION!C++	m,member	/class, struct, and union members/
+!_TAG_KIND_DESCRIPTION!C++	n,namespace	/namespaces/
+!_TAG_KIND_DESCRIPTION!C++	s,struct	/structure names/
+!_TAG_KIND_DESCRIPTION!C++	t,typedef	/typedefs/
+!_TAG_KIND_DESCRIPTION!C++	u,union	/union names/
+!_TAG_KIND_DESCRIPTION!C++	v,variable	/variable definitions/
+!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+!_TAG_OUTPUT_VERSION	0.0	/current.age/
+!_TAG_PARSER_VERSION!C	0.0	/current.age/
+!_TAG_PARSER_VERSION!C++	0.0	/current.age/
+!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+!_TAG_PROC_CWD	/nfs/homes/cchauvet/42/minishell/utils/	//
+!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+!_TAG_PROGRAM_VERSION	6.0.0	//
+!_TAG_ROLE_DESCRIPTION!C!header	local	/local header/
+!_TAG_ROLE_DESCRIPTION!C!header	system	/system header/
+!_TAG_ROLE_DESCRIPTION!C!macro	undef	/undefined/
+!_TAG_ROLE_DESCRIPTION!C++!header	local	/local header/
+!_TAG_ROLE_DESCRIPTION!C++!header	system	/system header/
+!_TAG_ROLE_DESCRIPTION!C++!macro	undef	/undefined/
+UTILS_H	utils.h	/^# define UTILS_H$/;"	d
+ft_atoi_check	ft_atoi_check.c	/^int	ft_atoi_check(const char *nptr)$/;"	f	typeref:typename:int
+ft_change_exit_code	ft_change_exit_code.c	/^int	ft_change_exit_code(t_data *data, int new_value)$/;"	f	typeref:typename:int
+ft_is_in_quote	ft_is_in_quote.c	/^int	ft_is_in_quote(const char *str, size_t n)$/;"	f	typeref:typename:int
+ft_isspace	ft_atoi_check.c	/^static int	ft_isspace(char c)$/;"	f	typeref:typename:int	file:
+ft_printn	ft_printn.c	/^void	ft_printn(const char *str, size_t n)$/;"	f	typeref:typename:void
+ft_quote_remover	ft_quote_remover.c	/^char	*ft_quote_remover(char *str)$/;"	f	typeref:typename:char *
+ft_seglen_quoted	ft_split_quoted.c	/^size_t	ft_seglen_quoted(const char *str, char c)$/;"	f	typeref:typename:size_t
+ft_segsplitter	ft_split_quoted.c	/^static char	**ft_segsplitter(char **tab, size_t len, const char *s, char c)$/;"	f	typeref:typename:char **	file:
+ft_split_quoted	ft_split_quoted.c	/^char	**ft_split_quoted(const char *s, char c)$/;"	f	typeref:typename:char **
+ft_str_is_empty	ft_str_is_empty.c	/^int	ft_str_is_empty(const char *str)$/;"	f	typeref:typename:int
+ft_strnchr	ft_strnchr.c	/^ssize_t	ft_strnchr(const char *str, char c)$/;"	f	typeref:typename:ssize_t
+ft_strncpy	ft_strncpy.c	/^size_t	ft_strncpy(char *dst, const char *src, size_t n)$/;"	f	typeref:typename:size_t
+ft_strreplace	ft_strreplace.c	/^char	*ft_strreplace(const char *str, const char *fill,$/;"	f	typeref:typename:char *
+ft_strshift	ft_strshift.c	/^void	ft_strshift(char *str, int shift)$/;"	f	typeref:typename:void
--- a/utils/utils.h
+++ b/utils/utils.h
@ -14,6 +14,8 @@
 # define UTILS_H
 # include <stdlib.h>
 # include "../libftx/libftx.h"
+# include "../data/data.h"
+# include "../env/env.h"

 size_t		ft_strncpy(char *dst, const char *src, size_t n);
 int			ft_is_in_quote(const char *str, size_t n);
@ -25,5 +27,9 @@ int			ft_str_is_empty(const char *str);
 char		**ft_split_quoted(const char *s, char c);
 void		ft_strshift(char *str, int shift);
 char		*ft_quote_remover(char *str);
+int			ft_atoi_check(const char *nptr);
+char		*ft_get_executable(t_data *data, const char *name);
+void		ft_closer(int fds[2]);
+void		ft_add_fd(int fds[2], int fd);

 #endif
--- a/15
+++ b/15
@ -0,0 +1,15 @@
+{
+   readline
+   Memcheck:Leak
+   ...
+   fun:readline
+   ...
+}
+
+{
+   readline
+   Memcheck:Leak
+   ...
+   fun:add_history
+   ...
+}
Author	SHA1	Message	Date
starnakin	8a6a0012dc	Update 'README.md'	2023-03-28 13:37:24 +00:00
starnakin	4acefd9208	Update 'README.md'	2023-03-28 13:35:22 +00:00
starnakin	c8c4297f8b	Update 'README.md'	2023-03-28 13:33:08 +00:00
starnakin	d05edefa0f	Update 'README.md'	2023-03-28 13:31:54 +00:00
starnakin	392c2d94d0	Update 'README.md'	2023-03-28 13:31:36 +00:00
starnakin	94fa4de0a2	Update 'README.md'	2023-03-28 13:31:14 +00:00
starnakin	d54cd98197	Update 'README.md'	2023-03-28 13:30:07 +00:00
Camille Chauvet	147af02c6e	Merge branch 'master' of git.chauvet.pro:starnakin/42_minishell	2023-03-28 15:28:37 +02:00
Camille Chauvet	67e8a60423	fix: signal set exit code	2023-03-28 14:38:10 +02:00
starnakin	96a5856592	Update 'README.md'	2023-03-27 14:40:24 +00:00
starnakin	57dd5c9962	Update 'README.md'	2023-03-27 14:39:35 +00:00
starnakin	689a4e4eb6	Update 'README.md'	2023-03-27 14:38:13 +00:00
Camille Chauvet	db51c3c85b	change: subject	2023-03-27 16:35:34 +02:00
camille lechauve	c5ddcdc892	bozo	2023-03-24 15:47:06 +01:00
starnakin	45fc051e9d	Delete 'README'	2023-03-24 14:30:50 +00:00
camille lechauve	e195fe2c6d	readme	2023-03-24 15:30:25 +01:00
camille lechauve	215b0dbb7e	add Readme	2023-03-24 15:29:37 +01:00
Camille Chauvet	22dc9776d6	fix: exit code	2023-03-22 16:07:27 +01:00
Camille Chauvet	b3d060874d	fix: "echo $" works	2023-03-22 14:59:19 +01:00
Camille Chauvet	72ff3ba134	fix	2023-03-22 14:41:17 +01:00
Camille Chauvet	086fd3bcbe	fix: cat work now	2023-03-22 14:35:09 +01:00
Camille Chauvet	0fa822f6db	core: env var replacer	2023-03-22 14:29:32 +01:00
Camille Chauvet	a58f9a0c76	fix: exit code works	2023-03-20 15:31:39 +01:00
Camille Chauvet	d56aac4b25	fix: remove multiple redirection	2023-03-20 13:18:20 +01:00
Camille Chauvet	96696243d0	fix: no env is now workable	2023-03-20 12:41:40 +01:00
Camille Chauvet	f5940ee99e	fix: waitpid infinite loop	2023-03-13 19:29:20 +01:00
Camille Chauvet	ee3d535393	fix: quote verif is better	2023-03-13 19:28:46 +01:00
Etienne Rey-bethbeder	08261b1921	Je ne veux pas dénoncer mais	2023-03-13 16:51:56 +01:00
Etienne Rey-bethbeder	7ea602b12c	Merge branch 'master' of https://git.chauvet.pro/starnakin/minishell	2023-03-13 16:31:06 +01:00
Etienne Rey-bethbeder	7ffe556cd4	CORINNE J'AI CHAUD, VIENS 42	2023-03-13 16:30:45 +01:00
Camille Chauvet	6ce54ea6fe	fix	2023-03-13 15:34:57 +01:00
Camille Chauvet	74bbbd899a	fix	2023-03-13 15:34:43 +01:00
Camille Chauvet	b1d827e106	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-03-13 15:12:57 +01:00
Camille Chauvet	bf15a86c2e	clean: remove trash file	2023-03-13 15:12:50 +01:00
Etienne Rey-bethbeder	1b17df6170	Merge branch 'master' of https://git.chauvet.pro/starnakin/minishell	2023-03-13 15:12:36 +01:00
Etienne Rey-bethbeder	51d7e60790	Fixed Armand, essaye de trouver un autre bug, BOZO	2023-03-13 15:12:23 +01:00
Camille Chauvet	4d3c25547e	fix	2023-03-13 14:23:27 +01:00
Etienne Rey-bethbeder	c43331dca3	Faut ajouter make bozo, bozo	2023-03-13 13:26:36 +01:00
Etienne Rey-bethbeder	ec752adbfa	Merge branch 'master' of https://git.chauvet.pro/starnakin/minishell	2023-03-13 13:09:48 +01:00
Etienne Rey-bethbeder	dbb39712ea	File Descriptor 2 pour les erreurs de export	2023-03-13 13:09:41 +01:00
Camille Chauvet	e2c43eb973	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-03-13 12:45:42 +01:00
Camille Chauvet	3d68490320	fix: execve failed	2023-03-13 12:45:29 +01:00
Etienne Rey-bethbeder	0694b36a72	message 'exit' quand tu fais exit	2023-03-10 14:53:22 +01:00
Camille Chauvet	3d62d3dde9	fix: cd is now usable	2023-03-10 13:55:17 +01:00
Camille Chauvet	69fc4c573a	fix: args have now a env var replacement ex: 0 -> 0	2023-03-10 13:40:20 +01:00
Camille Chauvet	087a96e54b	fix: non nuiltins is now startable	2023-03-10 13:34:23 +01:00
Camille Chauvet	1a4ed128e7	core: merge	2023-03-10 12:37:09 +01:00
Camille Chauvet	d36d9c92f5	core: rebuild of parsing and the execution	2023-03-10 12:32:39 +01:00
Etienne Rey-bethbeder	6c8e161a32	Norme pour tout les builtins et env, et correction export	2023-03-09 20:13:43 +01:00
Etienne Rey-bethbeder	f20eab31dd	Norme pour tout les builtins et env, et correction export	2023-03-09 20:13:38 +01:00
Etienne Rey-bethbeder	86f01779cc	Merge branch 'master' of https://git.chauvet.pro/starnakin/minishell	2023-03-09 15:08:15 +01:00
Etienne Rey-bethbeder	c6d683a1fc	BIENTOT FINI POTO PAVAAAARRDDDD	2023-03-09 15:07:42 +01:00
Etienne Rey-bethbeder	f956986789	BIENTOT FINI POTO PAVAAAARRDDDD	2023-03-09 15:07:36 +01:00
Camille Chauvet	a18c4cae82	fix: use the bash waitpid implementation	2023-03-08 18:19:10 +01:00
Camille Chauvet	5c9be2d56b	fix: change default output from 0 to 1	2023-03-08 18:18:47 +01:00
Camille Chauvet	15c95b45b1	fix: Makefile bon ok c ma faute j;avais oublié un flag comme un bozo	2023-03-08 15:02:31 +01:00
Camille Chauvet	876c75bb92	fix: heredoc is now rightly implemented (no fork, ctrl + c support, ctrl + d support)	2023-03-07 17:48:18 +01:00
Camille Chauvet	8093b250ce	fix: leaks	2023-03-06 17:43:29 +01:00
Camille Chauvet	2930755dd3	fix	2023-03-06 16:43:50 +01:00
Camille Chauvet	3540743135	fix: infile has now quote removed and env var replacement	2023-03-06 16:06:12 +01:00
Camille Chauvet	5bfc613126	fix: exit	2023-03-06 14:22:30 +01:00
Camille Chauvet	686ea5d0db	fix: infile/outfile work as well now	2023-03-06 13:21:22 +01:00
Camille Chauvet	e7f8373b4a	c la merde	2023-02-28 15:21:47 +01:00
Camille Chauvet	9cbb1e139a	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:57:25 +01:00
Camille Chauvet	06f6308bc4	merge	2023-02-28 14:57:16 +01:00
Etienne Rey-bethbeder	8ea2e6c620	SAL NEGRO	2023-02-28 14:56:28 +01:00
Camille Chauvet	b2c7013cf9	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:55:18 +01:00
Etienne Rey-bethbeder	960daa8658	HITLER	2023-02-28 14:54:57 +01:00
Camille Chauvet	7f4fd9d421	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:54:15 +01:00
Etienne Rey-bethbeder	da75bdbf72	SIEG HIEL	2023-02-28 14:53:56 +01:00
Camille Chauvet	af7336fbf3	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:52:16 +01:00
Etienne Rey-bethbeder	00dc583ff8	卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍卍	2023-02-28 14:51:39 +01:00
Camille Chauvet	4342d9a015	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:41:28 +01:00
Etienne Rey-bethbeder	46d30864ed	MON GROS SEXE DANS LE CUL D'IDEFIXXX	2023-02-28 14:40:51 +01:00
Camille Chauvet	e0e329a355	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:36:36 +01:00
Etienne Rey-bethbeder	6e0d7288e8	ESGIbdurifjjkigjikdthijir	2023-02-28 14:36:07 +01:00
Camille Chauvet	5541a1f3fe	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:29:22 +01:00
Etienne Rey-bethbeder	d5eb265a3f	PAS PAR LES FESSESESESESESESESESE	2023-02-28 14:28:54 +01:00
Camille Chauvet	b914753c47	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 14:25:41 +01:00
Etienne Rey-bethbeder	5948237aad	OBELIX: MAIS ASTERIX ARRETE TOUT DE SUITE	2023-02-28 14:25:20 +01:00
Camille Chauvet	9a5cca3e2d	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 13:20:25 +01:00
Etienne Rey-bethbeder	00e570d92e	IDEFIX: 'OUAFA FEJISGNNOE GSEJG SE GSKNLGSNKENE PAS PAR LES FESSES'	2023-02-28 13:19:52 +01:00
Camille Chauvet	77620211da	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-28 13:17:31 +01:00
Camille Chauvet	07bc37cc71	fix	2023-02-28 13:17:26 +01:00
Etienne Rey-bethbeder	ed546f5a8d	ASTERIX IL SUCE IDEFIX DANS LES CHIOTTES	2023-02-28 13:16:10 +01:00
Camille Chauvet	ca18dd4205	fix: execute own builtin	2023-02-28 13:10:02 +01:00
Camille Chauvet	370e5149d5	core: exit_code work ?	2023-02-24 20:30:01 +01:00
Camille Chauvet	fc82eefd7b	fix: issue #3	2023-02-24 15:53:46 +01:00
Camille Chauvet	51f892350a	fix: bug bizarre	2023-02-24 15:51:12 +01:00
Camille Chauvet	0941f3a370	fix: no command but one redirection crash	2023-02-24 13:25:29 +01:00
Camille Chauvet	9f0b0f5422	add: exit cmd	2023-02-24 13:13:11 +01:00
Etienne Rey-bethbeder	3d66fbe9a9	NIQUE TA GROSSE MÈRE LA SALOPE PUTE PUTE -Camille Chauvet 2004/2023	2023-02-24 12:46:02 +01:00
Camille Chauvet	1626424ed7	fix: main.c compile with clang	2023-02-24 11:16:35 +01:00
Camille Chauvet	8e22eb210a	fix: now is clang	2023-02-24 11:01:57 +01:00
Camille Chauvet	57be71a168	fix: infile	2023-02-23 18:05:21 +01:00
Camille Chauvet	0327d0f5d7	core: heredocs is now forked to prepare signal	2023-02-23 18:03:22 +01:00
Etienne Rey-bethbeder	2f386686c6	SAMANTHA EST CHAUDE	2023-02-23 17:19:25 +01:00
Camille Chauvet	7728ded62d	fix: empty line is now not add to the history	2023-02-23 15:21:06 +01:00
Camille Chauvet	405c1937cd	fix	2023-02-23 15:14:08 +01:00
Camille Chauvet	b98717ae1a	execution fix	2023-02-23 15:12:41 +01:00
Camille Chauvet	413d75b94c	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-23 13:38:03 +01:00
Etienne Rey-bethbeder	4f66624667	Oubli	2023-02-23 13:37:50 +01:00
Camille Chauvet	f31d805d83	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-23 13:37:42 +01:00
Camille Chauvet	28fedfdd75	merge	2023-02-23 13:37:26 +01:00
Etienne Rey-bethbeder	0661f2fbd1	Je suis tout dur façe a Samantha	2023-02-23 13:36:26 +01:00
Etienne Rey-bethbeder	29a4a864c3	Bozo3 avance	2023-02-22 14:00:09 +01:00
Etienne Rey-bethbeder	cdde24f0d0	Merge branch 'master' of https://git.chauvet.pro/starnakin/minishell	2023-02-22 13:24:50 +01:00
Etienne Rey-bethbeder	a4befa5fa6	Finito Echo	2023-02-22 13:24:35 +01:00
Camille Chauvet	94f48602d1	add: add ctrl + C support, but not work in heredoc	2023-02-22 00:26:32 +01:00
Camille Chauvet	2b66ce5bc3	fix: "'''"	2023-02-21 23:55:32 +01:00
Camille Chauvet	f346c5c2ce	merge	2023-02-21 23:31:16 +01:00
Etienne Rey-bethbeder	9ace235831	teesgdmbklvr	2023-02-21 23:29:56 +01:00
Etienne Rey-bethbeder	4e92c03637	tetgs	2023-02-21 23:28:37 +01:00
Camille Chauvet	76bc8fbfd8	fix: quoted split work now	2023-02-21 23:12:16 +01:00
Camille Chauvet	916f2c3c50	fix: close fd	2023-02-21 22:38:00 +01:00
Etienne Rey-bethbeder	89c80e9bdb	.......................prout	2023-02-21 22:26:45 +01:00
Camille Chauvet	eb4a8ed663	merge	2023-02-21 22:13:08 +01:00
Camille Chauvet	3fb6eb65a8	add: exitcode	2023-02-21 22:12:23 +01:00
Etienne Rey-bethbeder	1fdc51a668	OUAF OUAF OUAF OUAF OUAF BOUGNOUL	2023-02-21 22:10:40 +01:00
Etienne Rey-bethbeder	03a2cc055c	Merge branch 'master' of https://git.chauvet.pro/starnakin/minishell	2023-02-21 16:03:18 +01:00
Etienne Rey-bethbeder	a136a66522	echo.c	2023-02-21 16:03:08 +01:00
Camille Chauvet	0ece156b97	fix: use own echo	2023-02-21 15:46:21 +01:00
Etienne Rey-bethbeder	4c45a2c603	deux tours ont despawn dans les backrooms le 11 septembres	2023-02-21 15:44:43 +01:00
Etienne Rey-bethbeder	b40762478a	ARABIE AHLAWAKBAR	2023-02-21 15:42:05 +01:00
Camille Chauvet	d7032849d6	fix: minishell rework	2023-02-21 15:32:22 +01:00
Camille Chauvet	a20fa2a4c6	fix: add '\n' pwd	2023-02-21 15:12:26 +01:00
Camille Chauvet	255892e12e	fix: use builtin	2023-02-21 15:07:14 +01:00
Etienne Rey-bethbeder	96de7639cd	Terrifiant Camille, par contre ses grosses fessses MIAM	2023-02-21 14:52:58 +01:00
Etienne Rey-bethbeder	17ece4bc7b	problème de	2023-02-21 14:49:42 +01:00
Etienne Rey-bethbeder	73899f5905	J'ai fais des trucs pas comme toi bozo	2023-02-21 14:45:43 +01:00
Camille Chauvet	373629b541	clean: norme	2023-02-21 14:38:09 +01:00
Camille Chauvet	5caeed312c	fix: leak	2023-02-21 14:37:41 +01:00
Camille Chauvet	5e0ae80404	add: builtin makefile	2023-02-21 14:37:10 +01:00
Camille Chauvet	69d6ac533b	fix: add prototype create_value_by_key_dup	2023-02-21 14:36:20 +01:00
Camille Chauvet	73d1f11269	clean: norm	2023-02-21 14:35:08 +01:00
Camille Chauvet	e8deb0be19	fix: leak '0' creation	2023-02-21 14:34:49 +01:00
Etienne Rey-bethbeder	ca09c8ed26	Merge branch 'master' of https://git.chauvet.pro/starnakin/minishell	2023-02-21 13:45:06 +01:00
Etienne Rey-bethbeder	3682d0a348	NIQUE TA GROSSE MERE CAMILLE	2023-02-21 13:44:51 +01:00
Camille Chauvet	e2a40e07fc	add: ft_dprintf	2023-02-21 13:28:45 +01:00
Camille Chauvet	cfd1dffbcf	fix: minishell.h	2023-02-21 13:22:50 +01:00
Camille Chauvet	55e378e2cb	fix: minishell.h	2023-02-21 13:21:20 +01:00
Etienne Rey-bethbeder	fb8186ac78	OUAF OUAF OUAF CORRECTION MINISHELL.H	2023-02-21 13:15:58 +01:00
Etienne Rey-bethbeder	3ef58c0116	OUAF OUAF OUAF OUAF OUAF MINISHELL.H	2023-02-21 13:14:58 +01:00
starnakin	cc74fda339	fix: '$' variable	2023-02-20 15:41:03 +01:00
starnakin	7eedf74847	infile fix	2023-02-20 13:08:01 +01:00
Camille Chauvet	c75c6838d6	clean	2023-02-17 19:05:33 +01:00
Camille Chauvet	4b5a50d7fe	fix: outfile is now perfectly removed	2023-02-17 18:51:27 +01:00
Camille Chauvet	922db1e08f	fix: quote remover	2023-02-17 18:28:06 +01:00
Camille Chauvet	e709eb0dbb	norm	2023-02-17 18:24:24 +01:00
Camille Chauvet	3ce5b64420	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-17 18:23:26 +01:00
Camille Chauvet	a183971a7a	bozo	2023-02-17 18:23:17 +01:00
Etienne Rey-bethbeder	5175073708	SBEUB SBEUB ARABE	2023-02-17 17:46:12 +01:00
Etienne Rey-bethbeder	72f9dd39cf	enlève le main dans pwd.c	2023-02-17 16:56:02 +01:00
Etienne Rey-bethbeder	8bd58675e9	Ajout Pwd et dans le .h	2023-02-17 16:54:58 +01:00
Camille Chauvet	afd71e5ed8	Merge branch 'master' of git.chauvet.pro:starnakin/minishell	2023-02-17 16:44:04 +01:00
Etienne Rey-bethbeder	d59562899b	Ajout de Echo, a voir si il y a des bugs	2023-02-17 16:03:28 +01:00