From 6c955a4a445ee1ff77e044d3d1084c80b6bc4804 Mon Sep 17 00:00:00 2001 From: gwojda Date: Sat, 18 Mar 2017 15:43:59 +0100 Subject: [PATCH] fix leaks --- 42sh/src/builtin/builtin_exit.c | 5 +---- 42sh/src/main/data_exit.c | 6 +++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/42sh/src/builtin/builtin_exit.c b/42sh/src/builtin/builtin_exit.c index e08a3563..d38bd167 100644 --- a/42sh/src/builtin/builtin_exit.c +++ b/42sh/src/builtin/builtin_exit.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 14:28:41 by jhalford #+# #+# */ -/* Updated: 2017/03/14 15:22:44 by gwojda ### ########.fr */ +/* Updated: 2017/03/18 15:41:42 by gwojda ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,9 +33,6 @@ int builtin_exit(const char *path, char *const av[], char *const envp[]) status = ft_atoi(av[1]); else status = ft_atoi(ft_getenv(data_singleton()->env, "?")); - ft_save_termios(-1); - ft_free_hash_table(); - free_history_list(data_singleton()->line.list_beg); if (SH_IS_INTERACTIVE(data_singleton()->opts)) tcsetattr(STDIN, TCSANOW, &data_singleton()->jobc.shell_tmodes); data_exit(); diff --git a/42sh/src/main/data_exit.c b/42sh/src/main/data_exit.c index 27f59f26..566a1c23 100644 --- a/42sh/src/main/data_exit.c +++ b/42sh/src/main/data_exit.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/07 18:07:50 by jhalford #+# #+# */ -/* Updated: 2017/03/14 15:21:17 by gwojda ### ########.fr */ +/* Updated: 2017/03/18 15:43:07 by gwojda ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,6 +19,10 @@ void data_exit(void) data = data_singleton(); /* ft_strdel(&data->line.input); */ ft_sstrfree(data->env); + ft_sstrfree(data->local_var); ft_sstrfree(data->argv); + ft_save_termios(-1); + ft_free_hash_table(); + free_history_list(data_singleton()->line.list_beg); free(data_singleton()); }