diff --git a/Makefile b/Makefile index de29175..85119b6 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/03/06 12:50:24 by apommier #+# #+# # -# Updated: 2022/03/09 23:29:16 by apommier ### ########.fr # +# Updated: 2022/03/11 16:35:32 by apommier ### ########.fr # # # # **************************************************************************** # @@ -16,7 +16,8 @@ SRCS = srcs/main.c\ srcs/pipe/pipex_utils.c\ srcs/set_cmd/free_cmd.c\ srcs/set_cmd/set_cmd.c\ - srcs/set_redirection/redirection.c + srcs/set_redirection/redirection.c\ + srcs/set_redirection/utils.c OBJS = ${SRCS:.c=.o} CC = clang CFLAGS = -Wall -Wextra diff --git a/includes/minishell.h b/includes/minishell.h index 8ea81ab..1303484 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 22:33:49 by apommier #+# #+# */ -/* Updated: 2022/03/10 11:39:08 by apommier ### ########.fr */ +/* Updated: 2022/03/11 17:04:09 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -64,8 +64,8 @@ t_cmd *set_cmd(char *input, char **path); //pipex_utils.c char **get_path(char **env); char *get_command(char **exec, char **env); -void print_double(char **tab); -void free_double(char **tab); + + //free_cmd void free_cmd(t_cmd *cmd); @@ -75,4 +75,9 @@ void exit_shell(t_cmd *cmd); char *set_redirection(t_s_cmd *cmd, char *line); char next_space(char *str, int i); +//uitls redirection +int double_size(char **tab); +void print_double(char **tab); + void free_double(char **tab); + #endif \ No newline at end of file diff --git a/srcs/pipe/pipex_utils.c b/srcs/pipe/pipex_utils.c index c1cbb89..b7ae674 100644 --- a/srcs/pipe/pipex_utils.c +++ b/srcs/pipe/pipex_utils.c @@ -6,27 +6,13 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/08 16:58:40 by apommier #+# #+# */ -/* Updated: 2022/03/09 20:43:42 by apommier ### ########.fr */ +/* Updated: 2022/03/11 16:57:52 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ #include "../../includes/minishell.h" -void print_double(char **tab) -{ - int i; - i = 0; - if (tab) - { - while (tab[i]) - { - printf("%d -%s-\n", i, tab[i]); - i++; - } - printf("end double\n"); - } -} char **get_path(char **env) { diff --git a/srcs/set_cmd/free_cmd.c b/srcs/set_cmd/free_cmd.c index 5f42299..e1a3fcc 100644 --- a/srcs/set_cmd/free_cmd.c +++ b/srcs/set_cmd/free_cmd.c @@ -6,24 +6,13 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 12:33:30 by apommier #+# #+# */ -/* Updated: 2022/03/10 01:32:44 by apommier ### ########.fr */ +/* Updated: 2022/03/11 17:05:20 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ #include "../../includes/minishell.h" -void free_double(char **tab) -{ - int i; - i = 0; - if (tab) - { - while (tab[i]) - free(tab[i++]); - free(tab); - } -} void exit_shell(t_cmd *cmd) { diff --git a/srcs/set_cmd/set_cmd.c b/srcs/set_cmd/set_cmd.c index e1bd0a6..de40d5e 100644 --- a/srcs/set_cmd/set_cmd.c +++ b/srcs/set_cmd/set_cmd.c @@ -6,21 +6,13 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/08 15:19:42 by apommier #+# #+# */ -/* Updated: 2022/03/10 01:27:01 by apommier ### ########.fr */ +/* Updated: 2022/03/11 16:39:15 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ #include "../../includes/minishell.h" -int double_size(char **tab) -{ - int i; - i = 0; - while (tab[i]) - i++; - return (i); -} t_s_cmd *set_s_cmd(char *line, t_cmd *cmd) { diff --git a/srcs/set_redirection/redirection.c b/srcs/set_redirection/redirection.c index 58a9565..46f8968 100644 --- a/srcs/set_redirection/redirection.c +++ b/srcs/set_redirection/redirection.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 15:18:58 by apommier #+# #+# */ -/* Updated: 2022/03/10 11:47:21 by apommier ### ########.fr */ +/* Updated: 2022/03/11 16:57:53 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -167,6 +167,48 @@ void set_file(char *file) error_redirect(); } +char **add_line(char **tab, char *line) +{ + int size; + char **ret; + int i; + + i = 0; + size = double_size(tab); + ret = malloc(sizeof(char *) * size + 2); + if (!ret) + { + if (tab) + free_double(tab); + return (0); + } + while (tab && tab[i]) + { + ret[i] == tab[i]; + i++; + } + ret[i] = line; + ret[i + 1] = 0; + if (tab) + free_double(tab); + return(ret); +} + +void wait_prompt(t_s_cmd *cmd) +{ + char *input; + char **history; + + history = 0; + input = 0; + while (ft_strcmp(input, cmd->infile)) + { + input = readline("> "); + history = add_line(history, input); + } + free(input); +} + char *set_redirection(t_s_cmd *cmd, char *line) { int i; @@ -178,8 +220,8 @@ char *set_redirection(t_s_cmd *cmd, char *line) if(line[i] == '<') { line = ft_input(line, cmd, i); - //if (cmd->in_type == 1) - // set_file(cmd->infile); + if (cmd->in_type == 1) + wait_prompt(cmd); i = 0; } else if(line[i] == '>') diff --git a/srcs/set_redirection/utils.c b/srcs/set_redirection/utils.c new file mode 100644 index 0000000..c600fec --- /dev/null +++ b/srcs/set_redirection/utils.c @@ -0,0 +1,54 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* utils.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: apommier +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/03/11 16:35:37 by apommier #+# #+# */ +/* Updated: 2022/03/11 17:04:07 by apommier ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "../../includes/minishell.h" + +int double_size(char **tab) +{ + int i; + + i = 0; + if (tab == 0) + return (0); + while (tab[i]) + i++; + return (i); +} + +void free_double(char **tab) +{ + int i; + + i = 0; + if (tab) + { + while (tab[i]) + free(tab[i++]); + free(tab); + } +} + +void print_double(char **tab) +{ + int i; + + i = 0; + if (tab) + { + while (tab[i]) + { + printf("%d -%s-\n", i, tab[i]); + i++; + } + printf("end double\n"); + } +} \ No newline at end of file