changes

5 files changed, 26 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 28ab638..4834b20 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ SRCS			= \
 				${SRCS_DIR}ft_echo.c \
 				${SRCS_DIR}ft_pwd.c \
 				${SRCS_DIR}ft_exec.c \
+				${SRCS_DIR}ft_history.c \
 
 OBJS_DIR		= obj/
 OBJS			= $(patsubst ${SRCS_DIR}%.c,${OBJS_DIR}%.o,${SRCS})
diff --git a/inc/minishell.h b/inc/minishell.h
index bbb4c2c..e3fb5b6 100644
--- a/inc/minishell.h
+++ b/inc/minishell.h
@@ -11,5 +11,6 @@ int ft_pwd(void);
 uint8_t ft_exit(char **com);
 int ft_error(const char *com, int errno);
 int ft_exec(char **app);
+int ft_history(char *arg);
 
 #endif
diff --git a/src/ft_exec.c b/src/ft_exec.c
index 31fcaf2..b9d50cf 100644
--- a/src/ft_exec.c
+++ b/src/ft_exec.c
@@ -11,5 +11,4 @@ ft_exec(char **app)
 	while (app[i])
 		i++;
 	return (execve(app[0] + 2, app, NULL));
-	return (0);
 }
diff --git a/src/ft_history.c b/src/ft_history.c
index fa28100..6a82a16 100644
--- a/src/ft_history.c
+++ b/src/ft_history.c
@@ -1,17 +1,35 @@
+/* ************************************************************************** */
+/*                                                          LE - /            */
+/*                                                              /             */
+/*   ft_history.c                                     .::    .:/ .      .::   */
+/*                                                 +:+:+   +:    +:  +:+:+    */
+/*   By: rbousset <marvin@le-101.fr>                +:+   +:    +:    +:+     */
+/*                                                 #+#   #+    #+    #+#      */
+/*   Created: 2019/10/30 20:36:05 by rbousset     #+#   ##    ##    #+#       */
+/*   Updated: 2019/10/30 20:36:07 by rbousset    ###    #+. /#+    ###.fr     */
+/*                                                         /                  */
+/*                                                        /                   */
+/* ************************************************************************** */
+
 #include <libft.h>
 #include <minishell.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 int
-ft_history(const char *arg)
+ft_history(char *arg)
 {
+	char c;
 	int fd;
-	int ret;
+	int r;
 
-	if ((fd = open("joe-sh_history", O_RDWR | O_CREAT)) == -1)
+	if ((fd = open("joe-sh_history", O_CREAT | O_RDWR, 0644)) == -1)
 		return (1);
-	ret = write(1, arg + "\n", ft_strlen(arg) + 1);
+	while ((r = read(fd, &c, 1)) != EOF)
+		puts(&c);
+	ft_putendl_fd(arg, fd);
 	close(fd);
-	return (ret);
+	return (0);
 }
diff --git a/src/main.c b/src/main.c
index 1f18c9b..bbbc92f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,6 +47,7 @@ int
 			i++;
 		}
 		arg[i] = '\0';
+		ft_history(arg);
 		ret = ft_process_arg(arg);
 	}
 	free(arg);