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

hotfix, forget to check compilation

Browse source
This commit is contained in:
Jack Halford 2017-02-03 14:56:30 +01:00
parent da66e7bd79
commit f4efbdd313
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
42sh/includes/types.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 17:11:48 by jhalford #+# #+# */ /* Created: 2016/12/13 17:11:48 by jhalford #+# #+# */
/* Updated: 2017/02/03 14:02:56 by jhalford ### ########.fr */ /* Updated: 2017/02/03 14:54:04 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

9
42sh/src/exec/process_do_redirection.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/03 13:46:40 by jhalford #+# #+# */ /* Created: 2017/02/03 13:46:40 by jhalford #+# #+# */
/* Updated: 2017/02/03 14:41:01 by jhalford ### ########.fr */ /* Updated: 2017/02/03 14:55:44 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -26,7 +26,7 @@ void process_do_redirection(t_redir *redir)
{ {
fdin = redir->n; fdin = redir->n;
fdout = open(redir->word.word, O_WRONLY | O_CREAT fdout = open(redir->word.word, O_WRONLY | O_CREAT
(redir->type & TK_GREAT) ? O_TRUNC : O_APPEND, | (redir->type & TK_GREAT) ? O_TRUNC : O_APPEND,
0644); 0644);
} }
else if (redir->type & TK_LESS) else if (redir->type & TK_LESS)
@ -47,6 +47,11 @@ void process_do_redirection(t_redir *redir)
fdout = redir->type & TK_LESSAND ? redir->n : redir->word.fd; fdout = redir->type & TK_LESSAND ? redir->n : redir->word.fd;
} }
} }
else
{
ft_dprintf(2, "{red}%s: redirection error.", SHELL_NAME);
return ;
}
fd_is_valid(fdout) ? dup2(fdout, fdin) : close(fdin); fd_is_valid(fdout) ? dup2(fdout, fdin) : close(fdin);
close(fdout); close(fdout);
} }