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

Merge branch 'master' into maix/norminette

Browse source
This commit is contained in:
Maix0 2024-04-30 14:23:56 +02:00 • committed by GitHub
commit 43e276cc1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 74 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

4
includes/minishell.h
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 14:41:15 by rparodi #+# #+# */ /* Created: 2024/03/28 14:41:15 by rparodi #+# #+# */
/* Updated: 2024/04/28 18:34:45 by maiboyer ### ########.fr */ /* Updated: 2024/04/29 15:07:54 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -27,6 +27,8 @@
# include <readline/readline.h> # include <readline/readline.h>
# include <readline/history.h> # include <readline/history.h>
# define PATH_FILES "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
typedef struct s_utils typedef struct s_utils
{ {
t_str name_shell; t_str name_shell;

1
note_raph.txt
View file

@ -1 +0,0 @@
Alors pour le coup, il faut que j'arrive a separer les strings par commande puis a chaque sep regarder les autres cmd (bisous lpb si tu passe par la ;))

97
sources/main.c
View file

@ -10,58 +10,23 @@
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "app/node.h"
#include "me/string/str_len.h"
#include "parser/api.h"
#include "parser/parser.h"
#include "../includes/minishell.h" #include "../includes/minishell.h"
t_i32 ft_check_type_operators(t_str operators) void ft_check(t_utils *shcat, char **input) {
{
if (operators == NULL)
printf("End of input");
else if (ft_strcmp(operators, ">") == 0)
printf("Have to redirect in the file\n");
else if (ft_strcmp(operators, ">>") == 0)
printf("Have to redirect at the end of the file after\n");
else if (ft_strcmp(operators, ">&") == 0)
printf("Have to redirect the stdout in the file\n");
else if (ft_strcmp(operators, "<") == 0)
printf("Have to redirect at the end of the file before\n");
else if (ft_strcmp(operators, "<<") == 0)
printf("Have to redirect at the end of the file after\n");
else if (ft_strcmp(operators, "<&") == 0)
printf("Have to redirect the stdout in the file\n");
else if (ft_strcmp(operators, ";") == 0)
printf("Have to execute one more command\n");
else if (ft_strcmp(operators, ";") == 0)
printf("Have to execute one more command\n");
else if (ft_strcmp(operators, "|") == 0)
printf("I have to pipe a operators !\n");
else if (ft_strcmp(operators, "||") == 0)
printf("Or something\n");
else if (ft_strcmp(operators, "&&") == 0)
printf("Only if the first has exit status 0\n");
else if (ft_strcmp(operators, "&") == 0)
printf("Parreil mais chelou\n");
else
return (0);
return (1);
}
void ft_check(t_utils *shcat, char **input)
{
t_usize i; t_usize i;
t_usize prev_i; t_usize prev_i;
i = 0; i = 0;
prev_i = 0; prev_i = 0;
while (input[i] != NULL) while (input[i] != NULL) {
{
while (ft_check_type_operators(input[i]) == 1)
i++;
if (ft_strcmp(input[i], "exit") == 0) if (ft_strcmp(input[i], "exit") == 0)
ft_exit(shcat, 0); ft_exit(shcat, 0);
else if (ft_strcmp(input[i], "pwd") == 0) else if (ft_strcmp(input[i], "pwd") == 0)
ft_pwd(); ft_pwd();
else if (ft_strcmp(input[i], "echo") == 0)
ft_echo("ECHO MAIS PAS ARG BORDEL !\n", "flag");
else else
ft_other_cmd(shcat, i, prev_i); ft_other_cmd(shcat, i, prev_i);
prev_i = i; prev_i = i;
@ -74,8 +39,7 @@ void ft_take_args(t_utils *shcat)
t_i32 i; t_i32 i;
i = 0; i = 0;
while (1) while (1) {
{
shcat->str_input = readline((t_const_str)shcat->name_shell); shcat->str_input = readline((t_const_str)shcat->name_shell);
if (!shcat->str_input) if (!shcat->str_input)
ft_exit(shcat, 0); ft_exit(shcat, 0);
@ -90,36 +54,25 @@ void ft_take_args(t_utils *shcat)
} }
} }
void ft_init_arge(t_str arge[], t_utils *utils) void ft_find_path(t_str arge[], t_utils *utils)
{ {
size_t i; t_i32 i;
char *temp; t_u8 check;
i = 0; i = 0;
temp = NULL; check = 0;
while (arge[i] != NULL) while (arge[i] != NULL)
{ {
if (arge[i][0] == 'P' && arge[i][1] == 'A' && arge[i][2] == 'T' && if (arge[i][0] == 'P' && arge[i][1] == 'A' && arge[i][2] == 'T' && arge[i][3] == 'H' && arge[i][4] == '=')
arge[i][3] == 'H' && arge[i][4] == '=')
{ {
temp = ft_strdup(arge[i] + 5); utils->path = ft_split(arge[i] + 5, ':');
if (!temp) return ;
ft_exit(utils, 1);
else
utils->path = ft_split(temp, ':');
break;
} }
i++; i++;
} }
if (temp != NULL) utils->path = ft_split(PATH_FILES, ':');
free(temp);
} }
#include "app/node.h"
#include "me/string/str_len.h"
#include "parser/api.h"
#include "parser/parser.h"
t_language *tree_sitter_bash(void); t_language *tree_sitter_bash(void);
t_node parse_to_nodes(t_parser *parser, t_const_str input) t_node parse_to_nodes(t_parser *parser, t_const_str input)
@ -174,13 +127,19 @@ t_node parse_string(t_myparser *parser, t_const_str input)
return (parse_to_nodes(parser->parser, input)); return (parse_to_nodes(parser->parser, input));
} }
t_i32 main() t_i32 main(t_i32 argc, t_str argv[], t_str arge[])
{ {
t_myparser parser; // t_myparser parser;
t_node node; // t_node node;
t_utils utils;
parser = create_myparser(); (void)argc;
node = parse_string(&parser, "banane \"$VAR\"'truc'"); (void)argv;
print_node_data(&node, 0); ft_find_path(arge, &utils);
free_node(node); utils.name_shell = "42sh > ";
ft_take_args(&utils);
// parser = create_myparser();
// node = parse_string(&parser, "banane \"$VAR\"'truc'");
// print_node_data(&node, 0);
// free_node(node);
} }