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

Fix #104 modified files c_abs_path.c and c_parser.c

Browse source
This commit is contained in:
M600 2017-03-15 06:59:03 +01:00
parent 15870d6a89
commit af97e96d60
2 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
42sh/src/completion/c_abs_path.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/09 16:54:59 by gwojda #+# #+# */
/* Updated: 2017/03/09 17:34:43 by gwojda ### ########.fr */
/* Updated: 2017/03/15 06:57:53 by alao ### ########.fr */
/* */
/* ************************************************************************** */
@ -48,5 +48,6 @@ void c_seek_abs_path(t_comp *c, char *current_word)
}
!c->match ? c->match = ft_strdupi_w(ft_strrchr(c->rcmd, '/') + 1) : 0;
c_parser(c, c->cpath, c->match);
c_exclusion_folder(c);
if (c->lst == NULL || c->lst == c->lst->prev)
c_exclusion_folder(c);
}

33
42sh/src/completion/c_parser.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:52:07 by alao #+# #+# */
/* Updated: 2017/03/14 11:37:25 by gwojda ### ########.fr */
/* Updated: 2017/03/15 06:53:34 by alao ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,6 +18,7 @@
void c_add_to_lst(t_comp *c, t_clst *node)
{
DG("\tADD %s", node->name);
if (c->lst == NULL)
{
c->lst = node;
@ -41,6 +42,9 @@ void c_add_to_lst(t_comp *c, t_clst *node)
** created and the function above is called to add it.
*/
//TODO: The above function doesn't reject . and .. folder for abs_path. Fix needed.
/*
static int c_storing(t_comp *c, char *value, unsigned char type)
{
t_clst *tmp;
@ -59,6 +63,33 @@ static int c_storing(t_comp *c, char *value, unsigned char type)
c_add_to_lst(c, tmp);
return (0);
}
*/
static int c_storing(t_comp *c, char *value, unsigned char type)
{
t_clst *tmp;
if (c->match && c->match[0] == '.')
{
if (ft_strequ(".", value) || ft_strequ("..", value))
return (0);
}
else
{
if (ft_strncmp(".", value, 1) == 0 || ft_strncmp("..", value, 2) == 0)
return (0);
}
if (c->match && ft_strnequ(c->match, value, ft_strlen(c->match)) != 1)
return (0);
if (!(tmp = (t_clst *)malloc(sizeof(t_clst))))
return (-1);
tmp->name = ft_strdup(value);
tmp->len = ft_strlen(tmp->name);
tmp->type = (int)type;
tmp->cursor = 0;
c_add_to_lst(c, tmp);
return (0);
}
/*
** Cycle through the path specified.