From b25e6b186a79111e7cf56f26994fb2d7ddcb15a7 Mon Sep 17 00:00:00 2001 From: gwojda Date: Fri, 10 Feb 2017 12:19:51 +0100 Subject: [PATCH] fixe termcaps --- 42sh/src/glob/lib_perso/ft_memrealloc.c | 6 +++--- 42sh/src/main/data_init.c | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/42sh/src/glob/lib_perso/ft_memrealloc.c b/42sh/src/glob/lib_perso/ft_memrealloc.c index 08130733..4f3c6125 100644 --- a/42sh/src/glob/lib_perso/ft_memrealloc.c +++ b/42sh/src/glob/lib_perso/ft_memrealloc.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* ft_memrealloc.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: wescande +#+ +:+ +#+ */ +/* By: wescande +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/05 13:44:36 by wescande #+# #+# */ -/* Updated: 2017/02/08 13:54:33 by wescande ### ########.fr */ +/* Updated: 2017/02/10 12:13:23 by gwojda ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,6 +25,6 @@ void *ft_memrealloc(void *ptr, size_t old_s, size_t new_s) } n_ptr = ft_memalloc(new_s); ft_memcpy(n_ptr, ptr, old_s); - ft_memdel(ptr); + ft_memdel(&ptr); return (n_ptr); } diff --git a/42sh/src/main/data_init.c b/42sh/src/main/data_init.c index 8c11688e..9127da80 100644 --- a/42sh/src/main/data_init.c +++ b/42sh/src/main/data_init.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 19:26:32 by jhalford #+# #+# */ -/* Updated: 2017/02/07 17:23:02 by jhalford ### ########.fr */ +/* Updated: 2017/02/10 12:16:32 by gwojda ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,6 +17,7 @@ extern char **environ; int data_init(void) { t_data *data; + char *term_name; data = data_singleton(); data->env = ft_sstrdup(environ); @@ -44,5 +45,9 @@ int data_init(void) data->jobc.first_job = NULL; data->jobc.current_id = 1; + if ((term_name = ft_getenv(data->env, "TERM")) == NULL) + return (-1); + if (tgetent(NULL, term_name) != 1) + return (-1); return (0); }