Added better error handling in eval

4 files changed, 63 insertions, 64 deletions

diff --git a/src/eval/cmd.c b/src/eval/cmd.c
index 5130a45..107a2a6 100644
--- a/src/eval/cmd.c
+++ b/src/eval/cmd.c
@@ -6,14 +6,14 @@
 /*   By: charles <charles@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/14 10:41:31 by charles           #+#    #+#             */
-/*   Updated: 2020/09/09 17:40:54 by charles          ###   ########.fr       */
+/*   Updated: 2020/09/10 15:05:54 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "eval.h"
 
 pid_t	g_child_pid = -1;
-int		g_last_status_code = 0;
+int		g_last_status = 0;
 void token_debug(void *v);
 
 /*
@@ -33,19 +33,19 @@ int			fork_wrap(
 	pid_t	child_pid;
 
 	if ((child_pid = fork()) == -1)
-		return (-1);
+		return (ERR_FATAL);
 	if (child_pid == 0)
 	{
-		if ((fds[FDS_READ] != MS_NO_FD && dup2(fds[FDS_READ], STDIN_FILENO) == -1) ||
-			(fds[FDS_WRITE] != MS_NO_FD && dup2(fds[FDS_WRITE], STDOUT_FILENO) == -1))
+		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)) == -1)
+		if ((status = wrapped(passed)) == ERR_FATAL)
 			exit(EXIT_FAILURE);
 		exit(status);
 	}
 	g_child_pid = child_pid;
 	wait(&child_pid);
-	close(fds[FDS_WRITE]);
+	close(fds[FD_WRITE]);
 	// also read end?
 	return (WEXITSTATUS(child_pid));
 }
@@ -53,38 +53,41 @@ int			fork_wrap(
 int 		forked_cmd(void *void_param)
 {
 	t_fork_param_cmd	*param;
-	int					ret;
+	int					status;
+	struct stat			statbuf;
 
 	param = void_param;
 	ft_vecpop(param->env_local, NULL);
 	if (ft_vecswallow_at(param->env, param->env->size - 1, param->env_local) == NULL)
 	{
 		ft_vecdestroy(param->env_local, free);
-		return (-1);
+		return (ERR_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));
+		}
+		if (S_ISDIR(statbuf.st_mode))
+		{
+			errorf("%s: Is a directory\n", param->exec_path);
+			return (error_get_status(ERR_IS_DIRECTORY));
+		}
+
 		errno = 0;
-		ret = execve(param->exec_path, param->argv, (char**)param->env->data);
-		if (ret == -1)
+		status = execve(param->exec_path, param->argv, (char**)param->env->data);
+		if (status == -1)
 		{
 			if (errno == ENOEXEC)
-				return (0);
-			struct stat statbuf;
-			if (stat(param->exec_path, &statbuf) != -1 && S_ISDIR(statbuf.st_mode))
-			{
-				errorf("%s: Is a directory\n", param->exec_path);
-				ret = 126;
-			}
-			else
-			{
-				errorf("%s: %s\n", param->exec_path, strerror(errno));
-				ret = 126;
-			}
+				return (error_get_status(ERR_NONE));
+			errorf("%s: %s\n", param->exec_path, strerror(errno));
+			return (error_get_status(ERR_ERRNO));
 		}
-		return (ret);
+		return (status);
 	}
 }
 
@@ -92,16 +95,18 @@ int			eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast)
 {
 	t_fork_param_cmd	param;
 	char				**argv;
+	int					status;
 
-	if (!redir_extract(&ast->redirs, env, fds))
+	if ((status = redir_extract(&ast->redirs, env, fds)) != ERR_NONE)
 	{
 		ast->redirs = NULL;
-		return (-1);
+		return (status);
 	}
 	ast->redirs = NULL;
 	if ((param.env_local = env_from_array((char*[]){NULL})) == NULL)
-		return (-1);
-	variable_extract(&ast->cmd_argv, env, param.env_local);
+		return (ERR_FATAL);
+	if (!variable_extract(&ast->cmd_argv, env, param.env_local))
+		return (ERR_FATAL);
 
 	/* char **strs = preprocess(&start, env); */
     /*  */
@@ -115,17 +120,16 @@ int			eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast)
 	/* 		ft_vecdestroy(param.env_local, free); */
 	/* 		return (-1); */
 	/* 	} */
-	/* 	g_last_status_code = 0; */
+	/* 	g_last_status = 0; */
 	/* 	return (0); */
 	/* } */
 
 	if ((argv = preprocess(&ast->cmd_argv, env)) == NULL)
 	{
 		ast->cmd_argv = NULL;
-		return (-1);
+		return (ERR_FATAL);
 	}
 
-	// can have no command (e.g `< file`)
 	if (argv[0] == NULL)
 		return (0);
 	param.builtin = builtin_search_func(argv[0]);
