working on fixing pipes

Makefile

@@ -6,7 +6,7 @@
 #    By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/07/28 00:35:01 by tomoron           #+#    #+#              #
-#    Updated: 2024/03/29 14:34:57 by tomoron          ###   ########.fr        #
+#    Updated: 2024/04/01 20:09:57 by marde-vr         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -34,7 +34,7 @@ SRCS_RAW =	main.c\
 			commands.c\
 			pipe.c\
 			utils.c\
-			utils2.c\
+			utils_bonus.c\
 			signal_handler.c\
 			parsing_bonus.c\
 			exec_bonus.c

srcs/commands.c

@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/05 18:22:15 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/04/01 13:27:40 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 20:01:21 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -61,7 +61,7 @@ char	**get_cmd_args(t_msh *msh)
 
 	args_count = get_args_count(msh->cmds);
 	cmd_args = ft_calloc(args_count + 1, sizeof(char *));
-	if (!cmd_args || !msh->fds)
+	if (!cmd_args)
 		ft_exit(msh, 1);
 	cur_cmd = msh->cmds;
 	i = 0;

srcs/exec_bonus.c

@@ -6,12 +6,28 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/28 13:50:14 by tomoron           #+#    #+#             */
-/*   Updated: 2024/04/01 13:58:58 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 21:39:20 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
+void	get_redirections(t_msh *msh)
+{
+	if (first_is_in_type(msh))
+	{
+		get_in_type(msh, msh->cmds);
+		if (!g_return_code)
+			get_out_type(msh, msh->cmds);
+	}
+	else
+	{
+		get_out_type(msh, msh->cmds);
+		if (!g_return_code)
+			get_in_type(msh, msh->cmds);
+	}
+}
+
 void	exec_command_bonus(t_msh *msh, char *cmd_str)
 {
 	t_cmd *cmds;
@@ -23,11 +39,8 @@ void	exec_command_bonus(t_msh *msh, char *cmd_str)
 	{
 		if (cmds->cmd_type == CMD)
 		{
-			if (cmds->next->cmd_type == PIPE)
-			{
-
-			}
 			msh->cmds = parse_command(cmds->value, msh->env);
+			get_redirections(msh);
 			print_parsed_cmd(cmds);
 			print_parsed_token(msh->cmds);
 			exec_commands(msh);
@@ -37,6 +50,7 @@ void	exec_command_bonus(t_msh *msh, char *cmd_str)
 	if (cmds && cmds->cmd_type == CMD)
 	{
 		msh->cmds = parse_command(cmds->value, msh->env);
+		get_redirections(msh);
 		print_parsed_cmd(cmds);
 		print_parsed_token(msh->cmds);
 		exec_commands(msh);
@@ -46,14 +60,17 @@ void	exec_command_bonus(t_msh *msh, char *cmd_str)
 int	exec(t_msh *msh, char **cmd_args, int i, int cmd_count)
 {
 	pid_t	pid;
+	int		fds[2];
 
 	if (i != cmd_count - 1)
 	{
-		if (pipe(msh->fds[i]) == -1)
+		if (pipe(fds) == -1)
 		{
 			perror("pipe");
 			ft_exit(msh, 1);
 		}
+		msh->in_fd = fds[0];
+		msh->out_fd = fds[1];
 	}
 	pid = fork();
 	if (pid == -1)
@@ -75,21 +92,6 @@ int	exec(t_msh *msh, char **cmd_args, int i, int cmd_count)
 void	exec_command(t_msh *msh, int i, int cmd_count)
 {
 	g_return_code = 0;
-	msh->fds[i] = ft_calloc(2, sizeof(int *));
-	if (!msh->fds[i])
-		ft_exit(msh, 1);
-	if (first_is_in_type(msh))
-	{
-		get_in_type(msh, msh->cmds);
-		if (!g_return_code)
-			get_out_type(msh, msh->cmds);
-	}
-	else
-	{
-		get_out_type(msh, msh->cmds);
-		if (!g_return_code)
-			get_in_type(msh, msh->cmds);
-	}
 	if (!cmd_is_builtin(msh, msh->cmds->value))
 		get_cmd_path(msh);
 	exec(msh, get_cmd_args(msh), i, cmd_count);
@@ -108,15 +110,6 @@ void	end_execution(t_msh *msh, int cmd_count)
 		g_return_code = WEXITSTATUS(status);
 	if (WIFSIGNALED(status) && WTERMSIG(status) == SIGQUIT)
 		printf("Quit (core dumped)\n");
-	i = 0;
-	while (i < cmd_count)
-	{
-		free(msh->fds[i]);
-		msh->fds[i] = 0;
-		i++;
-	}
-	free(msh->fds);
-	msh->fds = 0;
 	free(msh->pids);
 	msh->pids = 0;
 	//signal(SIGINT, signal_handler_interactive); //enables ctrl-C
@@ -130,13 +123,10 @@ void	exec_commands(t_msh *msh)
 	int	i;
 
 	i = -1;
-	if (!msh->cmds)
-		return ;
 	cmd_count = get_cmd_count(msh->cmds);
 	ft_printf("cmd_count: %d\n", cmd_count);
-	msh->fds = ft_calloc(cmd_count, sizeof(int **));
 	msh->pids = ft_calloc(cmd_count, sizeof(int *));
-	if (!msh->pids || !msh->fds)
+	if (!msh->pids)
 		ft_exit(msh, 1);
 	while (++i < cmd_count)
 		exec_command(msh, i, cmd_count);

srcs/exit.c

@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/07 16:04:11 by tomoron           #+#    #+#             */
-/*   Updated: 2024/04/01 13:19:41 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 20:07:47 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,7 +37,6 @@ int	exit_bt(t_msh *msh)
 {
 	t_token	*cur_cmd;
 	int		exit_code;
-	int		cmd_count;
 
 	cur_cmd = msh->cmds->next;
 	ft_printf("exit\n");
@@ -47,15 +46,6 @@ int	exit_bt(t_msh *msh)
 	else
 	{
 		get_exit_bt_return_code(msh, &exit_code);
-		if (msh->fds)
-		{
-			cmd_count = get_cmd_count(msh->cmds);
-			while (cmd_count)
-			{
-				free(msh->fds[cmd_count - 1]);
-				cmd_count--;
-			}
-		}
 		free_msh(msh);
 		exit(exit_code);
 	}

srcs/here_doc.c

@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/24 17:44:32 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/03/26 17:52:26 by tomoron          ###   ########.fr       */
+/*   Updated: 2024/04/01 20:06:47 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -43,7 +43,6 @@ void	here_doc_child(t_msh *msh, char *eof, char *here_doc_file)
 	get_here_doc_input(msh, eof);
 	close(msh->in_fd);
 	free(here_doc_file);
-	free(msh->fds[0]);
 	ft_exit(msh, 0);
 }
 

srcs/input_redirections.c

@@ -6,13 +6,13 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/05 18:15:27 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/04/01 13:20:54 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 20:08:48 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-void	redirect_input(t_msh *msh, int i)
+void	redirect_input(t_msh *msh)
 {
 	if (/*msh->in_type != PIPE*/ 1)
 	{
@@ -22,7 +22,7 @@ void	redirect_input(t_msh *msh, int i)
 	}
 	else
 	{
-		if (dup2(msh->fds[i - 1][0], 0) < 0)
+		if (dup2(msh->in_fd, 0) < 0)
 			ft_exit(msh, 1);
 	}
 }

