_

Makefile

@@ -1,4 +1,4 @@
-UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_split_quoted.c utils/ft_strshift.c utils/ft_quote_remover.c utils/ft_str_is_empty.c utils/ft_atoi_check.c ./utils/ft_get_executable.c ./utils/fd.c
+UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_split_charset_quoted.c utils/ft_strshift.c utils/ft_quote_remover.c utils/ft_str_is_empty.c utils/ft_atoi_check.c ./utils/ft_get_executable.c ./utils/fd.c
 
 BUILTINS_SRC = builtins/pwd.c \
 			   builtins/export.c \
@@ -23,7 +23,9 @@ SRCS = ${BUILTINS_SRC} \
 	   ./redirection/heredoc.c \
 	   ./redirection/file.c \
 	   ./redirection/redirection.c \
-	   ./parse/parse.c
+	   ./redirection/check.c \
+	   ./parse/parse.c \
+	   ./signal/signal.c
 
 OBJS = ${SRCS:.c=.o}
 

README.md

@@ -1,40 +0,0 @@
-# Minishell
-
-Minishell is a 42 School project that involves creating a minimalistic shell in C language. The shell should be able to handle basic commands, manage environment variables and implement several built-in functions.
-
-## Features
-
-- Prompt management (display, editing, history)
-- Command execution (with or without arguments)
-- Basic shell operations (pipes, redirections)
-- Environment variables management (listing, setting, unsetting)
-- Built-in functions management (echo, cd, env, exit, export, pwd, unset)
-
-## Getting started
-
-1. Clone this repository: `git clone https://github.com/<your_username>/minishell.git`
-2. `cd` into the cloned directory: `cd minishell`
-3. Run the `make` command to compile the program: `make`
-4. Start the shell by running the executable: `./minishell`
-
-## Usage
-
-Once the shell is started, you can enter commands as you would with any other shell. The following are some examples of commands that can be executed:
-
-- Display the working directory: `pwd`
-- Change directory: `cd <directory_name>`
-- Print the value of an environment variable: `echo $<variable_name>`
-- Set an environment variable: `export <variable_name>=<value>`
-- Unset an environment variable: `unset <variable_name>`
-- Display a list of environment variables: `env`
-- Exit the shell: `exit`
-
-## Resources
-
-- ![The project subject](./subject.pdf)
-- The C library documentation for the standard library functions used in the program
-- bash man
-
-## Authors
-
-This project was created by [Camille CHAUVET](mailto:camille@chauvet.pro) and [Xamora](mailto:ogame.xamora@42l.fr). If you have any questions or suggestions, feel free to contact us.

bozoshell.h

@@ -1,17 +1,17 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   minishell.h                                        :+:      :+:    :+:   */
+/*   bozoshell.h                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/09 14:59:49 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/14 16:16:31 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#ifndef MINISHELL_H
+#ifndef BOZOSHELL_H
-# define MINISHELL_H
+# define BOZOSHELL_H
 # include "./env/env.h"
 # include "./cmd/cmd.h"
 # include "./parse/parse.h"
@@ -23,6 +23,8 @@
 # include "./libftx/libftx.h"
 # include "./utils/utils.h"
 # include "./data/data.h"
+# include "./signal/signal.h"
+# include <stdio.h>
 # include <readline/readline.h>
 # include <readline/history.h>
 # include <signal.h>

builtins/builtins.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:41:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 13:41:31 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/18 12:57:36 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,11 +16,11 @@
 
 int			echo(int fd, char **strs);
 int			pwd(int fd);
-char		*get_pwd(int fd);
+char		*get_pwd(void);
 int			print_env(t_list **env, int fd);
 int			ft_export(t_list **env, char **args, int fd);
-int			move_folder(char **args, int fd);
+int			move_folder(char **args, t_list **env, int fd);
 int			unset(t_list **env, char **args, int fd);
-int			ft_exit(char **args);
+int			ft_exit(char **args, int err);
 
 #endif

builtins/builtins_private.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:41:42 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 13:41:44 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/18 12:57:25 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,6 +17,6 @@
 # include "../env/env.h"
 # include "../utils/utils.h"
 
-char	*get_pwd(int fd);
+char		*get_pwd(void);
 
 #endif

builtins/cd.c

@@ -6,50 +6,57 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/20 14:27:36 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/13 15:11:07 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/18 13:22:22 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "./builtins_private.h"
 
-int	make_move(char *path, int fd)
+int	make_move(char *path, t_list **env)
 {
 	char	*join;
+	char	*old;
 
 	join = ft_strjoin("/", path);
-	join = ft_strfjoin(get_pwd(fd), join);
+	join = ft_strfjoin(get_pwd(), join);
+	old = get_pwd();
 	if (chdir(join) == 0)
 	{
+		set_value_by_key("OLDPWD", old, env);
+		set_value_by_key("PWD", get_pwd(), env);
 		free(join);
 		return (0);
 	}
+	free(old);
 	free(join);
-	write(2, "No such file or directory\n", 26);
+	write(2, "cd: No such file or directory\n", 30);
 	return (1);
 }
 
-int	move_folder(char **args, int fd)
+int	move_folder(char **args, t_list **env)
 {
 	char	*path;
+	char	*old;
 
-	if (args[1] != NULL)
+	if (args[0] == NULL || args[1] != NULL)
 	{
-		write(2, "cd: too many argument\n", 22);
+		write(2, "cd: Wrong number's argument\n", 28);
 		return (1);
 	}
 	path = args[0];
-	if (!path)
-	{
-		write(2, "No such file or directory\n", 26);
-		return (1);
-	}
 	if (path[0] == '/' || ft_strncmp(path, "..", ft_strlen(path)) == 0)
 	{
+		old = get_pwd();
 		if (chdir(path) == 0)
+		{
+			set_value_by_key("OLDPWD", old, env);
+			set_value_by_key("PWD", get_pwd(), env);
 			return (0);
-		write(2, "No such file or directory\n", 26);
+		}
+		free(old);
+		write(2, "cd: No such file or directory\n", 30);
 		return (1);
 	}
 	else
-		return (make_move(path, fd));
+		return (make_move(path, env));
 }

builtins/echo.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 13:09:08 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:53:52 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/11 14:57:00 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,7 +26,7 @@ int	check_argument(char *str, int *check_backslash_n)
 	while (str[++i])
 		if (str[i] != '-' && str[i] != 'n')
 			return (1);
-	if (ft_strnstr(str, "n", ft_strlen(str)))
+	if (ft_strnstr(str, "n", ft_strlen(str)) && str[0] == '-')
 		*check_backslash_n = 1;
 	else
 		return (1);
@@ -38,14 +38,16 @@ int	echo(int fd, char **strs)
 	int		check_backslash_n;
 	int		check_start_write;
 	int		i;
+	int		y;
 
 	check_backslash_n = 0;
 	check_start_write = 0;
 	i = -1;
 	while (strs[++i])
 	{
-		while (is_space(*strs[i]))
+		y = -1;
-			strs[i]++;
+		while (is_space(strs[i][++y]))
+			;
 		if (check_start_write == 1
 			|| check_argument(strs[i], &check_backslash_n))
 		{

builtins/env.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:56:02 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/09 15:04:47 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/30 15:15:04 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,7 +19,7 @@ int	print_env(t_list **env, int fd)
 	current = *env;
 	while (current->next != NULL)
 	{
-		if (((t_env *)(current->content))->original)
+		if (((t_env *)(current->content))->value)
 		{
 			ft_putstr_fd(((t_env *)(current->content))->key, fd);
 			ft_putstr_fd("=", fd);
@@ -30,12 +30,3 @@ int	print_env(t_list **env, int fd)
 	}
 	return (0);
 }
-
-/*int	main(int argc, char *argv[], char **env)
-{
-	t_list **be;
-
-	be = init_env(env);
-	print_env(be, 1);
-	return (0);
-}*/

