jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-t works fine, gonna do the IFS split next

Browse source
This commit is contained in:
Jack Halford 2017-01-27 17:11:11 +01:00
parent 7d57b47f5e
commit e66999c24f
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/builtin/bt_read_term.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/25 16:02:05 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) if (tcsetattr(0, TCSANOW, &term) < 0)
return (-1); return (-1);
DG("c_cc[VTIME]=%i", term.c_cc[VTIME]); /* DG("c_cc[VTIME]=%i", term.c_cc[VTIME]); */
return (0); return (0);
} }

7
42sh/src/builtin/builtin_read.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/20 15:01:45 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->delim = '\n';
data->nchars = -1; data->nchars = -1;
data->prompt = NULL; data->prompt = NULL;
data->timeout = -1;
data->fd = 0; data->fd = 0;
} }
@ -121,9 +120,9 @@ int builtin_read(const char *path, char *const av[], char *const envp[])
ft_printf(data.prompt); ft_printf(data.prompt);
while (42) while (42)
{ {
if ((ret = read(data.fd, buf, 1) <= 0)) if ((ret = read(data.fd, buf, 1)) <= 0)
return (1); return (1);
DG("got *buf=%c, ret=%i", *buf, ret); /* DG("got *buf=%c, ret=%i", *buf, ret); */
buf[ret] = 0; buf[ret] = 0;
if (!esc && *buf == data.delim) if (!esc && *buf == data.delim)
break ; break ;