add ask_command() and minishell_error()
This commit is contained in:
parent
fa1301d41f
commit
2da8cbabdd
5 changed files with 82 additions and 17 deletions
25
src/ask_command.c
Normal file
25
src/ask_command.c
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ask_command.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/04/23 15:03:23 by mcolonna #+# #+# */
|
||||
/* Updated: 2024/04/23 15:56:21 by mcolonna ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "include.h"
|
||||
|
||||
const char *ask_command(t_memclass mc)
|
||||
{
|
||||
const char *r;
|
||||
|
||||
print_str(minishell_error, 1, "( ^.^)> ");
|
||||
r = read_line(minishell_error, mc, 0);
|
||||
if (r)
|
||||
return (r);
|
||||
else
|
||||
return ("");
|
||||
}
|
||||
22
src/error.c
Normal file
22
src/error.c
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* error.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/04/23 15:51:56 by mcolonna #+# #+# */
|
||||
/* Updated: 2024/04/23 15:56:49 by mcolonna ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "include.h"
|
||||
|
||||
void minishell_error(const char *msg)
|
||||
{
|
||||
if (str_eq(msg, "errno"))
|
||||
msg = strerror(errno);
|
||||
print_str(err_remember, 2, "minishell: ");
|
||||
print_str(err_remember, 2, msg);
|
||||
err_get();
|
||||
}
|
||||
11
src/main.c
11
src/main.c
|
|
@ -6,26 +6,27 @@
|
|||
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/04/23 14:33:45 by mcolonna #+# #+# */
|
||||
/* Updated: 2024/04/23 14:55:04 by mcolonna ### ########.fr */
|
||||
/* Updated: 2024/04/23 16:00:53 by mcolonna ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "include.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
int main(void)
|
||||
{
|
||||
t_memclass mc;
|
||||
t_command command;
|
||||
int errorstatus;
|
||||
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
errorstatus = 0;
|
||||
while (true)
|
||||
{
|
||||
command = parse_command(ask_command());
|
||||
mc = mem_newclass(minishell_error);
|
||||
command = parse_command(ask_command(mc));
|
||||
if (command.error)
|
||||
continue ;
|
||||
errorstatus = execute_command(command);
|
||||
mem_freeall(mc);
|
||||
}
|
||||
return (errorstatus);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue