diff --git a/Makefile b/Makefile index fbb7fa9..3f5e47f 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: Jskehan +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/05/14 15:15:48 by iverniho #+# #+# # -# Updated: 2024/07/25 16:02:24 by Jskehan ### ########.fr # +# Updated: 2024/07/25 16:31:19 by Jskehan ### ########.fr # # # # **************************************************************************** # @@ -40,11 +40,11 @@ SRC_BUILTIN = builtin_cd.c builtin_functions.c builtin_utils.c SRC_ENV = envp_functions.c path_resolution.c SRC_EXEC = execution.c SRC_INIT = initilisation.c -SRC_PARS = parser.c prompt.c parser_utils.c expand_vars.c tokenization.c set_redir_utils.c -SRC_REDIRECT = here_doc.c redirection.c +SRC_PARS = parser.c parser_utils.c expand_vars.c tokenization.c +SRC_REDIRECT = here_doc.c redirection.c set_redir_utils.c SRC_SIGNAL = signal.c SRC_TESTER = libft_extra_tests.c execution_tests.c node_tester.c -SRC_UTILS = error.c node_utils.c utils.c +SRC_UTILS = error.c node_utils.c utils.c prompt.c SRC = $(SRC_DIR) \ $(SRC_GNL) \ diff --git a/lib/libft/libft.a b/lib/libft/libft.a deleted file mode 100644 index 65e06c6..0000000 Binary files a/lib/libft/libft.a and /dev/null differ diff --git a/lib/libft/obj/src/ft_atoi.o b/lib/libft/obj/src/ft_atoi.o deleted file mode 100644 index 98d7c94..0000000 Binary files a/lib/libft/obj/src/ft_atoi.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_bzero.o b/lib/libft/obj/src/ft_bzero.o deleted file mode 100644 index 283753d..0000000 Binary files a/lib/libft/obj/src/ft_bzero.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_calloc.o b/lib/libft/obj/src/ft_calloc.o deleted file mode 100644 index 878bef1..0000000 Binary files a/lib/libft/obj/src/ft_calloc.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_isalnum.o b/lib/libft/obj/src/ft_isalnum.o deleted file mode 100644 index f1ba7cb..0000000 Binary files a/lib/libft/obj/src/ft_isalnum.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_isalpha.o b/lib/libft/obj/src/ft_isalpha.o deleted file mode 100644 index 1993e07..0000000 Binary files a/lib/libft/obj/src/ft_isalpha.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_isascii.o b/lib/libft/obj/src/ft_isascii.o deleted file mode 100644 index b4d302e..0000000 Binary files a/lib/libft/obj/src/ft_isascii.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_isdigit.o b/lib/libft/obj/src/ft_isdigit.o deleted file mode 100644 index 9bba9c5..0000000 Binary files a/lib/libft/obj/src/ft_isdigit.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_isprint.o b/lib/libft/obj/src/ft_isprint.o deleted file mode 100644 index 89a9507..0000000 Binary files a/lib/libft/obj/src/ft_isprint.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_itoa.o b/lib/libft/obj/src/ft_itoa.o deleted file mode 100644 index c9c6314..0000000 Binary files a/lib/libft/obj/src/ft_itoa.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstadd_back.o b/lib/libft/obj/src/ft_lstadd_back.o deleted file mode 100644 index 8db002d..0000000 Binary files a/lib/libft/obj/src/ft_lstadd_back.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstadd_front.o b/lib/libft/obj/src/ft_lstadd_front.o deleted file mode 100644 index 0328a83..0000000 Binary files a/lib/libft/obj/src/ft_lstadd_front.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstclear.o b/lib/libft/obj/src/ft_lstclear.o deleted file mode 100644 index 1b56410..0000000 Binary files a/lib/libft/obj/src/ft_lstclear.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstdelone.o b/lib/libft/obj/src/ft_lstdelone.o deleted file mode 100644 index 5d37b30..0000000 Binary files a/lib/libft/obj/src/ft_lstdelone.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstiter.o b/lib/libft/obj/src/ft_lstiter.o deleted file mode 100644 index 702600d..0000000 Binary files a/lib/libft/obj/src/ft_lstiter.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstlast.o b/lib/libft/obj/src/ft_lstlast.o deleted file mode 100644 index 06fe1f4..0000000 Binary files a/lib/libft/obj/src/ft_lstlast.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstmap.o b/lib/libft/obj/src/ft_lstmap.o deleted file mode 100644 index 0419616..0000000 Binary files a/lib/libft/obj/src/ft_lstmap.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstnew.o b/lib/libft/obj/src/ft_lstnew.o deleted file mode 100644 index cde8371..0000000 Binary files a/lib/libft/obj/src/ft_lstnew.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_lstsize.o b/lib/libft/obj/src/ft_lstsize.o deleted file mode 100644 index adec3cf..0000000 Binary files a/lib/libft/obj/src/ft_lstsize.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_memchr.o b/lib/libft/obj/src/ft_memchr.o deleted file mode 100644 index 5dc0d62..0000000 Binary files a/lib/libft/obj/src/ft_memchr.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_memcmp.o b/lib/libft/obj/src/ft_memcmp.o deleted file mode 100644 index 96bff8b..0000000 Binary files a/lib/libft/obj/src/ft_memcmp.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_memcpy.o b/lib/libft/obj/src/ft_memcpy.o deleted file mode 100644 index f6ed351..0000000 Binary files a/lib/libft/obj/src/ft_memcpy.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_memmove.o b/lib/libft/obj/src/ft_memmove.o deleted file mode 100644 index 1cbf4f6..0000000 Binary files a/lib/libft/obj/src/ft_memmove.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_memset.o b/lib/libft/obj/src/ft_memset.o deleted file mode 100644 index 3fb4234..0000000 Binary files a/lib/libft/obj/src/ft_memset.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_putchar_fd.o b/lib/libft/obj/src/ft_putchar_fd.o deleted file mode 100644 index 1a610d1..0000000 Binary files a/lib/libft/obj/src/ft_putchar_fd.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_putendl_fd.o b/lib/libft/obj/src/ft_putendl_fd.o deleted file mode 100644 index 40b4dc7..0000000 Binary files a/lib/libft/obj/src/ft_putendl_fd.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_putnbr_fd.o b/lib/libft/obj/src/ft_putnbr_fd.o deleted file mode 100644 index 1219552..0000000 Binary files a/lib/libft/obj/src/ft_putnbr_fd.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_putstr_fd.o b/lib/libft/obj/src/ft_putstr_fd.o deleted file mode 100644 index 49ddd4d..0000000 Binary files a/lib/libft/obj/src/ft_putstr_fd.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_realloc.o b/lib/libft/obj/src/ft_realloc.o deleted file mode 100644 index 1684deb..0000000 Binary files a/lib/libft/obj/src/ft_realloc.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_split.o b/lib/libft/obj/src/ft_split.o deleted file mode 100644 index 1517ce7..0000000 Binary files a/lib/libft/obj/src/ft_split.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strchr.o b/lib/libft/obj/src/ft_strchr.o deleted file mode 100644 index 66c044a..0000000 Binary files a/lib/libft/obj/src/ft_strchr.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strdup.o b/lib/libft/obj/src/ft_strdup.o deleted file mode 100644 index 7dc9a65..0000000 Binary files a/lib/libft/obj/src/ft_strdup.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_striteri.o b/lib/libft/obj/src/ft_striteri.o deleted file mode 100644 index 9417c3f..0000000 Binary files a/lib/libft/obj/src/ft_striteri.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strjoin.o b/lib/libft/obj/src/ft_strjoin.o deleted file mode 100644 index c01592a..0000000 Binary files a/lib/libft/obj/src/ft_strjoin.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strlcat.o b/lib/libft/obj/src/ft_strlcat.o deleted file mode 100644 index e4601c7..0000000 Binary files a/lib/libft/obj/src/ft_strlcat.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strlcpy.o b/lib/libft/obj/src/ft_strlcpy.o deleted file mode 100644 index a853155..0000000 Binary files a/lib/libft/obj/src/ft_strlcpy.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strlen.o b/lib/libft/obj/src/ft_strlen.o deleted file mode 100644 index 43cab14..0000000 Binary files a/lib/libft/obj/src/ft_strlen.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strmapi.o b/lib/libft/obj/src/ft_strmapi.o deleted file mode 100644 index 1dd6827..0000000 Binary files a/lib/libft/obj/src/ft_strmapi.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strncmp.o b/lib/libft/obj/src/ft_strncmp.o deleted file mode 100644 index 20155fc..0000000 Binary files a/lib/libft/obj/src/ft_strncmp.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strnstr.o b/lib/libft/obj/src/ft_strnstr.o deleted file mode 100644 index 083a591..0000000 Binary files a/lib/libft/obj/src/ft_strnstr.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strrchr.o b/lib/libft/obj/src/ft_strrchr.o deleted file mode 100644 index 1c70aff..0000000 Binary files a/lib/libft/obj/src/ft_strrchr.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_strtrim.o b/lib/libft/obj/src/ft_strtrim.o deleted file mode 100644 index 6d3d8df..0000000 Binary files a/lib/libft/obj/src/ft_strtrim.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_substr.o b/lib/libft/obj/src/ft_substr.o deleted file mode 100644 index 1b7af4e..0000000 Binary files a/lib/libft/obj/src/ft_substr.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_tolower.o b/lib/libft/obj/src/ft_tolower.o deleted file mode 100644 index 73d1c97..0000000 Binary files a/lib/libft/obj/src/ft_tolower.o and /dev/null differ diff --git a/lib/libft/obj/src/ft_toupper.o b/lib/libft/obj/src/ft_toupper.o deleted file mode 100644 index 5577081..0000000 Binary files a/lib/libft/obj/src/ft_toupper.o and /dev/null differ 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 deleted file mode 100644 index b70cc56..0000000 Binary files a/lib/libft/obj/src_extra/ft_1st_char_in_set_i.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_2d_array_len.o b/lib/libft/obj/src_extra/ft_2d_array_len.o deleted file mode 100644 index e6661d0..0000000 Binary files a/lib/libft/obj/src_extra/ft_2d_array_len.o and /dev/null differ 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 deleted file mode 100644 index fbde592..0000000 Binary files a/lib/libft/obj/src_extra/ft_add_row_2d_array.o and /dev/null differ 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 deleted file mode 100644 index 3c2a7b1..0000000 Binary files a/lib/libft/obj/src_extra/ft_add_row_2d_array_i.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_count_char.o b/lib/libft/obj/src_extra/ft_count_char.o deleted file mode 100644 index fc38e07..0000000 Binary files a/lib/libft/obj/src_extra/ft_count_char.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_duplicate_2d_array.o b/lib/libft/obj/src_extra/ft_duplicate_2d_array.o deleted file mode 100644 index dd0f23b..0000000 Binary files a/lib/libft/obj/src_extra/ft_duplicate_2d_array.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_free_2d_array.o b/lib/libft/obj/src_extra/ft_free_2d_array.o deleted file mode 100644 index 46ecf28..0000000 Binary files a/lib/libft/obj/src_extra/ft_free_2d_array.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_is_only_special.o b/lib/libft/obj/src_extra/ft_is_only_special.o deleted file mode 100644 index ec89d44..0000000 Binary files a/lib/libft/obj/src_extra/ft_is_only_special.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_is_space.o b/lib/libft/obj/src_extra/ft_is_space.o deleted file mode 100644 index 05a1a58..0000000 Binary files a/lib/libft/obj/src_extra/ft_is_space.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_is_special_symbol.o b/lib/libft/obj/src_extra/ft_is_special_symbol.o deleted file mode 100644 index 5182d8a..0000000 Binary files a/lib/libft/obj/src_extra/ft_is_special_symbol.o and /dev/null differ 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 deleted file mode 100644 index 96f5125..0000000 Binary files a/lib/libft/obj/src_extra/ft_print_2d_array_fd.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_realloc_2d_array.o b/lib/libft/obj/src_extra/ft_realloc_2d_array.o deleted file mode 100644 index d9cf69c..0000000 Binary files a/lib/libft/obj/src_extra/ft_realloc_2d_array.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_splice_2d_array.o b/lib/libft/obj/src_extra/ft_splice_2d_array.o deleted file mode 100644 index 0e42901..0000000 Binary files a/lib/libft/obj/src_extra/ft_splice_2d_array.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_strchr_i.o b/lib/libft/obj/src_extra/ft_strchr_i.o deleted file mode 100644 index 08ddf91..0000000 Binary files a/lib/libft/obj/src_extra/ft_strchr_i.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_strcmp.o b/lib/libft/obj/src_extra/ft_strcmp.o deleted file mode 100644 index 27d80a9..0000000 Binary files a/lib/libft/obj/src_extra/ft_strcmp.o and /dev/null differ diff --git a/lib/libft/obj/src_extra/ft_strjoin_free.o b/lib/libft/obj/src_extra/ft_strjoin_free.o deleted file mode 100644 index bf22d0d..0000000 Binary files a/lib/libft/obj/src_extra/ft_strjoin_free.o and /dev/null differ diff --git a/minishell b/minishell deleted file mode 100755 index 8d70944..0000000 Binary files a/minishell and /dev/null differ diff --git a/src/parser/set_redir_utils.c b/src/redirect/set_redir_utils.c similarity index 100% rename from src/parser/set_redir_utils.c rename to src/redirect/set_redir_utils.c diff --git a/src/parser/prompt.c b/src/utils/prompt.c similarity index 100% rename from src/parser/prompt.c rename to src/utils/prompt.c diff --git a/src/utils/utils.c b/src/utils/utils.c index 4bff0f4..ea10c0e 100644 --- a/src/utils/utils.c +++ b/src/utils/utils.c @@ -6,7 +6,7 @@ /* By: Jskehan +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/03 16:34:53 by Jskehan #+# #+# */ -/* Updated: 2024/07/25 16:03:42 by Jskehan ### ########.fr */ +/* Updated: 2024/07/25 16:29:45 by Jskehan ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,5 +23,3 @@ void free_mini(t_mini *mini) ft_lstclear(&mini->node, free); free(mini); } - - \ No newline at end of file