From 076d3c3d5be8cb514a034781bcef2db424ad2f6e Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Sat, 28 Jan 2017 14:44:00 +0100
Subject: [PATCH] remise a la norme avant de merge

---
 42sh/libft                      |  2 +-
 42sh/src/builtin/bt_read_term.c |  1 -
 42sh/src/builtin/builtin_read.c | 10 +++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/42sh/libft b/42sh/libft
index 4c497745..ab92f0e5 160000
--- a/42sh/libft
+++ b/42sh/libft
@@ -1 +1 @@
-Subproject commit 4c4977452745481166749b813e8db51dcf0caf44
+Subproject commit ab92f0e5d817c9d726a8ccf2f11c084ba446bbdf
diff --git a/42sh/src/builtin/bt_read_term.c b/42sh/src/builtin/bt_read_term.c
index ae5d40a9..853929c4 100644
--- a/42sh/src/builtin/bt_read_term.c
+++ b/42sh/src/builtin/bt_read_term.c
@@ -40,7 +40,6 @@ int		bt_read_terminit(t_read *data)
 	}
 	if (tcsetattr(0, TCSANOW, &term) < 0)
 		return (-1);
-	/* DG("c_cc[VTIME]=%i", term.c_cc[VTIME]); */
 	return (0);
 }
 
diff --git a/42sh/src/builtin/builtin_read.c b/42sh/src/builtin/builtin_read.c
index 176acb3a..586f3627 100644
--- a/42sh/src/builtin/builtin_read.c
+++ b/42sh/src/builtin/builtin_read.c
@@ -32,7 +32,6 @@ int		bt_read_loop(t_read *data)
 {
 	int		i;
 	int		esc;
-	int		ret;
 	char	buf[2];
 
 	i = 0;
@@ -41,24 +40,21 @@ int		bt_read_loop(t_read *data)
 		ft_printf(data->prompt);
 	while (42)
 	{
-		if ((ret = read(data->fd, buf, 1)) <= 0)
+		if (read(data->fd, buf, 1) <= 0)
 			return (1);
-		/* DG("got *buf=%c, ret=%i", *buf, ret); */
-		buf[ret] = 0;
+		buf[1] = 0;
 		if (!esc && *buf == data->delim)
 			break ;
 		esc = esc ? 0 : !(data->opts & READ_OPT_LR) && (*buf == '\\');
 		ft_strappend(&data->input, buf);
 		if (!(data->opts & READ_OPT_LS))
 			ft_putchar(*buf);
-		i++;
 		if (*buf == '\n' && !(data->opts & READ_OPT_LR))
 			ft_putstr("> ");
-		if ((data->opts & READ_OPT_LN) && i >= data->nchars)
+		if ((data->opts & READ_OPT_LN) && ++i >= data->nchars)
 			break ;
 	}
 	ft_putchar('\n');
-	DG("input=%s", data->input);
 	return (0);
 }