diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-09-10 15:08:28 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-09-10 15:08:28 +0200 |
| commit | b16d4b834d95d5cc0757d09e74fe6042e55f5440 (patch) | |
| tree | aa64f6d4397a0c55337224c8cf474da73750ac30 /src/eval/op.c | |
| parent | 10b54ed457ec0999e9289811401907d3a88970dc (diff) | |
| download | minishell-b16d4b834d95d5cc0757d09e74fe6042e55f5440.tar.gz minishell-b16d4b834d95d5cc0757d09e74fe6042e55f5440.tar.bz2 minishell-b16d4b834d95d5cc0757d09e74fe6042e55f5440.zip | |
Added better error handling in eval
Diffstat (limited to 'src/eval/op.c')
| -rw-r--r-- | src/eval/op.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/eval/op.c b/src/eval/op.c index 36340be..e06c959 100644 --- a/src/eval/op.c +++ b/src/eval/op.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 15:27:22 by charles #+# #+# */ -/* Updated: 2020/08/28 16:54:39 by charles ### ########.fr */ +/* Updated: 2020/09/10 14:15:08 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,15 +19,15 @@ int eval_op(int fds[2], t_env env, t_path path, t_ast *ast) int right_fds[2]; int p[2]; - left_fds[FDS_READ] = fds[FDS_READ]; - left_fds[FDS_WRITE] = MS_NO_FD; - right_fds[FDS_READ] = MS_NO_FD; - right_fds[FDS_WRITE] = fds[FDS_WRITE]; + left_fds[FD_READ] = fds[FD_READ]; + left_fds[FD_WRITE] = FD_NONE; + right_fds[FD_READ] = FD_NONE; + right_fds[FD_WRITE] = fds[FD_WRITE]; if (ast->op.sep == TAG_PIPE) { pipe(p); - left_fds[FDS_WRITE] = p[FDS_WRITE]; - right_fds[FDS_READ] = p[FDS_READ]; + left_fds[FD_WRITE] = p[FD_WRITE]; + right_fds[FD_READ] = p[FD_READ]; } if ((status = eval(left_fds, env, path, ast->op.left)) == -1) return (-1); @@ -51,7 +51,7 @@ int eval_parent(int fds[2], t_env env, t_path path, t_ast *ast) t_fork_param_parent param; if (!redir_extract(&ast->redirs, env, fds)) - return (-1); + return (ERR_FATAL); param.fds[0] = fds[0]; param.fds[1] = fds[1]; param.env = env; @@ -69,5 +69,5 @@ int eval(int fds[2], t_env env, t_path path, t_ast *ast) return (eval_op(fds, env, path, ast)); if (ast->tag == AST_CMD) return (eval_cmd(fds, env, path, ast)); - return (-1); + return (ERR_FATAL); } |