From e66999c24f96676be5702f5ac9d917b78a9cebb5 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Fri, 27 Jan 2017 17:11:11 +0100 Subject: [PATCH] -t works fine, gonna do the IFS split next --- 42sh/src/builtin/bt_read_term.c | 4 ++-- 42sh/src/builtin/builtin_read.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/42sh/src/builtin/bt_read_term.c b/42sh/src/builtin/bt_read_term.c index 69bb5643..65c87ff6 100644 --- a/42sh/src/builtin/bt_read_term.c +++ b/42sh/src/builtin/bt_read_term.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/25 16:02:05 by jhalford #+# #+# */ -/* Updated: 2017/01/26 20:27:00 by jhalford ### ########.fr */ +/* Updated: 2017/01/27 17:07:48 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,7 +40,7 @@ int bt_read_terminit(t_read *data) } if (tcsetattr(0, TCSANOW, &term) < 0) return (-1); - DG("c_cc[VTIME]=%i", term.c_cc[VTIME]); + /* 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 953254ef..6dae6f74 100644 --- a/42sh/src/builtin/builtin_read.c +++ b/42sh/src/builtin/builtin_read.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/20 15:01:45 by jhalford #+# #+# */ -/* Updated: 2017/01/26 20:32:28 by jhalford ### ########.fr */ +/* Updated: 2017/01/27 17:10:43 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,7 +34,6 @@ void bt_read_init(t_read *data) data->delim = '\n'; data->nchars = -1; data->prompt = NULL; - data->timeout = -1; data->fd = 0; } @@ -121,9 +120,9 @@ int builtin_read(const char *path, char *const av[], char *const envp[]) ft_printf(data.prompt); while (42) { - if ((ret = read(data.fd, buf, 1) <= 0)) + if ((ret = read(data.fd, buf, 1)) <= 0) return (1); - DG("got *buf=%c, ret=%i", *buf, ret); + /* DG("got *buf=%c, ret=%i", *buf, ret); */ buf[ret] = 0; if (!esc && *buf == data.delim) break ;