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

conflit

Browse Source
This commit is contained in:
tomoron
2024-04-01 22:06:51 +02:00
parent fde70abd2b dc73084ede
commit 68469542ff
14 changed files with 110 additions and 132 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> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2023/07/28 00:35:01 by tomoron #+# #+# #
# Updated: 2024/03/29 14:34:57 by tomoron ### ########.fr #
# Updated: 2024/04/01 20:09:57 by marde-vr ### ########.fr #
# #
# **************************************************************************** #
@ -34,7 +34,7 @@ SRCS_RAW = main.c\
commands.c\
pipe.c\
utils.c\
utils2.c\
utils_bonus.c\
signal_handler.c\
parsing_bonus.c\
exec_bonus.c

8
srcs/builtins.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:20:21 by marde-vr #+# #+# */
/* Updated: 2024/03/30 18:40:49 by marde-vr ### ########.fr */
/* Updated: 2024/04/01 13:22:14 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,7 +27,7 @@ int cmd_is_builtin(t_msh *msh, char *cmd_token)
return (0);
else if (!ft_strcmp(cmd_token, "cd"))
{
cd(msh->tokens);
cd(msh->cmds);
return (1);
}
else if (!ft_strcmp(cmd_token, "exit"))
@ -54,7 +54,7 @@ int exec_builtin(t_msh *msh)
if (!msh->cmds->value)
return (0);
if (!ft_strcmp(msh->cmds->value, "echo"))
g_return_code = echo(msh->tokens->next);
g_return_code = echo(msh->cmds->next);
else if (!ft_strcmp(msh->cmds->value, "ret"))
g_return_code = ft_atoi(msh->cmds->next->value);
else if (!ft_strcmp(msh->cmds->value, "env"))
@ -64,7 +64,7 @@ int exec_builtin(t_msh *msh)
else if (!ft_strcmp(msh->cmds->value, "pwd"))
g_return_code = pwd();
else if (!ft_strcmp(msh->cmds->value, "cd"))
g_return_code = cd(msh->tokens);
g_return_code = cd(msh->cmds);
else
return (0);
return (1);

32
srcs/commands.c
View File

@ -6,45 +6,45 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:22:15 by marde-vr #+# #+# */
/* Updated: 2024/03/30 17:25:20 by marde-vr ### ########.fr */
/* Updated: 2024/04/01 20:01:21 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
int get_cmd_count(t_cmd *cmds)
int get_cmd_count(t_token *cmds)
{
int count;
t_cmd *cur_cmd;
(void)cmds;
t_token *cur_cmd;
count = 0;
cur_cmd = cmds;
while (cur_cmd->next != 0)
{
if (cur_cmd->cmd_type != PIPE)
if (cur_cmd->type != PIPE)
count++;
cur_cmd = cur_cmd->next;
}
if (cur_cmd->cmd_type != PIPE)
if (cur_cmd->type != PIPE)
count++;
return (count);
}
int get_args_count(t_cmd *cmds)
int get_args_count(t_token *cmds)
{
int count;
t_cmd *cur_cmd;
t_token *cur_cmd;
count = 0;
cur_cmd = cmds;
if (cur_cmd->cmd_type == ARG)
if (cur_cmd->type == ARG)
count++;
while (cur_cmd->next)
{
if (/*cur_cmd->type == PIPE*/ 0)
break ;
cur_cmd = cur_cmd->next;
if (cur_cmd->cmd_type == ARG)
if (cur_cmd->type == ARG)
count++;
else if (/*cur_cmd->type != PIPE*/ 1)
cur_cmd = cur_cmd->next;
@ -55,19 +55,19 @@ int get_args_count(t_cmd *cmds)
char **get_cmd_args(t_msh *msh)
{
char **cmd_args;
t_cmd *cur_cmd;
t_token *cur_cmd;
int args_count;
int i;
args_count = get_args_count(msh->cmds);
cmd_args = ft_calloc(args_count + 1, sizeof(char *));
if (!cmd_args || !msh->fds)
if (!cmd_args)
ft_exit(msh, 1);
cur_cmd = msh->cmds;
i = 0;
while (i < args_count)
{
if (cur_cmd->cmd_type == ARG)
if (cur_cmd->type == ARG)
{
if (!i)
cmd_args[i++] = remove_path(cur_cmd->value);
@ -83,8 +83,8 @@ char **get_cmd_args(t_msh *msh)
void remove_command_from_msh(t_msh *msh)
{
t_cmd *cur_cmd;
t_cmd *cmd_tmp;
t_token *cur_cmd;
t_token *cmd_tmp;
cur_cmd = msh->cmds;
while (cur_cmd && cur_cmd->next)
@ -93,7 +93,7 @@ void remove_command_from_msh(t_msh *msh)
{
cmd_tmp = cur_cmd;
cur_cmd = cur_cmd->next;
//msh->in_type = cmd_tmp->cmd_type;
//msh->in_type = cmd_tmp->type;
free(cmd_tmp->value);
free(cmd_tmp);
msh->cmds = cur_cmd;

77
srcs/exec_bonus.c
View File

@ -6,19 +6,34 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */
/* Updated: 2024/04/01 20:08:24 by tomoron ### ########.fr */
/* Updated: 2024/04/01 21:56:12 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void get_redirections(t_msh *msh)
{
if (first_is_in_type(msh))
{
get_in_type(msh, msh->cmds);
if (!g_return_code)
get_out_type(msh, msh->cmds);
}
else
{
get_out_type(msh, msh->cmds);
if (!g_return_code)
get_in_type(msh, msh->cmds);
}
}
void exec_command_bonus(t_msh *msh, char *cmd_str)
{
t_cmd *cmds;
t_cmd *tmp;
(void)msh;
printf("cmd : %s\n",cmd_str);
//printf("cmd : %s\n",cmd_str);
cmds = parsing_bonus(cmd_str);
tmp = check_cmds_syntax(cmds);
if(tmp)
@ -28,24 +43,42 @@ void exec_command_bonus(t_msh *msh, char *cmd_str)
free_cmd(cmds);
return;
}
printf("has address : %d\n", cmds!=0);
msh->tokens = parse_command(cmd_str, msh->env);
msh->cmds = cmds;
while (cmds && cmds->next)
{
if (cmds->cmd_type == CMD)
{
msh->cmds = parse_command(cmds->value, msh->env);
get_redirections(msh);
print_parsed_cmd(cmds);
print_parsed_token(msh->cmds);
exec_commands(msh);
}
cmds = cmds->next;
}
if (cmds && cmds->cmd_type == CMD)
{
msh->cmds = parse_command(cmds->value, msh->env);
get_redirections(msh);
print_parsed_cmd(cmds);
print_parsed_token(msh->cmds);
exec_commands(msh);
}
}
int exec(t_msh *msh, char **cmd_args, int i, int cmd_count)
{
pid_t pid;
int fds[2];
if (i != cmd_count - 1)
{
if (pipe(msh->fds[i]) == -1)
if (pipe(fds) == -1)
{
perror("pipe");
ft_exit(msh, 1);
}
msh->in_fd = fds[0];
msh->out_fd = fds[1];
}
pid = fork();
if (pid == -1)
@ -67,21 +100,6 @@ int exec(t_msh *msh, char **cmd_args, int i, int cmd_count)
void exec_command(t_msh *msh, int i, int cmd_count)
{
g_return_code = 0;
msh->fds[i] = ft_calloc(2, sizeof(int *));
if (!msh->fds[i])
ft_exit(msh, 1);
if (first_is_in_type(msh))
{
get_in_type(msh, msh->tokens);
if (!g_return_code)
get_out_type(msh, msh->tokens);
}
else
{
get_out_type(msh, msh->tokens);
if (!g_return_code)
get_in_type(msh, msh->tokens);
}
if (!cmd_is_builtin(msh, msh->cmds->value))
get_cmd_path(msh);
exec(msh, get_cmd_args(msh), i, cmd_count);
@ -100,15 +118,6 @@ void end_execution(t_msh *msh, int cmd_count)
g_return_code = WEXITSTATUS(status);
if (WIFSIGNALED(status) && WTERMSIG(status) == SIGQUIT)
printf("Quit (core dumped)\n");
i = 0;
while (i < cmd_count)
{
free(msh->fds[i]);
msh->fds[i] = 0;
i++;
}
free(msh->fds);
msh->fds = 0;
free(msh->pids);
msh->pids = 0;
//signal(SIGINT, signal_handler_interactive); //enables ctrl-C
@ -122,14 +131,10 @@ void exec_commands(t_msh *msh)
int i;
i = -1;
ft_printf("yes\n");
if (!msh->cmds)
return ;
cmd_count = get_cmd_count(msh->cmds);
ft_printf("cmd_count: %d\n", cmd_count);
msh->fds = ft_calloc(cmd_count, sizeof(int **));
msh->pids = ft_calloc(cmd_count, sizeof(int *));
if (!msh->pids || !msh->fds)
if (!msh->pids)
ft_exit(msh, 1);
while (++i < cmd_count)
exec_command(msh, i, cmd_count);

16
srcs/exit.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/07 16:04:11 by tomoron #+# #+# */
/* Updated: 2024/03/30 18:41:32 by marde-vr ### ########.fr */
/* Updated: 2024/04/01 20:07:47 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,7 +24,7 @@ void get_exit_bt_return_code(t_msh *msh, int *exit_code)
{
t_token *cur_cmd;
cur_cmd = msh->tokens->next;
cur_cmd = msh->cmds->next;
if (cur_cmd && cur_cmd->type == ARG && !ft_strisnbr(cur_cmd->value))
numeric_arg_err(cur_cmd->value, exit_code);
else if (cur_cmd && cur_cmd->type == ARG)
@ -37,9 +37,8 @@ int exit_bt(t_msh *msh)
{
t_token *cur_cmd;
int exit_code;
int cmd_count;
cur_cmd = msh->tokens->next;
cur_cmd = msh->cmds->next;
ft_printf("exit\n");
if (cur_cmd && cur_cmd->next && cur_cmd->next->type == ARG
&& ft_strisnbr(cur_cmd->value))
@ -47,15 +46,6 @@ int exit_bt(t_msh *msh)
else
{
get_exit_bt_return_code(msh, &exit_code);
if (msh->fds)
{
cmd_count = get_cmd_count(msh->cmds);
while (cmd_count)
{
free(msh->fds[cmd_count - 1]);
cmd_count--;
}
}
free_msh(msh);
exit(exit_code);
}

6
srcs/export.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/18 18:29:20 by marde-vr #+# #+# */
/* Updated: 2024/03/30 18:45:02 by marde-vr ### ########.fr */
/* Updated: 2024/04/01 13:20:34 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -44,7 +44,7 @@ int ft_export(t_msh *msh)
char *value;
int len;
cmd = msh->tokens;
cmd = msh->cmds;
if (cmd && (!cmd->next || (cmd->next && cmd->next->type != ARG)))
print_env_declare(msh->env);
if (cmd && cmd->next && cmd->next->type == ARG && (!cmd->next->next
@ -94,7 +94,7 @@ int ft_unset(t_msh *msh)
{
t_token *cmd;
cmd = msh->tokens;
cmd = msh->cmds;
if (cmd)
cmd = cmd->next;
while (cmd && cmd->type == ARG)

3
srcs/here_doc.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */
/* Updated: 2024/03/26 17:52:26 by tomoron ### ########.fr */
/* Updated: 2024/04/01 20:06:47 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -43,7 +43,6 @@ void here_doc_child(t_msh *msh, char *eof, char *here_doc_file)
get_here_doc_input(msh, eof);
close(msh->in_fd);
free(here_doc_file);
free(msh->fds[0]);
ft_exit(msh, 0);
}

8
srcs/input_redirections.c
View File

@ -6,13 +6,13 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:15:27 by marde-vr #+# #+# */
/* Updated: 2024/03/30 17:09:09 by marde-vr ### ########.fr */
/* Updated: 2024/04/01 20:08:48 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void redirect_input(t_msh *msh, int i)
void redirect_input(t_msh *msh)
{
if (/*msh->in_type != PIPE*/ 1)
{
@ -22,7 +22,7 @@ void redirect_input(t_msh *msh, int i)
}
else
{
if (dup2(msh->fds[i - 1][0], 0) < 0)
if (dup2(msh->in_fd, 0) < 0)
ft_exit(msh, 1);
}
}
@ -69,7 +69,7 @@ int first_is_in_type(t_msh *msh)
{
t_token *cur_token;
cur_token = msh->tokens;
cur_token = msh->cmds;
while (cur_token && cur_token->type == ARG && cur_token->next)
cur_token = cur_token->next;
if (cur_token->type == RED_I || cur_token->type == HERE_DOC)

14
srcs/minishell.h
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
/* Updated: 2024/04/01 20:15:11 by tomoron ### ########.fr */
/* Updated: 2024/04/01 21:56:27 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -58,9 +58,7 @@ typedef struct s_env
typedef struct s_msh
{
t_env *env;
t_cmd *cmds;
t_token *tokens;
int **fds;
t_token *cmds;
int *pids;
t_token_type in_type;
t_token_type out_type;
@ -97,20 +95,20 @@ void remove_command_from_msh(t_msh *msh);
void ft_exit(t_msh *msh, int error_code);
void signal_handler_command(int signum);
void ft_exit(t_msh *msh, int exit_code);
void redirect_output(t_msh *msh, int i);
void redirect_output(t_msh *msh);
char **split_paths_from_env(t_env *env);
int add_return_code_to_str(char *res);
void redirect_input(t_msh *msh, int i);
void redirect_input(t_msh *msh);
void parse_var(t_msh *msh, char *line);
void print_parsed_token(t_token *cmd);//debug
int get_var_name_len(char *command);
void handle_minishellrc(t_msh *msh);
t_cmd *check_cmds_syntax(t_cmd *cmds);
char *get_tmp_file_name(t_msh *msh);
int get_args_count(t_cmd *cmds);
int get_args_count(t_token *cmds);
char **env_to_char_tab(t_env *env);
void print_parsed_cmd(t_cmd *cmd);//debug
int get_cmd_count(t_cmd *cmds);
int get_cmd_count(t_token *cmds);
int first_is_in_type(t_msh *msh);
int contains_newline(char *str);
int check_var_name(char *name);

10
srcs/output_redirections.c
View File

@ -6,13 +6,13 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 19:10:52 by marde-vr #+# #+# */
/* Updated: 2024/03/30 18:44:30 by marde-vr ### ########.fr */
/* Updated: 2024/04/01 20:09:27 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void redirect_output(t_msh *msh, int i)
void redirect_output(t_msh *msh)
{
if (/*msh->out_type != PIPE*/ 1)
{
@ -21,7 +21,7 @@ void redirect_output(t_msh *msh, int i)
}
else
{
if (dup2(msh->fds[i][1], 1) < 0)
if (dup2(msh->out_fd, 1) < 0)
ft_exit(msh, 1);
}
}
@ -58,9 +58,9 @@ void get_out_type(t_msh *msh, t_token *cmds)
msh->out_type = ARG;
msh->out_fd = 0;
cur_cmd = cmds;
if (cmds->type && msh->tokens == cmds)
if (cmds->type && msh->cmds == cmds)
{
while (msh->cmds->cmd_type != ARG && msh->cmds->next->next)
while (msh->cmds->type != ARG && msh->cmds->next->next)
msh->cmds = msh->cmds->next->next;
}
while (cur_cmd && cur_cmd->next && (cur_cmd->type == ARG

52
srcs/pipe.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:17:25 by marde-vr #+# #+# */
/* Updated: 2024/03/28 13:18:35 by tomoron ### ########.fr */
/* Updated: 2024/04/01 20:09:14 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,30 +16,24 @@ void close_pipe_fds(t_msh *msh, int i)
{
if (i != 0)
{
if (msh->fds[i - 1][0] > 2)
close(msh->fds[i - 1][0]);
if (msh->fds[i - 1][1] > 2)
close(msh->fds[i - 1][1]);
if (msh->in_fd > 2)
close(msh->in_fd);
if (msh->out_fd > 2)
close(msh->out_fd);
}
if (msh->fds[i][0] > 2)
close(msh->fds[i][0]);
if (msh->fds[i][1] > 2)
close(msh->fds[i][1]);
if (msh->in_fd > 2)
close(msh->out_fd);
if (msh->in_fd > 2)
close(msh->in_fd);
}
void execute_command(t_msh *msh, char **cmd_args, int i)
void execute_command(t_msh *msh, char **cmd_args)
{
char **env;
if (msh->cmds->value && (!ft_strcmp(msh->cmds->value, "cd")
|| !ft_strcmp(msh->cmds->value, "exit") || exec_builtin(msh)))
{
while (i >= 0)
{
free(msh->fds[i]);
msh->fds[i] = 0;
i--;
}
free(cmd_args);
ft_exit(msh, g_return_code);
}
@ -56,21 +50,15 @@ void child(t_msh *msh, char **cmd_args, int i)
{
if ((msh->in_type != ARG/* && msh->in_type != PIPE*/)
|| (/*msh->in_type == PIPE &&*/ i > 0))
redirect_input(msh, i);
redirect_input(msh);
if (/*msh->out_type == PIPE ||*/ msh->out_type == RED_O
|| msh->out_type == RED_O_APP)
redirect_output(msh, i);
close_pipe_fds(msh, i);
execute_command(msh, cmd_args, i);
execute_command(msh, cmd_args);
close(0);
close(1);
close(2);
while (i >= 0)
{
free(msh->fds[i]);
msh->fds[i] = 0;
i--;
}
free(cmd_args);
ft_exit(msh, g_return_code);
}
@ -81,17 +69,17 @@ void parent(t_msh *msh, int i, int cmd_count)
signal(SIGQUIT, signal_handler_command);
if (i != 0)
{
if (msh->fds[i - 1][0] > 2)
close(msh->fds[i - 1][0]);
if (msh->fds[i - 1][1] > 2)
close(msh->fds[i - 1][1]);
if (msh->in_fd > 2)
close(msh->in_fd);
if (msh->out_fd > 2)
close(msh->out_fd);
}
if (i == cmd_count - 1)
{
if (msh->fds[i][0] > 2)
close(msh->fds[i][0]);
if (msh->fds[i][1] > 2)
close(msh->fds[i][1]);
if (msh->in_fd > 2)
close(msh->in_fd);
if (msh->out_fd > 2)
close(msh->out_fd);
}
if (msh->in_fd > 2)
close(msh->in_fd);

3
srcs/signal_handler.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/22 14:31:13 by tomoron #+# #+# */
/* Updated: 2024/03/27 17:21:09 by tomoron ### ########.fr */
/* Updated: 2024/04/01 20:10:09 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -49,7 +49,6 @@ void signal_handler_here_doc(int signum)
here_doc_file = here_doc_variables(0, 1, 0);
close(msh->in_fd);
free(here_doc_file);
free(msh->fds[0]);
ft_exit(msh, 1);
}
}

5
srcs/utils.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:19:26 by marde-vr #+# #+# */
/* Updated: 2024/03/30 18:45:27 by marde-vr ### ########.fr */
/* Updated: 2024/04/01 20:06:36 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,8 +18,7 @@ void free_msh(t_msh *msh)
{
free_env(msh->env);
free(msh->pids);
free(msh->fds);
free_token(msh->tokens);
free_token(msh->cmds);
set_echoctl(msh->echoctl);
free(msh);
}

0
srcs/utils2.c → srcs/utils_bonus.c
View File