diff options
| author | salad <fmoenne-@student.le-101.fr> | 2020-12-15 17:15:58 +0100 |
|---|---|---|
| committer | salad <fmoenne-@student.le-101.fr> | 2020-12-15 17:15:58 +0100 |
| commit | 658e858cee47e54b8e3023f50d4f972a9ac55f0f (patch) | |
| tree | 5227bb7de28efaa19e9a61da67335f0212b6ae20 | |
| parent | norm and fix ctrl_c to fit c_gnl rewrite (diff) | |
| download | 42-minishell-658e858cee47e54b8e3023f50d4f972a9ac55f0f.tar.gz 42-minishell-658e858cee47e54b8e3023f50d4f972a9ac55f0f.tar.bz2 42-minishell-658e858cee47e54b8e3023f50d4f972a9ac55f0f.tar.xz 42-minishell-658e858cee47e54b8e3023f50d4f972a9ac55f0f.tar.zst 42-minishell-658e858cee47e54b8e3023f50d4f972a9ac55f0f.zip | |
norm tobecontinued
| -rw-r--r-- | src/c_ctrls.c | 18 | ||||
| -rw-r--r-- | src/c_ctrls.h | 1 | ||||
| -rw-r--r-- | src/c_init.c | 18 |
3 files changed, 23 insertions, 14 deletions
diff --git a/src/c_ctrls.c b/src/c_ctrls.c index 9431f72..58b4517 100644 --- a/src/c_ctrls.c +++ b/src/c_ctrls.c @@ -11,6 +11,7 @@ /* ************************************************************************** */ #include <signal.h> +#include <stdlib.h> #include <libft.h> #include <unistd.h> #include <term.h> @@ -18,6 +19,9 @@ #include "c_ctrls.h" #include "c_utils.h" #include "m_prompt.h" +#include "m_loop.h" +#include "s_destroy.h" +#include "u_utils.h" t_msh *c_get_msh(int mode, t_msh *src) { @@ -30,6 +34,20 @@ t_msh *c_get_msh(int mode, t_msh *src) return (msh); } +short c_ctrl_d(t_msh *msh) +{ + int tmp; + + c_set_term_raw(0); + write(STDERR_FILENO, "exit\n", 5); + u_eof_fd(msh->fd); + m_dump_hist(msh->curr_hist_ptr, msh); + tmp = msh->ret; + s_destroy(msh); + exit(tmp); + return (1); +} + short c_ctrl_l(char *line, t_caps *tcaps, t_msh *msh) { tputs(tgetstr("cl", NULL), 1, ft_putchar); diff --git a/src/c_ctrls.h b/src/c_ctrls.h index 63710a0..d4b932b 100644 --- a/src/c_ctrls.h +++ b/src/c_ctrls.h @@ -20,6 +20,7 @@ void c_signal_int(int signo); void c_signal_ign(int signo); t_msh *c_get_msh(int mode, t_msh *src); short c_ctrl_l(char *line, t_caps *tcaps, t_msh *msh); +short c_ctrl_d(t_msh *msh); char *c_ctrl_c(char **line, char *buf, t_msh *msh); #endif diff --git a/src/c_init.c b/src/c_init.c index 93f6bb3..0994e5d 100644 --- a/src/c_init.c +++ b/src/c_init.c @@ -60,8 +60,6 @@ short static short c_read_cap(char *buf, char *line, t_caps *tcaps, t_msh *msh) { - int tmp; - if (((*((unsigned int *)buf)) == LEFT_K) || ((*((unsigned int *)buf)) == CTRL_B)) return (c_key_left(tcaps->plen, tcaps)); @@ -78,18 +76,8 @@ static short return (c_ctrl_l(line, tcaps, msh)); else if ((*((unsigned int *)buf)) == CTRL_D && line[0] == '\0') - { - c_set_term_raw(0); - write(STDERR_FILENO, "exit\n", 5); - u_eof_fd(msh->fd); - m_dump_hist(msh->curr_hist_ptr, msh); - tmp = msh->ret; - s_destroy(msh); - exit(tmp); - return (0); - } - else - return (0); + return (c_ctrl_d(msh)); + return (0); } char *ft_strrbavchr(const char *s, int c, size_t start) @@ -145,6 +133,8 @@ char *c_set_ptr(t_bool reset, char key, t_msh *msh) return (p); } +/* TODO : key_up_down should manage and set the correct key */ + static char *c_process_key(char **line, char *buf, t_caps *tcaps, t_msh *msh) { |