diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-06-14 21:26:36 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-06-14 21:26:36 +0200 |
| commit | 91d91b0f54ec9795beaf673f20ff87b894a558c4 (patch) | |
| tree | bc6e084703bd677fcf4ca3ee82898688fc3e2ee7 /include | |
| parent | 47fff4418d3a83ae214429f395232c3536ff03c4 (diff) | |
| download | minishell-91d91b0f54ec9795beaf673f20ff87b894a558c4.tar.gz minishell-91d91b0f54ec9795beaf673f20ff87b894a558c4.tar.bz2 minishell-91d91b0f54ec9795beaf673f20ff87b894a558c4.zip | |
WIP: Added eval cmd with redirection and builtins
Diffstat (limited to 'include')
| -rw-r--r-- | include/ast.h | 6 | ||||
| -rw-r--r-- | include/eval.h | 9 | ||||
| -rw-r--r-- | include/minishell.h | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/include/ast.h b/include/ast.h index 790ac29..c508bd9 100644 --- a/include/ast.h +++ b/include/ast.h @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:05:38 by charles #+# #+# */ -/* Updated: 2020/06/14 10:28:53 by charles ### ########.fr */ +/* Updated: 2020/06/14 17:47:10 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,9 +69,7 @@ typedef struct s_ast t_line line; t_ftlst *cmd_argv; }; - t_ftlst *in; - t_ftlst *out; - bool is_append; + t_ftlst *redirs; } t_ast; typedef struct s_ret diff --git a/include/eval.h b/include/eval.h index b90e8b6..55f1540 100644 --- a/include/eval.h +++ b/include/eval.h @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:05:30 by charles #+# #+# */ -/* Updated: 2020/06/14 12:52:45 by charles ### ########.fr */ +/* Updated: 2020/06/14 20:47:28 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -87,4 +87,11 @@ typedef struct // char *basename; } t_error; + +/* +** cmd.c +*/ + +int eval_cmd(t_env env, t_path path, t_ast *ast); + #endif diff --git a/include/minishell.h b/include/minishell.h index 07c2fa1..ccb5068 100644 --- a/include/minishell.h +++ b/include/minishell.h @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/26 15:33:51 by cacharle #+# #+# */ -/* Updated: 2020/06/14 16:03:25 by charles ### ########.fr */ +/* Updated: 2020/06/14 16:22:08 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -110,5 +110,6 @@ int builtin_exit(char **argv, t_env env); */ char **preprocess(t_ftlst *tokens, t_env env); +char *preprocess_filename(t_ftlst *tokens, t_env env); #endif |