diff --git a/inc/typedef.h b/inc/typedef.h index a09131e..a5e6799 100644 --- a/inc/typedef.h +++ b/inc/typedef.h @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* :::::::: */ -/* typedef.h :+: :+: */ -/* +:+ */ -/* By: whaffman +#+ */ -/* +#+ */ -/* Created: 2025/02/05 12:36:08 by whaffman #+# #+# */ -/* Updated: 2025/02/20 11:37:00 by whaffman ######## odam.nl */ +/* ::: :::::::: */ +/* typedef.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/02/05 12:36:08 by whaffman #+# #+# */ +/* Updated: 2025/02/20 16:45:55 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -52,11 +52,19 @@ typedef struct s_lexer char current_char; } t_lexer; +typedef struct s_redirect +{ + enum e_token_type type; + char *value; +} t_redirect; + typedef struct s_command { char *command; char **args; t_list *environment; + t_list *redirect_in; + t_list *redirect_out; int fd_in; int fd_out; int n_fds; diff --git a/src/expander/expander_parse_string.c b/src/expander/expander_parse_string.c index ec32807..25b7b27 100644 --- a/src/expander/expander_parse_string.c +++ b/src/expander/expander_parse_string.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/18 19:00:35 by qmennen #+# #+# */ -/* Updated: 2025/02/19 15:20:04 by qmennen ### ########.fr */ +/* Updated: 2025/02/20 16:38:28 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -51,6 +51,7 @@ char *expander_parse_string(char *s, t_minishell *minishell) else string[j++] = s[i++]; } + //TODO: Figure out why echo "> echo "\as"" breaks string[j] = 0; free_variables(variables); diff --git a/src/lexer/lexer_parse_input.c b/src/lexer/lexer_parse_input.c index a85c561..2182c21 100644 --- a/src/lexer/lexer_parse_input.c +++ b/src/lexer/lexer_parse_input.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* :::::::: */ -/* lexer_parse_input.c :+: :+: */ -/* +:+ */ -/* By: qmennen +#+ */ -/* +#+ */ -/* Created: 2025/02/05 19:09:20 by qmennen #+# #+# */ -/* Updated: 2025/02/19 17:59:44 by whaffman ######## odam.nl */ +/* ::: :::::::: */ +/* lexer_parse_input.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/02/05 19:09:20 by qmennen #+# #+# */ +/* Updated: 2025/02/20 16:42:39 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,6 +31,7 @@ t_list *ft_parse_input(t_lexer *lexer) list = NULL; while (TRUE) { + //TODO: Check if unicode support is viable token = ft_token_next(lexer); if (token->type == T_EOF || token->type == T_ERROR) //TODO T_ERROR removes the inf loop break ;