raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed some stuff with lineedit

Browse source
This commit is contained in:
Maieul BOYER 2024-07-20 14:37:38 +02:00
parent 1d4fd27f97
commit 0cb2d91cac
No known key found for this signature in database
9 changed files with 95 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

71
sources/main.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */
/* Updated: 2024/07/08 21:11:43 by maiboyer ### ########.fr */
/* Updated: 2024/07/20 14:23:13 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,9 +16,11 @@
#include "line/line.h"
#include "me/hashmap/hashmap_env.h"
#include "me/str/str.h"
#include "me/string/string.h"
#include "me/types.h"
#include "minishell.h"
#include "parser/api.h"
#include <errno.h>
#include <sys/types.h>
#undef free
@ -122,21 +124,40 @@ void exec_shcat(t_state *shcat)
free_node(shcat->current_node);
}
void ft_take_args(t_state *shcat)
t_error handle_arguments(t_state *state)
{
t_str cmd;
t_line_state lstate;
while (1)
if (line_edit_start(&lstate, get_stdin(), get_stdout(), state->prompt))
return (ERROR);
while (!line_edit_feed(&lstate, &state->str_input))
{
shcat->str_input = NULL;
cmd = linenoise((t_const_str)shcat->name_shell);
if (cmd == NULL)
ft_exit(shcat, 0);
shcat->str_input = cmd;
line_history_add(shcat->str_input);
shcat->current_node = parse_str(&shcat->parser, shcat->str_input);
exec_shcat(shcat);
mem_free(shcat->str_input);
if (errno == EAGAIN)
{
errno = 0;
lstate.pos = 0;
string_clear(&lstate.buf);
write_fd(lstate.output_fd, (void *)"^C\n", 3, NULL);
line_refresh_line(&lstate);
}
}
line_edit_stop(&lstate);
return (NO_ERROR);
}
void ft_take_args(t_state *state)
{
while (true)
{
state->str_input = NULL;
if (handle_arguments(state))
ft_exit(state, 1);
if (state->str_input == NULL)
ft_exit(state, 0);
line_history_add(state->str_input);
state->current_node = parse_str(&state->parser, state->str_input);
exec_shcat(state);
mem_free(state->str_input);
}
}
@ -163,23 +184,23 @@ void free_myparser(t_parser self)
t_i32 main(t_i32 argc, t_str argv[], t_str envp[])
{
t_state utils;
t_state state;
(void)argc;
(void)argv;
(void)envp;
if (install_signal())
me_abort("Unable to install signals");
utils = (t_state){};
utils.parser = create_myparser();
utils.env = create_env_map();
if (populate_env(utils.env, envp))
state = (t_state){};
state.parser = create_myparser();
state.env = create_env_map();
if (populate_env(state.env, envp))
me_abort("Unable to build env hashmap");
utils.name_shell = "\x1B[93m"
"42sh"
"\x1B[32m"
">"
"\x1B[0m"
"$ ";
ft_take_args(&utils);
state.prompt = "\x1B[93m"
"42sh"
"\x1B[32m"
">"
"\x1B[0m"
"$ ";
ft_take_args(&state);
}

72
sources/signal_handler.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/02 13:22:14 by maiboyer #+# #+# */
/* Updated: 2024/07/18 14:53:14 by maiboyer ### ########.fr */
/* Updated: 2024/07/20 14:22:33 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,54 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
typedef struct s_sig_pending t_sig_pending;
struct s_sig_pending
{
int pending_signal[1024];
int pending_signal_data[1024];
t_usize length;
};
t_sig_pending *get_sig_pending()
{
static t_sig_pending data = {};
return (&data);
}
t_error append_signal(int signal, int signal_data)
{
}
void sigint_handle(int sig, siginfo_t *info, void *ucontext)
void sigsegv_handle(int sig)
{
(void)(sig);
(void)(info);
(void)(ucontext);
write_fd(get_stdout(), (void *)"\n", 1, NULL);
// TODO: change this to the linenoise verison
// rl_replace_line("", 0);
// rl_on_new_line();
// rl_redisplay();
}
void sigquit_handle(int sig, siginfo_t *info, void *ucontext)
{
(void)(sig);
(void)(info);
(void)(ucontext);
write_fd(get_stdout(), (void *)"\n", 1, NULL);
// rl_replace_line("", 0);
// rl_on_new_line();
// rl_redisplay();
}
void sigsegv_handle(int sig, siginfo_t *info, void *ucontext)
{
(void)(sig);
(void)(info);
(void)(ucontext);
me_eprintf("Abort: SEGFAULT!!!\n");
print_trace();
exit(139);
@ -77,30 +32,11 @@ t_error install_signal(void)
struct sigaction data;
data = (struct sigaction){};
data.sa_sigaction = sigint_handle;
data.sa_flags = SA_SIGINFO | SA_NOCLDWAIT;
data.sa_handler = SIG_IGN;
if (sigaction(SIGINT, &data, NULL))
return (ERROR);
data.sa_sigaction = sigquit_handle;
if (sigaction(SIGQUIT, &data, NULL))
return (ERROR);
data.sa_handler = SIG_DFL;
sigemptyset(&data.sa_mask);
if (sigaction(SIGTSTP, &data, NULL))
return (ERROR);
if (sigaction(SIGTTIN, &data, NULL))
return (ERROR);
if (sigaction(SIGTTOU, &data, NULL))
return (ERROR);
data.sa_handler = SIG_IGN;
if (sigaction(SIGCHLD, &data, NULL))
return (ERROR);
// data.sa_sigaction = sigsegv_handle;
// if (sigaction(SIGSEGV, &data, NULL))
// return (ERROR);
me_eprintf("Installed Signals\n");
return (NO_ERROR);
}