diff options
Diffstat (limited to 'src/eval/cmd.c')
| -rw-r--r-- | src/eval/cmd.c | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/src/eval/cmd.c b/src/eval/cmd.c index 107a2a6..36e5a00 100644 --- a/src/eval/cmd.c +++ b/src/eval/cmd.c @@ -6,7 +6,7 @@ /* By: charles <charles@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/14 10:41:31 by charles #+# #+# */ -/* Updated: 2020/09/10 15:05:54 by charles ### ########.fr */ +/* Updated: 2020/09/10 20:32:13 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,20 +33,19 @@ int fork_wrap( pid_t child_pid; if ((child_pid = fork()) == -1) - return (ERR_FATAL); + return (EVAL_FATAL); if (child_pid == 0) { if ((fds[FD_READ] != FD_NONE && dup2(fds[FD_READ], STDIN_FILENO) == -1) || (fds[FD_WRITE] != FD_NONE && dup2(fds[FD_WRITE], STDOUT_FILENO) == -1)) exit(EXIT_FAILURE); - if ((status = wrapped(passed)) == ERR_FATAL) + if ((status = wrapped(passed)) == EVAL_FATAL) // FIXME detect fatal in child (pipe ?) exit(EXIT_FAILURE); exit(status); } g_child_pid = child_pid; wait(&child_pid); close(fds[FD_WRITE]); - // also read end? return (WEXITSTATUS(child_pid)); } @@ -61,31 +60,25 @@ int forked_cmd(void *void_param) if (ft_vecswallow_at(param->env, param->env->size - 1, param->env_local) == NULL) { ft_vecdestroy(param->env_local, free); - return (ERR_FATAL); + return (EVAL_FATAL); } if (param->builtin != NULL) return (param->builtin->func(param->argv, param->env)); else { if (stat(param->exec_path, &statbuf) == -1) - { - errorf("%s: %s\n", param->exec_path, strerror(errno)); - return (error_get_status(ERR_ERRNO)); - } + return (errorf_ret(126, "%s: %s\n", param->exec_path, strerror(errno))); if (S_ISDIR(statbuf.st_mode)) - { - errorf("%s: Is a directory\n", param->exec_path); - return (error_get_status(ERR_IS_DIRECTORY)); - } - + return (errorf_ret(126, "%s: Is a directory\n", param->exec_path)); + if (!(statbuf.st_mode & 0444)) + return (errorf_ret(126, "%s: %s\n", param->exec_path, strerror(EACCES))); errno = 0; status = execve(param->exec_path, param->argv, (char**)param->env->data); if (status == -1) { if (errno == ENOEXEC) - return (error_get_status(ERR_NONE)); - errorf("%s: %s\n", param->exec_path, strerror(errno)); - return (error_get_status(ERR_ERRNO)); + return (0); + return (errorf_ret(126, "%s: %s\n", param->exec_path, strerror(errno))); } return (status); } @@ -97,16 +90,12 @@ int eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast) char **argv; int status; - if ((status = redir_extract(&ast->redirs, env, fds)) != ERR_NONE) - { - ast->redirs = NULL; + if ((status = redir_extract(&ast->redirs, env, fds)) != 0) return (status); - } - ast->redirs = NULL; if ((param.env_local = env_from_array((char*[]){NULL})) == NULL) - return (ERR_FATAL); + return (EVAL_FATAL); if (!variable_extract(&ast->cmd_argv, env, param.env_local)) - return (ERR_FATAL); + return (EVAL_FATAL); /* char **strs = preprocess(&start, env); */ /* */ @@ -127,7 +116,7 @@ int eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast) if ((argv = preprocess(&ast->cmd_argv, env)) == NULL) { ast->cmd_argv = NULL; - return (ERR_FATAL); + return (EVAL_FATAL); } if (argv[0] == NULL) @@ -141,7 +130,7 @@ int eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast) { errorf("%s: command not found\n", argv[0]); ft_split_destroy(argv); - return (ERR_CMD_NOT_FOUND); + return (127); } } else if (!param.builtin->forked) @@ -150,8 +139,8 @@ int eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast) param.argv = argv; param.env = env; status = fork_wrap(fds, ¶m, &forked_cmd); - /* g_last_status = status; */ ft_split_destroy(argv); ft_vecdestroy(param.env_local, free); + g_last_status = status; return (status); } |