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

completion semble fonctionnelle : plus de tests a faire ! :)

Browse source
This commit is contained in:
gwojda 2017-02-03 16:13:36 +01:00
parent 6ab0634d4c
commit 2d6b314a68
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/completion/c_output.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/03 13:10:38 by alao #+# #+# */ /* Created: 2017/02/03 13:10:38 by alao #+# #+# */
/* Updated: 2017/02/03 15:47:16 by alao ### ########.fr */ /* Updated: 2017/02/03 16:12:00 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -58,7 +58,7 @@ int c_gtfo(t_comp *c, long int keypress)
if (keypress != 10) if (keypress != 10)
{ {
c_clear(data_singleton()); c_clear(data_singleton());
return (0); return (1);
} }
ptr = c->lst; ptr = c->lst;
while (!ptr->cursor) while (!ptr->cursor)

9
42sh/src/line-editing/completion.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/03 14:15:55 by gwojda #+# #+# */ /* Created: 2017/02/03 14:15:55 by gwojda #+# #+# */
/* Updated: 2017/02/03 15:39:40 by gwojda ### ########.fr */ /* Updated: 2017/02/03 16:10:54 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -18,16 +18,15 @@ int ft_completion(int ret)
char boolean; char boolean;
boolean = 0; boolean = 0;
if ((ret != TOUCHE_TAB && ret != 10) if (((ret != TOUCHE_TAB && ret != 10)
|| (ret == 10 && !(data_singleton()->comp))) || (ret == 10)) && !(data_singleton()->comp))
return (0); return (0);
tmp = data_singleton()->line.pos; tmp = data_singleton()->line.pos;
if (ret == 10)
ft_puttermcaps("cd");
if (data_singleton()->comp || ret == TOUCHE_TAB) if (data_singleton()->comp || ret == TOUCHE_TAB)
boolean = completion(ret); boolean = completion(ret);
if (boolean || ret == 10) if (boolean || ret == 10)
{ {
ft_puttermcaps("cd");
ft_current_str(data_singleton()->line.input, tmp); ft_current_str(data_singleton()->line.input, tmp);
ft_get_next_str(data_singleton()->line.input, &tmp); ft_get_next_str(data_singleton()->line.input, &tmp);
data_singleton()->line.pos = tmp; data_singleton()->line.pos = tmp;