From 74713d84b0ab7bd975d3536449411b1b29e0223a Mon Sep 17 00:00:00 2001 From: wescande Date: Thu, 9 Feb 2017 17:02:35 +0100 Subject: [PATCH] rectif memrealloc --- 42sh/src/glob/lib_perso/ft_memrealloc.c | 4 ++-- 42sh/src/lexer/token_append.c | 6 +++--- 42sh/src/lexer/token_free.c | 2 +- 42sh/src/lexer/token_init.c | 6 +++--- 42sh/src/main/data_init.c | 7 ++++++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/42sh/src/glob/lib_perso/ft_memrealloc.c b/42sh/src/glob/lib_perso/ft_memrealloc.c index 08130733..2ea59d78 100644 --- a/42sh/src/glob/lib_perso/ft_memrealloc.c +++ b/42sh/src/glob/lib_perso/ft_memrealloc.c @@ -6,7 +6,7 @@ /* By: wescande +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/05 13:44:36 by wescande #+# #+# */ -/* Updated: 2017/02/08 13:54:33 by wescande ### ########.fr */ +/* Updated: 2017/02/09 17:01:01 by wescande ### ########.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/lexer/token_append.c b/42sh/src/lexer/token_append.c index d7205017..08a2f5cc 100644 --- a/42sh/src/lexer/token_append.c +++ b/42sh/src/lexer/token_append.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/11 17:18:42 by jhalford #+# #+# */ -/* Updated: 2017/02/08 13:55:31 by wescande ### ########.fr */ +/* Updated: 2017/02/09 17:00:41 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,11 +21,11 @@ int token_append(t_token *token, char c, short int esc, short int esc2) { token->size += 8; token->data = (char *)ft_realloc(token->data, token->size + 1); - token->esc = (unsigned char *)ft_memrealloc((char *)token->esc, + token->esc = (unsigned char *)ft_memrealloc(token->esc, (token->size >> 3), (token->size >> 3) + 1); token->esc[token->size >> 3] = 0; - token->esc2 = (unsigned char *)ft_memrealloc((char *)token->esc2, + token->esc2 = (unsigned char *)ft_memrealloc(token->esc2, (token->size >> 3), (token->size >> 3) + 1); token->esc2[token->size >> 3] = 0; diff --git a/42sh/src/lexer/token_free.c b/42sh/src/lexer/token_free.c index a807db59..882fcc04 100644 --- a/42sh/src/lexer/token_free.c +++ b/42sh/src/lexer/token_free.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/03 12:07:30 by jhalford #+# #+# */ -/* Updated: 2017/02/07 13:39:50 by wescande ### ########.fr */ +/* Updated: 2017/02/09 17:00:44 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/token_init.c b/42sh/src/lexer/token_init.c index d67262c4..280ed495 100644 --- a/42sh/src/lexer/token_init.c +++ b/42sh/src/lexer/token_init.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/10 15:30:25 by jhalford #+# #+# */ -/* Updated: 2017/02/07 13:42:00 by wescande ### ########.fr */ +/* Updated: 2017/02/09 17:00:52 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ t_token *token_init(void) token->type = 0; token->size = 8; token->data = ft_strnew(token->size + 1); - token->esc = (unsigned char *)ft_strnew((token->size >> 3) + 1); - token->esc2 = (unsigned char *)ft_strnew((token->size >> 3) + 1); + token->esc = (unsigned char *)ft_strnew((token->size >> 3)); + token->esc2 = (unsigned char *)ft_strnew((token->size >> 3)); return (token); } diff --git a/42sh/src/main/data_init.c b/42sh/src/main/data_init.c index 8c11688e..de9e0895 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/09 16:31:07 by wescande ### ########.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); }