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

exec

Browse Source
This commit is contained in:
Loic Deridder
2025-01-28 15:40:22 +01:00
parent 66ebd61d6f
commit 16e351d92d
4 changed files with 95 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
srcs/ast/ast.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 08:22:16 by lderidde #+# #+# */ /* Created: 2025/01/24 08:22:16 by lderidde #+# #+# */
/* Updated: 2025/01/28 10:50:43 by lderidde ### ########.fr */ /* Updated: 2025/01/28 13:31:27 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -78,13 +78,18 @@ t_ast_n *return_hardcode_ast(char **envp)
{ {
t_ast_n *head; t_ast_n *head;
head = created_ast_n(_CMD, NULL, NULL); // head = created_ast_n(_CMD, NULL, NULL);
head->head = head; // head->head = head;
setup_cmd(head, "sdd", "ls -l"); // setup_cmd(head, "sdd", "ls -l");
// head = created_ast_n(_AND, NULL, NULL); head = created_ast_n(_AND, NULL, NULL);
head->env = init_env(envp); head->env = init_env(envp);
// head->left = created_ast_n(_CMD, head, head); head->left = created_ast_n(_CMD, head, head);
// setup_cmd(head->left, "echo", "echo coucou"); setup_cmd(head->left, "cd", "cd srcs/../..");
head->right = created_ast_n(_AND, head, head);
head->right->left = created_ast_n(_CMD, head->right, head);
setup_cmd(head->right->left, "echo", "echo $PWD");
head->right->right = created_ast_n(_CMD, head->right, head);
setup_cmd(head->right->right, "ls", "ls -l");
// head->right = created_ast_n(_PLINE, head, head); // head->right = created_ast_n(_PLINE, head, head);
// head->right->pline = malloc(sizeof(t_ast_n *) * 4); // head->right->pline = malloc(sizeof(t_ast_n *) * 4);
// head->right->pline[0] = created_ast_n(_CMD, head->right, head); // head->right->pline[0] = created_ast_n(_CMD, head->right, head);

4
srcs/builtins/echo.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:31:56 by lderidde #+# #+# */ /* Created: 2025/01/24 14:31:56 by lderidde #+# #+# */
/* Updated: 2025/01/28 09:34:41 by lderidde ### ########.fr */ /* Updated: 2025/01/28 12:40:27 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -103,6 +103,6 @@ int builtin_echo(char **arg, char **envp)
} }
echo_print(arg, i, envp); echo_print(arg, i, envp);
if (!flag) if (!flag)
printf("\n"); ft_printf("\n");
return (0); return (0);
} }

8
srcs/builtins/unset.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 14:32:36 by lderidde #+# #+# */ /* Created: 2025/01/24 14:32:36 by lderidde #+# #+# */
/* Updated: 2025/01/28 10:32:54 by lderidde ### ########.fr */ /* Updated: 2025/01/28 12:43:49 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -39,9 +39,9 @@ int builtin_unset(char **arg, t_ast_n *head)
int ret; int ret;
i = 0; i = 0;
if (count_var(arg) == 1) if (count_args(arg) == 1)
return (err_msg_cmd("unset", NULL, "not enough arguments", EXIT_FAILURE)); return (err_msg_cmd("unset", NULL, "not enough arguments", EXIT_FAILURE));
while (++i < count_var(arg)) while (++i < count_args(arg))
ret = remove_env_var(arg[i], head); ret = remove_env_var(arg[i], head);
return (ret); return (!ret);
} }

128
srcs/execution/exec.c
View File

@@ -6,11 +6,55 @@
/* 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/01/28 10:41:39 by lderidde ### ########.fr */ /* Updated: 2025/01/28 15:39:37 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../../includes/minishell.h" #include "minishell.h"
void handle_file(t_ast_n *node, int check)
{
int fd;
if (check == 1)
fd = open(node->infile, O_RDONLY);
else if (check == 2)
fd = open(node->outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
else if (check == 3)
fd = open(node->outfile, O_WRONLY | O_CREAT | O_APPEND, 0666);
if (fd == -1)
{
perror("open");
exit(1);
}
if (check == 1)
node->_stdin = fd;
else if (check == 2 || check == 3)
node->_stdout = fd;
}
void handle_redir(t_ast_n *node)
{
if (node->redir == _NR)
return ;
else if (node->redir == _RED_L)
handle_file(node, 1);
else if (node->redir == _RED_R)
handle_file(node, 2);
else if (node->redir == _RED_DR)
handle_file(node, 3);
if (node->redir == _RED_L)
{
dup2(node->_stdin, STDIN_FILENO);
close(node->_stdin);
}
else if (node->redir == _RED_R || node->redir == _RED_DR)
{
dup2(node->_stdout, STDOUT_FILENO);
close(node->_stdout);
}
}
int is_builtin(char *str) int is_builtin(char *str)
{ {
@@ -34,6 +78,7 @@ int is_builtin(char *str)
int exec_builtin(t_ast_n *node) int exec_builtin(t_ast_n *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, true)); return (builtin_exit(node->args, true));
else if (ft_strncmp(node->cmd, "pwd", 3) == 0) else if (ft_strncmp(node->cmd, "pwd", 3) == 0)
@@ -83,49 +128,6 @@ void return_error(char *arg, char *msg, int code)
exit(code); exit(code);
} }
void handle_file(t_ast_n *node, int check)
{
int fd;
if (check == 1)
fd = open(node->infile, O_RDONLY);
else if (check == 2)
fd = open(node->outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
else if (check == 3)
fd = open(node->outfile, O_WRONLY | O_CREAT | O_APPEND, 0666);
if (fd == -1)
{
perror("open");
exit(1);
}
if (check == 1)
node->_stdin = fd;
else if (check == 2 || check == 3)
node->_stdout = fd;
}
void handle_redir(t_ast_n *node)
{
if (node->redir == _NR)
return ;
else if (node->redir == _RED_L)
handle_file(node, 1);
else if (node->redir == _RED_R)
handle_file(node, 2);
else if (node->redir == _RED_DR)
handle_file(node, 3);
if (node->redir == _RED_L)
{
dup2(node->_stdin, STDIN_FILENO);
close(node->_stdin);
}
else if (node->redir == _RED_R || node->redir == _RED_DR)
{
dup2(node->_stdout, STDOUT_FILENO);
close(node->_stdout);
}
}
int exec(t_ast_n *node) int exec(t_ast_n *node)
{ {
char *path; char *path;
@@ -156,9 +158,7 @@ int exec_scmd(t_ast_n *node)
{ {
pid = fork(); pid = fork();
if (pid == 0) if (pid == 0)
{
exec(node); exec(node);
}
else else
{ {
waitpid(pid, &status, 0); waitpid(pid, &status, 0);
@@ -171,6 +171,32 @@ int exec_scmd(t_ast_n *node)
} }
} }
// int exec_pipe(t_ast_n **pline)
// {
// int i;
// pid_t pid;
//
// i = -1;
// while (pline[++i])
// {
// pipe(pline[i]->fds);
// pid = fork();
// if (pid == 0)
// {
// close(pline[i]->fds[0]);
// dup2(pline[i]->fds[1], STDOUT_FILENO);
// close(pline[i]->fds[1]);
// execute_command(pline[i]);
// }
// else
// {
// close(pline[i]->fds[1]);
// dup2(pline[i]->fds[0], STDIN_FILENO);
// close(pline[i]->fds[0]);
// }
// }
// }
int execute_command(t_ast_n *node) int execute_command(t_ast_n *node)
{ {
int status; int status;
@@ -180,18 +206,18 @@ int execute_command(t_ast_n *node)
else if (node->state == _AND) else if (node->state == _AND)
{ {
status = execute_command(node->left); status = execute_command(node->left);
if (WEXITSTATUS(status) == 0) if (status == 0)
return (execute_command(node->right)); return (execute_command(node->right));
return (status); return (status);
} }
else if (node->state == _OR) else if (node->state == _OR)
{ {
status = execute_command(node->left); status = execute_command(node->left);
if (WEXITSTATUS(status) != 0) if (status != 0)
return (execute_command(node->right)); return (execute_command(node->right));
return (status); return (status);
} }
return (0);
// else if (node->state == _PLINE) // else if (node->state == _PLINE)
// return (exec_pipe(node)); // return (exec_pipe(node->pline));
return (0);
} }