diff --git a/.file.c.swp b/.file.c.swp
new file mode 100644
index 0000000..8d73039
Binary files /dev/null and b/.file.c.swp differ
diff --git a/>> b/>>
deleted file mode 100644
index e69de29..0000000
diff --git a/>>> b/>>>
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile b/Makefile
index 70ce727..1834a75 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_getstr.c
-SRCS = main.c file.c infile.c outfile.c ${UTILS_SRC}
+SRCS = ${UTILS_SRC} main.c file.c infile.c outfile.c heredoc.c
 
 OBJS = ${SRCS:.c=.o}
 
@@ -18,7 +18,7 @@ all: ${NAME}
 
 ${NAME}: ${OBJS}
 	make -C libftx all
-	${CC} ${OBJS} -o ${NAME} ${LIBS}
+	${CC} ${OBJS} -o ${NAME} ${LIBS} -lreadline
 
 clean:
 	make -C libftx clean
diff --git a/d b/d
new file mode 100755
index 0000000..9daeafb
--- /dev/null
+++ b/d
@@ -0,0 +1 @@
+test
diff --git a/file.c b/file.c
index e567526..da9b9c8 100644
--- a/file.c
+++ b/file.c
@@ -47,21 +47,20 @@ char	*ft_get_file_path(char *infile)
 	size_t	i;
 	size_t	n;
 
-	n = 0;
-	while (infile[-n] == infile[0])
+	n = 1;
+	while (infile[-n] == infile[-1])
 		n++;
-	i = 1;
+	i = 0;
 	while (infile[i] == ' ')
 		i++;
-	if (infile[i] == '\0')
+	if (infile[i] == '\0' || infile[i] == '>' || infile[i] == '<')
 	{
 		ft_eprintf("minishell: syntax error near ");
-		if ((infile[0] == '<' && n < 3) || (infile[0] == '>' && n < 4))
-			ft_eprintf("unexpected token `newline`\n");
+		if ((infile[0] == '<' && n > 3) || (infile[0] == '>' && n > 2))
+			ft_eprintf("unexpected token `%c`\n", infile[i - 1]);
 		else
-			ft_eprintf("unexpected token `%c`\n", infile[i]);
+			ft_eprintf("unexpected token `newline`\n");
 		return (NULL);
 	}
 	return (ft_getstr(infile, i + 1));
-	//j'aime jackie et michel
 }
diff --git a/file.o b/file.o
index 4a8dab1..8c378ac 100644
Binary files a/file.o and b/file.o differ
diff --git a/heredoc.c b/heredoc.c
new file mode 100644
index 0000000..df182a4
--- /dev/null
+++ b/heredoc.c
@@ -0,0 +1,25 @@
+#include "minishell.h"
+#include <readline/history.h>
+
+int	ft_heredoc(char *stop)
+{
+	int		fds[2];
+	char	*line;
+
+	pipe(fds);
+	line = readline("> ");
+	while (line != NULL)
+	{
+		if (ft_strcmp(line, stop) == 0)
+		{
+			free(line);
+			break ;
+		}
+		ft_putstr_fd(line, fds[1]);
+		add_history(line);
+		free(line);
+		line = readline("> ");
+	}
+	close(fds[1]);
+	return (fds[0]);
+}
diff --git a/heredoc.o b/heredoc.o
new file mode 100644
index 0000000..1f428b1
Binary files /dev/null and b/heredoc.o differ
diff --git a/infile.c b/infile.c
index 76d3230..279fa17 100644
--- a/infile.c
+++ b/infile.c
@@ -3,30 +3,43 @@
 static int	ft_get_infile(char *line)
 {
 	size_t	i;
+	int		fd;
 	char	*path;
 
-	path = NULL;
+	fd = 0;
 	i = 0;
 	while (line[i] != '\0')
 	{
 		if (line[i] == '<' && ft_is_in_quote(line, i) == 0)
 		{
-			if (path != NULL)
-				free(path);
-			path = ft_get_file_path(line + i);
-			if (path == NULL || ft_file_is_readable(path) == 0)
+			i++;
+			if (fd != 0)
+				close(fd);
+			if (line[i] == '<')
 			{
-				free(path);
-				return (-1);
+				i++;
+				path = ft_get_file_path(line + i);
+				if (path == NULL)
+					return (-1);
+				fd = ft_heredoc(path);
 			}
+			else
+			{
+				path = ft_get_file_path(line + i);
+				if (path == NULL)
+					return (-1);
+				if (ft_file_is_readable(path) == 0)
+				{					
+					free(path);
+					return (-1);
+				}
+				fd = open(path, O_RDONLY);
+			}
+			free(path);
 		}
 		i++;
 	}
-	if (path == NULL)
-		return (-2);
-	i = open(path, O_RDONLY);
-	free(path);
-	return (i);
+	return (fd);
 }
 
 static int	ft_remove_infile(char *line)
