From 2d6b314a682adf2ac22bff29c5a7a7d0ece8fdab Mon Sep 17 00:00:00 2001 From: gwojda Date: Fri, 3 Feb 2017 16:13:36 +0100 Subject: [PATCH] completion semble fonctionnelle : plus de tests a faire ! :) --- 42sh/src/completion/c_output.c | 4 ++-- 42sh/src/line-editing/completion.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/42sh/src/completion/c_output.c b/42sh/src/completion/c_output.c index 3273d4b8..8fb7fd08 100644 --- a/42sh/src/completion/c_output.c +++ b/42sh/src/completion/c_output.c @@ -6,7 +6,7 @@ /* 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) { c_clear(data_singleton()); - return (0); + return (1); } ptr = c->lst; while (!ptr->cursor) diff --git a/42sh/src/line-editing/completion.c b/42sh/src/line-editing/completion.c index 019cf514..cc968a28 100644 --- a/42sh/src/line-editing/completion.c +++ b/42sh/src/line-editing/completion.c @@ -6,7 +6,7 @@ /* 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; boolean = 0; - if ((ret != TOUCHE_TAB && ret != 10) - || (ret == 10 && !(data_singleton()->comp))) + if (((ret != TOUCHE_TAB && ret != 10) + || (ret == 10)) && !(data_singleton()->comp)) return (0); tmp = data_singleton()->line.pos; - if (ret == 10) - ft_puttermcaps("cd"); if (data_singleton()->comp || ret == TOUCHE_TAB) boolean = completion(ret); if (boolean || ret == 10) { + ft_puttermcaps("cd"); ft_current_str(data_singleton()->line.input, tmp); ft_get_next_str(data_singleton()->line.input, &tmp); data_singleton()->line.pos = tmp;