nalebrun/mmoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stdout redirection

Browse Source
This commit is contained in:
Loic Deridder
2025-02-03 15:46:04 +01:00
parent 010f965a71
commit 3f9b6d9d7b
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/parser/ast.h
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* ast.h :+: :+: :+: */ /* ast.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 08:23:27 by nalebrun #+# #+# */ /* Created: 2025/01/24 08:23:27 by lderidde #+# #+# */
/* Updated: 2025/01/24 08:23:27 by nalebrun ### ########.fr */ /* Updated: 2025/02/03 15:10:17 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -47,6 +47,7 @@ typedef struct s_ast_n
int fds[2]; int fds[2];
int _stdout; int _stdout;
int _stdin; int _stdin;
int save_std;
t_redir redir; t_redir redir;
char *infile; char *infile;
char *outfile; char *outfile;

34
srcs/execution/exec.c
View File

@@ -6,11 +6,13 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 11:22:33 by lderidde #+# #+# */ /* Created: 2025/01/27 11:22:33 by lderidde #+# #+# */
/* Updated: 2025/02/03 14:05:14 by lderidde ### ########.fr */ /* Updated: 2025/02/03 15:44:14 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../../includes/minishell.h" #include "../../includes/minishell.h"
#include <fcntl.h>
#include <unistd.h>
void handle_file(t_ast_n *node, int check) void handle_file(t_ast_n *node, int check)
{ {
@@ -76,23 +78,39 @@ int is_builtin(char *str)
return (0); return (0);
} }
void reset_redir(t_ast_n *node)
{
int fd;
fd = open("/dev/pts/1", O_WRONLY);
(void)node;
if (dup2(fd, 1) == -1)
printf("error\n");
close(fd);
// close(node->save_std);
}
int exec_builtin(t_ast_n *node) int exec_builtin(t_ast_n *node)
{ {
int ret;
handle_redir(node); handle_redir(node);
if (ft_strncmp(node->cmd, "exit", 4) == 0) if (ft_strncmp(node->cmd, "exit", 4) == 0)
return (builtin_exit(node->args, false, node)); ret = builtin_exit(node->args, false, node);
else if (ft_strncmp(node->cmd, "pwd", 3) == 0) else if (ft_strncmp(node->cmd, "pwd", 3) == 0)
return (builtin_pwd(node->args)); ret = builtin_pwd(node->args);
else if (ft_strncmp(node->cmd, "echo", 4) == 0) else if (ft_strncmp(node->cmd, "echo", 4) == 0)
return (builtin_echo(node->args, node->msh->env)); ret = builtin_echo(node->args, node->msh->env);
else if (ft_strncmp(node->cmd, "env", 3) == 0) else if (ft_strncmp(node->cmd, "env", 3) == 0)
return (builtin_env(node->args, node->msh->env)); ret = builtin_env(node->args, node->msh->env);
else if (ft_strncmp(node->cmd, "unset", 5) == 0) else if (ft_strncmp(node->cmd, "unset", 5) == 0)
return (builtin_unset(node->args, node)); ret = builtin_unset(node->args, node);
else if (ft_strncmp(node->cmd, "cd", 2) == 0) else if (ft_strncmp(node->cmd, "cd", 2) == 0)
return (builtin_cd(node->args, node)); ret = builtin_cd(node->args, node);
else else
return (builtin_export(node->args, node)); ret = builtin_export(node->args, node);
reset_redir(node);
return (ret);
} }
int count_cmds(t_ast_n **pline) int count_cmds(t_ast_n **pline)

9
srcs/parsing/ast/ast.c
View File

@@ -3,14 +3,15 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* ast.c :+: :+: :+: */ /* ast.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 08:22:16 by nalebrun #+# #+# */ /* Created: 2025/01/24 08:22:16 by lderidde #+# #+# */
/* Updated: 2025/02/01 11:13:58 by nalebrun ### ########.fr */ /* Updated: 2025/02/03 15:44:56 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../../../includes/minishell.h" #include "../../../includes/minishell.h"
#include <unistd.h>
// =================================================================== // ===================================================================
@@ -211,6 +212,8 @@ t_ast_n *create_ast_n(t_node *lst, t_ast_n *parent, t_msh *msh)
node->pline = NULL; node->pline = NULL;
node->msh = msh; node->msh = msh;
node->parent = parent; node->parent = parent;
node->_stdout = 1;
node->_stdin = 0;
if (node->state == _AND || node->state == _OR) if (node->state == _AND || node->state == _OR)
create_and_or(node, lst, token, msh); create_and_or(node, lst, token, msh);
else if (node->state == _SUBSH) else if (node->state == _SUBSH)