fixxing execution need to remove for loops XD

jackoske · Aug 2, 2024 · 101b4b0 · 101b4b0
1 parent d96f58d
commit 101b4b0
Show file tree

Hide file tree

Showing 65 changed files with 96 additions and 227 deletions.
diff --git a/lib/libft/libft.a b/lib/libft/libft.a
diff --git a/lib/libft/obj/src/ft_atoi.o b/lib/libft/obj/src/ft_atoi.o
diff --git a/lib/libft/obj/src/ft_bzero.o b/lib/libft/obj/src/ft_bzero.o
diff --git a/lib/libft/obj/src/ft_calloc.o b/lib/libft/obj/src/ft_calloc.o
diff --git a/lib/libft/obj/src/ft_isalnum.o b/lib/libft/obj/src/ft_isalnum.o
diff --git a/lib/libft/obj/src/ft_isalpha.o b/lib/libft/obj/src/ft_isalpha.o
diff --git a/lib/libft/obj/src/ft_isascii.o b/lib/libft/obj/src/ft_isascii.o
diff --git a/lib/libft/obj/src/ft_isdigit.o b/lib/libft/obj/src/ft_isdigit.o
diff --git a/lib/libft/obj/src/ft_isprint.o b/lib/libft/obj/src/ft_isprint.o
diff --git a/lib/libft/obj/src/ft_itoa.o b/lib/libft/obj/src/ft_itoa.o
diff --git a/lib/libft/obj/src/ft_lstadd_back.o b/lib/libft/obj/src/ft_lstadd_back.o
diff --git a/lib/libft/obj/src/ft_lstadd_front.o b/lib/libft/obj/src/ft_lstadd_front.o
diff --git a/lib/libft/obj/src/ft_lstclear.o b/lib/libft/obj/src/ft_lstclear.o
diff --git a/lib/libft/obj/src/ft_lstdelone.o b/lib/libft/obj/src/ft_lstdelone.o
diff --git a/lib/libft/obj/src/ft_lstiter.o b/lib/libft/obj/src/ft_lstiter.o
diff --git a/lib/libft/obj/src/ft_lstlast.o b/lib/libft/obj/src/ft_lstlast.o
diff --git a/lib/libft/obj/src/ft_lstmap.o b/lib/libft/obj/src/ft_lstmap.o
diff --git a/lib/libft/obj/src/ft_lstnew.o b/lib/libft/obj/src/ft_lstnew.o
diff --git a/lib/libft/obj/src/ft_lstsize.o b/lib/libft/obj/src/ft_lstsize.o
diff --git a/lib/libft/obj/src/ft_memchr.o b/lib/libft/obj/src/ft_memchr.o
diff --git a/lib/libft/obj/src/ft_memcmp.o b/lib/libft/obj/src/ft_memcmp.o
diff --git a/lib/libft/obj/src/ft_memcpy.o b/lib/libft/obj/src/ft_memcpy.o
diff --git a/lib/libft/obj/src/ft_memmove.o b/lib/libft/obj/src/ft_memmove.o
diff --git a/lib/libft/obj/src/ft_memset.o b/lib/libft/obj/src/ft_memset.o
diff --git a/lib/libft/obj/src/ft_putchar_fd.o b/lib/libft/obj/src/ft_putchar_fd.o
diff --git a/lib/libft/obj/src/ft_putendl_fd.o b/lib/libft/obj/src/ft_putendl_fd.o
diff --git a/lib/libft/obj/src/ft_putnbr_fd.o b/lib/libft/obj/src/ft_putnbr_fd.o
diff --git a/lib/libft/obj/src/ft_putstr_fd.o b/lib/libft/obj/src/ft_putstr_fd.o
diff --git a/lib/libft/obj/src/ft_realloc.o b/lib/libft/obj/src/ft_realloc.o
diff --git a/lib/libft/obj/src/ft_split.o b/lib/libft/obj/src/ft_split.o
diff --git a/lib/libft/obj/src/ft_strchr.o b/lib/libft/obj/src/ft_strchr.o
diff --git a/lib/libft/obj/src/ft_strdup.o b/lib/libft/obj/src/ft_strdup.o
diff --git a/lib/libft/obj/src/ft_striteri.o b/lib/libft/obj/src/ft_striteri.o
diff --git a/lib/libft/obj/src/ft_strjoin.o b/lib/libft/obj/src/ft_strjoin.o
diff --git a/lib/libft/obj/src/ft_strlcat.o b/lib/libft/obj/src/ft_strlcat.o
diff --git a/lib/libft/obj/src/ft_strlcpy.o b/lib/libft/obj/src/ft_strlcpy.o
diff --git a/lib/libft/obj/src/ft_strlen.o b/lib/libft/obj/src/ft_strlen.o
diff --git a/lib/libft/obj/src/ft_strmapi.o b/lib/libft/obj/src/ft_strmapi.o
diff --git a/lib/libft/obj/src/ft_strncmp.o b/lib/libft/obj/src/ft_strncmp.o
diff --git a/lib/libft/obj/src/ft_strnstr.o b/lib/libft/obj/src/ft_strnstr.o
diff --git a/lib/libft/obj/src/ft_strrchr.o b/lib/libft/obj/src/ft_strrchr.o
diff --git a/lib/libft/obj/src/ft_strtrim.o b/lib/libft/obj/src/ft_strtrim.o
diff --git a/lib/libft/obj/src/ft_substr.o b/lib/libft/obj/src/ft_substr.o
diff --git a/lib/libft/obj/src/ft_tolower.o b/lib/libft/obj/src/ft_tolower.o
diff --git a/lib/libft/obj/src/ft_toupper.o b/lib/libft/obj/src/ft_toupper.o
diff --git a/lib/libft/obj/src_extra/ft_1st_char_in_set_i.o b/lib/libft/obj/src_extra/ft_1st_char_in_set_i.o
diff --git a/lib/libft/obj/src_extra/ft_2d_array_len.o b/lib/libft/obj/src_extra/ft_2d_array_len.o
diff --git a/lib/libft/obj/src_extra/ft_add_row_2d_array.o b/lib/libft/obj/src_extra/ft_add_row_2d_array.o
diff --git a/lib/libft/obj/src_extra/ft_add_row_2d_array_i.o b/lib/libft/obj/src_extra/ft_add_row_2d_array_i.o
diff --git a/lib/libft/obj/src_extra/ft_count_char.o b/lib/libft/obj/src_extra/ft_count_char.o
diff --git a/lib/libft/obj/src_extra/ft_duplicate_2d_array.o b/lib/libft/obj/src_extra/ft_duplicate_2d_array.o
diff --git a/lib/libft/obj/src_extra/ft_free_2d_array.o b/lib/libft/obj/src_extra/ft_free_2d_array.o
diff --git a/lib/libft/obj/src_extra/ft_is_only_special.o b/lib/libft/obj/src_extra/ft_is_only_special.o
diff --git a/lib/libft/obj/src_extra/ft_is_space.o b/lib/libft/obj/src_extra/ft_is_space.o
diff --git a/lib/libft/obj/src_extra/ft_is_special_symbol.o b/lib/libft/obj/src_extra/ft_is_special_symbol.o
diff --git a/lib/libft/obj/src_extra/ft_print_2d_array_fd.o b/lib/libft/obj/src_extra/ft_print_2d_array_fd.o
diff --git a/lib/libft/obj/src_extra/ft_realloc_2d_array.o b/lib/libft/obj/src_extra/ft_realloc_2d_array.o
diff --git a/lib/libft/obj/src_extra/ft_splice_2d_array.o b/lib/libft/obj/src_extra/ft_splice_2d_array.o
diff --git a/lib/libft/obj/src_extra/ft_strchr_i.o b/lib/libft/obj/src_extra/ft_strchr_i.o
diff --git a/lib/libft/obj/src_extra/ft_strcmp.o b/lib/libft/obj/src_extra/ft_strcmp.o
diff --git a/lib/libft/obj/src_extra/ft_strjoin_free.o b/lib/libft/obj/src_extra/ft_strjoin_free.o
diff --git a/minishell b/minishell
diff --git a/src/exec/execution.c b/src/exec/execution.c
@@ -6,7 +6,7 @@
 /*   By: Jskehan <[email protected]>      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/16 10:52:13 by Jskehan           #+#    #+#             */