srcs/minishell.h

@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/04 17:31:38 by tomoron           #+#    #+#             */
-/*   Updated: 2024/04/01 13:24:39 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 20:09:38 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -69,7 +69,6 @@ typedef struct s_msh
 {
 	t_env			*env;
 	t_token			*cmds;
-	int				**fds;
 	int				*pids;
 	t_token_type	in_type;
 	t_token_type	out_type;
@@ -106,10 +105,10 @@ void	remove_command_from_msh(t_msh *msh);
 void	ft_exit(t_msh *msh, int error_code);
 void	signal_handler_command(int signum);
 void	ft_exit(t_msh *msh, int exit_code);
-void	redirect_output(t_msh *msh, int i);
+void	redirect_output(t_msh *msh);
 char	**split_paths_from_env(t_env *env);
 int		add_return_code_to_str(char *res);
-void	redirect_input(t_msh *msh, int i);
+void	redirect_input(t_msh *msh);
 void	parse_var(t_msh *msh, char *line);
 void	print_parsed_token(t_token *cmd);//debug
 int		get_var_name_len(char *command);

srcs/output_redirections.c

@@ -6,13 +6,13 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/05 19:10:52 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/04/01 13:21:28 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 20:09:27 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-void	redirect_output(t_msh *msh, int i)
+void	redirect_output(t_msh *msh)
 {
 	if (/*msh->out_type != PIPE*/ 1)
 	{
@@ -21,7 +21,7 @@ void	redirect_output(t_msh *msh, int i)
 	}
 	else
 	{
-		if (dup2(msh->fds[i][1], 1) < 0)
+		if (dup2(msh->out_fd, 1) < 0)
 			ft_exit(msh, 1);
 	}
 }