builtins/exit.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/24 10:17:59 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/10 14:52:22 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/05 12:30:46 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,7 @@
 
 static int	error(int err, char *reason, char *problem)
 {
-	ft_putstr_fd("minishell: exit ", 2);
+	ft_putstr_fd("bozoshell: bozo_exit ", 2);
 	if (problem != NULL)
 	{
 		ft_putstr_fd(problem, 2);
@@ -24,22 +24,20 @@ static int	error(int err, char *reason, char *problem)
 	return (err);
 }
 
-int	ft_exit(char **args)
+int	ft_exit(char **args, int err)
 {
-	int	err;
-
 	if (args[0] == NULL)
 	{
-		write(1, "exit\n", 6);
+		write(1, "bozo_exit\n", 10);
-		return (0);
+		return (err);
 	}
 	err = ft_atoi_check(args[0]);
 	if (err == 1)
-		return (error(err, "numeric argument required", args[0]));
+		return (error(err, "bozo_exit: numeric argument required\n", args[0]));
 	if (args[1] != NULL)
-		return (error(1, "too many arguments", NULL));
+		return (error(-1, "bozo_exit: too many arguments\n", NULL));
 	if (err > 0)
-		return (error(err, "numeric argument required", args[0]));
+		return (error(err, "bozo_exit: numeric argument required\n", args[0]));
 	write(1, "exit\n", 6);
 	return ((ft_atoi(args[0]) % 256 + 256) % 256);
 }

builtins/export.c

@@ -6,17 +6,21 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:27:08 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/13 13:23:56 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/14 19:12:10 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "./builtins_private.h"
 
-static int	error(char *str)
+static int	error(char *str, char *to_free1, char *to_free2)
 {
-	write(2, "bash: export: `", 15);
+	write(2, "bozoshell: export: `", 20);
 	write(2, str, ft_strlen(str));
 	write(2, "': not a valid identifier\n", 26);
+	if (to_free1 != NULL)
+		free(to_free1);
+	if (to_free2 != NULL)
+		free(to_free2);
 	return (1);
 }
 
@@ -27,17 +31,20 @@ void	print_export(t_list **env, int fd)
 	current = *env;
 	while (current->next != NULL)
 	{
-		write(fd, "declare -x ", 11);
+		if (ft_strcmp(((t_env *)(current->content))->key, "_"))
-		ft_putstr_fd(((t_env *)(current->content))->key, fd);
-		if (((t_env *)(current->content))->value != NULL)
 		{
-			ft_putstr_fd("=", fd);
+			write(fd, "declare -x ", 11);
-			write(fd, "\"", 1);
+			ft_putstr_fd(((t_env *)(current->content))->key, fd);
-			ft_putstr_fd(((t_env *)(current->content))->value, fd);
+			if (((t_env *)(current->content))->value != NULL)
-			write(fd, "\"\n", 2);
+			{
+				ft_putstr_fd("=", fd);
+				write(fd, "\"", 1);
+				ft_putstr_fd(((t_env *)(current->content))->value, fd);
+				write(fd, "\"\n", 2);
+			}
+			else
+				write(fd, "\n", 2);
 		}
-		else
-			write(fd, "\n", 2);
 		current = current->next;
 	}
 }
@@ -71,7 +78,7 @@ int	add_export(t_list **env, char *args)
 	if (ft_strchr(args, '=') != NULL)
 	{
 		if (set_key_value_export(env, args, &key, &value))
-			return (error(args));
+			return (error(args, key, NULL));
 	}
 	else
 	{
@@ -80,10 +87,10 @@ int	add_export(t_list **env, char *args)
 		if (value != NULL)
 			value = ft_strdup(value);
 		if (possible_key(key) == 2)
-			return (error(key));
+			return (error(key, key, value));
 	}
 	if (!possible_key(key))
-		return (error(args));
+		return (error(args, key, value));
 	create_value_by_key(key, value, env);
 	return (0);
 }

builtins/pwd.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 16:09:11 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/09 20:00:19 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/18 12:59:25 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,13 +20,13 @@ int	pwd(int fd)
 		ft_putendl_fd(path, fd);
 	else
 	{
-		ft_putendl_fd("Error getcwd", fd);
+		ft_putendl_fd("Error getcwd", 2);
 		return (1);
 	}
 	return (0);
 }
 
-char	*get_pwd(int fd)
+char	*get_pwd(void)
 {
 	char	*str;
 
@@ -35,7 +35,7 @@ char	*get_pwd(int fd)
 		return (str);
 	else
 	{
-		ft_putendl_fd("Error getcwd", fd);
+		ft_putendl_fd("Error getcwd", 2);
 		return (NULL);
 	}
 }

builtins/unset.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/22 13:28:27 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/23 15:49:21 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/07 12:46:28 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,9 +14,9 @@
 
 int	error(char *str, int fd)
 {
-	write(fd, "bash: unset: `", 14);
+	write(fd, "bozoshell: unset: `", 19);
 	write(fd, str, ft_strlen(str));
-	write(fd, "': not a valid identifier", 25);
+	write(fd, "': not a valid identifier\n", 26);
 	return (1);
 }
 

cmd/cmd.c

@@ -6,11 +6,14 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 14:18:21 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 22:27:28 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/17 11:57:07 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "cmd.h"
 #include "cmd_private.h"
+#include "../signal/signal.h"
+#include <signal.h>
 
 void	ft_cmddel(void *ptr)
 {
@@ -31,3 +34,40 @@ void	ft_cmddel(void *ptr)
 		close(content->fd_out[1]);
 	free(content);
 }
+
+void	ft_cmdcloser(void *ptr)
+{
+	t_cmd	*cmd;
+
+	cmd = ptr;
+	ft_closer(cmd->fd_in);
+	ft_closer(cmd->fd_out);
+}
+
+void	ft_cmdwaiter(void *ptr)
+{
+	t_cmd	*cmd;
+	int		exit_status;
+
+	cmd = ptr;
+	if (cmd->executable != NULL && cmd->own_cmd == 0
+		&& cmd->pid != -1 && cmd->fd_in[0] != -2 && cmd->fd_out[0] != -2)
+	{
+		waitpid(cmd->pid, &exit_status, 0);
+		if (WIFSIGNALED(exit_status))
+		{
+			if (exit_status == 131)
+			{
+				ft_printf("Quit (core dumped)");
+				*ft_get_exit_code() = 131;
+			}
+			else
+				*ft_get_exit_code() = 130;
+			ft_printf("\n");
+		}
+		else
+			*ft_get_exit_code() = WEXITSTATUS(exit_status);
+	}
+	signal(SIGINT, ft_ctrlc);
+	signal(SIGQUIT, SIG_IGN);
+}

cmd/cmd.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/28 15:47:01 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:47:02 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/07 15:03:53 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,5 +26,7 @@ typedef struct s_cmd
 }	t_cmd;
 
 void		ft_cmddel(void *content);
+void		ft_cmdwaiter(void *content);
+void		ft_cmdcloser(void *ptr);
 
 #endif

cmd/cmd_private.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/28 15:50:23 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:50:24 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/31 16:33:24 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,4 +17,5 @@
 # include "./cmd.h"
 # include "../libftx/libftx.h"
 # include "../data/data.h"
+# include "../utils/utils.h"
 #endif

data/data.c

@@ -6,16 +6,16 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:42:09 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 13:42:58 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/05 14:48:30 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "./data_private.h"
 #include "data.h"
 
-t_data	*ft_get_data(void)
+int	*ft_get_exit_code(void)
 {
-	static t_data	data;
+	static int	exit_code;
 
-	return (&data);
+	return (&exit_code);
 }

data/data.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:43:39 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 13:43:40 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/05 14:45:23 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,10 +18,9 @@ typedef struct s_data
 {
 	t_list	**env;
 	t_list	**cmds;
-	int		exit_code;
+	int		*exit_code;
-	int		child_pid;
 }	t_data;
 
-t_data	*ft_get_data(void);
+int	*ft_get_exit_code(void);
 
 #endif

env/env.h

@@ -20,7 +20,6 @@ typedef struct s_env
 {
 	char	*key;
 	char	*value;
-	bool	original;
 }	t_env;
 
 char		*ft_env_filler(t_data *data, const char *str);

env/env1.c

