「✏️」 norm: normed project.

include/minishell.h

@@ -45,5 +45,7 @@ t_list	**get_list2(t_list **list);
 int		get_exit_code(int in);
 size_t	ft_arrlen(char **a);
 char	**get_rl(char **rl);
+void	sig_c(int code);
+bool	run_checks(char *rl);
 
 #endif

src/main.c

@@ -6,114 +6,99 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/16 16:15:38 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/18 13:30:40 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 #include "parsing.h"
 
-char	**get_rl(char **rl)
+int	free_end(char *rl, t_env *env_l, int exit_code, bool print)
 {
-	static char	**ret;
+	free(rl);
-
+	rl_clear_history();
-	if (rl)
+	ft_envclear(&env_l, free);
-		ret = rl;
+	if (print == true)
-	return (ret);
+		ft_putendl_fd("exit", STDOUT_FILENO);
+	return (get_exit_code(exit_code));
 }
 
-void	sig_c(int code)
+void	__exec(t_list *cmd_list, t_env *env_l)
 {
-	(void)code;
+	if (!cmd_list)
-	ft_putchar_fd('\n', STDOUT_FILENO);
+		return ;
-	rl_on_new_line();
+	if (format_quotes(cmd_list))
-	rl_replace_line("", 0);
+	{
-	rl_redisplay();
+		ft_lstclear(get_list(NULL), &free_cmd);
-	get_exit_code(0);
+		return ;
+	}
+	get_list(&cmd_list);
+	if (check_redir(cmd_list))
+	{
+		ft_lstclear(get_list(NULL), &free_cmd);
+		return ;
+	}
+	exec_split_cmd(cmd_list, env_l);
+	ft_lstclear(&cmd_list, &free_cmd);
 }
 
-bool	run_checks(char *rl)
+void	__parse(char *rl, t_env *env_l)
 {
-	if (!*rl)
+	t_list	*cmd_list;
-		return (true);
+	t_list	*piped;
-	if (check_syntax(rl))
+
-		return (true);
+	rl = env_var_replace(rl, env_l);
-	if (check_quote(rl))
+	get_rl(&rl);
-		return (true);
+	piped = tokenizer(rl);
-	if (check_pipe(rl))
+	get_list(&piped);
-		return (true);
+	if (check_argv(piped))
-	if (check_space(rl))
+	{
-		return (true);
+		free(rl);
-	return (false);
+		ft_lstclear(&piped, &free_token);
+		return ;
+	}
+	cmd_list = get_cmd_list(piped);
+	free(rl);
+	ft_lstclear(&piped, &free_token);
+	__exec(cmd_list, env_l);
+}
+
+char	*__rl(t_env *env_l)
+{
+	char	*rl;
+	char	*prompt;
+
+	signal(SIGINT, &sig_c);
+	signal(SIGQUIT, SIG_IGN);
+	prompt = get_prompt(env_l);
+	rl = readline(prompt);
+	free(prompt);
+	return (rl);
 }
 
 int	main(int ac, char **av, char **env)
 {
 	char	*rl;
-	char	*prompt;
 	t_env	*env_l;
-	t_list	*cmd_list;
-	t_list	*piped;
 
 	(void)ac;
-	rl = NULL;
 	get_program_name(av[0]);
 	env_l = env_init(env);
-	get_env(&env_l);
 	if (!env_l)
 		return (EXIT_FAILURE);
-	get_exit_code(0);
+	get_env(&env_l);
+	get_exit_code(727);
 	while (1)
 	{
-		signal(SIGINT, &sig_c);
+		rl = __rl(env_l);
-		signal(SIGQUIT, SIG_IGN);
-		prompt = get_prompt(env_l);
-		rl = readline(prompt);
-		free(prompt);
 		if (!rl)
-		{
+			return (free_end(rl, env_l, -1, true));
-			ft_putendl_fd("exit", STDOUT_FILENO);
-			get_exit_code(0);
-			break ;
-		}
 		if (run_checks(rl))
 		{
 			free(rl);
 			continue ;
 		}
-		add_history(rl);
+		__parse(rl, env_l);
-		rl = env_var_replace(rl, env_l);
-		printf ("\t%s\n", rl);
-		get_rl(&rl);
-		piped = tokenizer(rl);
-		get_list(&piped);
-		if (check_argv(piped))
-		{
-			free(rl);
-			ft_lstclear(&piped, &free_token);
-			continue ;
-		}
-		cmd_list = get_cmd_list(piped);
-		free(rl);
-		ft_lstclear(&piped, &free_token);
-		if (!cmd_list)
-			continue ;
-		if (format_quotes(cmd_list))
-		{
-			ft_lstclear(get_list(NULL), &free_cmd);
-			continue ;
-		}
-		get_list(&cmd_list);
-		if (check_redir(cmd_list))
-		{
-			ft_lstclear(get_list(NULL), &free_cmd);
-			continue ;
-		}
-		exec_split_cmd(cmd_list, env_l);
-		ft_lstclear(&cmd_list, &free_cmd);
 	}
-	free(rl);
+	return (free_end(rl, env_l, -1, false));
-	rl_clear_history();
-	ft_envclear(&env_l, free);
-	return (get_exit_code(-1));
 }

src/parsing/check_error/check_quote.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/21 11:59:34 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/17 17:14:35 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/18 13:01:49 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,7 +17,7 @@
 
 char	*go_to_nxt_quote(char *rl, t_quote quote_type)
 {
-	 while (*rl && __is_quote(*rl) != quote_type)
+	while (*rl && __is_quote(*rl) != quote_type)
 		rl++;
 	return (rl);
 }

src/parsing/check_error/run_checks.c

@@ -0,0 +1,31 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   run_checks.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/07/18 13:30:27 by adjoly            #+#    #+#             */
+/*   Updated: 2024/07/18 13:31:33 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "parsing.h"
+#include "error_msg.h"
+#include <readline/history.h>
+
+bool	run_checks(char *rl)
+{
+	if (!*rl)
+		return (true);
+	if (check_space(rl))
+		return (true);
+	add_history(rl);
+	if (check_syntax(rl))
+		return (true);
+	if (check_quote(rl))
+		return (true);
+	if (check_pipe(rl))
+		return (true);
+	return (false);
+}

src/parsing/split_cmd.c

@@ -6,16 +6,13 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/04 15:00:32 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/17 16:04:23 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/18 13:02:26 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "parsing.h"
 #include "libft.h"
 
-
-#include <stdio.h>
-
 t_cmd	*split_cmd(char *cmd_av, t_cmd *cmd)
 {
 	char	**split;
@@ -27,6 +24,5 @@ t_cmd	*split_cmd(char *cmd_av, t_cmd *cmd)
 	if (!cmd->cmd)
 		return (NULL);
 	cmd->argv = split;
-	printf("%s\n", cmd->cmd);
 	return (cmd);
 }

src/utils/get.c

@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   get.c                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/07/18 13:08:56 by adjoly            #+#    #+#             */
+/*   Updated: 2024/07/18 13:09:15 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+char	**get_rl(char **rl)
+{
+	static char	**ret;
+
+	if (rl)
+		ret = rl;
+	return (ret);
+}

src/utils/sig.c

@@ -0,0 +1,23 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   sig.c                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/07/18 13:09:56 by adjoly            #+#    #+#             */
+/*   Updated: 2024/07/18 13:10:08 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+void	sig_c(int code)
+{
+	(void)code;
+	ft_putchar_fd('\n', STDOUT_FILENO);
+	rl_on_new_line();
+	rl_replace_line("", 0);
+	rl_redisplay();
+	get_exit_code(130);
+}