tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifs

Browse Source
This commit is contained in:
tomoron
2024-02-16 21:24:24 +01:00
parent 8d77586948
commit ab5912fe51
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,7 +6,7 @@
# By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ # # By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/07/28 00:35:01 by tomoron #+# #+# # # Created: 2023/07/28 00:35:01 by tomoron #+# #+# #
# Updated: 2024/02/16 14:26:43 by tomoron ### ########.fr # # Updated: 2024/02/16 16:28:16 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -37,7 +37,7 @@ all: $(NAME)
$(NAME) : $(LIBFT) $(OBJS) $(NAME) : $(LIBFT) $(OBJS)
$(CC) $(FLAGS) $(OBJS) $(LIBFT) -lreadline -o $(NAME) $(CC) $(FLAGS) $(OBJS) $(LIBFT) -lreadline -o $(NAME)
$(LIBFT) : $(LIBFT):
make --no-print-directory -j -C ./libft make --no-print-directory -j -C ./libft
.c.o: .c.o:

14
debug.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/15 14:16:47 by tomoron #+# #+# */ /* Created: 2024/02/15 14:16:47 by tomoron #+# #+# */
/* Updated: 2024/02/16 15:08:40 by marde-vr ### ########.fr */ /* Updated: 2024/02/16 16:34:53 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,10 +21,14 @@ void print_parsed_cmd(t_cmd *cmd)
printf("ARG : %s", cmd->token); printf("ARG : %s", cmd->token);
else if (cmd->type == PIPE) else if (cmd->type == PIPE)
printf("PIPE"); printf("PIPE");
else if (cmd->type == OR) else if (cmd->type == RED_O)
printf("OR"); printf("RED_O");
else if (cmd->type == AND) else if (cmd->type == RED_O_APP)
printf("AND"); printf("RED_O_APP");
else if(cmd->type == RED_I)
printf("RED_I");
else if(cmd->type == HERE_DOC)
printf("HERE_DOC");
printf("] "); printf("] ");
cmd = cmd->next; cmd = cmd->next;
} }

4
main.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
/* Updated: 2024/02/15 14:13:57 by tomoron ### ########.fr */ /* Updated: 2024/02/16 16:37:13 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -81,7 +81,7 @@ int main(int argc, char **argv, char **envp)
add_history(command); add_history(command);
parsed_cmd = parse_command(command, env); parsed_cmd = parse_command(command, env);
free(command); free(command);
print_parsed_cmd(parsed_cmd);//debug //print_parsed_cmd(parsed_cmd);//debug
exec_command(parsed_cmd, env); exec_command(parsed_cmd, env);
free_cmd(parsed_cmd); free_cmd(parsed_cmd);
} }

4
minishell.h
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */ /* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
/* Updated: 2024/02/16 16:11:48 by marde-vr ### ########.fr */ /* Updated: 2024/02/16 16:32:33 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -27,8 +27,6 @@ typedef enum e_token_type
RED_O_APP, RED_O_APP,
RED_I, RED_I,
HERE_DOC, HERE_DOC,
OR,
AND
} t_token_type; } t_token_type;
typedef struct s_cmd typedef struct s_cmd

10
parsing.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/09 15:26:01 by tomoron #+# #+# */ /* Created: 2024/02/09 15:26:01 by tomoron #+# #+# */
/* Updated: 2024/02/16 15:09:25 by marde-vr ### ########.fr */ /* Updated: 2024/02/16 16:34:13 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
@ -50,11 +50,7 @@ t_token_type get_token_type(char **command)
while (ft_isspace(**command)) while (ft_isspace(**command))
(*command)++; (*command)++;
if ((*command)[0] == '|' && (*command)[1] == '|') if ((*command)[0] == '>' && (*command)[1] == '>')
res = OR;
else if ((*command)[0] == '&' && (*command)[1] == '&')
res = AND;
else if ((*command)[0] == '>' && (*command)[1] == '>')
res = RED_O_APP; res = RED_O_APP;
else if ((*command)[0] == '<' && (*command)[1] == '<') else if ((*command)[0] == '<' && (*command)[1] == '<')
res = HERE_DOC; res = HERE_DOC;
@ -66,7 +62,7 @@ t_token_type get_token_type(char **command)
res = PIPE; res = PIPE;
else else
res = ARG; res = ARG;
if (res == OR || res == AND || res == RED_O_APP || res == HERE_DOC) if (res == RED_O_APP || res == HERE_DOC)
(*command) += 2; (*command) += 2;
if (res == RED_O || res == RED_I || res == PIPE) if (res == RED_O || res == RED_I || res == PIPE)
(*command)++; (*command)++;