make cleaning. gotta love hugo

vctrubio · Jan 11, 2023 · eeae38b · eeae38b
1 parent d6c2227
commit eeae38b
Show file tree

Hide file tree

Showing 82 changed files with 12 additions and 172 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/lib/libft.a b/lib/libft.a
diff --git a/lib/srcs/ft_atoi.o b/lib/srcs/ft_atoi.o
diff --git a/lib/srcs/ft_bzero.o b/lib/srcs/ft_bzero.o
diff --git a/lib/srcs/ft_c_counter.o b/lib/srcs/ft_c_counter.o
diff --git a/lib/srcs/ft_calloc.o b/lib/srcs/ft_calloc.o
diff --git a/lib/srcs/ft_d_counter.o b/lib/srcs/ft_d_counter.o
diff --git a/lib/srcs/ft_is_n_o_a.o b/lib/srcs/ft_is_n_o_a.o
diff --git a/lib/srcs/ft_isalpha.o b/lib/srcs/ft_isalpha.o
diff --git a/lib/srcs/ft_isascii.o b/lib/srcs/ft_isascii.o
diff --git a/lib/srcs/ft_isdigit.o b/lib/srcs/ft_isdigit.o
diff --git a/lib/srcs/ft_isprint.o b/lib/srcs/ft_isprint.o
diff --git a/lib/srcs/ft_isspace.o b/lib/srcs/ft_isspace.o
diff --git a/lib/srcs/ft_isupper.o b/lib/srcs/ft_isupper.o
diff --git a/lib/srcs/ft_memccpy.o b/lib/srcs/ft_memccpy.o
diff --git a/lib/srcs/ft_memchr.o b/lib/srcs/ft_memchr.o
diff --git a/lib/srcs/ft_memcmp.o b/lib/srcs/ft_memcmp.o
diff --git a/lib/srcs/ft_memcpy.o b/lib/srcs/ft_memcpy.o
diff --git a/lib/srcs/ft_memmove.o b/lib/srcs/ft_memmove.o
diff --git a/lib/srcs/ft_memset.o b/lib/srcs/ft_memset.o
diff --git a/lib/srcs/ft_putchar.o b/lib/srcs/ft_putchar.o
diff --git a/lib/srcs/ft_putstr.o b/lib/srcs/ft_putstr.o
diff --git a/lib/srcs/ft_realloc.o b/lib/srcs/ft_realloc.o
diff --git a/lib/srcs/ft_str_offset.o b/lib/srcs/ft_str_offset.o
diff --git a/lib/srcs/ft_stradd.o b/lib/srcs/ft_stradd.o
diff --git a/lib/srcs/ft_strchr.o b/lib/srcs/ft_strchr.o
diff --git a/lib/srcs/ft_strclr.o b/lib/srcs/ft_strclr.o
diff --git a/lib/srcs/ft_strcpy.o b/lib/srcs/ft_strcpy.o
diff --git a/lib/srcs/ft_strdup.o b/lib/srcs/ft_strdup.o
diff --git a/lib/srcs/ft_strexact.o b/lib/srcs/ft_strexact.o
diff --git a/lib/srcs/ft_strexist.o b/lib/srcs/ft_strexist.o
diff --git a/lib/srcs/ft_strfree.o b/lib/srcs/ft_strfree.o
diff --git a/lib/srcs/ft_strjoin.o b/lib/srcs/ft_strjoin.o
diff --git a/lib/srcs/ft_strlen.o b/lib/srcs/ft_strlen.o
diff --git a/lib/srcs/ft_strncmp.o b/lib/srcs/ft_strncmp.o
diff --git a/lib/srcs/ft_strnew.o b/lib/srcs/ft_strnew.o
diff --git a/lib/srcs/ft_strnstr.o b/lib/srcs/ft_strnstr.o
diff --git a/lib/srcs/ft_strsplit.o b/lib/srcs/ft_strsplit.o
diff --git a/lib/srcs/ft_substr.o b/lib/srcs/ft_substr.o
diff --git a/lib/srcs/ft_tolower.o b/lib/srcs/ft_tolower.o
diff --git a/lib/srcs/ft_toupper.o b/lib/srcs/ft_toupper.o
diff --git a/lib/srcs/ft_validnl.o b/lib/srcs/ft_validnl.o
diff --git a/lib/srcs/ft_wrdcnt.o b/lib/srcs/ft_wrdcnt.o
diff --git a/lib/srcs/gnl.o b/lib/srcs/gnl.o
diff --git a/minishell b/minishell
diff --git a/srcs/built_ins_background.c b/srcs/built_ins_background.c
diff --git a/srcs/built_ins_background2.c b/srcs/built_ins_background2.c
diff --git a/srcs/builtins.o b/srcs/builtins.o
diff --git a/srcs/builtins_background.o b/srcs/builtins_background.o
diff --git a/srcs/builtins_background2.o b/srcs/builtins_background2.o
diff --git a/srcs/builtins_checkers.o b/srcs/builtins_checkers.o
diff --git a/srcs/builtins_runners.o b/srcs/builtins_runners.o
diff --git a/srcs/cmd_build.o b/srcs/cmd_build.o
diff --git a/srcs/cmd_build2.o b/srcs/cmd_build2.o
diff --git a/srcs/concat.o b/srcs/concat.o
diff --git a/srcs/create_files.o b/srcs/create_files.o
diff --git a/srcs/error.o b/srcs/error.o
diff --git a/srcs/exec.o b/srcs/exec.o
diff --git a/srcs/free.o b/srcs/free.o
diff --git a/srcs/heredoc.o b/srcs/heredoc.o
diff --git a/srcs/hg_loop.o b/srcs/hg_loop.o
diff --git a/srcs/initializers.o b/srcs/initializers.o
diff --git a/srcs/loop.o b/srcs/loop.o
diff --git a/srcs/loop_new.o b/srcs/loop_new.o
diff --git a/srcs/loop_utils.o b/srcs/loop_utils.o
diff --git a/srcs/main.o b/srcs/main.o
diff --git a/srcs/matrix_fts.o b/srcs/matrix_fts.o
diff --git a/srcs/matrix_utils.o b/srcs/matrix_utils.o
diff --git a/srcs/parse.o b/srcs/parse.o
diff --git a/srcs/parse2.o b/srcs/parse2.o
diff --git a/srcs/parse_clean.o b/srcs/parse_clean.o
diff --git a/srcs/parse_env.o b/srcs/parse_env.o
diff --git a/srcs/path.o b/srcs/path.o
diff --git a/srcs/prompt.o b/srcs/prompt.o
diff --git a/srcs/shell.o b/srcs/shell.o
diff --git a/srcs/utils2.o b/srcs/utils2.o
diff --git a/srcs/utils_array.o b/srcs/utils_array.o
diff --git a/srcs/utils_fd.o b/srcs/utils_fd.o
diff --git a/srcs/utils_parsing.o b/srcs/utils_parsing.o
diff --git a/srcs/validation.c b/srcs/validation.c
@@ -12,8 +12,12 @@
 
 #include "../include/minishell.h"
 
