Kinou/Minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

done ?

Browse Source
This commit is contained in:
kinou-p 2022-04-20 04:52:13 +02:00
parent f9a2acb10b
commit 892d8f5b1e
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,13 +6,13 @@
# By: apommier <apommier@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/03/06 12:50:24 by apommier #+# #+# #
# Updated: 2022/04/19 19:29:06 by apommier ### ########.fr #
# Updated: 2022/04/20 04:44:00 by apommier ### ########.fr #
# #
# **************************************************************************** #
NAME = minishell
SRCS = srcs/main.c\
srcs/pipe/pipe.c\
srcs/pipe/execution.c\
srcs/pipe/pipex_utils.c\
srcs/pipe/exec_utils.c\
srcs/set_cmd/free_cmd.c\

4
includes/minishell.h
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/09 22:33:49 by apommier #+# #+# */
/* Updated: 2022/04/19 19:33:31 by apommier ### ########.fr */
/* Updated: 2022/04/20 04:44:53 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -65,7 +65,7 @@ int main(int ac, char **av, char **path);
char **ft_dup_double(char **env);
//pipe.c
void execute(t_cmd *cmd, char **env);
void execute(t_cmd *cmd);
//set_cmd.c
int error_parsing(void);

6
srcs/built_in/utils_builtin.c
View File

@ -3,13 +3,15 @@
/* ::: :::::::: */
/* utils_builtin.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/16 15:04:12 by sadjigui #+# #+# */
/* Updated: 2022/04/20 00:36:10 by sadjigui ### ########.fr */
/* Updated: 2022/04/20 04:42:35 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/minishell.h"
int find_len(char *input, int i, char c)
{
int j;

4
srcs/main.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/06 13:27:11 by apommier #+# #+# */
/* Updated: 2022/04/19 16:02:18 by apommier ### ########.fr */
/* Updated: 2022/04/20 04:45:06 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -63,7 +63,7 @@ char **read_line(char **path, char *input, t_cmd *cmd, int *err_var)
if (cmd)
{
free_double(path);
execute(cmd, cmd->env);
execute(cmd);
*err_var = cmd->err_var;
path = ft_dup_double(cmd->env);
free_cmd(cmd);

5
srcs/pipe/exec_utils.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/19 17:36:53 by apommier #+# #+# */
/* Updated: 2022/04/19 18:13:29 by apommier ### ########.fr */
/* Updated: 2022/04/20 04:50:19 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -49,7 +49,7 @@ void exit_child(t_cmd *cmd, int exit_pid, int status, int i)
cmd->err_var = WTERMSIG(status);
ft_putstr_fd("\b\b\b\b\b", 1);
if (WTERMSIG(status) == 3)
ft_putstr_fd("^\\Quit", 1);
ft_putstr_fd("^\\Quit\n", 1);
}
}
}
@ -59,6 +59,7 @@ void check_access(t_cmd *cmd)
if (!cmd->current_s_cmd->cmd || access(cmd->current_s_cmd->cmd, F_OK))
{
ft_putstr_fd("Minishell: command not found: ", 2);
if (cmd->current_s_cmd->cmd)
ft_putstr_fd(cmd->current_s_cmd->cmd, 2);
ft_putstr_fd("\n", 2);
close(0);

8
srcs/pipe/pipe.c → srcs/pipe/execution.c
View File

@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* pipe.c :+: :+: :+: */
/* execution.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/02 18:51:31 by apommier #+# #+# */
/* Updated: 2022/04/19 18:12:19 by apommier ### ########.fr */
/* Created: 2022/04/20 04:43:32 by apommier #+# #+# */
/* Updated: 2022/04/20 04:44:20 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -82,7 +82,7 @@ void set_fdin_not_first(t_cmd *cmd, int *fdin)
printf("Minishell: open : bad file descriptor\n");
}
void execute(t_cmd *cmd, char **env)
void execute(t_cmd *cmd)
{
int fdpipe[2];
int fdout;