srcs/pipe.c

@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/05 18:17:25 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/04/01 13:59:08 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 20:09:14 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,30 +16,24 @@ void	close_pipe_fds(t_msh *msh, int i)
 {
 	if (i != 0)
 	{
-		if (msh->fds[i - 1][0] > 2)
+		if (msh->in_fd > 2)
-			close(msh->fds[i - 1][0]);
+			close(msh->in_fd);
-		if (msh->fds[i - 1][1] > 2)
+		if (msh->out_fd > 2)
-			close(msh->fds[i - 1][1]);
+			close(msh->out_fd);
 	}
-	if (msh->fds[i][0] > 2)
+	if (msh->in_fd > 2)
-		close(msh->fds[i][0]);
+		close(msh->out_fd);
-	if (msh->fds[i][1] > 2)
+	if (msh->in_fd > 2)
-		close(msh->fds[i][1]);
+		close(msh->in_fd);
 }
 
-void	execute_command(t_msh *msh, char **cmd_args, int i)
+void	execute_command(t_msh *msh, char **cmd_args)
 {
 	char	**env;
 
 	if (msh->cmds->value && (!ft_strcmp(msh->cmds->value, "cd")
 			|| !ft_strcmp(msh->cmds->value, "exit") || exec_builtin(msh)))
 	{
-		while (i >= 0)
-		{
-			free(msh->fds[i]);
-			msh->fds[i] = 0;
-			i--;
-		}
 		free(cmd_args);
 		ft_exit(msh, g_return_code);
 	}
@@ -56,21 +50,15 @@ void	child(t_msh *msh, char **cmd_args, int i)
 {
 	if ((msh->in_type != ARG/* && msh->in_type != PIPE*/)
 		|| (/*msh->in_type == PIPE &&*/ i > 0))
-		redirect_input(msh, i);
+		redirect_input(msh);
 	if (/*msh->out_type == PIPE ||*/ msh->out_type == RED_O
 		|| msh->out_type == RED_O_APP)
 		redirect_output(msh, i);
 	close_pipe_fds(msh, i);
-	execute_command(msh, cmd_args, i);
+	execute_command(msh, cmd_args);
 	close(0);
 	close(1);
 	close(2);
-	while (i >= 0)
-	{
-		free(msh->fds[i]);
-		msh->fds[i] = 0;
-		i--;
-	}
 	free(cmd_args);
 	ft_exit(msh, g_return_code);
 }
@@ -81,17 +69,17 @@ void	parent(t_msh *msh, int i, int cmd_count)
 	signal(SIGQUIT, signal_handler_command);
 	if (i != 0)
 	{
-		if (msh->fds[i - 1][0] > 2)
+		if (msh->in_fd > 2)
-			close(msh->fds[i - 1][0]);
+			close(msh->in_fd);
-		if (msh->fds[i - 1][1] > 2)
+		if (msh->out_fd > 2)
-			close(msh->fds[i - 1][1]);
+			close(msh->out_fd);
 	}
 	if (i == cmd_count - 1)
 	{
-		if (msh->fds[i][0] > 2)
+		if (msh->in_fd > 2)
-			close(msh->fds[i][0]);
+			close(msh->in_fd);
-		if (msh->fds[i][1] > 2)
+		if (msh->out_fd > 2)
-			close(msh->fds[i][1]);
+			close(msh->out_fd);
 	}
 	if (msh->in_fd > 2)
 		close(msh->in_fd);

srcs/signal_handler.c

@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/22 14:31:13 by tomoron           #+#    #+#             */
-/*   Updated: 2024/03/27 17:21:09 by tomoron          ###   ########.fr       */
+/*   Updated: 2024/04/01 20:10:09 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -49,7 +49,6 @@ void	signal_handler_here_doc(int signum)
 		here_doc_file = here_doc_variables(0, 1, 0);
 		close(msh->in_fd);
 		free(here_doc_file);
-		free(msh->fds[0]);
 		ft_exit(msh, 1);
 	}
 }

srcs/utils.c

@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/05 18:19:26 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/04/01 13:28:00 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/01 20:06:36 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,7 +18,6 @@ void	free_msh(t_msh *msh)
 	{
 		free_env(msh->env);
 		free(msh->pids);
-		free(msh->fds);
 		free_token(msh->cmds);
 		set_echoctl(msh->echoctl);
 		free(msh);