diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval/operation.c | 4 | ||||
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/parser/parser.c | 4 | ||||
| -rw-r--r-- | src/setup.c | 15 |
4 files changed, 6 insertions, 20 deletions
diff --git a/src/eval/operation.c b/src/eval/operation.c index cb7de34..6ec41f9 100644 --- a/src/eval/operation.c +++ b/src/eval/operation.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 15:27:22 by charles #+# #+# */ -/* Updated: 2020/10/08 16:59:42 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 14:00:04 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -80,7 +80,7 @@ int eval_pipeline(int fds[2], t_env env, t_ast *ast) dup2(prev_output, STDIN_FILENO); close(prev_output); } - close(p[FD_WRITE]); + /* close(p[FD_WRITE]); */ fds[0] = FD_NONE; fds[1] = FD_NONE; exit(eval(fds, env, curr->data)); @@ -6,7 +6,7 @@ /* By: cacharle <cacharle@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 11:45:44 by cacharle #+# #+# */ -/* Updated: 2020/10/09 12:39:36 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 13:57:22 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,7 +43,6 @@ int execute(t_env env, char *input) parser_out = parse(lexer_out); if (parser_out == NULL || parser_out->syntax_error) { - ast_destroy(parser_out->ast); free(parser_out); return (2); } diff --git a/src/parser/parser.c b/src/parser/parser.c index 9d5a99d..cac820c 100644 --- a/src/parser/parser.c +++ b/src/parser/parser.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 18:09:04 by nahaddac #+# #+# */ -/* Updated: 2020/10/09 12:35:51 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 13:58:05 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -225,8 +225,8 @@ t_parsed *parse_expr(t_tok_lst *input) tmp = parse_redir(input, &parsed->ast->redirs); if (tmp == NULL || tmp->syntax_error) return (tmp); - free(tmp); input = tmp->rest; + free(tmp); } parsed->rest = input; return (parsed); diff --git a/src/setup.c b/src/setup.c index e069dba..844b9e4 100644 --- a/src/setup.c +++ b/src/setup.c @@ -6,7 +6,7 @@ /* By: charles <me@cacharle.xyz> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/09/16 15:46:09 by charles #+# #+# */ -/* Updated: 2020/10/07 11:21:14 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 13:38:34 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -29,21 +29,8 @@ bool setup_env(t_env env) !st_export_default(env, "SHLVL", "1") || !st_export_default(env, "PATH", "/sbin:")) return (false); - - /* char *path_str = env_search(env, "PATH"); */ - /* if (ft_strstr(path_str, "/sbin") == NULL) */ - /* { */ - /* char *value = ft_strjoin("/sbin:", path_str); */ - /* env_export(env, "PATH", value); */ - /* free(value); */ - /* } */ - if (path_search(env, "env", buf, false) != 0) - { ft_strcpy(buf, "/sbin/env"); - /* errorf("env: command not found\n"); */ - /* return (127); */ - } env_export(env, "_", buf); return (true); } |