Refactoring error handling during parsing

9 files changed, 43 insertions, 22 deletions

diff --git a/src/builtin/exit.c b/src/builtin/exit.c
index aa5d10b..15271f6 100644
--- a/src/builtin/exit.c
+++ b/src/builtin/exit.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 17:10:16 by charles           #+#    #+#             */
-/*   Updated: 2020/06/23 10:03:39 by charles          ###   ########.fr       */
+/*   Updated: 2020/07/13 15:35:44 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,7 +23,7 @@ int	builtin_exit(char **argv, t_env env)
 
 	(void)env;
 	if (argv[1] == NULL)
-		status = 0;
+		status = g_last_status_code;
 	else if (argv[2] != NULL)
 	{
 		// replace with minishell error system
diff --git a/src/env.c b/src/env.c
index 89dafeb..bdc2498 100644
--- a/src/env.c
+++ b/src/env.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/28 09:21:24 by cacharle          #+#    #+#             */
-/*   Updated: 2020/06/18 14:33:26 by charles          ###   ########.fr       */
+/*   Updated: 2020/07/13 11:09:39 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,7 @@
 */
 
 #include "minishell.h"
+#include "eval.h"
 
 #define ENV_VEC_DEFAULT_SIZE 64
 
@@ -87,6 +88,8 @@ char	*env_search_first_match(t_env env, const char *haystack)
 	len = 0;
 	while (ft_isalnum(haystack[len]) || haystack[len] == '_')
 		len++;
+	if (haystack[0] == '?')
+		return (ft_itoa(g_last_status_code)); // FIXME leak
 	if (len == 0)
 		return (NULL);
 	i = -1;
diff --git a/src/eval/error.c b/src/error.c
index 016a751..f5848a6 100644
--- a/src/eval/error.c
+++ b/src/error.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/14 11:02:52 by charles           #+#    #+#             */
-/*   Updated: 2020/06/14 12:19:14 by charles          ###   ########.fr       */
+/*   Updated: 2020/07/14 09:23:38 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,6 +17,7 @@ static t_error	g_errors[] =
 	{ERROR_AMBIGUOUS_REDIR, 1, "ambiguous redirect"},
 	{ERROR_OPEN, 1, NULL},
 	{ERROR_CMD_NOT_FOUND, 127, "command not found"},
+	/* {ERROR_CMD_FOUND_ERROR, 126, NULL}, */
 	{ERROR_SYNTAX, 2, "syntax error near unexpected token "},
 };
 