@@ -135,23 +139,19 @@ int			eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast)
 		param.exec_path = exec_search_path(path, env_search(env, "PATH"), argv[0]);
 		if (param.exec_path == NULL)
 		{
-			g_last_status_code = 127;
 			errorf("%s: command not found\n", argv[0]);
 			ft_split_destroy(argv);
-			return (-1); // return error status
+			return (ERR_CMD_NOT_FOUND);
 		}
 	}
 	else if (!param.builtin->forked)
-	{
-		g_last_status_code = param.builtin->func(argv, env);
-		return (g_last_status_code);
-	}
+		return (param.builtin->func(argv, env));
 
 	param.argv = argv;
 	param.env = env;
-	int ret = fork_wrap(fds, &param, &forked_cmd);
-	g_last_status_code = ret;
+	status = fork_wrap(fds, &param, &forked_cmd);
+	/* g_last_status = status; */
 	ft_split_destroy(argv);
 	ft_vecdestroy(param.env_local, free);
-	return (ret);
+	return (status);
 }
diff --git a/src/eval/local.c b/src/eval/local.c
index 13719cd..089a0c7 100644
--- a/src/eval/local.c
+++ b/src/eval/local.c
@@ -62,7 +62,7 @@
 	/* 		ft_vecdestroy(param.env_local, free); */
 	/* 		return (-1); */
 	/* 	} */
-	/* 	g_last_status_code = 0; */
+	/* 	g_last_status = 0; */
 	/* 	return (0); */
 	/* } */
 
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);
 }
diff --git a/src/eval/redir.c b/src/eval/redir.c
index e8796a5..9beef17 100644
--- a/src/eval/redir.c
+++ b/src/eval/redir.c
@@ -6,15 +6,15 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/15 11:05:34 by charles           #+#    #+#             */
-/*   Updated: 2020/08/28 17:14:19 by charles          ###   ########.fr       */
+/*   Updated: 2020/09/10 14:25:08 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "eval.h"
 
-static bool				st_open_replace(int *fd, char *filename, int oflag)
+static int				st_open_replace(int *fd, char *filename, int oflag)
 {
-	if (*fd != MS_NO_FD)
+	if (*fd != FD_NONE)
 		close(*fd);
 	if (oflag & O_CREAT)
 		*fd = open(filename, oflag, 0644);
@@ -22,15 +22,14 @@ static bool				st_open_replace(int *fd, char *filename, int oflag)
 		*fd = open(filename, oflag);
 	if (*fd == -1)
 	{
-		g_last_status_code = 1;
 		errorf("%s: %s\n", filename, strerror(errno));
 		free(filename);
-		return (false);
+		return (ERR_OPEN);
 	}
-	return (true);
+	return (ERR_NONE);
 }
 
-bool					redir_extract(
+int					redir_extract(
 		t_tok_lst **redirs,
 		t_env env,
 		int fds[2])
@@ -40,10 +39,10 @@ bool					redir_extract(
 	char		*filename;
 
 	if (*redirs == NULL)
-		return (true);
+		return (ERR_NONE);
 	if (!((*redirs)->tag & TAG_IS_REDIR) || (*redirs)->next == NULL
 		|| !((*redirs)->next->tag & TAG_IS_STR))
-		return (false);
+		return (ERR_FATAL);
 	curr = (*redirs)->next;
 	after = NULL;
 	while (curr != NULL && curr->tag & TAG_IS_STR)
@@ -59,18 +58,18 @@ bool					redir_extract(
 	{
 		tok_lst_destroy(redirs, free);
 		tok_lst_destroy(&after, free);
-		return (false);
+		return (ERR_FATAL);
 	}
 	if (((*redirs)->tag == TAG_REDIR_IN
-			&& !st_open_replace(&fds[FDS_READ], filename, O_RDONLY))
+			&& st_open_replace(&fds[FD_READ], filename, O_RDONLY) != ERR_NONE)
 		|| ((*redirs)->tag == TAG_REDIR_OUT
-			&& !st_open_replace(&fds[FDS_WRITE], filename, O_WRONLY | O_CREAT | O_TRUNC))
+			&& st_open_replace(&fds[FD_WRITE], filename, O_WRONLY | O_CREAT | O_TRUNC) != ERR_NONE)
 		|| ((*redirs)->tag == TAG_REDIR_APPEND
-			&& !st_open_replace(&fds[FDS_WRITE], filename, O_WRONLY | O_CREAT | O_APPEND)))
+			&& st_open_replace(&fds[FD_WRITE], filename, O_WRONLY | O_CREAT | O_APPEND) != ERR_NONE))
 	{
 		tok_lst_destroy(redirs, free);
 		tok_lst_destroy(&after, free);
-		return (false);
+		return (ERR_FATAL);
 	}
 	tok_lst_destroy(redirs, free);
 	free(filename);