aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-04-03 15:13:08 +0200
committerCharles <sircharlesaze@gmail.com>2020-04-03 15:13:08 +0200
commitc0e2ee28eedc1a9a886f9729a994d77738e2eb58 (patch)
treef099ec9b9effe0db078a521c9405c5765b68fd8f /src/main.c
parente5393671a265e1c301c6c303f21f938c4cf9ca75 (diff)
downloadminishell-c0e2ee28eedc1a9a886f9729a994d77738e2eb58.tar.gz
minishell-c0e2ee28eedc1a9a886f9729a994d77738e2eb58.tar.bz2
minishell-c0e2ee28eedc1a9a886f9729a994d77738e2eb58.zip
Refactoring env, connecting pipes, preprocess draft
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c55
1 files changed, 28 insertions, 27 deletions
diff --git a/src/main.c b/src/main.c
index f898bf8..2e42601 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/28 11:45:44 by cacharle #+# #+# */
-/* Updated: 2020/04/03 08:56:46 by charles ### ########.fr */
+/* Updated: 2020/04/03 14:25:48 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -38,22 +38,22 @@ int main(int argc, char **argv, char **envp)
/* int ret; */
env = env_from_array(envp);
- path = path_update(NULL, env_search(env, "PATH"));
-
- t_ast *ast;
- t_line line;
- t_cmd cmd;
- t_eval_state state;
-
- cmd.argv = ft_split("ls -l", ' ');
- cmd.in = NULL;
- cmd.out = NULL;
- cmd.is_append = false;
-
- line.left = ast_new(TAG_CMD, &cmd);
- line.right = NULL;
- line.sep = SEP_END;
- ast = ast_new(TAG_LINE, &line);
+ /* path = path_update(NULL, env_search(env, "PATH")); */
+ /* */
+ /* t_ast *ast; */
+ /* t_line line; */
+ /* t_cmd cmd; */
+ /* t_eval_state state; */
+ /* */
+ /* cmd.argv = ft_split("ls -l", ' '); */
+ /* cmd.in = NULL; */
+ /* cmd.out = NULL; */
+ /* cmd.is_append = false; */
+ /* */
+ /* line.left = ast_new(TAG_CMD, &cmd); */
+ /* line.right = NULL; */
+ /* line.sep = SEP_END; */
+ /* ast = ast_new(TAG_LINE, &line); */
/* printf("%p\n", ast); */
/* printf("%d\n", ast->tag); */
@@ -64,15 +64,15 @@ int main(int argc, char **argv, char **envp)
/* printf("%s\n", ast->data.line.left->data.cmd.argv[0]); */
/* printf("%s\n", ast->data.line.left->data.cmd.argv[1]); */
- state.pipe_in[0] = -1;
- state.pipe_in[1] = -1;
- state.pipe_out[0] = -1;
- state.pipe_out[1] = -1;
- state.path = path;
- state.env = env;
- t_io_frame frame;
- io_frame_init(&frame);
- printf("ret: %d %s\n", eval(&frame,&state, ast), strerror(errno));
+ /* state.pipe_in[0] = -1; */
+ /* state.pipe_in[1] = -1; */
+ /* state.pipe_out[0] = -1; */
+ /* state.pipe_out[1] = -1; */
+ /* state.path = path; */
+ /* state.env = env; */
+ /* t_io_frame frame; */
+ /* io_frame_init(&frame); */
+ /* printf("ret: %d %s\n", eval(&frame,&state, ast), strerror(errno)); */
/* char buf[2048]; */
/* printf("%s\n", getcwd(buf, 2048)); */
@@ -85,7 +85,8 @@ int main(int argc, char **argv, char **envp)
/* free(line); */
/* } */
/* free(line); */
- ft_htdestroy(path, free);
+ /* ft_htdestroy(path, free); */
+ printf("%s\n", preprocess("*.c", env));
ft_vecdestroy(env, free);
return (0);
}