Merge branch 'master' of https://github.com/SquidyShell/MiniShell

SquidyShell · Mar 22, 2024 · c3a90f2 · c3a90f2
2 parents 283dff1 + 815f861
commit c3a90f2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/srcs/main.c b/srcs/main.c
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   main.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: legrandc <legrandc@student.42.fr>          +#+  +:+       +#+        */
+/*   By: cviegas <cviegas@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/08 16:46:32 by cviegas           #+#    #+#             */
-/*   Updated: 2024/03/21 17:45:22 by legrandc         ###   ########.fr       */
+/*   Updated: 2024/03/22 13:36:49 by cviegas          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,8 +18,7 @@ int	main(int ac, char **av, char **env)
 {
 	t_vars	vars;
 
-	init_minishell(&vars, env);
-	get_paths(&vars);
+	(init_minishell(&vars, env), get_paths(&vars));
 	vars.dash_c = (ac == 3 && !ft_strcmp("-c", av[1]));
 	while (1)
 	{
@@ -30,10 +29,11 @@ int	main(int ac, char **av, char **env)
 			vars.line = readline(vars.readlinestring);
 		if (!vars.line)
 			break ;
+		if (!vars.line[0] && (free(vars.line), 1))
+			continue ;
 		if (!vars.dash_c && !*vars.line)
 			continue ;
-		save_line(&vars);
-		set_signals_cmd(&vars);
+		(save_line(&vars), set_signals_cmd(&vars));
 		if (parsing(&vars) != -1 && g_exit_status != 666)
 			g_exit_status = exec(&vars);
 		tok_clear(&vars.tokens);