From f53969cd4596cea8b7c586a14b38b7ffa7798302 Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Thu, 16 Dec 2021 03:37:34 +0100 Subject: [PATCH] srcs files moved --- Makefile | 18 +++++++++++------- .../expansions => generic}/ft_split_MODIF.c | 0 .../expansions => generic}/ft_split_quotes.c | 0 .../expansions => generic}/ft_strdup_quotes.c | 0 srcs/{ => generic}/generic.c | 0 srcs/{ => misc}/error_wrappers.c | 0 srcs/{ => misc}/free.c | 0 srcs/{ => misc}/init.c | 0 srcs/{ => misc}/last_exit_status.c | 0 srcs/{ => misc}/retrieve_path.c | 0 srcs/{ => misc}/signals.c | 0 srcs/{ => misc}/terminal.c | 0 12 files changed, 11 insertions(+), 7 deletions(-) rename srcs/{parsing/expansions => generic}/ft_split_MODIF.c (100%) rename srcs/{parsing/expansions => generic}/ft_split_quotes.c (100%) rename srcs/{parsing/expansions => generic}/ft_strdup_quotes.c (100%) rename srcs/{ => generic}/generic.c (100%) rename srcs/{ => misc}/error_wrappers.c (100%) rename srcs/{ => misc}/free.c (100%) rename srcs/{ => misc}/init.c (100%) rename srcs/{ => misc}/last_exit_status.c (100%) rename srcs/{ => misc}/retrieve_path.c (100%) rename srcs/{ => misc}/signals.c (100%) rename srcs/{ => misc}/terminal.c (100%) diff --git a/Makefile b/Makefile index bc7bcd0..f897df3 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,14 @@ CC = clang CFLAGS = -Wall -Wextra $(INCLUDES) -g # add -Werror, del -g VPATH = $(DIR_SRCS) -DIR_SRCS = srcs srcs/builtins \ +DIR_SRCS = srcs \ + srcs/builtins \ srcs/lexing \ srcs/parsing srcs/parsing/valid_syntax \ srcs/parsing/expansions srcs/parsing/redirections \ - srcs/exec + srcs/exec \ + srcs/generic \ + srcs/misc \ INCLUDES = -I$(HEADERS_D) -I$(LIBFT_D) @@ -25,19 +28,20 @@ LIBS = -L $(LIBFT_D) -lft \ LIBFT_D = ./libft LIBFT = $(LIBFT_D)/libft.a -SRCS = main.c init.c retrieve_path.c free.c generic.c error_wrappers.c \ - signals.c \ +SRCS = main.c \ shell_loop.c shell_script.c \ + init.c retrieve_path.c free.c \ + signals.c error_wrappers.c last_exit_status.c \ lexing.c fill_token.c check_operators.c \ parsing.c create_pipeline.c \ valid_syntax.c valid_pipeline.c valid_command.c valid_io_redirect.c \ expansions.c expand_token.c rejoin_after_expand.c new_token_for_each_field.c \ - ft_split_quotes.c ft_strdup_quotes.c \ redirections.c here_doc.c \ exec_cmd_line.c pipeline.c \ find_access.c subshell_exec.c subshell_wait.c simple_cmd_builtin.c \ - last_exit_status.c \ - cd.c pwd.c export.c unset.c exit.c env.c echo.c + cd.c pwd.c export.c unset.c exit.c env.c echo.c \ + generic.c \ + ft_split_quotes.c ft_strdup_quotes.c \ DIR_OBJS = builds OBJS = $(SRCS:%.c=$(DIR_OBJS)/%.o) diff --git a/srcs/parsing/expansions/ft_split_MODIF.c b/srcs/generic/ft_split_MODIF.c similarity index 100% rename from srcs/parsing/expansions/ft_split_MODIF.c rename to srcs/generic/ft_split_MODIF.c diff --git a/srcs/parsing/expansions/ft_split_quotes.c b/srcs/generic/ft_split_quotes.c similarity index 100% rename from srcs/parsing/expansions/ft_split_quotes.c rename to srcs/generic/ft_split_quotes.c diff --git a/srcs/parsing/expansions/ft_strdup_quotes.c b/srcs/generic/ft_strdup_quotes.c similarity index 100% rename from srcs/parsing/expansions/ft_strdup_quotes.c rename to srcs/generic/ft_strdup_quotes.c diff --git a/srcs/generic.c b/srcs/generic/generic.c similarity index 100% rename from srcs/generic.c rename to srcs/generic/generic.c diff --git a/srcs/error_wrappers.c b/srcs/misc/error_wrappers.c similarity index 100% rename from srcs/error_wrappers.c rename to srcs/misc/error_wrappers.c diff --git a/srcs/free.c b/srcs/misc/free.c similarity index 100% rename from srcs/free.c rename to srcs/misc/free.c diff --git a/srcs/init.c b/srcs/misc/init.c similarity index 100% rename from srcs/init.c rename to srcs/misc/init.c diff --git a/srcs/last_exit_status.c b/srcs/misc/last_exit_status.c similarity index 100% rename from srcs/last_exit_status.c rename to srcs/misc/last_exit_status.c diff --git a/srcs/retrieve_path.c b/srcs/misc/retrieve_path.c similarity index 100% rename from srcs/retrieve_path.c rename to srcs/misc/retrieve_path.c diff --git a/srcs/signals.c b/srcs/misc/signals.c similarity index 100% rename from srcs/signals.c rename to srcs/misc/signals.c diff --git a/srcs/terminal.c b/srcs/misc/terminal.c similarity index 100% rename from srcs/terminal.c rename to srcs/misc/terminal.c