aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ast.h6
-rw-r--r--include/eval.h9
-rw-r--r--include/minishell.h3
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