nalebrun/mmoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:gazhonsepaskwa/mmoat

Browse Source
This commit is contained in:
Loic Deridder
2025-02-12 10:10:55 +01:00
parent adc59eb33b 3bb3fce50d
commit 2350222238
4 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
srcs/main.c
View File

@@ -14,24 +14,6 @@
#include <readline/history.h>
#include <readline/readline.h>
int g_sig = 0;
void handle_sigint(int sig)
{
(void)sig;
g_sig = SIGINT;
rl_replace_line("", 0);
// rl_on_new_line();
rl_done = 1;
rl_redisplay();
}
void handle_sigquit(int sig)
{
(void)sig;
// ft_printf("\b\b");
}
static void add_prevhistory(t_msh *msh)
{
char *str;
@@ -52,9 +34,8 @@ int interactive_mode(t_msh *msh)
{
msh->input = malloc(1);
msh->input[0] = 0;
while (!msh->input[0] || is_only_space(msh->input) || g_sig == SIGINT)
while (!msh->input[0] || is_only_space(msh->input))
{
g_sig = 0;
free(msh->input);
msh->input = powerline(msh);
if (!msh->input)
@@ -62,15 +43,19 @@ int interactive_mode(t_msh *msh)
}
if (!msh->input)
return (1);
if (g_sig != SIGINT)
interpret_cmd(&msh->input, msh);
interpret_cmd(&msh->input, msh);
return (1);
}
int main(int ac, char **av, char **envp)
{
t_msh *msh;
struct termios term;
(void)av;
tcgetattr(STDIN_FILENO, &term);
term.c_cc[VQUIT] = _POSIX_VDISABLE;
tcsetattr(STDIN_FILENO, TCSANOW, &term);
msh = init_msh(envp);
init_sig();
add_prevhistory(msh);
@@ -83,9 +68,6 @@ int main(int ac, char **av, char **envp)
break ;
}
else
{
msh->input = ft_strdup(av[1]);
interpret_cmd(&msh->input, msh);
}
ft_error("minishell : usages : - ./minishell\n");
free_msh(msh);
}

4
srcs/powerline.c
View File

@@ -53,9 +53,11 @@ char *powerline(t_msh *msh)
char *pwd;
char *input;
char *prompt;
struct winsize w;
ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
pwd = get_pwd();
prompt = ft_sprintf("\n%s  MMOAT %s%s %s%s %s%s%s ", POW1, POW2, POW3,
prompt = ft_sprintf("%s%s%s\n%s  MMOAT %s%s %s%s %s%s%s ", SEP, rep_c('-', w.ws_col), RESET, POW1, POW2, POW3,
POW4, pwd, RESET, POW5, RESET);
input = readline(prompt);
handle_input(input, msh);

15
srcs/sig.c
View File

@@ -30,3 +30,18 @@ void init_sig(void)
(sa[1]).sa_handler = handle_sigquit;
sigaction(SIGQUIT, &(sa[1]), NULL);
}
void handle_sigint(int sig)
{
(void)sig;
write(2, "\n\n", 2);
rl_on_new_line();
rl_replace_line("", 0);
rl_redisplay();
}
void handle_sigquit(int sig)
{
(void)sig;
// ft_printf("\b\b");
}