@@ -39,7 +52,8 @@ static int	ft_remove_infile(char *line)
 	{
 		if (line[i] == '<' && ft_is_in_quote(line, i) == 0)
 		{
-			line[i++] = ' ';
+			while (line[i] == '<')
+				line[i++] = ' ';
 			while (line[i] == ' ')
 				i++;
 			separator = ft_is_in_quote(line, i);
diff --git a/infile.o b/infile.o
index cc20d3e..4d01b27 100644
Binary files a/infile.o and b/infile.o differ
diff --git a/libftx/libftx.a b/libftx/libftx.a
index 2346697..4958b95 100644
Binary files a/libftx/libftx.a and b/libftx/libftx.a differ
diff --git a/libftx/libftx.h b/libftx/libftx.h
index 3f74279..7c02636 100644
--- 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/01 16:20:05 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/03 12:42:13 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -67,7 +67,7 @@ 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(int fd, char c);
-void	ft_putstr_fd(int fd, char *s);
+void	ft_putstr_fd(char *s, int fd);
 void	ft_putendl_fd(int fd, char *s);
 void	ft_putnbr_fd(int fd, int n);
 
diff --git a/libftx/printf/ft_dprintarg.c b/libftx/printf/ft_dprintarg.c
index 18db1d5..defeb1b 100644
--- a/libftx/printf/ft_dprintarg.c
+++ b/libftx/printf/ft_dprintarg.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/23 18:08:31 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/01/05 17:37:12 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/03 12:52:38 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,7 +27,7 @@ int	ft_dprintarg(int fd, int arg, va_list args)
 	if (arg == 'S')
 		return (ft_dprintstrtab(fd, va_arg(args, char **)));
 	if (arg == 's')
-		return (ft_putstr_fd(fd, va_arg(args, char *)));
+		return (ft_putstr_fd_p(fd, va_arg(args, char *)));
 	if (arg == '%')
 		return (ft_putchar_fd(fd, '%'));
 	if (arg == 'p')
diff --git a/libftx/printf/ft_dprintarg.o b/libftx/printf/ft_dprintarg.o
index e145da1..2bbcb2d 100644
Binary files a/libftx/printf/ft_dprintarg.o and b/libftx/printf/ft_dprintarg.o differ
diff --git a/libftx/printf/ft_dprintptr.c b/libftx/printf/ft_dprintptr.c
index 4a9a735..8bc4d2d 100644
--- a/libftx/printf/ft_dprintptr.c
+++ b/libftx/printf/ft_dprintptr.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/06 17:41:04 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/10/12 15:22:40 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/03 12:53:45 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,10 +18,10 @@ int	ft_dprintptr(int fd, void *ptr)
 	int				i;
 
 	if (ptr == NULL)
-		return (ft_putstr_fd(fd, "(nil)"));
+		return (ft_putstr_fd_p(fd, "(nil)"));
 	address = (unsigned long) ptr;
 	i = 2;
-	ft_putstr_fd(fd, "0x");
+	ft_putstr_fd_p(fd, "0x");
 	i += ft_dprintul_base(fd, address, "0123456789abcdef");
 	return (i);
 }
diff --git a/libftx/printf/ft_dprintptr.o b/libftx/printf/ft_dprintptr.o
index 385cfa9..5b13694 100644
Binary files a/libftx/printf/ft_dprintptr.o and b/libftx/printf/ft_dprintptr.o differ
diff --git a/libftx/printf/ft_dprintstrtab.c b/libftx/printf/ft_dprintstrtab.c
index 7055512..a6d8910 100644
--- a/libftx/printf/ft_dprintstrtab.c
+++ b/libftx/printf/ft_dprintstrtab.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/01/05 17:26:55 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/01/05 18:52:56 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/03 12:54:44 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,7 +21,7 @@ int	ft_dprintstrtab(int fd, char **tab)
 	index = 0;
 	while (tab[index] != NULL)
 	{
-		i += ft_putstr_fd(fd, tab[index]) + 1;
+		i += ft_putstr_fd_p(fd, tab[index]) + 1;
 		ft_putchar_fd(fd, '\n');
 		index++;
 	}
diff --git a/libftx/printf/ft_dprintstrtab.o b/libftx/printf/ft_dprintstrtab.o
index 575ae67..b2635fb 100644
Binary files a/libftx/printf/ft_dprintstrtab.o and b/libftx/printf/ft_dprintstrtab.o differ
diff --git a/libftx/printf/ft_printf.a b/libftx/printf/ft_printf.a
index 1b8bba7..cbf2819 100644
Binary files a/libftx/printf/ft_printf.a and b/libftx/printf/ft_printf.a differ
diff --git a/libftx/printf/ft_printf.h b/libftx/printf/ft_printf.h
index a85455f..8f011a0 100644
--- 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/01 16:19:38 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/03 12:51:07 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,6 +37,6 @@ int		ft_eprintf(const char *format, ...);
 int		ft_vdprintf(int fd, const char *format, va_list va);
 
 int		ft_putchar_fd(int fd, char c);
-int		ft_putstr_fd(int fd, char *str);
+int		ft_putstr_fd_p(int fd, char *str);
 
 #endif
diff --git a/libftx/printf/ft_putstr_fd.c b/libftx/printf/ft_putstr_fd.c
index c3c6f3c..3ff77d8 100644
--- a/libftx/printf/ft_putstr_fd.c
+++ b/libftx/printf/ft_putstr_fd.c
@@ -6,13 +6,13 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/29 22:25:08 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/10/12 16:51:51 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/03 12:49:18 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "ft_printf.h"
 
-int	ft_putstr_fd(int fd, char *str)
+int	ft_putstr_fd_p(int fd, char *str)
 {
 	int	i;
 
diff --git a/libftx/printf/ft_putstr_fd.o b/libftx/printf/ft_putstr_fd.o
index 7324dbe..918d6ac 100644
Binary files a/libftx/printf/ft_putstr_fd.o and b/libftx/printf/ft_putstr_fd.o differ
diff --git a/minishell b/minishell
index 849fbf6..aa5b96f 100755
Binary files a/minishell and b/minishell differ
diff --git a/minishell.h b/minishell.h
index 19129ad..4e0055c 100644
--- a/minishell.h
+++ b/minishell.h
@@ -5,12 +5,16 @@
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <fcntl.h>
+#include <stdio.h>
+#include <readline/readline.h>
+#include <readline/history.h>
 
 int	ft_file_is_readable(char *path);
 int	ft_file_is_writeable(char *path);
 char	*ft_get_file_path(char *infile);
 int	ft_infile(char *line);
 int	ft_outfile(char *line);
+int	ft_heredoc(char *stop);
 
 typedef struct cmd
 {
diff --git a/outfile.c b/outfile.c
index 8939ef3..2779606 100644
--- a/outfile.c
+++ b/outfile.c
@@ -13,7 +13,8 @@ static int	ft_get_outfile(char *line)
 	{
 		if (line[i] == '>' && ft_is_in_quote(line, i) == 0)
 		{
-			if (line[i + 1] == '>')
+			i++;
+			if (line[i] == '>')
 			{
 				i++;
 				append = 1;
diff --git a/outfile.o b/outfile.o
index 13f900d..43c9022 100644
Binary files a/outfile.o and b/outfile.o differ