From 5178f7181c57eb7f2b42628744c80080ba6273c5 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Wed, 9 Mar 2022 20:46:01 +0100 Subject: [PATCH] new folders --- Makefile | 12 +++++----- minishell.h => includes/minishell.h | 2 +- main.c => srcs/main.c | 4 ++-- pipe.c => srcs/pipe/pipe.c | 4 ++-- pipex_utils.c => srcs/pipe/pipex_utils.c | 4 ++-- free_cmd.c => srcs/set_cmd/free_cmd.c | 4 ++-- set_cmd.c => srcs/set_cmd/set_cmd.c | 4 ++-- srcs/set_redirection/redirection.c | 28 ++++++++++++++++++++++++ 8 files changed, 45 insertions(+), 17 deletions(-) rename minishell.h => includes/minishell.h (98%) rename main.c => srcs/main.c (94%) rename pipe.c => srcs/pipe/pipe.c (95%) rename pipex_utils.c => srcs/pipe/pipex_utils.c (95%) rename free_cmd.c => srcs/set_cmd/free_cmd.c (93%) rename set_cmd.c => srcs/set_cmd/set_cmd.c (95%) create mode 100644 srcs/set_redirection/redirection.c diff --git a/Makefile b/Makefile index 7e77e4c..097717a 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,16 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/03/06 12:50:24 by apommier #+# #+# # -# Updated: 2022/03/09 12:44:11 by apommier ### ########.fr # +# Updated: 2022/03/09 20:43:04 by apommier ### ########.fr # # # # **************************************************************************** # NAME = minishell -SRCS = main.c\ - pipe.c\ - free_cmd.c\ - pipex_utils.c\ - set_cmd.c +SRCS = srcs/main.c\ + srcs/pipe/pipe.c\ + srcs/pipe/pipex_utils.c\ + srcs/set_cmd/free_cmd.c\ + srcs/set_cmd/set_cmd.c OBJS = ${SRCS:.c=.o} CC = clang CFLAGS = -Wall -Wextra diff --git a/minishell.h b/includes/minishell.h similarity index 98% rename from minishell.h rename to includes/minishell.h index e6a7968..d32bea6 100644 --- a/minishell.h +++ b/includes/minishell.h @@ -13,7 +13,7 @@ #ifndef MINISHELL_H # define MINISHELL_H -# include "./libft/libft.h" +# include "../libft/libft.h" # include # include # include diff --git a/main.c b/srcs/main.c similarity index 94% rename from main.c rename to srcs/main.c index b26e25f..cea214f 100644 --- a/main.c +++ b/srcs/main.c @@ -6,11 +6,11 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/06 13:27:11 by apommier #+# #+# */ -/* Updated: 2022/03/09 16:56:38 by apommier ### ########.fr */ +/* Updated: 2022/03/09 20:43:42 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ -#include "minishell.h" +#include "../includes/minishell.h" void red() { diff --git a/pipe.c b/srcs/pipe/pipe.c similarity index 95% rename from pipe.c rename to srcs/pipe/pipe.c index e834dce..56f2742 100644 --- a/pipe.c +++ b/srcs/pipe/pipe.c @@ -6,11 +6,11 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/07 11:13:32 by apommier #+# #+# */ -/* Updated: 2022/03/09 11:37:06 by apommier ### ########.fr */ +/* Updated: 2022/03/09 20:43:42 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ -#include "minishell.h" +#include "../../includes/minishell.h" void execute(t_cmd *cmd, char **env) { diff --git a/pipex_utils.c b/srcs/pipe/pipex_utils.c similarity index 95% rename from pipex_utils.c rename to srcs/pipe/pipex_utils.c index 4dc4bb1..c1cbb89 100644 --- a/pipex_utils.c +++ b/srcs/pipe/pipex_utils.c @@ -6,11 +6,11 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/08 16:58:40 by apommier #+# #+# */ -/* Updated: 2022/03/09 16:45:53 by apommier ### ########.fr */ +/* Updated: 2022/03/09 20:43:42 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ -#include "minishell.h" +#include "../../includes/minishell.h" void print_double(char **tab) { diff --git a/free_cmd.c b/srcs/set_cmd/free_cmd.c similarity index 93% rename from free_cmd.c rename to srcs/set_cmd/free_cmd.c index 89fc5a1..c269a50 100644 --- a/free_cmd.c +++ b/srcs/set_cmd/free_cmd.c @@ -6,11 +6,11 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 12:33:30 by apommier #+# #+# */ -/* Updated: 2022/03/09 16:03:44 by apommier ### ########.fr */ +/* Updated: 2022/03/09 20:43:42 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ -#include "minishell.h" +#include "../../includes/minishell.h" void free_double(char **tab) { diff --git a/set_cmd.c b/srcs/set_cmd/set_cmd.c similarity index 95% rename from set_cmd.c rename to srcs/set_cmd/set_cmd.c index 1a97054..bce14d8 100644 --- a/set_cmd.c +++ b/srcs/set_cmd/set_cmd.c @@ -6,11 +6,11 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/08 15:19:42 by apommier #+# #+# */ -/* Updated: 2022/03/09 16:58:32 by apommier ### ########.fr */ +/* Updated: 2022/03/09 20:43:42 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ -#include "minishell.h" +#include "../../includes/minishell.h" int double_size(char **tab) { diff --git a/srcs/set_redirection/redirection.c b/srcs/set_redirection/redirection.c new file mode 100644 index 0000000..1c8cb23 --- /dev/null +++ b/srcs/set_redirection/redirection.c @@ -0,0 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* redirection.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: apommier +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/03/09 15:18:58 by apommier #+# #+# */ +/* Updated: 2022/03/09 20:43:42 by apommier ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "../../includes/minishell.h" + +void set_redirection(t_s_cmd *cmd, char *line) +{ + int i; + + i = 0; + while (line[i] && line[i] != ' ') + i++; + if (!line[i]) + return (0); + while (line[i] && (line[i] != '<' || line[i] != '<')) + i++; + if (!line[i]) + return (0); +} \ No newline at end of file