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

free leaks

Browse Source
This commit is contained in:
Loic Deridder
2025-02-07 09:29:15 +01:00
parent 98e3040a87
commit 4d63a10900
8 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/minishell.h
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 11:25:25 by lderidde #+# #+# */ /* Created: 2025/01/27 11:25:25 by lderidde #+# #+# */
/* Updated: 2025/02/05 09:55:28 by lderidde ### ########.fr */ /* Updated: 2025/02/07 09:22:29 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -22,6 +22,7 @@ typedef struct s_msh
{ {
int ex_code; int ex_code;
t_ast_n *head; t_ast_n *head;
char *input;
char **env; char **env;
} t_msh; } t_msh;
@@ -43,6 +44,7 @@ typedef struct s_msh
t_msh *init_msh(char **envp); t_msh *init_msh(char **envp);
void free_msh(t_msh *msh); void free_msh(t_msh *msh);
void free_child(t_msh *msh);
# define POW1 "\033[1;38;2;21;22;26;48;2;92;106;178m" # define POW1 "\033[1;38;2;21;22;26;48;2;92;106;178m"
# define POW2 "\033[1;38;2;92;106;178;48;2;54;54;54m" # define POW2 "\033[1;38;2;92;106;178;48;2;54;54;54m"

15
srcs/execution/exec.c
View File

@@ -6,7 +6,7 @@
/* 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/06 14:08:10 by lderidde ### ########.fr */ /* Updated: 2025/02/07 09:28:49 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -285,6 +285,7 @@ void exec_pcmd(t_ast_n *pcmd)
if (is_builtin(pcmd->cmd)) if (is_builtin(pcmd->cmd))
{ {
ret = exec_builtin(pcmd); ret = exec_builtin(pcmd);
free_child(pcmd->msh);
exit(ret); exit(ret);
} }
else else
@@ -296,6 +297,9 @@ int execute_shcommand(t_ast_n *node);
void exec_pchild(int *pipes, int index, t_ast_n *pcmd, int cmds) void exec_pchild(int *pipes, int index, t_ast_n *pcmd, int cmds)
{ {
int ret;
ret = 0;
if (index < cmds - 1) if (index < cmds - 1)
dup2(pipes[1], STDOUT_FILENO); dup2(pipes[1], STDOUT_FILENO);
close(pipes[0]); close(pipes[0]);
@@ -304,7 +308,11 @@ void exec_pchild(int *pipes, int index, t_ast_n *pcmd, int cmds)
if (pcmd->state == _CMD) if (pcmd->state == _CMD)
exec_pcmd(pcmd); exec_pcmd(pcmd);
else if (pcmd->state == _SUBSH) else if (pcmd->state == _SUBSH)
exit (execute_shcommand(pcmd->left)); {
ret = execute_shcommand(pcmd->left);
free_child(pcmd->msh);
exit(ret);
}
} }
int end_pline(pid_t last_pid, t_ast_n **pline) int end_pline(pid_t last_pid, t_ast_n **pline)
@@ -418,7 +426,8 @@ int exec_subsh(t_ast_n *node)
{ {
handle_redir(node->parent); handle_redir(node->parent);
ret = execute_shcommand(node); ret = execute_shcommand(node);
reset_redir(node->parent); // reset_redir(node->parent);
free_child(node->msh);
exit(ret); exit(ret);
} }
else if (pid > 0) else if (pid > 0)

14
srcs/main.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 14:16:52 by lderidde #+# #+# */ /* Created: 2025/01/27 14:16:52 by lderidde #+# #+# */
/* Updated: 2025/02/05 13:27:18 by lderidde ### ########.fr */ /* Updated: 2025/02/07 09:24:34 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -52,7 +52,6 @@ static void interpret_cmd(char **input, t_msh *msh)
int main(int ac, char **av, char **envp) int main(int ac, char **av, char **envp)
{ {
char *input;
t_msh *msh; t_msh *msh;
(void)ac; (void)ac;
@@ -60,18 +59,17 @@ int main(int ac, char **av, char **envp)
msh = init_msh(envp); msh = init_msh(envp);
if (!msh) if (!msh)
return (1); return (1);
input = NULL;
if (ac == 1) if (ac == 1)
while (1) while (1)
{ {
while (!input || !input[0]) while (!msh->input || !msh->input[0])
input = powerline(); msh->input = powerline();
interpret_cmd(&input, msh); interpret_cmd(&msh->input, msh);
} }
else else
{ {
input = ft_strdup(av[1]); msh->input = ft_strdup(av[1]);
interpret_cmd(&input, msh); interpret_cmd(&msh->input, msh);
} }
free_msh(msh); free_msh(msh);
} }

8
srcs/msh_struct.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* msh_struct.c :+: :+: :+: */ /* msh_struct.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/06 15:32:03 by nalebrun #+# #+# */ /* Created: 2025/02/06 15:32:03 by lderidde #+# #+# */
/* Updated: 2025/02/06 15:32:03 by nalebrun ### ########.fr */ /* Updated: 2025/02/07 09:24:52 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -32,6 +32,7 @@ t_msh *init_msh(char **envp)
msh = malloc(sizeof(t_msh) * 1); msh = malloc(sizeof(t_msh) * 1);
msh->ex_code = 0; msh->ex_code = 0;
msh->input = NULL;
if (!msh) if (!msh)
return (NULL); return (NULL);
if (!envp[0]) if (!envp[0])
@@ -44,5 +45,6 @@ t_msh *init_msh(char **envp)
void free_msh(t_msh *msh) void free_msh(t_msh *msh)
{ {
free_tab(msh->env); free_tab(msh->env);
free(msh->input);
free(msh); free(msh);
} }

12
srcs/parsing/ast/free_ast.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* free_ast.c :+: :+: :+: */ /* free_ast.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 14:39:28 by nalebrun #+# #+# */ /* Created: 2025/02/05 14:39:28 by lderidde #+# #+# */
/* Updated: 2025/02/05 14:39:28 by nalebrun ### ########.fr */ /* Updated: 2025/02/07 09:20:16 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -53,3 +53,9 @@ void free_ast(t_ast_n *node)
free_cmd(node); free_cmd(node);
free(node); free(node);
} }
void free_child(t_msh *msh)
{
free_ast(msh->head);
free_msh(msh);
}

12
srcs/parsing/ast/subsh.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* subsh.c :+: :+: :+: */ /* subsh.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 07:51:27 by nalebrun #+# #+# */ /* Created: 2025/02/05 07:51:27 by lderidde #+# #+# */
/* Updated: 2025/02/05 07:51:27 by nalebrun ### ########.fr */ /* Updated: 2025/02/07 09:12:41 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,6 +17,7 @@ t_node *remove_parentheses(t_node *lst)
t_node *it; t_node *it;
t_node *out; t_node *out;
int deepness; int deepness;
char *str;
out = NULL; out = NULL;
it = lst; it = lst;
@@ -24,15 +25,18 @@ t_node *remove_parentheses(t_node *lst)
deepness = 1; deepness = 1;
while (1) while (1)
{ {
str = ft_strdup(it->val);
if (it->pressision == SUBSH_S) if (it->pressision == SUBSH_S)
deepness += 1; deepness += 1;
if (it->pressision == SUBSH_E) if (it->pressision == SUBSH_E)
deepness -= 1; deepness -= 1;
if (deepness == 0) if (deepness == 0)
break; break;
add_node_back(&out, ft_strdup(it->val), it->token, it->pressision); add_node_back(&out, str, it->token, it->pressision);
free(str);
it = it->next; it = it->next;
} }
free(str);
return (out); return (out);
} }

21
srcs/parsing/drawio/drawio_ast.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* drawio_ast.c :+: :+: :+: */ /* drawio_ast.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 17:15:39 by nalebrun #+# #+# */ /* Created: 2025/01/27 17:15:39 by lderidde #+# #+# */
/* Updated: 2025/01/27 17:15:39 by nalebrun ### ########.fr */ /* Updated: 2025/02/07 09:14:08 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -24,12 +24,15 @@ void set_ast_rect(t_dio_elem *rect)
void gen_dio_ast(t_ast_n *head, int fd) void gen_dio_ast(t_ast_n *head, int fd)
{ {
t_elems e; t_elems *e;
set_ast_rect(&e.rect); e = ft_calloc(sizeof(t_elems), 1);
e.arrow.type = ARROW; set_ast_rect(&e->rect);
e.arrow.id_src = 0; e->arrow.type = ARROW;
e.arrow.id_dst = 0; e->arrow.id_src = 0;
print_ast(head, &e, fd); e->arrow.id_dst = 0;
print_ast(head, e, fd);
free(e->rect.text);
free(e);
return ; return ;
} }

13
srcs/parsing/drawio/drawio_print_ast.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* drawio_print_ast.c :+: :+: :+: */ /* drawio_print_ast.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/29 09:54:31 by nalebrun #+# #+# */ /* Created: 2025/01/29 09:54:31 by lderidde #+# #+# */
/* Updated: 2025/01/29 09:54:31 by nalebrun ### ########.fr */ /* Updated: 2025/02/07 09:09:01 by lderidde ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -20,14 +20,15 @@ char *get_node_txt(t_ast_n *node)
txt = get_cmd_txt(node); txt = get_cmd_txt(node);
if (node->sh == true) if (node->sh == true)
subsh = " (subsh) "; subsh = ft_strdup(" (subsh) ");
else else
subsh = ""; subsh = ft_strdup("");
out = ft_sprintf("%s%s%s%s%s", txt.st, txt.cmd, txt.args, out = ft_sprintf("%s%s%s%s%s", txt.st, txt.cmd, txt.args,
subsh, txt.files); subsh, txt.files);
free(txt.cmd); free(txt.cmd);
free(txt.args); free(txt.args);
free(txt.files); free(txt.files);
free(subsh);
return (out); return (out);
} }
@@ -67,12 +68,12 @@ int print_ast(t_ast_n *node, t_elems *e, int fd)
if (!node) if (!node)
return (-1); return (-1);
ft_free(&e->rect.text);
e->rect.text = get_node_txt(node); e->rect.text = get_node_txt(node);
node_id = drawio_create_elem(fd, &e->rect); node_id = drawio_create_elem(fd, &e->rect);
if (node->state != _PLINE) if (node->state != _PLINE)
draw_bin_part(node, e, fd, node_id); draw_bin_part(node, e, fd, node_id);
else else
draw_pline_part(node, e, fd, node_id); draw_pline_part(node, e, fd, node_id);
ft_free(&e->rect.text);
return (node_id); return (node_id);
} }