@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   env.c                                              :+:      :+:    :+:   */
+/*   env1.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/09 19:01:05 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/18 13:57:38 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,7 +34,11 @@ void	add_sort(t_list **head, t_env *var)
 		}
 	}
 	if (current->next == NULL)
+	{
 		current->next = ft_calloc(1, sizeof(t_list));
+		if (!current->next)
+			return ;
+	}
 }
 
 char	*get_value_by_key(char *key, t_list **head)
@@ -74,13 +78,15 @@ int	create_value_by_key(char *key, char *value, t_list **head)
 	t_env	*content;
 
 	if (set_value_by_key(key, value, head) == 0)
+	{
+		free(key);
 		return (0);
+	}
 	content = ft_calloc(1, sizeof(t_env));
 	if (content == NULL)
 		return (1);
 	content->key = key;
 	content->value = value;
-	content->original = 0;
 	add_sort(head, content);
 	return (0);
 }
@@ -96,7 +102,10 @@ t_list	**init_env(char **env)
 		return (NULL);
 	*head = ft_calloc(1, sizeof(t_list));
 	if (*head == NULL)
+	{
+		free(head);
 		return (NULL);
+	}
 	i = -1;
 	while (env[++i])
 	{
@@ -105,7 +114,6 @@ t_list	**init_env(char **env)
 			return (NULL);
 		var->key = get_key(env[i]);
 		var->value = get_value(env[i]);
-		var->original = 1;
 		add_sort(head, var);
 	}
 	return (head);

env/env2.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/09 19:59:03 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/09 19:59:10 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/18 13:26:31 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

env/env3.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 17:25:09 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/09 19:58:55 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/07 13:21:54 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -70,14 +70,19 @@ int	delete_by_key(char *key, t_list **head)
 	t_list	*current;
 
 	current = *head;
+	last = NULL;
 	while (current->next != NULL)
 	{
 		if (ft_strcmp(((t_env *)current->content)->key, key) == 0)
 		{
-			if (last->next != NULL)
+			free(((t_env *)current->content)->key);
+			free(((t_env *)current->content)->value);
+			free(current->content);
+			if (last && last->next)
 				last->next = current->next;
 			else
 				*head = current->next;
+			free(current);
 			return (0);
 		}
 		last = current;

env/env_fill.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 16:29:08 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 16:42:27 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/05 15:09:46 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,12 +26,12 @@ static char	*ft_getkey(const char *str)
 	else
 	{
 		i = 1;
-		while (str[i] != '\0' && !ft_is_in("$?\'\"", str[i]))
+		while (str[i] != '\0' && !ft_is_in("$?\'\" ", str[i]))
 			i++;
 		key = ft_strndup(str + 1, i - 1);
 	}
 	if (key == NULL)
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 	return (key);
 }
 
@@ -40,7 +40,7 @@ static char	*ft_getvalue(t_data *data, char *key)
 	char	*value;
 
 	if (ft_strcmp(key, "?") == 0)
-		value = ft_itoa(data->exit_code);
+		value = ft_itoa(*data->exit_code);
 	else if (ft_strcmp(key, "$") == 0)
 		value = ft_strdup("PID");
 	else if (key[0] == '\0')
@@ -54,7 +54,7 @@ static char	*ft_getvalue(t_data *data, char *key)
 			value = ft_strdup(value);
 	}
 	if (value == NULL)
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 	return (value);
 }
 
@@ -73,12 +73,25 @@ static char	*ft_getvalue_by_str(t_data *data, const char *str,
 	return (value);
 }
 
+char	*ft_str_formator(t_data *data, char *str, size_t *i)
+{
+	char	*value;
+	size_t	key_len;
+	char	*out;
+
+	value = ft_getvalue_by_str(data, str + *i, &key_len);
+	if (value == NULL)
+		return (NULL);
+	out = ft_strreplace(str, value, *i, key_len + *i);
+	*i = *i + ft_strlen(value);
+	free(value);
+	return (out);
+}
+
 char	*ft_env_filler(t_data *data, const char *str)
 {
 	char	*out;
 	char	*temp;
-	char	*value;
-	size_t	key_len;
 	size_t	i;
 
 	out = ft_strdup(str);
@@ -91,14 +104,10 @@ char	*ft_env_filler(t_data *data, const char *str)
 			i++;
 		while (out[i] == '$')
 		{
-			value = ft_getvalue_by_str(data, out + i, &key_len);
+			temp = ft_str_formator(data, out, &i);
-			if (value == NULL)
-				return (NULL);
-			temp = ft_strreplace(out, value, i, key_len + i);
-			i = i + ft_strlen(value);
-			ft_freer_ultimate(2, value, out);
 			if (temp == NULL)
 				return (NULL);
+			free(out);
 			out = temp;
 		}
 		if (out[i] != '\0')

execution/execution.c

@@ -6,17 +6,16 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/21 12:45:16 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:46:43 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/18 13:00:08 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "execution_private.h"
 
-static int	ft_own_cmd(t_data *data, t_cmd *cmd)
+static int	ft_execute_own_cmd(t_data *data, t_cmd *cmd)
 {
 	int	return_code;
 
-	return_code = -1;
 	if (ft_strcmp(cmd->executable, "pwd") == 0)
 		return_code = pwd(cmd->fd_out[0]);
 	else if (ft_strcmp(cmd->executable, "env") == 0)
@@ -24,58 +23,57 @@ static int	ft_own_cmd(t_data *data, t_cmd *cmd)
 	else if (ft_strcmp(cmd->executable, "export") == 0)
 		return_code = ft_export(data->env, cmd->args + 1, cmd->fd_out[0]);
 	else if (ft_strcmp(cmd->executable, "cd") == 0)
-		return_code = (move_folder(cmd->args + 1, cmd->fd_out[0]));
+		return_code = (move_folder(cmd->args + 1, data->env, cmd->fd_out[0]));
 	else if (ft_strcmp(cmd->executable, "unset") == 0)
 		return_code = (unset(data->env, cmd->args, cmd->fd_out[0]));
 	else if (ft_strcmp(cmd->executable, "echo") == 0)
 		return_code = (echo(cmd->fd_out[0], cmd->args + 1));
-	else if (ft_strcmp(cmd->executable, "exit") == 0)
+	else
 	{
-		return_code = ft_exit(cmd->args + 1);
+		return_code = ft_exit(cmd->args + 1, *data->exit_code);
 		if (return_code >= 0)
 		{
-			data->exit_code = return_code;
+			*data->exit_code = return_code;
-			return (-1);
+			return (-2);
 		}
 	}
-	data->exit_code = return_code;
+	*data->exit_code = return_code;
 	return (return_code);
 }
 
-static bool	ft_executor(t_cmd *cmd, char **env, int fd)
+static bool	ft_executor(t_data *data, t_cmd *cmd, char **env)
 {
 	if (cmd->fd_in[0] == -1 || cmd->fd_out[0] == -1 || cmd->executable == NULL)
 		return (0);
 	cmd->pid = fork();
-	ft_get_data()->child_pid = cmd->pid;
 	if (cmd->pid == -1)
 		return (1);
 	if (cmd->pid == 0)
 	{
+		signal(SIGQUIT, SIG_DFL);
+		signal(SIGINT, SIG_DFL);
 		dup2(cmd->fd_in[0], 0);
 		dup2(cmd->fd_out[0], 1);
-		if (fd != -1)
+		ft_lstiter(*data->cmds, ft_cmdcloser);
-			close(fd);
-		ft_closer(cmd->fd_in);
-		ft_closer(cmd->fd_out);
 		execve(cmd->executable, cmd->args, env);
-		ft_eprintf("minishell: permission denied: %s\n", cmd->executable);
 		return (1);
 	}
+	signal(SIGQUIT, SIG_IGN);
+	signal(SIGINT, SIG_IGN);
 	return (0);
 }
 
-static int	ft_cmd_executor(t_data *data, t_cmd *cmd, int fd)
+static int	ft_cmd_executor(t_data *data, t_cmd *cmd)
 {
 	int		exit_code;
 	char	**env;
 
 	if (cmd->own_cmd == 1)
 	{
-		exit_code = ft_own_cmd(data, cmd);
+		exit_code = ft_execute_own_cmd(data, cmd);
 		ft_closer(cmd->fd_in);
 		ft_closer(cmd->fd_out);
-		if (exit_code == -1)
+		if (exit_code == -2)
 			return (1);
 	}
 	else
@@ -83,7 +81,7 @@ static int	ft_cmd_executor(t_data *data, t_cmd *cmd, int fd)
 		env = env_to_strs(data->env);
 		if (env == NULL)
 			return (1);
-		exit_code = ft_executor(cmd, env, fd);
+		exit_code = ft_executor(data, cmd, env);
 		ft_closer(cmd->fd_in);
 		ft_closer(cmd->fd_out);
 		ft_freer_tab_ultimate(1, env);
@@ -104,7 +102,6 @@ int	ft_cmds_executor(t_data *data)
 	{
 		content = current->content;
 		fds[0] = -1;
-		fds[1] = -1;
 		if (current->next != NULL)
 		{
 			if (pipe(fds) == -1)
@@ -112,7 +109,9 @@ int	ft_cmds_executor(t_data *data)
 			ft_add_fd(content->fd_out, fds[1]);
 			ft_add_fd(((t_cmd *)(current->next->content))->fd_in, fds[0]);
 		}
-		if (ft_cmd_executor(data, content, fds[0]))
+		if (content->fd_in[0] == -2 || content->fd_out[0] == -2)
+			ft_mega_closer(content->fd_in, content->fd_out);
+		else if (ft_cmd_executor(data, content))
 			return (1);
 		current = current->next;
 	}

execution/execution_private.h

@@ -6,18 +6,19 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/28 15:45:53 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:45:54 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/05 15:15:56 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef EXECUTION_PRIVATE_H
 # define EXECUTION_PRIVATE_H
+# include <signal.h>
+# include "../signal/signal.h"
 # include "../data/data.h"
 # include "../libftx/libftx.h"
 # include "../cmd/cmd.h"
 # include "../env/env.h"
 # include "../builtins/builtins.h"
+# include "../utils/utils.h"
 
-void	ft_closer(int fds[2]);
-void	ft_add_fd(int fds[2], int fd);
 #endif

format/format.c

@@ -6,16 +6,30 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 13:35:50 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 16:26:15 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/31 15:22:21 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "./format_private.h"
 
+static int	ft_replace(char **str, size_t i)
+{
+	char	*temp;
+
+	temp = ft_strreplace(*str, " ", i, i);
+	free(*str);
+	if (temp == NULL)
+	{
+		ft_eprintf("bozoshell: malloc failed\n");
+		return (1);
+	}
+	*str = temp;
+	return (0);
+}
+
 static char	*ft_spacer_after(const char *str)
 {
 	char	*out;
-	char	*temp;
 	size_t	i;
 
 	out = ft_strdup(str);
@@ -26,16 +40,13 @@ static char	*ft_spacer_after(const char *str)
 	{
 		while (ft_is_in_quote(out, i - 1))
 			i++;
-		if (out[i] == '\0')
+		if (out[i - 1] == '\0' || out[i] == '\0')
 			break ;
 		if (ft_is_in("><|", out[i - 1]))
 		{
 			while (out[i] == out[i - 1])
 				i++;
-			temp = ft_strreplace(out, " ", i, i);
+			if (ft_replace(&out, i))
-			free(out);
-			out = temp;
-			if (out == NULL)
 				return (NULL);
 		}
 		if (out[i] != '\0')
@@ -47,16 +58,15 @@ static char	*ft_spacer_after(const char *str)
 static char	*ft_spacer_before(const char *str)
 {
 	char	*out;
-	char	*temp;
+	ssize_t	i;
-	size_t	i;
 
 	out = ft_strdup(str);
 	if (out == NULL)
 		return (NULL);
-	i = 0;
+	i = -1;
-	while (out[i + 1] != '\0')
+	while (out[++i] != '\0')
 	{
-		while (ft_is_in_quote(out, i))
+		while (ft_is_in_quote(out, i + 1))
 			i++;
 		if (out[i] == '\0')
 			break ;
@@ -66,13 +76,9 @@ static char	*ft_spacer_before(const char *str)
 				i++;
 			while (out[i] == out[i + 1])
 				i++;
-			temp = ft_strreplace(out, " ", i + 1, i + 1);
+			if (ft_replace(&out, i + 1))
-			free(out);
-			out = temp;
-			if (out == NULL)
 				return (NULL);
 		}
-		i++;
 	}
 	return (out);
 }

main.c

@@ -6,19 +6,18 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:39:53 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/18 12:59:43 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "data/data.h"
-#include "execution/execution.h"
+#include "env/env.h"
 #include "libftx/libft/libft.h"
 #include "libftx/libft/list.h"
 #include "libftx/libftx.h"
-#include "minishell.h"
+#include "bozoshell.h"
-#include <signal.h>
+#include "signal/signal.h"
 #include <stdlib.h>
-#include <sys/wait.h>
 
 static char	*ft_get_user_input(void)
 {
@@ -26,14 +25,14 @@ static char	*ft_get_user_input(void)
 	char	*prompt;
 	char	*pwd;
 
-	pwd = get_pwd(2);
+	pwd = get_pwd();
 	if (pwd == NULL)
 		return (NULL);
 	prompt = ft_strmerger(2, pwd, "$ ");
 	free(pwd);
 	if (prompt == NULL)
 	{
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 		return (NULL);
 	}
 	line = readline(prompt);
@@ -45,34 +44,6 @@ static char	*ft_get_user_input(void)
 	return (line);
 }
 
-static void	ft_cmds_waiter(t_data *data)
-{
-	t_list	*current;
-	t_cmd	*content;
-	int		exit_status;
-
-	current = *data->cmds;
-	while (current != NULL)
-	{
-		content = current->content;
-		if (content->own_cmd == 0 && content->pid != -1)
-		{
-			waitpid(content->pid, &exit_status, 0);
-			if (WIFSIGNALED(exit_status))
-			{
-				if (WTERMSIG(exit_status) == SIGKILL)
-					data->exit_code = 131;
-				else
-					data->exit_code = 130;
-			}
-			else
-				data->exit_code = WEXITSTATUS(exit_status);
-		}
-		current = current->next;
-	}
-	data->child_pid = 0;
-}
-
 static int	ft_minishell(t_data *data, char *line)
 {
 	char	*line_clean;
@@ -90,92 +61,55 @@ static int	ft_minishell(t_data *data, char *line)
 	free(line_clean);
 	if (ft_cmds_executor(data) == 1)
 		return (1);
-	ft_cmds_waiter(data);
+	ft_lstiter(*data->cmds, ft_cmdwaiter);
 	ft_lstclear(data->cmds, ft_cmddel);
 	return (0);
 }
 
-void	ft_ctrlc(int num)
+int	ft_init_data(t_data *data, char **env)
 {
-	t_data	*data;
+	data->exit_code = ft_get_exit_code();
-
+	data->cmds = malloc(sizeof(t_cmd *));
-	if (num == SIGQUIT)
+	if (data->cmds == NULL)
-		return ;
-	data = ft_get_data();
-	data->exit_code = 130;
-	if (*ft_get_heredoc() != -1)
 	{
-		close(*ft_get_heredoc());
+		ft_eprintf("bozoshell: malloc failed\n");
-		*ft_get_heredoc() = -1;
+		return (1);
 	}
-	else
+	*data->cmds = NULL;
+	data->env = init_env(env);
+	if (data->env == NULL)
 	{
-		if (data->child_pid > 1)
+		ft_eprintf("bozoshell: malloc failed\n");
-		{
+		free(data->cmds);
-			data->child_pid = 0;
+		return (1);
-			ft_putchar_fd('\n', 1);
-		}
-		else
-		{
-			rl_replace_line("", 0);
-			rl_on_new_line();
-			ft_putchar_fd('\n', 1);
-			rl_redisplay();
-		}
-	}
-}
-
-void	ft_quit(int num)
-{
-	t_data	*data;
-
-	(void) num;
-	data = ft_get_data();
-	data->exit_code = 131;
-	if (data->child_pid > 1)
-	{
-		ft_printf("Quit (core dumped)\n");
-		data->child_pid = 0;
-	}
-	else
-	{
-		rl_replace_line("", 0);
-		rl_redisplay();
 	}
+	return (0);
 }
 
 int	main(int ac, char **av, char **env)
 {
-	t_data	*data;
+	t_data	data;
 	char	*line;
 
 	(void) ac;
 	(void) av;
 	signal(SIGINT, ft_ctrlc);
-	signal(SIGQUIT, ft_quit);
+	signal(SIGQUIT, SIG_IGN);
-	data = ft_get_data();
+	if (ft_init_data(&data, env))
-	data->exit_code = 0;
-	data->child_pid = 0;
-	data->cmds = malloc(sizeof(t_cmd *));
-	if (data->cmds == NULL)
-		return (1);
-	*data->cmds = NULL;
-	data->env = init_env(env);
-	if (data->env == NULL)
 		return (1);
 	line = ft_get_user_input();
 	while (line != NULL)
 	{
-		if (ft_minishell(data, line) == 1)
+		if (ft_minishell(&data, line) == 1)
 			break ;
 		free(line);
 		line = ft_get_user_input();
 		if (line == NULL)
 			break ;
 	}
-	ft_lstclear(data->cmds, ft_cmddel);
+	ft_lstclear(data.cmds, ft_cmddel);
-	free(data->cmds);
+	free(data.cmds);
-	ft_lstclear(data->env, env_del);
+	ft_lstclear(data.env, env_del);
-	free(data->env);
+	free(data.env);
-	return (data->exit_code);
+	return (*data.exit_code);
 }

parse/parse.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:44:38 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:42:37 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/11 16:17:19 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,7 +17,7 @@ static int	ft_args_parse(char *cmd_str, t_cmd *cmd)
 	char	**tab;
 	size_t	i;
 
-	tab = ft_split_quoted(cmd_str, ' ');
+	tab = ft_split_charset_quoted(cmd_str, "\t ");
 	if (tab == NULL)
 		return (1);
 	i = 0;
@@ -80,24 +80,20 @@ int	ft_cmd_parser(t_data *data, char *cmd_str)
 	cmd = ft_calloc(sizeof(t_cmd), 1);
 	if (cmd == NULL)
 	{
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 		return (1);
 	}
 	if (ft_redirection(data, cmd, cmd_str))
 	{
 		ft_cmddel(cmd);
-		return (0);
+		return (1);
 	}
 	if (ft_args_parse(cmd_str, cmd))
 	{
 		ft_cmddel(cmd);
 		return (1);
 	}
-	if (ft_executable_parse(data, cmd))
+	ft_executable_parse(data, cmd);
-	{
-		ft_cmddel(cmd);
-		return (1);
-	}
 	return (ft_cmd_adder(data, cmd));
 }
 
@@ -106,10 +102,10 @@ int	ft_cmds_parser(t_data *data, const char *line)
 	char	**tab;
 	ssize_t	i;
 
-	tab = ft_split_quoted(line, '|');
+	tab = ft_split_charset_quoted(line, "|");
 	if (tab == NULL)
 	{
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 		return (1);
 	}
 	i = -1;

redirection/check.c

@@ -0,0 +1,151 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   check.c                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/29 17:32:06 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/17 11:15:38 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./redirection_private.h"
+#include <stdbool.h>
+#include "../signal/signal.h"
+#include <signal.h>
+
+static bool	ft_check_heredoc(t_data *data, t_cmd *cmd,
+				char *redirection_identifier, char *redirection)
+{
+	int	fd;
+
+	if (ft_strcmp(redirection_identifier, "<<") == 0)
+	{
+		if (cmd->fd_in[0] == -2)
+			return (0);
+		signal(SIGINT, ft_ctrlc_heredoc);
+		fd = ft_heredoc(data, redirection);
+		signal(SIGINT, ft_ctrlc);
+		if (fd == -2)
+			return (1);
+		else
+		{
+			if (cmd->fd_in[0] > 2)
+				close(cmd->fd_in[0]);
+			cmd->fd_in[0] = fd;
+		}
+	}
+	return (0);
+}
+
+static bool	ft_check_infile(t_data *data, t_cmd *cmd,
+				char *redirection_identifier, char *redirection)
+{
+	int	fd;
+
+	if (ft_strcmp(redirection_identifier, "<") == 0)
+	{
+		if (cmd->fd_in[0] == -2)
+			return (0);
+		if (ft_file_is_readable(data, redirection))
+		{
+			fd = open(redirection, O_RDONLY);
+			if (cmd->fd_in[0] > 2)
+				close(cmd->fd_in[0]);
+			cmd->fd_in[0] = fd;
+		}
+		else
+		{
+			if (cmd->fd_in[0] > 2)
+				close(cmd->fd_in[0]);
+			cmd->fd_in[0] = -2;
+			return (0);
+		}
+	}
+	return (0);
+}
+
+static bool	ft_check_outfile(t_data *data, t_cmd *cmd,
+				char *redirection_identifier, char *redirection)
+{
+	int	fd;
+
+	if (ft_strcmp(redirection_identifier, ">") == 0)
+	{
+		if (cmd->fd_out[0] == -2)
+			return (0);
+		if (ft_file_is_writable(data, redirection))
+		{
+			fd = open(redirection,
+					O_WRONLY | O_TRUNC | O_CREAT, 0644);
+			if (cmd->fd_out[0] > 2)
+				close(cmd->fd_out[0]);
+			cmd->fd_out[0] = fd;
+		}
+		else
+		{
+			if (cmd->fd_out[0] > 2)
+				close(cmd->fd_out[0]);
+			cmd->fd_out[0] = -2;
+			return (0);
+		}
+	}
+	return (0);
+}
+
+static bool	ft_check_outfile_append(t_data *data, t_cmd *cmd,
+				char *redirection_identifier, char *redirection)
+{
+	int	fd;
+
+	if (ft_strcmp(redirection_identifier, ">>") == 0)
+	{
+		if (cmd->fd_out[0] == -2)
+			return (0);
+		if (ft_file_is_appendable(data, redirection))
+		{
+			fd = open(redirection,
+					O_WRONLY | O_APPEND | O_CREAT, 0644);
+			if (cmd->fd_out[0] > 2)
+				close(cmd->fd_out[0]);
+			cmd->fd_out[0] = fd;
+		}
+		else
+		{
+			if (cmd->fd_out[0] > 2)
+				close(cmd->fd_out[0]);
+			cmd->fd_out[0] = -2;
+		}
+	}
+	return (0);
+}
+
+bool	ft_check_redirection(t_data *data, t_cmd *cmd,
+				char *redirection_identifier, char *redirection)
+{
+	char	*str;
+	bool	out;
+
+	if (ft_is_in("<>", redirection_identifier[0])
+		&& ft_is_in("<>", redirection[0]))
+	{
+		ft_eprintf("bozoshell: %s: invalid redirection file\n", redirection);
+		return (1);
+	}
+	str = ft_strdup(redirection);
+	if (str == NULL)
+	{
+		ft_eprintf("bozoshell: malloc failed\n");
+		return (1);
+	}
+	ft_quote_remover(str);
+	out = 0;
+	if (ft_check_heredoc(data, cmd, redirection_identifier, str)
+		|| ft_check_infile(data, cmd, redirection_identifier, str)
+		|| ft_check_outfile(data, cmd, redirection_identifier, str)
+		|| ft_check_outfile_append(data, cmd, redirection_identifier, str))
+		out = 1;
+	free(str);
+	return (out);
+}

redirection/file.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 17:36:11 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/15 17:41:13 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/05 15:12:41 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,15 +20,15 @@ int	ft_file_is_readable(t_data *data, const char *path)
 	fd = open(path, O_RDONLY);
 	if (fd == -1)
 	{
-		data->exit_code = 1;
+		*data->exit_code = 1;
-		ft_eprintf("minishell: %s: No such file or directory\n", path);
+		ft_eprintf("bozoshell: %s: No such file or directory\n", path);
 		return (0);
 	}
 	readable = read(fd, "", 0);
 	if (readable == -1)
 	{
-		data->exit_code = 1;
+		*data->exit_code = 1;
-		ft_eprintf("minishell: %s: Permission denied\n", path);
+		ft_eprintf("bozoshell: %s: Permission denied\n", path);
 		return (0);
 	}
 	close(fd);
@@ -43,18 +43,19 @@ int	ft_file_is_writable(t_data *data, const char *path)
 	fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0644);
 	if (fd == -1)
 	{
-		data->exit_code = 1;
+		*data->exit_code = 1;
-		ft_eprintf("minishell: %s: Permission denied\n", path);
+		ft_eprintf("bozoshell: %s: Permission denied\n", path);
 		return (0);
 	}
 	writeable = write(fd, "", 0);
 	if (writeable == -1)
 	{
-		data->exit_code = 1;
+		*data->exit_code = 1;
-		ft_eprintf("minishell: %s: Permission denied\n", path);
+		ft_eprintf("bozoshell: %s: Permission denied\n", path);
 		return (0);
 	}
-	return (fd);
+	close(fd);
+	return (1);
 }
 
 int	ft_file_is_appendable(t_data *data, const char *path)
@@ -65,16 +66,17 @@ int	ft_file_is_appendable(t_data *data, const char *path)
 	fd = open(path, O_WRONLY | O_APPEND | O_CREAT, 0644);
 	if (fd == -1)
 	{
-		data->exit_code = 1;
+		*data->exit_code = 1;
-		ft_eprintf("minishell: %s: Permission denied\n", path);
+		ft_eprintf("bozoshell: %s: Permission denied\n", path);
 		return (0);
 	}
 	writeable = write(fd, "", 0);
 	if (writeable == -1)
 	{
-		data->exit_code = 1;
+		*data->exit_code = 1;
-		ft_eprintf("minishell: %s: Permission denied\n", path);
+		ft_eprintf("bozoshell: %s: Permission denied\n", path);
 		return (0);
 	}
-	return (fd);
+	close(fd);
+	return (1);
 }

redirection/heredoc.c

@@ -6,52 +6,88 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 15:36:26 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:47:25 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/17 12:14:11 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "./redirection_private.h"
+#include <readline/readline.h>
+#include <unistd.h>
 
-int	*ft_get_heredoc(void)
+static bool	ft_fd_is_closed(int fd)
 {
-	static int	heredoc = -1;
+	int	fd2;
 
-	return (&heredoc);
+	fd2 = dup(fd);
+	if (fd2 == -1)
+		return (1);
+	close(fd2);
+	return (0);
+}
+
+static int	ft_format_and_write(t_data *data, const char *str, int fd)
+{
+	char	*line_clean;
+
+	line_clean = ft_env_filler(data, str);
+	if (line_clean == NULL)
+		return (1);
+	ft_putendl_fd(line_clean, fd);
+	free(line_clean);
+	return (0);
+}
+
+int	ft_heredoc2(t_data *data, char *line, char *stop, int fds[2])
+{
+	if (line == NULL)
+	{
+		if (ft_fd_is_closed(0))
+		{
+			close(fds[0]);
+			fds[0] = -2;
+			return (1);
+		}
+		else
+		{
+			ft_eprintf("\nbozoshell: warning: here-document at line 1%s",
+				"delimited by end-of-file (wanted `adfsd')\n");
+			return (1);
+		}
+	}
+	if (ft_strcmp(line, stop) == 0)
+		return (1);
+	if (ft_format_and_write(data, line, fds[1]))
+	{
+		close(fds[0]);
+		fds[0] = -2;
+		return (1);
+	}
+	return (0);
 }
 
 int	ft_heredoc(t_data *data, char *stop)
 {
-	char	*line;
-	char	*line_clean;
 	int		fds[2];
+	int		stdin_bak;
+	char	*line;
 
-	if (pipe(fds) == -1)
+	stdin_bak = dup(0);
-		return (-2);
+	if (stdin_bak == -1)
-	*ft_get_heredoc() = dup(0);
+		return (1);
-	ft_printf("> ");
+	if (pipe(fds))
-	line = get_next_line(*ft_get_heredoc());
-	while (line != NULL)
 	{
-		line[ft_strlen(line) - 1] = '\0';
+		close(stdin_bak);
-		if (ft_strcmp(line, stop) == 0)
+		return (1);
-		{
-			free(line);
-			break ;
-		}
-		line_clean = ft_env_filler(data, line);
-		free(line);
-		ft_putendl_fd(line_clean, fds[1]);
-		free(line_clean);
-		ft_printf("> ");
-		line = get_next_line(*ft_get_heredoc());
-		if (line == NULL && *ft_get_heredoc() == -1)
-		{
-			close(fds[0]);
-			close(fds[1]);
-			return (-2);
-		}
 	}
+	line = readline("> ");
+	while (ft_heredoc2(data, line, stop, fds) == 0)
+	{
+		free(line);
+		line = readline("> ");
+	}
+	free(line);
 	close(fds[1]);
-	*ft_get_heredoc() = -1;
+	dup2(stdin_bak, 0);
+	close(stdin_bak);
 	return (fds[0]);
 }

redirection/redirection.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:44:22 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:49:58 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/13 13:26:06 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -35,11 +35,21 @@ int	ft_replace_file(t_data *data, char **tab)
 	return (0);
 }
 
-void	ft_remove_redirection(char *cmd_str)
+static void	ft_skip(char *str, size_t *i, ssize_t *start)
+{
+	while (str[*i] == str[*start])
+		(*i)++;
+	while (str[*i] == ' ')
+		(*i)++;
+	while (str[*i] != '\0' && (str[*i] != ' '
+			|| ft_is_in_quote(str, *i)))
+		(*i)++;
+}
+
+static void	ft_remove_redirection(char *cmd_str)
 {
 	size_t	i;
 	ssize_t	start;
-	ssize_t	stop;
 
 	i = 0;
 	while (cmd_str[i] != '\0')
@@ -50,19 +60,12 @@ void	ft_remove_redirection(char *cmd_str)
 			i++;
 		if (ft_is_in("<>", cmd_str[i]))
 			start = i;
-		if (start == -1)
+		else
 			continue ;
-		while (cmd_str[i] == cmd_str[start])
+		ft_skip(cmd_str, &i, &start);
-			i++;
-		while (cmd_str[i] == ' ')
-			i++;
-		while (cmd_str[i] != '\0' && (cmd_str[i] != ' '
-				|| ft_is_in_quote(cmd_str, i)))
-			i++;
-		stop = i - start;
 		if (start != -1)
 		{
-			ft_strshift(cmd_str + start, -1 * stop);
+			ft_strshift(cmd_str + start, -1 * (i - start));
 			i = start;
 		}
 	}
@@ -75,38 +78,15 @@ int	ft_set_redirection(t_data *data, t_cmd *cmd, char **tab)
 	i = 0;
 	while (tab[i + 1] != NULL)
 	{
-		ft_quote_remover(tab[i + 1]);
+		if (ft_check_redirection(data, cmd, tab[i], tab[i + 1]))
-		if (ft_strcmp(tab[i], "<<") == 0)
+			return (1);
-		{
-			cmd->fd_in[0] = ft_heredoc(data, tab[i + 1]);
-			if (cmd->fd_in[0] == -2)
-				return (1);
-		}
-		else if (ft_strcmp(tab[i], "<") == 0)
-		{
-			if (ft_file_is_readable(data, tab[i + 1]))
-				cmd->fd_in[0] = open(tab[i + 1], O_RDONLY);
-			else
-				return (1);
-		}
-		else if (ft_strcmp(tab[i], ">") == 0)
-		{
-			if (ft_file_is_writable(data, tab[i + 1]))
-				cmd->fd_out[0] = open(tab[i + 1],
-						O_WRONLY | O_TRUNC | O_CREAT, 0644);
-			else
-				return (1);
-		}
-		else if (ft_strcmp(tab[i], ">>") == 0)
-		{
-			if (ft_file_is_appendable(data, tab[i + 1]))
-				cmd->fd_out[0] = open(tab[i + 1],
-						O_WRONLY | O_APPEND | O_CREAT, 0644);
-			else
-				return (1);
-		}
 		i++;
 	}
+	if (ft_is_in("<>", tab[i][0]))
+	{
+		ft_eprintf("bozoshell: %s: must be followed by a file\n", tab[i]);
+		return (1);
+	}
 	return (0);
 }
 
@@ -118,10 +98,10 @@ int	ft_redirection(t_data *data, t_cmd *cmd, char *cmd_str)
 	cmd->fd_in[1] = -1;
 	cmd->fd_out[0] = -1;
 	cmd->fd_out[1] = -1;
-	tab = ft_split_quoted(cmd_str, ' ');
+	tab = ft_split_charset_quoted(cmd_str, " \t");
 	if (tab == NULL)
 	{
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 		return (1);
 	}
 	ft_remove_redirection(cmd_str);

redirection/redirection_private.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:44:31 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/28 15:44:38 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/29 19:19:21 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,6 +24,8 @@
 
 int			ft_file_is_readable(t_data *data, const char *path);
 int			ft_file_is_writable(t_data *data, const char *path);
+bool		ft_check_redirection(t_data *data, t_cmd *cmd,
+				char *redirection_identifier, char *redirection);
 int			ft_file_is_appendable(t_data *data, const char *path);
 int			ft_heredoc(t_data *data, char *stop);
 

signal/signal.c

@@ -0,0 +1,36 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   signal.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:59:01 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/17 11:23:21 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "signal_private.h"
+
+void	ft_ctrlc_heredoc(int num)
+{
+	close(0);
+	ft_putchar_fd('\n', 1);
+	(void) num;
+}
+
+void	ft_ctrlc(int num)
+{
+	rl_replace_line("", 0);
+	rl_on_new_line();
+	ft_putchar_fd('\n', 1);
+	rl_redisplay();
+	*ft_get_exit_code() = 130;
+	(void) num;
+}
+
+void	ft_quit(int num)
+{
+	(void) num;
+	ft_printf("Quit (core dumped)\n");
+}

signal/signal.h

@@ -0,0 +1,20 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   signal.h                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 16:02:31 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/17 11:14:28 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef SIGNAL_H
+# define SIGNAL_H
+
+void	ft_quit(int num);
+void	ft_ctrlc(int num);
+void	ft_ctrlc_heredoc(int num);
+
+#endif

signal/signal_private.h

@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   signal_private.h                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:59:42 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/05 15:05:00 by alouis-j         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef SIGNAL_PRIVATE_H
+# define SIGNAL_PRIVATE_H
+# include <signal.h>
+# include <stdio.h>
+# include <readline/readline.h>
+# include <unistd.h>
+# include "../libftx/libftx.h"
+# include "../data/data.h"
+# include "../redirection/redirection.h"
+#endif

syntax/syntax.c

@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   syntatics.c                                        :+:      :+:    :+:   */
+/*   syntax.c                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/21 13:00:05 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 23:40:20 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/07 11:07:52 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,7 +17,7 @@ static int	ft_quote_verif(const char *str)
 {
 	if (ft_is_in_quote(str, ft_strlen(str)))
 	{
-		ft_eprintf("minishell: Quote is not closed\n");
+		ft_eprintf("bozoshell: Quote is not closed\n");
 		return (1);
 	}
 	else
@@ -26,16 +26,14 @@ static int	ft_quote_verif(const char *str)
 
 static int	ft_pipe_is_alone(const char *str)
 {
-	size_t	i;
+	ssize_t	i;
 	int		check;
 
 	check = 0;
-	i = 0;
+	i = -1;
-	while (str[i] != '\0')
+	while (str[++i] != '\0')
 	{
-		while (str[i] == ' ')
+		while (str[i] == ' ' || ft_is_in_quote(str, i))
-			i++;
-		while (ft_is_in_quote(str, i))
 			i++;
 		if (str[i] == '\0')
 			break ;
@@ -44,20 +42,13 @@ static int	ft_pipe_is_alone(const char *str)
 		else
 		{
 			if (check == 0)
-			{
+				break ;
-				ft_eprintf("minishell: Pipe must be followed and ");
-				ft_eprintf("preced by a command or redirection\n");
-				return (1);
-			}
 			check = 0;
 		}
-		i++;
 	}
 	if (check == 0)
-	{
+		ft_eprintf("bozoshell: Pipe must be followed and %s",
-		ft_eprintf("minishell: Pipe must be followed and ");
+			"preced by a command or redirection\n");
-		ft_eprintf("preced by a command or redirection\n");
-	}
 	return (check == 0);
 }
 
@@ -79,7 +70,7 @@ static int	ft_special_char_dub(const char *str)
 			if ((y > 2 && (str[i] == '>' || str[i] == '<'))
 				|| (y > 1 && str[i] == '|'))
 			{
-				ft_eprintf("minishell: too many %s in a row\n", str);
+				ft_eprintf("bozoshell: too many %s in a row\n", str);
 				return (1);
 			}
 			i = i + y;
@@ -95,7 +86,7 @@ static int	ft_empty_verif(const char *str)
 	size_t	i;
 
 	i = 0;
-	while (str[i] == ' ')
+	while (str[i] == ' ' || str[i] == '\t')
 		i++;
 	return (str[i] == '\0');
 }
@@ -108,7 +99,7 @@ int	ft_syntax_verif(t_data *data, const char *str)
 		|| ft_pipe_is_alone(str)
 		|| ft_special_char_dub(str))
 	{
-		data->exit_code = 2;
+		*data->exit_code = 2;
 		return (1);
 	}
 	return (0);

utils/fd.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:39:58 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 14:14:17 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/29 18:51:58 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,6 +25,12 @@ void	ft_closer(int fds[2])
 	}
 }
 
+void	ft_mega_closer(int fds1[2], int fds2[2])
+{
+	ft_closer(fds1);
+	ft_closer(fds2);
+}
+
 void	ft_add_fd(int fds[2], int fd)
 {
 	if (fds[0] == -1)

utils/ft_atoi_check.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/07/21 08:21:05 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/28 13:52:13 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/04/04 13:40:43 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,7 +22,7 @@ static int	ft_isspace(char c)
 
 int	ft_atoi_check(const char *nptr)
 {
-	long	result;
+	int64_t	result;
 	int		sign;
 
 	while (ft_isspace(*nptr))
@@ -37,9 +37,9 @@ int	ft_atoi_check(const char *nptr)
 	result = 0;
 	while (*nptr >= '0' && *nptr <= '9')
 	{
-		result = result * 10 + *nptr++ - '0';
+		result = result * 10 + (*nptr++ - '0') * sign;
-		if ((result > 2147483647 && sign == 1)
+		if ((result < 0 && sign == 1)
-			|| (result > 2147483647 && sign == 1))
+			|| (result > 0 && sign == -1))
 			return (2);
 	}
 	if (*nptr--)

utils/ft_change_exit_code.c

@@ -20,7 +20,7 @@ int	ft_change_exit_code(t_data *data, int new_value)
 	exit_code_str = ft_itoa(new_value);
 	if (exit_code_str == NULL)
 	{
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 		return (1);
 	}
 	return (0);

utils/ft_get_executable.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 13:39:48 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 13:39:50 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/05 15:09:29 by alouis-j         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,20 +19,20 @@ char	*ft_get_executable_with_path(t_data *data, const char *name)
 
 	if (access(name, F_OK) != 0)
 	{
-		data->exit_code = 127;
+		*data->exit_code = 127;
-		ft_eprintf("minishell: %s bash: No such file or directery\n");
+		ft_eprintf("bozoshell: %s: No such file or directery\n", name);
 		return (NULL);
 	}
 	if (access(name, X_OK) != 0)
 	{
-		data->exit_code = 126;
+		*data->exit_code = 126;
-		ft_eprintf("minishell: %s: permission denied\n", name);
+		ft_eprintf("bozoshell: %s: permission denied\n", name);
 		return (NULL);
 	}
 	path = ft_strdup(name);
 	if (path == NULL)
 	{
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 		return (NULL);
 	}
 	return (path);
@@ -46,19 +46,36 @@ static char	**ft_get_paths(t_data *data, const char *name)
 	paths = get_value_by_key("PATH", data->env);
 	if (paths == NULL)
 	{
-		data->exit_code = 127;
+		*data->exit_code = 127;
-		ft_eprintf("minishell: %s: command not found\n", name);
+		ft_eprintf("bozoshell: %s: command not found\n", name);
 		return (NULL);
 	}
 	tab = ft_split(paths, ':');
 	if (tab == NULL)
 	{
-		ft_eprintf("minishell: malloc failed\n");
+		ft_eprintf("bozoshell: malloc failed\n");
 		return (NULL);
 	}
 	return (tab);
 }
 
+static char	*ft_file_is_executable(const char *path, const char *name)
+{
+	char	*out;
+
+	out = ft_strmerger(3, path, "/", name);
+	if (out == NULL)
+	{
+		ft_eprintf("bozoshell: malloc failed\n");
+		free(out);
+		return (NULL);
+	}
+	if (access(out, X_OK) == 0)
+		return (out);
+	free(out);
+	return (NULL);
+}
+
 static char	*ft_get_executable_without_path(t_data *data, const char *name)
 {
 	char	**paths;
@@ -72,23 +89,16 @@ static char	*ft_get_executable_without_path(t_data *data, const char *name)
 	i = 0;
 	while (paths[i] != NULL)
 	{
-		path = ft_strmerger(3, paths[i], "/", name);
+		path = ft_file_is_executable(paths[i], name);
-		if (path == NULL)
+		if (path != NULL)
-		{
-			ft_eprintf("minishell: malloc failed\n");
 			break ;
-		}
-		if (access(path, X_OK) == 0)
-			break ;
-		free(path);
-		path = NULL;
 		i++;
 	}
 	ft_freer_tab_ultimate(1, paths);
 	if (path == NULL)
 	{
-		data->exit_code = 127;
+		*data->exit_code = 127;
-		ft_eprintf("minishell: %s: command not found\n", name);
+		ft_eprintf("bozoshell: %s: command not found\n", name);
 	}
 	return (path);
 }

utils/ft_is_in_quote.c

@@ -3,39 +3,38 @@
 /*                                                        :::      ::::::::   */
 /*   ft_is_in_quote.c                                   :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2023/02/21 12:59:34 by cchauvet          #+#    #+#             */