diff --git a/src/eval/cmd.c b/src/eval/cmd.c
index fc73ed0..e79cb88 100644
--- a/src/eval/cmd.c
+++ b/src/eval/cmd.c
@@ -6,13 +6,14 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/14 10:41:31 by charles           #+#    #+#             */
-/*   Updated: 2020/07/13 09:54:12 by charles          ###   ########.fr       */
+/*   Updated: 2020/07/13 11:03:09 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "eval.h"
 
 pid_t	g_child_pid = -1;
+int		g_last_status_code = 0;
 
 /*
 ** \brief          Wrap a function in a fork
@@ -97,6 +98,7 @@ int			eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast)
 	param.argv = argv;
 	param.env = env;
 	int ret = fork_wrap(fds, &param, &forked_cmd);
+	g_last_status_code = ret;
 	ft_split_destroy(argv);
 	return (ret);
 }
diff --git a/src/main.c b/src/main.c
index e5c9bf9..ee98e1a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <cacharle@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/28 11:45:44 by cacharle          #+#    #+#             */
-/*   Updated: 2020/07/14 09:41:42 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/07/14 10:03:35 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -57,6 +57,23 @@ void signal_sigquit(int signum)
 	}
 }
 
+void signal_sigterm(int signum)
+{
+	(void)signum;
+}
+
+
+/*
+** TODO
+** $?
+** syntax error
+** signal
+** pipeline
+** cmd are path
+** interpolation order
+** PATH with no permission
+*/
+
 int main(int argc, char **argv, char **envp)
 {
 	t_path	path;
@@ -68,6 +85,7 @@ int main(int argc, char **argv, char **envp)
 
 	signal(SIGINT, signal_sigint);
 	signal(SIGQUIT, signal_sigquit);
+	signal(SIGTERM, signal_sigterm);
 
 	if (argc == 3 && ft_strcmp(argv[1], "-l") == 0)
 	{
@@ -85,8 +103,8 @@ int main(int argc, char **argv, char **envp)
 		/* ft_lstiter(lex_out, token_debug); */
 
 		t_ret *parser_out = parse(lex_out);
-		if (parser_out == NULL || parser_out->unexpected != NULL)
-		 return (1);
+		if (parser_out == NULL || parser_out->syntax_error)
+			return (1);
 
 		/* ast_print(0, parser_out->ast); */
 		/* printf("\n"); */
@@ -119,11 +137,8 @@ int main(int argc, char **argv, char **envp)
 				return (1);
 
 			t_ret *parser_out = parse(lex_out);
-			if (parser_out == NULL || parser_out->unexpected != NULL)
-			{
-				printf("%s\n",((t_token *)parser_out->unexpected)->content);
+			if (parser_out == NULL || parser_out->syntax_error)
 				return (1);
-			}
 
 			int fds[2] = {MS_NO_FD, MS_NO_FD};
 			int eval_out = eval(fds, env, path, parser_out->ast);
@@ -134,7 +149,7 @@ int main(int argc, char **argv, char **envp)
 
 	ft_htdestroy(path, free);
 	ft_vecdestroy(env, free);
-	return (0);
+	return (g_last_status_code);
 }
 // 	else
 // 	{
diff --git a/src/parse/parse.c b/src/parse/parse.c
index 6e4721a..b2532ac 100644
--- a/src/parse/parse.c
+++ b/src/parse/parse.c
@@ -6,7 +6,7 @@
 /*   By: nahaddac <nahaddac@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/17 18:09:04 by nahaddac          #+#    #+#             */
-/*   Updated: 2020/07/14 09:43:41 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/07/14 10:03:00 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,7 +34,7 @@ t_ret					*ret_wrap_ast(t_ast *ast, t_ftlst *rest)
 
 	if ((ret = malloc(sizeof(t_ret))) == NULL)
 		return (NULL);
-	ret->unexpected = NULL;
+	ret->syntax_error = false;
 	ret->rest = rest;
 	ret->ast = ast;
 	return ret;
@@ -165,17 +165,15 @@ t_ret       *parse_expr(t_ftlst *input)
 t_ret		*parse(t_ftlst *input)
 {
 	t_ret *ret;
-	t_ftlst *in_f;
 
-	in_f = input;
 	if (input == NULL)
 		return NULL;
 	if (!(ret = malloc(sizeof(t_ret) * 1)))
 		return (NULL);
 	ret->ast = NULL;
 	ret->rest = NULL;
-	if((ret->unexpected = error_syntax_simple(input)))
-		return (ret);
+	/* if((ret->unexpected = error_syntax_simple(input))) */
+	/* 	return (ret); */
 	ret = parse_op(input);
 	return (ret);
 }
diff --git a/src/parse/parse_error.c b/src/parse/parse_error.c
index b63715d..3d988ae 100644
--- a/src/parse/parse_error.c
+++ b/src/parse/parse_error.c
@@ -6,7 +6,7 @@
 /*   By: nahaddac <nahaddac@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/18 15:09:48 by nahaddac          #+#    #+#             */
-/*   Updated: 2020/07/14 09:43:35 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/07/14 10:01:43 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/preprocess.c b/src/preprocess.c
index eb6ac3b..13f297c 100644
--- a/src/preprocess.c
+++ b/src/preprocess.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/03 08:58:49 by charles           #+#    #+#             */
-/*   Updated: 2020/06/16 13:49:38 by charles          ###   ########.fr       */
+/*   Updated: 2020/07/13 11:08:18 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/utils.c b/src/utils.c
index 84a1920..7c1f496 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <cacharle@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/28 11:56:31 by cacharle          #+#    #+#             */
-/*   Updated: 2020/07/14 09:42:14 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/07/14 10:00:16 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -54,6 +54,8 @@ size_t	utils_var_end(char *name)
 {
 	size_t	i;
 
+	if (*name == '?')
+		return (2);
 	if (ft_isdigit(*name))
 		return (0);
 	i = 0;