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

rectif bquote vide + protection strtok

Browse source
This commit is contained in:
wescande 2017-03-29 15:00:35 +02:00
parent e87dbff14c
commit 042785b412
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
42sh/libft/src/str/ft_strtok.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/07 18:08:31 by jhalford #+# #+# */ /* Created: 2017/03/07 18:08:31 by jhalford #+# #+# */
/* Updated: 2017/03/22 22:23:33 by wescande ### ########.fr */ /* Updated: 2017/03/29 14:48:09 by wescande ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,11 +14,15 @@
char *ft_strtok(char *s, const char *delim) char *ft_strtok(char *s, const char *delim)
{ {
static char *lasts; static char *lasts = NULL;
int ch; int ch;
if (s == 0) if (!s)
{
if (!lasts)
return (NULL);
s = lasts; s = lasts;
}
if ((ch = *s++) == 0) if ((ch = *s++) == 0)
return (0); return (0);
while (ft_strchr(delim, ch)) while (ft_strchr(delim, ch))

10
42sh/src/glob/expand_bquote.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */ /* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 17:47:53 by wescande #+# #+# */ /* Created: 2017/02/17 17:47:53 by wescande #+# #+# */
/* Updated: 2017/03/23 03:20:10 by wescande ### ########.fr */ /* Updated: 2017/03/29 14:59:17 by wescande ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -44,7 +44,7 @@ static void init_expand(t_bquote *me, char *content, int doifs)
char *content2; char *content2;
ifs = doifs ? ft_getenv(data_singleton()->local_var, "IFS") : NULL; ifs = doifs ? ft_getenv(data_singleton()->local_var, "IFS") : NULL;
content = ft_strtok(content, ifs); content = content ? ft_strtok(content, ifs) : content;
if (!content || !(content2 = ft_strtok(NULL, ifs))) if (!content || !(content2 = ft_strtok(NULL, ifs)))
{ {
ft_ld_pushfront(me->wk, gen_tab(ft_strjoinf(ft_strjoin(me->s1, content), ft_ld_pushfront(me->wk, gen_tab(ft_strjoinf(ft_strjoin(me->s1, content),
@ -83,9 +83,9 @@ static int search_bquote(t_bquote *me)
me->mid = ft_strsub(sta, 1, me->str - sta - 1); me->mid = ft_strsub(sta, 1, me->str - sta - 1);
me->s1 = ft_strsub(CH(*me->wk)[0], 0, sta - CH(*me->wk)[0]); me->s1 = ft_strsub(CH(*me->wk)[0], 0, sta - CH(*me->wk)[0]);
me->s2 = ft_strdup(me->str + 1); me->s2 = ft_strdup(me->str + 1);
if ((content = get_output(me->mid))) content = get_output(me->mid);
init_expand(me, content, init_expand(me, content,
!is_char_esc(me->esc, CH(*me->wk)[0], sta)); !is_char_esc(me->esc, CH(*me->wk)[0], sta));
ft_strdel(&me->mid); ft_strdel(&me->mid);
ft_strdel(&me->s1); ft_strdel(&me->s1);
ft_strdel(&me->s2); ft_strdel(&me->s2);