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

Merge branch 'master' of https://github.com/jzck/42sh

Browse source 
"psk"
This commit is contained in:
Antoine Riard 2017-03-09 18:41:59 +01:00
commit ca55620d71
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/glob/gen_tab_esc.c
View file

@ -26,9 +26,9 @@ char **gen_tab(const char *pat,
{
len = ft_strlen(pat);
my_tab[0] = ft_strdup(pat);
my_tab[1] = (char *)dup_char_esc(esc, len >> 3);
my_tab[1] = (char *)dup_char_esc(esc, (len >> 3) + 1);
if (esc2)
my_tab[2] = (char *)dup_char_esc(esc2, len >> 3);
my_tab[2] = (char *)dup_char_esc(esc2, (len >> 3) + 1);
}
else
{

3
42sh/src/glob/is_char_esc.c
View file

@ -66,6 +66,7 @@ unsigned char *dup_char_esc(const unsigned char *esc, const int size)
if (!(new_esc = (unsigned char *)ft_strnew(size)))
return (NULL);
ft_memcpy(new_esc, esc, size);
new_esc = ft_memcpy(new_esc, esc, size);
return (new_esc);
}