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

👍 close #215

Browse source
This commit is contained in:
Jack Halford 2017-03-27 19:42:49 +02:00
parent c601d818a2
commit 7d4880b2b7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
42sh/src/exec/redirect_dless.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/20 12:36:10 by jhalford #+# #+# */ /* Created: 2017/03/20 12:36:10 by jhalford #+# #+# */
/* Updated: 2017/03/25 01:45:49 by jhalford ### ########.fr */ /* Updated: 2017/03/27 19:41:50 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,7 +21,6 @@ int redirect_dless(t_redir *redir)
str = redir->heredoc_data; str = redir->heredoc_data;
write(fds[PIPE_WRITE], str, ft_strlen(str)); write(fds[PIPE_WRITE], str, ft_strlen(str));
close(fds[PIPE_WRITE]); close(fds[PIPE_WRITE]);
dup2(fds[PIPE_READ], redir->n); fd_replace(fds[PIPE_READ], redir->n);
close(fds[PIPE_READ]);
return (0); return (0);
} }

3
42sh/src/main/shell_init.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 17:23:59 by jhalford #+# #+# */ /* Created: 2016/12/12 17:23:59 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:08:56 by jhalford ### ########.fr */ /* Updated: 2017/03/27 19:41:47 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -100,5 +100,6 @@ int shell_init(int ac, char **av, char **env)
if (SH_IS_INTERACTIVE(data->opts) && interactive_settings() < 0) if (SH_IS_INTERACTIVE(data->opts) && interactive_settings() < 0)
return (-1); return (-1);
shell_fds_init(); shell_fds_init();
shell_fds_push();
return (0); return (0);
} }