-static void	ft_validate_pipe_matrix(char **line, int i)
+static void	ft_validate_pipe_matrix(char **line, int i, int j)
 {
+	if (i == 0 && j == 0)
+		_shell()->valid_input = false;
+	if (line[i + 1] && line[i + 1][0] == '|')
+		_shell()->valid_input = false;
 	if (line[i])
 	{
 		if (line[i][1])
@@ -22,6 +26,10 @@ static void	ft_validate_pipe_matrix(char **line, int i)
 				_shell()->valid_input = false;
 		}
 	}
+	if (line[i + 1] == NULL)
+	{
+		_shell()->valid_input = false;
+	}
 }
 
 static void	ft_validate_redir_output_matrix(char **line, int i)
@@ -52,8 +60,8 @@ void	validate_rl(char **matrix)
 	int		j;
 	char	c;
 
-	i = 0;
-	while (matrix[i])
+	i = -1;
+	while (matrix[++i])
 	{
 		j = -1;
 		while (matrix[i][++j])
@@ -65,18 +73,11 @@ void	validate_rl(char **matrix)
 					j++;
 			}
 			if (matrix[i][j] == '|')
-			{
-				if (i == 0 && j == 0)
-					_shell()->valid_input = false;
-				if (matrix[i + 1] && matrix[i + 1][0] == '|')
-					_shell()->valid_input = false;
-				ft_validate_pipe_matrix(matrix, i);
-			}
+				ft_validate_pipe_matrix(matrix, i, j);
 			if (matrix[i][j] == '>')
 				ft_validate_redir_output_matrix(matrix, i);
 			if (matrix[i][j] == '<')
 				ft_validate_redir_input_matrix(matrix, i);
 		}
-		i++;
 	}
 }
diff --git a/srcs/validation.o b/srcs/validation.o
diff --git a/srcs/var_expansion.o b/srcs/var_expansion.o