+/*   Created: 2023/03/30 15:39:25 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/03/27 15:32:44 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/30 15:52:10 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "utils.h"
-#include <sys/types.h>
 
 int	ft_is_in_quote(const char *str, size_t n)
 {
-	ssize_t	i;
+	size_t	i;
+	ssize_t	start;
 
-	i = -1;
+	start = -1;
-	while (str[++i] != '\0' && i < (ssize_t) n)
+	i = 0;
+	while (str[i] != '\0')
 	{
-		if (str[i] == '\'')
+		if (i == n)
+			break ;
+		if (str[i] == '\"' || str[i] == '\'')
 		{
-			i++;
+			if (start == -1)
-			while (str[i] != '\'' && str[i] != '\0')
+				start = i;
-			{
+			else if (str[i] == str[start])
-				if (i == (ssize_t) n)
+				start = -1;
-					return (1);
-				i++;
-			}
-		}
-		if (str[i] == '"')
-		{
-			while (str[++i] != '"' && str[i] != '\0')
-				if (i == (ssize_t) n)
-					return (2);
 		}
+		i++;
 	}
-	return (0);
+	if (start == -1)
+		return (0);
+	if (str[start] == '\'')
+		return (1);
+	return (2);
 }

utils/ft_quote_remover.c

@@ -6,12 +6,20 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 14:12:00 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 14:33:28 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/03/29 15:11:44 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "utils.h"
 
+static void	ft_remove_quote_and_reset(char *str, ssize_t *start, ssize_t *stop)
+{
+	ft_strshift(str + *start, -1);
+	ft_strshift(str + *stop - 1, -1);
+	*start = -1;
+	*stop = -1;
+}
+
 char	*ft_quote_remover(char *str)
 {
 	size_t	i;
@@ -32,10 +40,7 @@ char	*ft_quote_remover(char *str)
 		}
 		if (stop != -1)
 		{
-			ft_strshift(str + start, -1);
+			ft_remove_quote_and_reset(str, &start, &stop);
-			ft_strshift(str + stop - 1, -1);
-			start = -1;
-			stop = -1;
 			i = i - 1;
 		}
 		else

utils/ft_split_charset_quoted.c

@@ -0,0 +1,90 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_split_charset_quoted.c                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/04/11 14:50:26 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/14 15:53:49 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "utils.h"
+
+int	new_strs(char ***strs, const char *to_split, int *i, int *j)
+{
+	if (ft_strlen((*strs)[(*i)]) <= 0)
+		return (0);
+	(*i)++;
+	(*j) = 0;
+	(*strs)[(*i)] = ft_calloc(sizeof(char),
+			(ft_strlen(to_split) + 1));
+	if (!(*strs)[(*i)])
+		return (1);
+	return (0);
+}
+
+int	get_strs(const char *to_split, const char *charset, char ***strs, int *i)
+{
+	int	j;
+	int	x;
+	int	y;
+	int	check;
+
+	x = -1;
+	j = 0;
+	while (to_split[++x])
+	{
+		y = -1;
+		check = 1;
+		while (charset[++y])
+		{
+			if (to_split[x] == charset[y] && !ft_is_in_quote(to_split, x))
+			{
+				check = 0;
+				if (new_strs(strs, to_split, i, &j))
+					return (1);
+			}
+		}
+		if (check)
+			(*strs)[(*i)][j++] = to_split[x];
+	}
+	return (0);
+}
+
+void	free_set_null(char ***strs, int i)
+{
+	if (ft_strlen((*strs)[i]) == 0)
+	{
+		free((*strs)[i]);
+		(*strs)[i] = NULL;
+	}
+}
+
+char	**ft_split_charset_quoted(const char *to_split, const char *charset)
+{
+	char	**strs;
+	int		i;
+
+	strs = ft_calloc(sizeof(char *), (ft_strlen(to_split) + 1));
+	if (!strs)
+		return (NULL);
+	i = 0;
+	strs[0] = ft_calloc(sizeof(char), (ft_strlen(to_split) + 1));
+	if (!strs[0])
+	{
+		free(strs);
+		return (NULL);
+	}
+	if (get_strs(to_split, charset, &strs, &i))
+	{
+		i = -1;
+		while (strs[++i])
+			free(strs[i]);
+		free(strs);
+		return (NULL);
+	}
+	free_set_null(&strs, i);
+	return (strs);
+}

utils/ft_split_quoted.c

@@ -1,75 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_split_quoted.c                                  :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2022/10/05 19:04:34 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/15 14:25:56 by cchauvet         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "utils.h"
-
-size_t	ft_seglen_quoted(const char *str, char c)
-{
-	size_t	len;
-	size_t	i;
-
-	len = 0;
-	i = 0;
-	while (str[i] != 0)
-	{
-		while ((str[i] == c || ft_is_in_quote(str, i)) && str[i] != 0)
-			i++;
-		if (str[i] != 0)
-			len++;
-		while ((str[i] != c || ft_is_in_quote(str, i)) && str[i] != 0)
-			i++;
-	}
-	return (len);
-}
-
-static char	**ft_segsplitter(char **tab, size_t len, const char *s, char c)
-{
-	size_t	tab_index;
-	size_t	let_i;
-	size_t	start;
-
-	tab_index = 0;
-	let_i = 0;
-	start = 0;
-	if (tab == NULL || s == NULL)
-		return (NULL);
-	while (tab_index < len)
-	{
-		while ((s[let_i] == c || ft_is_in_quote(s, let_i)) && s[let_i] != 0)
-			let_i++;
-		start = let_i;
-		while ((s[let_i] != c || ft_is_in_quote(s, let_i)) && s[let_i] != 0)
-			let_i++;
-		tab[tab_index] = ft_substr(s, start, let_i - start);
-		if (tab[tab_index] == NULL)
-			return (ft_cancel((void *)tab, tab_index));
-		tab_index++;
-	}
-	return (tab);
-}
-
-char	**ft_split_quoted(const char *s, char c)
-{
-	size_t	len;
-	char	**tab;
-
-	if (s == NULL)
-		return (NULL);
-	len = ft_seglen_quoted(s, c);
-	tab = malloc((len + 1) * sizeof(char *));
-	if (tab == NULL)
-		return (NULL);
-	tab[len] = NULL;
-	if (ft_segsplitter(tab, len, s, c) == NULL)
-		return (NULL);
-	return (tab);
-}

utils/tags

@@ -1,68 +0,0 @@
-!_TAG_EXTRA_DESCRIPTION	anonymous	/Include tags for non-named objects like lambda/
-!_TAG_EXTRA_DESCRIPTION	fileScope	/Include tags of file scope/
-!_TAG_EXTRA_DESCRIPTION	pseudo	/Include pseudo tags/
-!_TAG_EXTRA_DESCRIPTION	subparser	/Include tags generated by subparsers/
-!_TAG_FIELD_DESCRIPTION	epoch	/the last modified time of the input file (only for F\/file kind tag)/
-!_TAG_FIELD_DESCRIPTION	file	/File-restricted scoping/
-!_TAG_FIELD_DESCRIPTION	input	/input file/
-!_TAG_FIELD_DESCRIPTION	name	/tag name/
-!_TAG_FIELD_DESCRIPTION	pattern	/pattern/
-!_TAG_FIELD_DESCRIPTION	typeref	/Type and name of a variable or typedef/
-!_TAG_FIELD_DESCRIPTION!C++	name	/aliased names/
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_KIND_DESCRIPTION!C	d,macro	/macro definitions/
-!_TAG_KIND_DESCRIPTION!C	e,enumerator	/enumerators (values inside an enumeration)/
-!_TAG_KIND_DESCRIPTION!C	f,function	/function definitions/
-!_TAG_KIND_DESCRIPTION!C	g,enum	/enumeration names/
-!_TAG_KIND_DESCRIPTION!C	h,header	/included header files/
-!_TAG_KIND_DESCRIPTION!C	m,member	/struct, and union members/
-!_TAG_KIND_DESCRIPTION!C	s,struct	/structure names/
-!_TAG_KIND_DESCRIPTION!C	t,typedef	/typedefs/
-!_TAG_KIND_DESCRIPTION!C	u,union	/union names/
-!_TAG_KIND_DESCRIPTION!C	v,variable	/variable definitions/
-!_TAG_KIND_DESCRIPTION!C++	c,class	/classes/
-!_TAG_KIND_DESCRIPTION!C++	d,macro	/macro definitions/
-!_TAG_KIND_DESCRIPTION!C++	e,enumerator	/enumerators (values inside an enumeration)/
-!_TAG_KIND_DESCRIPTION!C++	f,function	/function definitions/
-!_TAG_KIND_DESCRIPTION!C++	g,enum	/enumeration names/
-!_TAG_KIND_DESCRIPTION!C++	h,header	/included header files/
-!_TAG_KIND_DESCRIPTION!C++	m,member	/class, struct, and union members/
-!_TAG_KIND_DESCRIPTION!C++	n,namespace	/namespaces/
-!_TAG_KIND_DESCRIPTION!C++	s,struct	/structure names/
-!_TAG_KIND_DESCRIPTION!C++	t,typedef	/typedefs/
-!_TAG_KIND_DESCRIPTION!C++	u,union	/union names/
-!_TAG_KIND_DESCRIPTION!C++	v,variable	/variable definitions/
-!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
-!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
-!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
-!_TAG_OUTPUT_VERSION	0.0	/current.age/
-!_TAG_PARSER_VERSION!C	0.0	/current.age/
-!_TAG_PARSER_VERSION!C++	0.0	/current.age/
-!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
-!_TAG_PROC_CWD	/nfs/homes/cchauvet/42/minishell/utils/	//
-!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
-!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
-!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
-!_TAG_PROGRAM_VERSION	6.0.0	//
-!_TAG_ROLE_DESCRIPTION!C!header	local	/local header/
-!_TAG_ROLE_DESCRIPTION!C!header	system	/system header/
-!_TAG_ROLE_DESCRIPTION!C!macro	undef	/undefined/
-!_TAG_ROLE_DESCRIPTION!C++!header	local	/local header/
-!_TAG_ROLE_DESCRIPTION!C++!header	system	/system header/
-!_TAG_ROLE_DESCRIPTION!C++!macro	undef	/undefined/
-UTILS_H	utils.h	/^# define UTILS_H$/;"	d
-ft_atoi_check	ft_atoi_check.c	/^int	ft_atoi_check(const char *nptr)$/;"	f	typeref:typename:int
-ft_change_exit_code	ft_change_exit_code.c	/^int	ft_change_exit_code(t_data *data, int new_value)$/;"	f	typeref:typename:int
-ft_is_in_quote	ft_is_in_quote.c	/^int	ft_is_in_quote(const char *str, size_t n)$/;"	f	typeref:typename:int
-ft_isspace	ft_atoi_check.c	/^static int	ft_isspace(char c)$/;"	f	typeref:typename:int	file:
-ft_printn	ft_printn.c	/^void	ft_printn(const char *str, size_t n)$/;"	f	typeref:typename:void
-ft_quote_remover	ft_quote_remover.c	/^char	*ft_quote_remover(char *str)$/;"	f	typeref:typename:char *
-ft_seglen_quoted	ft_split_quoted.c	/^size_t	ft_seglen_quoted(const char *str, char c)$/;"	f	typeref:typename:size_t
-ft_segsplitter	ft_split_quoted.c	/^static char	**ft_segsplitter(char **tab, size_t len, const char *s, char c)$/;"	f	typeref:typename:char **	file:
-ft_split_quoted	ft_split_quoted.c	/^char	**ft_split_quoted(const char *s, char c)$/;"	f	typeref:typename:char **
-ft_str_is_empty	ft_str_is_empty.c	/^int	ft_str_is_empty(const char *str)$/;"	f	typeref:typename:int
-ft_strnchr	ft_strnchr.c	/^ssize_t	ft_strnchr(const char *str, char c)$/;"	f	typeref:typename:ssize_t
-ft_strncpy	ft_strncpy.c	/^size_t	ft_strncpy(char *dst, const char *src, size_t n)$/;"	f	typeref:typename:size_t
-ft_strreplace	ft_strreplace.c	/^char	*ft_strreplace(const char *str, const char *fill,$/;"	f	typeref:typename:char *
-ft_strshift	ft_strshift.c	/^void	ft_strshift(char *str, int shift)$/;"	f	typeref:typename:void

utils/utils.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:46:40 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 16:13:47 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/04/11 16:55:16 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,12 +24,13 @@ char		*ft_strreplace(const char *str, const char *fill,
 ssize_t		ft_strnchr(const char *str, char c);
 char		*ft_getstr(const char *str, size_t n);
 int			ft_str_is_empty(const char *str);
-char		**ft_split_quoted(const char *s, char c);
+char		**ft_split_charset_quoted(const char *s, const char *charset);
 void		ft_strshift(char *str, int shift);
 char		*ft_quote_remover(char *str);
 int			ft_atoi_check(const char *nptr);
 char		*ft_get_executable(t_data *data, const char *name);
 void		ft_closer(int fds[2]);
+void		ft_mega_closer(int fds1[2], int fds2[2]);
 void		ft_add_fd(int fds[2], int fd);
 
 #endif

vsupp

@@ -1,15 +0,0 @@
-{
-   readline
-   Memcheck:Leak
-   ...
-   fun:readline
-   ...
-}
-
-{
-   readline
-   Memcheck:Leak
-   ...
-   fun:add_history
-   ...
-}