jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rectif memrealloc

Browse source
This commit is contained in:
wescande 2017-02-09 17:02:35 +01:00
parent c5263b51d0
commit 74713d84b0
5 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/glob/lib_perso/ft_memrealloc.c
View file

@ -6,7 +6,7 @@
/* By: wescande <marvin@42.fr> +#+ +:+ +#+ */ /* By: wescande <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/05 13:44:36 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); n_ptr = ft_memalloc(new_s);
ft_memcpy(n_ptr, ptr, old_s); ft_memcpy(n_ptr, ptr, old_s);
ft_memdel(ptr); ft_memdel(&ptr);
return (n_ptr); return (n_ptr);
} }

6
42sh/src/lexer/token_append.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/11 17:18:42 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->size += 8;
token->data = (char *)ft_realloc(token->data, token->size + 1); 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),
(token->size >> 3) + 1); (token->size >> 3) + 1);
token->esc[token->size >> 3] = 0; 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),
(token->size >> 3) + 1); (token->size >> 3) + 1);
token->esc2[token->size >> 3] = 0; token->esc2[token->size >> 3] = 0;

2
42sh/src/lexer/token_free.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/03 12:07:30 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

6
42sh/src/lexer/token_init.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/10 15:30:25 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->type = 0;
token->size = 8; token->size = 8;
token->data = ft_strnew(token->size + 1); token->data = ft_strnew(token->size + 1);
token->esc = (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) + 1); token->esc2 = (unsigned char *)ft_strnew((token->size >> 3));
return (token); return (token);
} }

7
42sh/src/main/data_init.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 19:26:32 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) int data_init(void)
{ {
t_data *data; t_data *data;
char *term_name;
data = data_singleton(); data = data_singleton();
data->env = ft_sstrdup(environ); data->env = ft_sstrdup(environ);
@ -44,5 +45,9 @@ int data_init(void)
data->jobc.first_job = NULL; data->jobc.first_job = NULL;
data->jobc.current_id = 1; 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); return (0);
} }