-/*   Updated: 2024/08/02 12:46:45 by Jskehan          ###   ########.fr       */
+/*   Updated: 2024/08/02 14:44:29 by Jskehan          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -83,12 +83,14 @@ static void	close_pipes_in_parent(int num_cmds, int pipes[][2])
 	}
 }
 
-static void	close_pipes_in_child(int num_cmds, int pipes[][2])
+static void	close_pipes_in_child(int num_cmds, int pipes[][2], int i)
 {
-	for (int i = 0; i < num_cmds - 1; i++)
+	for (int j = 0; j < num_cmds - 1; j++)
 	{
-		close(pipes[i][0]);
-		close(pipes[i][1]);
+		if (j != i - 1)
+			close(pipes[j][0]);
+		if (j != i)
+			close(pipes[j][1]);
 	}
 }
 
@@ -134,44 +136,35 @@ void	exec_pipes(t_mini *mini, t_list *commands)
 {
 	int		num_cmds;
 	int		pipes[128][2]; // Define a maximum number of pipes
-	t_list	*cmd_node;
 	pid_t	pid;
-	int		i;
+	int		i;					
 	t_cmd	*cmd;
 
 	num_cmds = ft_lstsize(commands);
-	cmd_node = commands;
 	i = 0;
 	create_pipes(num_cmds, pipes);
-	while (cmd_node)
+	while (i < num_cmds)
 	{
-		cmd = (t_cmd *)cmd_node->content;
-		printf("Executing command: %s\n", cmd->full_command[0]); // Debug print
+		cmd = (t_cmd *)commands->content;
 		if ((pid = fork()) == 0)
 		{
 			setup_pipe_redirection(i, num_cmds, pipes);
-			close_pipes_in_child(num_cmds, pipes);
+			close_pipes_in_child(num_cmds, pipes, i);
 			child_process(mini, cmd);
-			exit(0); // Ensure child process exits after executing the command
 		}
 		else if (pid < 0)
 		{
 			perror("fork");
 			exit(EXIT_FAILURE);
 		}
-		// Close the write end of the previous pipe in the parent
-		if (i > 0)
-		{
-			close(pipes[i - 1][0]);
-			close(pipes[i - 1][1]);
-		}
-		cmd_node = cmd_node->next;
+		commands = commands->next;
 		i++;
 	}
 	close_pipes_in_parent(num_cmds, pipes);
 	wait_for_children(num_cmds, mini);
 }
 
+
 void	*check_to_fork(t_mini *mini, t_list *commands)
 {
 	t_cmd	*cmd;

diff --git a/src/parser/prompt.c b/src/parser/prompt.c