_

Makefile

@@ -1,13 +1,39 @@
-UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_getstr.c
-SRCS = ${UTILS_SRC} main.c file.c infile.c outfile.c heredoc.c syntatics.c ft_split_quoted.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 \
+			   builtins/env.c \
+			   builtins/cd.c \
+			   builtins/exit.c \
+			   builtins/unset.c \
+			   builtins/echo.c 
+
+SRCS = ${BUILTINS_SRC} \
+	   ${UTILS_SRC} \
+	   main.c \
+	   ./cmd/cmd.c \
+	   ./env/env1.c \
+	   ./env/env2.c \
+	   ./env/env3.c \
+	   ./env/env_fill.c \
+	   ./data/data.c \
+	   ./execution/execution.c \
+	   ./syntax/syntax.c \
+	   ./format/format.c \
+	   ./redirection/heredoc.c \
+	   ./redirection/file.c \
+	   ./redirection/redirection.c \
+	   ./redirection/check.c \
+	   ./parse/parse.c \
+	   ./signal/signal.c
 
 OBJS = ${SRCS:.c=.o}
 
 NAME = minishell
 
-CC = gcc
+CC = clang
 
-CFLAGS = -Wall -Werror -Wextra -g
+CFLAGS = -Werror -Wextra -Wall -g
 
 LIBS = libftx/libftx.a
 
@@ -28,7 +54,8 @@ fclean: clean
 	make -C libftx fclean
 	rm -f ${NAME}
 
-re: fclean all
+re: fclean
+	make all
 
 .PHONY: all clean fclean re
 

bozoshell.h

@@ -0,0 +1,34 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   bozoshell.h                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/14 16:16:31 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef BOZOSHELL_H
+# define BOZOSHELL_H
+# include "./env/env.h"
+# include "./cmd/cmd.h"
+# include "./parse/parse.h"
+# include "./syntax/syntax.h"
+# include "./execution/execution.h"
+# include "./builtins/builtins.h"
+# include "./format/format.h"
+# include "./redirection/redirection.h"
+# 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>
+# include <sys/types.h>
+# include <sys/wait.h>
+
+#endif

builtins/builtins.h

@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   builtins.h                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/27 13:41:30 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/18 12:57:36 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef BUILTINS_H
+# define BUILTINS_H
+# include "../libftx/libft/list.h"
+
+int			echo(int fd, char **strs);
+int			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, t_list **env, int fd);
+int			unset(t_list **env, char **args, int fd);
+int			ft_exit(char **args, int err);
+
+#endif

builtins/builtins_private.h

@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   builtins_private.h                                 :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/27 13:41:42 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/18 12:57:25 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef BUILTINS_PRIVATE_H
+# define BUILTINS_PRIVATE_H
+# include <limits.h>
+# include "../libftx/libftx.h"
+# include "../env/env.h"
+# include "../utils/utils.h"
+
+char		*get_pwd(void);
+
+#endif

builtins/cd.c

@@ -0,0 +1,62 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   cd.c                                               :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/20 14:27:36 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/18 13:22:22 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	make_move(char *path, t_list **env)
+{
+	char	*join;
+	char	*old;
+
+	join = ft_strjoin("/", path);
+	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, "cd: No such file or directory\n", 30);
+	return (1);
+}
+
+int	move_folder(char **args, t_list **env)
+{
+	char	*path;
+	char	*old;
+
+	if (args[0] == NULL || args[1] != NULL)
+	{
+		write(2, "cd: Wrong number's argument\n", 28);
+		return (1);
+	}
+	path = args[0];
+	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);
+		}
+		free(old);
+		write(2, "cd: No such file or directory\n", 30);
+		return (1);
+	}
+	else
+		return (make_move(path, env));
+}

builtins/echo.c

@@ -0,0 +1,63 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   echo.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/17 13:09:08 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/11 14:57:00 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	is_space(char c)
+{
+	return (c == ' ' || c == '\f' || c == '\v' || c == '\t'
+		|| c == '\r' || c == '\n');
+}
+
+int	check_argument(char *str, int *check_backslash_n)
+{
+	int	i;
+
+	i = -1;
+	while (str[++i])
+		if (str[i] != '-' && str[i] != 'n')
+			return (1);
+	if (ft_strnstr(str, "n", ft_strlen(str)) && str[0] == '-')
+		*check_backslash_n = 1;
+	else
+		return (1);
+	return (0);
+}
+
+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])
+	{
+		y = -1;
+		while (is_space(strs[i][++y]))
+			;
+		if (check_start_write == 1
+			|| check_argument(strs[i], &check_backslash_n))
+		{
+			check_start_write = 1;
+			ft_putstr_fd(strs[i], fd);
+			if (strs[i + 1] != NULL)
+				write(fd, " ", 1);
+		}
+	}
+	if (!check_backslash_n)
+		write(fd, "\n", 1);
+	return (0);
+}

builtins/env.c

@@ -0,0 +1,32 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env.c                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/14 14:56:02 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/30 15:15:04 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	print_env(t_list **env, int fd)
+{
+	t_list	*current;
+
+	current = *env;
+	while (current->next != NULL)
+	{
+		if (((t_env *)(current->content))->value)
+		{
+			ft_putstr_fd(((t_env *)(current->content))->key, fd);
+			ft_putstr_fd("=", fd);
+			ft_putstr_fd(((t_env *)(current->content))->value, fd);
+			write(fd, "\n", 1);
+		}
+		current = current->next;
+	}
+	return (0);
+}

builtins/exit.c

@@ -0,0 +1,43 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   exit.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/24 10:17:59 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/05 12:30:46 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+static int	error(int err, char *reason, char *problem)
+{
+	ft_putstr_fd("bozoshell: bozo_exit ", 2);
+	if (problem != NULL)
+	{
+		ft_putstr_fd(problem, 2);
+		write(2, ": ", 3);
+	}
+	ft_putstr_fd(reason, 2);
+	return (err);
+}
+
+int	ft_exit(char **args, int err)
+{
+	if (args[0] == NULL)
+	{
+		write(1, "bozo_exit\n", 10);
+		return (err);
+	}
+	err = ft_atoi_check(args[0]);
+	if (err == 1)
+		return (error(err, "bozo_exit: numeric argument required\n", args[0]));
+	if (args[1] != NULL)
+		return (error(-1, "bozo_exit: too many arguments\n", NULL));
+	if (err > 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

@@ -0,0 +1,114 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   export.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/14 14:27:08 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/14 19:12:10 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+static int	error(char *str, char *to_free1, char *to_free2)
+{
+	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);
+}
+
+void	print_export(t_list **env, int fd)
+{
+	t_list	*current;
+
+	current = *env;
+	while (current->next != NULL)
+	{
+		if (ft_strcmp(((t_env *)(current->content))->key, "_"))
+		{
+			write(fd, "declare -x ", 11);
+			ft_putstr_fd(((t_env *)(current->content))->key, fd);
+			if (((t_env *)(current->content))->value != NULL)
+			{
+				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);
+		}
+		current = current->next;
+	}
+}
+
+int	set_key_value_export(t_list **env, char *args, char **key, char **value)
+{
+	*key = ft_strndup(args, ft_strnchr(args, '='));
+	if (*key == NULL)
+		return (1);
+	if (ft_strlen(*key) == 0)
+		return (1);
+	if (possible_key(*key) == 2)
+	{
+		(*key)[ft_strlen(*key) - 1] = '\0';
+		if (get_value_by_key(*key, env) == NULL)
+			*value = ft_strdup(ft_strchr(args, '=') + 1);
+		else
+			*value = ft_strjoin(get_value_by_key(*key, env),
+					ft_strchr(args, '=') + 1);
+	}
+	else
+		*value = ft_strdup(ft_strchr(args, '=') + 1);
+	return (0);
+}
+
+int	add_export(t_list **env, char *args)
+{
+	char	*key;
+	char	*value;
+
+	if (ft_strchr(args, '=') != NULL)
+	{
+		if (set_key_value_export(env, args, &key, &value))
+			return (error(args, key, NULL));
+	}
+	else
+	{
+		key = ft_strdup(args);
+		value = get_value_by_key(key, env);
+		if (value != NULL)
+			value = ft_strdup(value);
+		if (possible_key(key) == 2)
+			return (error(key, key, value));
+	}
+	if (!possible_key(key))
+		return (error(args, key, value));
+	create_value_by_key(key, value, env);
+	return (0);
+}
+
+int	ft_export(t_list **env, char **args, int fd)
+{
+	int	err;
+	int	i;
+
+	err = 0;
+	if (args[0] == NULL)
+		print_export(env, fd);
+	else
+	{
+		i = -1;
+		while (args[++i])
+			if (add_export(env, args[i]) == 1)
+				err = 1;
+	}
+	return (err);
+}

builtins/pwd.c

@@ -0,0 +1,41 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   pwd.c                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/17 16:09:11 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/18 12:59:25 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	pwd(int fd)
+{
+	char	path[PATH_MAX];
+
+	if (getcwd(path, sizeof(path)) != NULL)
+		ft_putendl_fd(path, fd);
+	else
+	{
+		ft_putendl_fd("Error getcwd", 2);
+		return (1);
+	}
+	return (0);
+}
+
+char	*get_pwd(void)
+{
+	char	*str;
+
+	str = ft_calloc(PATH_MAX, sizeof(char *));
+	if (getcwd(str, PATH_MAX) != NULL)
+		return (str);
+	else
+	{
+		ft_putendl_fd("Error getcwd", 2);
+		return (NULL);
+	}
+}

builtins/unset.c

@@ -0,0 +1,35 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   unset.c                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/22 13:28:27 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/07 12:46:28 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./builtins_private.h"
+
+int	error(char *str, int fd)
+{
+	write(fd, "bozoshell: unset: `", 19);
+	write(fd, str, ft_strlen(str));
+	write(fd, "': not a valid identifier\n", 26);
+	return (1);
+}
+
+int	unset(t_list **env, char **args, int fd)
+{
+	int	i;
+	int	err;
+
+	i = -1;
+	err = 0;
+	while (args[++i])
+		if (delete_by_key(args[i], env))
+			if (!possible_key(args[i]))
+				err = error(args[i], fd);
+	return (err);
+}

cmd/cmd.c

@@ -0,0 +1,73 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   cmd.c                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/15 14:18:21 by cchauvet          #+#    #+#             */
+/*   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)
+{
+	t_cmd	*content;
+
+	content = (t_cmd *) ptr;
+	if (content->args != NULL)
+		ft_freer_tab_ultimate(1, content->args);
+	if (content->own_cmd == false && content->executable != NULL)
+		free(content->executable);
+	if (content->fd_in[0] > 2)
+		close(content->fd_in[0]);
+	if (content->fd_out[0] > 2)
+		close(content->fd_out[0]);
+	if (content->fd_in[1] > 2)
+		close(content->fd_in[1]);
+	if (content->fd_out[1] > 2)
+		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

@@ -0,0 +1,32 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   cmd.h                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:47:01 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/07 15:03:53 by alouis-j         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef CMD_H
+# define CMD_H
+# include <stdbool.h>
+# include "../data/data.h"
+
+typedef struct s_cmd
+{
+	int		fd_in[2];
+	int		fd_out[2];
+	int		pid;
+	char	*executable;
+	char	**args;
+	bool	own_cmd;
+}	t_cmd;
+
+void		ft_cmddel(void *content);
+void		ft_cmdwaiter(void *content);
+void		ft_cmdcloser(void *ptr);
+
+#endif

cmd/cmd_private.h

@@ -0,0 +1,21 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   cmd_private.h                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:50:23 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/31 16:33:24 by alouis-j         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef CMD_PRIVATE_H
+# define CMD_PRIVATE_H
+# include <sys/types.h>
+# include <sys/wait.h>
+# include "./cmd.h"
+# include "../libftx/libftx.h"
+# include "../data/data.h"
+# include "../utils/utils.h"
+#endif

d

@@ -1,24 +0,0 @@
-a.out
-argprinter
-d
-execution.c
-file.c
-file.o
-ft_split_quoted.c
-ft_split_quoted.o
-heredoc.c
-heredoc.o
-infile.c
-infile.o
-libftx
-main.c
-main.o
-Makefile
-minishell
-minishell.h
-outfile.c
-outfile.o
-syntatics.c
-syntatics.o
-t
-utils

data/data.c

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

data/data.h

@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   data.h                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/27 13:43:39 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/05 14:45:23 by alouis-j         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef DATA_H
+# define DATA_H
+# include "../libftx/libft/list.h"
+
+typedef struct s_data
+{
+	t_list	**env;
+	t_list	**cmds;
+	int		*exit_code;
+}	t_data;
+
+int	*ft_get_exit_code(void);
+
+#endif

data/data_private.h

@@ -0,0 +1,18 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   data_private.h                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/27 13:42:21 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/27 13:42:23 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef DATA_PRIVATE_H
+# define DATA_PRIVATE_H
+# include "../libftx/libftx.h"
+# include "./data.h"
+
+#endif

env/env.h

@@ -0,0 +1,37 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env.h                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/27 13:42:01 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/27 13:42:02 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef ENV_H
+# define ENV_H
+# include <stdbool.h>
+# include "../libftx/libft/list.h"
+# include "../data/data.h"
+
+typedef struct s_env
+{
+	char	*key;
+	char	*value;
+}	t_env;
+
+char		*ft_env_filler(t_data *data, const char *str);
+void		env_del(void *content);
+t_list		**init_env(char **env);
+char		**env_to_strs(t_list **head);
+int			create_value_by_key(char *key, char *value, t_list **head);
+int			create_value_by_key_dup(char *key, char *value, t_list **head);
+int			set_value_by_key(char *key, char *value, t_list **head);
+char		*get_value_by_key(char *key, t_list **head);
+void		env_del(void *ptr);
+int			delete_by_key(char *key, t_list **head);
+int			possible_key(char *key);
+
+#endif

env/env1.c

@@ -0,0 +1,120 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env1.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/18 13:57:38 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "env_private.h"
+
+void	add_sort(t_list **head, t_env *var)
+{
+	t_list	*current;
+	t_env	*last;
+
+	current = *head;
+	while (current->next != NULL
+		&& ft_strcmp(var->key, ((t_env *)(current->content))->key) > 0)
+		current = current->next;
+	if (current->content == NULL)
+		current->content = var;
+	else
+	{
+		last = NULL;
+		swap_env_3((void **)&last, &current->content, (void **)&var);
+		while (current->next != NULL)
+		{
+			current = current->next;
+			swap_env(&current->content, (void **)&last);
+		}
+	}
+	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)
+{
+	t_list	*current;
+
+	current = *head;
+	while (current->next != NULL)
+	{
+		if (ft_strcmp(((t_env *)current->content)->key, key) == 0)
+			return (((t_env *)current->content)->value);
+		current = current->next;
+	}
+	return (NULL);
+}
+
+int	set_value_by_key(char *key, char *value, t_list **head)
+{
+	t_list	*current;
+
+	current = *head;
+	while (current->next != NULL)
+	{
+		if (ft_strcmp(((t_env *)current->content)->key, key) == 0)
+		{
+			free(((t_env *)current->content)->value);
+			((t_env *)current->content)->value = value;
+			return (0);
+		}
+		current = current->next;
+	}
+	return (1);
+}
+
+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;
+	add_sort(head, content);
+	return (0);
+}
+
+t_list	**init_env(char **env)
+{
+	t_list	**head;
+	int		i;
+	t_env	*var;
+
+	head = ft_calloc(1, sizeof(t_list *));
+	if (head == NULL)
+		return (NULL);
+	*head = ft_calloc(1, sizeof(t_list));
+	if (*head == NULL)
+	{
+		free(head);
+		return (NULL);
+	}
+	i = -1;
+	while (env[++i])
+	{
+		var = ft_calloc(1, sizeof(t_env));
+		if (var == NULL)
+			return (NULL);
+		var->key = get_key(env[i]);
+		var->value = get_value(env[i]);
+		add_sort(head, var);
+	}
+	return (head);
+}

env/env2.c

@@ -0,0 +1,77 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env2.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/09 19:59:03 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/18 13:26:31 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "env_private.h"
+
+int	get_index(char *s, char c)
+{
+	int	i;
+
+	i = -1;
+	while (s[++i])
+		if (s[i] == c)
+			return (i);
+	return (-1);
+}
+
+void	swap_env_3(void **a, void **b, void **c)
+{
+	void	*d;
+
+	d = *a;
+	*a = *b;
+	*b = *c;
+	*c = d;
+}
+
+void	swap_env(void **a, void **b)
+{
+	void	*c;
+
+	c = *a;
+	*a = *b;
+	*b = c;
+}
+
+void	env_del(void *ptr)
+{
+	t_env	*content;
+
+	if (ptr == NULL)
+		return ;
+	content = ptr;
+	if (content->key != NULL)
+		free(content->key);
+	if (content->key != NULL)
+		free(content->value);
+	if (content != NULL)
+		free(content);
+}
+
+char	**env_to_strs(t_list **head)
+{
+	t_list	*current;
+	t_env	*content;
+	char	**env;
+	int		i;
+
+	current = *head;
+	env = ft_calloc(ft_lstsize(*head), sizeof(char *));
+	i = 0;
+	while (current->content)
+	{
+		content = current->content;
+		env[i++] = ft_strmerger(3, content->key, "=", content->value);
+		current = current->next;
+	}
+	return (env);
+}

env/env3.c

@@ -0,0 +1,109 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env3.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/17 17:25:09 by erey-bet          #+#    #+#             */
+/*   Updated: 2023/04/07 13:21:54 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "env_private.h"
+
+char	*get_value(char *str)
+{
+	char	*s;
+	int		i;
+	int		start;
+
+	s = ft_calloc(ft_strlen(str), sizeof(char));
+	start = get_index(str, '=');
+	i = start;
+	while (str[++i])
+		s[i - start - 1] = str[i];
+	return (s);
+}
+
+char	*get_key(char *str)
+{
+	char	*s;
+	int		i;
+
+	s = ft_calloc(ft_strlen(str), sizeof(char));
+	i = -1;
+	while (str[++i] != '=')
+		s[i] = str[i];
+	return (s);
+}
+
+int	create_value_by_key_dup(char *key, char *value, t_list **env)
+{
+	char	*key_dup;
+	char	*value_dup;
+
+	if (set_value_by_key(key, value, env) == 0)
+		return (0);
+	key_dup = ft_strdup(key);
+	if (key_dup == NULL)
+		return (1);
+	if (value != NULL)
+	{
+		value_dup = ft_strdup(value);
+		if (value_dup == NULL)
+		{
+			free(key);
+			return (1);
+		}
+	}
+	else
+		value_dup = value;
+	if (create_value_by_key(key_dup, value_dup, env))
+		return (1);
+	return (0);
+}
+
+int	delete_by_key(char *key, t_list **head)
+{
+	t_list	*last;
+	t_list	*current;
+
+	current = *head;
+	last = NULL;
+	while (current->next != NULL)
+	{
+		if (ft_strcmp(((t_env *)current->content)->key, key) == 0)
+		{
+			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;
+		current = current->next;
+	}
+	return (1);
+}
+
+int	possible_key(char *key)
+{
+	int		i;
+
+	i = -1;
+	if (ft_isdigit(key[i + 1]))
+		return (0);
+	while (key[++i + 1])
+		if (!ft_isalnum(key[i]) && key[i] != '_')
+			return (0);
+	if (key[i] == '+')
+		return (2);
+	else if (!ft_isalnum(key[i]) && key[i] != '_')
+		return (0);
+	return (1);
+}

env/env_fill.c

@@ -0,0 +1,117 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env_fill.c                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/16 16:29:08 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/05 15:09:46 by alouis-j         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "./env_private.h"
+
+static char	*ft_getkey(const char *str)
+{
+	size_t	i;
+	char	*key;
+
+	if (ft_strncmp(str, "$$", 2) == 0)
+		key = ft_strdup("$");
+	else if (ft_strncmp(str, "$?", 2) == 0)
+		key = ft_strdup("?");
+	else if (str[1] == '\0')
+		key = ft_strdup("");
+	else
+	{
+		i = 1;
+		while (str[i] != '\0' && !ft_is_in("$?\'\" ", str[i]))
+			i++;
+		key = ft_strndup(str + 1, i - 1);
+	}
+	if (key == NULL)
+		ft_eprintf("bozoshell: malloc failed\n");
+	return (key);
+}
+
+static char	*ft_getvalue(t_data *data, char *key)
+{
+	char	*value;
+
+	if (ft_strcmp(key, "?") == 0)
+		value = ft_itoa(*data->exit_code);
+	else if (ft_strcmp(key, "$") == 0)
+		value = ft_strdup("PID");
+	else if (key[0] == '\0')
+		value = ft_strdup("$");
+	else
+	{
+		value = get_value_by_key(key, data->env);
+		if (value == NULL)
+			value = ft_strdup("");
+		else
+			value = ft_strdup(value);
+	}
+	if (value == NULL)
+		ft_eprintf("bozoshell: malloc failed\n");
+	return (value);
+}
+
+static char	*ft_getvalue_by_str(t_data *data, const char *str,
+		size_t	*key_len)
+{
+	char	*key;
+	char	*value;
+
+	key = ft_getkey(str);
+	if (key == NULL)
+		return (NULL);
+	*key_len = ft_strlen(key) + 1;
+	value = ft_getvalue(data, key);
+	free(key);
+	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;
+	size_t	i;
+
+	out = ft_strdup(str);
+	if (out == NULL)
+		return (NULL);
+	i = 0;
+	while (out[i] != '\0')
+	{
+		while (ft_is_in_quote(out, i) == 1)
+			i++;
+		while (out[i] == '$')
+		{
+			temp = ft_str_formator(data, out, &i);
+			if (temp == NULL)
+				return (NULL);
+			free(out);
+			out = temp;
+		}
+		if (out[i] != '\0')
+			i++;
+	}
+	return (out);
+}

env/env_private.h

@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env_private.h                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/27 13:40:24 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/27 13:40:25 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef ENV_PRIVATE_H
+# define ENV_PRIVATE_H
+# include "./env.h"
+# include "../libftx/libftx.h"
+# include "../utils/utils.h"
+
+void		swap_env_3(void **a, void **b, void **c);
+void		swap_env(void **a, void **b);
+char		*get_value(char *str);
+char		*get_key(char *str);
+int			get_index(char *str, char c);
+char		*ft_env_filler(t_data *data, const char *str);
+
+#endif

execution.c

@@ -1,39 +0,0 @@
-#include "libftx/libftx.h"
-#include "minishell.h"
-#include <unistd.h>
-
-int	main(int ac, char **av, char **env)
-{
-
-}
-
-char	*ft_get_executable_path(t_data *data, char *executable)
-{
-	if (ft_strcmp(executable, "env"))
-		return (ft_strjoin("/usr/bin/bo", const char *s2))
-}
-
-int	ft_excutor(t_cmd *cmd, )
-{
-	char	cmd[13] = "/usr/bin/ls";
-	char	*args[3] = {NULL, "cat", NULL};
-	int		pid;
-	int		fd_in;
-	int		fd_out;
-
-	if (ac != 3)
-		return (1);
-	fd_out = open(av[2], O_WRONLY | O_CREAT | O_TRUNC);
-	fd_in = open(av[1], O_RDONLY);
-	pid = fork();
-	if (pid == -1)
-		return (1);
-	if (pid == 0)
-	{
-		dup2(fd_out, 1);
-		dup2(fd_in, 0);
-		execve(cmd, args, env);
-	}
-	else
-		waitpid(pid);
-}

execution/execution.c

@@ -0,0 +1,119 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   execution.c                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/21 12:45:16 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/04/18 13:00:08 by erey-bet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "execution_private.h"
+
+static int	ft_execute_own_cmd(t_data *data, t_cmd *cmd)
+{
+	int	return_code;
+
+	if (ft_strcmp(cmd->executable, "pwd") == 0)
+		return_code = pwd(cmd->fd_out[0]);
+	else if (ft_strcmp(cmd->executable, "env") == 0)
+		return_code = print_env(data->env, cmd->fd_out[0]);
+	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, 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
+	{
+		return_code = ft_exit(cmd->args + 1, *data->exit_code);
+		if (return_code >= 0)
+		{
+			*data->exit_code = return_code;
+			return (-2);
+		}
+	}
+	*data->exit_code = return_code;
+	return (return_code);
+}
+
+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();
+	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);
+		ft_lstiter(*data->cmds, ft_cmdcloser);
+		execve(cmd->executable, cmd->args, env);
+		return (1);
+	}
+	signal(SIGQUIT, SIG_IGN);
+	signal(SIGINT, SIG_IGN);
+	return (0);
+}
+
+static int	ft_cmd_executor(t_data *data, t_cmd *cmd)
+{
+	int		exit_code;
+	char	**env;
+
+	if (cmd->own_cmd == 1)
+	{
+		exit_code = ft_execute_own_cmd(data, cmd);
+		ft_closer(cmd->fd_in);
+		ft_closer(cmd->fd_out);
+		if (exit_code == -2)
+			return (1);
+	}
+	else
+	{
+		env = env_to_strs(data->env);
+		if (env == NULL)
+			return (1);
+		exit_code = ft_executor(data, cmd, env);
+		ft_closer(cmd->fd_in);
+		ft_closer(cmd->fd_out);
+		ft_freer_tab_ultimate(1, env);
+		if (exit_code == 1)
+			return (1);
+	}
+	return (0);
+}
+
+int	ft_cmds_executor(t_data *data)
+{
+	int		fds[2];
+	t_list	*current;
+	t_cmd	*content;
+
+	current = *data->cmds;
+	while (current != NULL)
+	{
+		content = current->content;
+		fds[0] = -1;
+		if (current->next != NULL)
+		{
+			if (pipe(fds) == -1)
+				return (1);
+			ft_add_fd(content->fd_out, fds[1]);
+			ft_add_fd(((t_cmd *)(current->next->content))->fd_in, 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;
+	}
+	return (0);
+}

execution/execution.h

@@ -0,0 +1,19 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   execution.h                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:46:52 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/28 15:46:53 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef EXECUTION_H
+# define EXECUTION_H
+# include "../data/data.h"
+
+int	ft_cmds_executor(t_data *data);
+
+#endif

execution/execution_private.h

@@ -0,0 +1,24 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   execution_private.h                                :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:45:53 by cchauvet          #+#    #+#             */
+/*   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"
+
+#endif

file.c

@@ -1,66 +0,0 @@
-#include "minishell.h"
-
-int	ft_file_is_readable(const char *path)
-{
-	int	readable;
-	int	fd;
-
-	fd = open(path, O_RDONLY);
-	if (fd == -1)
-	{
-		ft_eprintf("minishell: %s: No such file or directory\n", path);
-		return (0);
-	}
-	readable = read(fd, "", 0);
-	if (readable == -1)
-	{
-		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (0);
-	}
-	close(fd);
-	return (1);
-}
-
-int	ft_file_is_writeable(const char *path)
-{
-	int	writeable;
-	int	fd;
-
-	fd = open(path, O_WRONLY | O_CREAT, 0644);
-	if (fd == -1)
-	{
-		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (0);
-	}
-	writeable = write(fd, "", 0);
-	if (writeable == -1)
-	{
-		ft_eprintf("minishell: %s: Permission denied\n", path);
-		return (0);
-	}
-	close(fd);
-	return (1);
-}
-
-char	*ft_get_file_path(const char *infile)
-{
-	size_t	i;
-	size_t	n;
-
-	n = 1;
-	while (infile[-n] == infile[-1])
-		n++;
-	i = 0;
-	while (infile[i] == ' ')
-		i++;
-	if (infile[i] == '\0' || infile[i] == '>' || infile[i] == '<')
-	{
-		ft_eprintf("minishell: syntax error near ");
-		if ((infile[0] == '<' && n > 3) || (infile[0] == '>' && n > 2))
-			ft_eprintf("unexpected token `%c`\n", infile[i - 1]);
-		else
-			ft_eprintf("unexpected token `newline`\n");
-		return (NULL);
-	}
-	return (ft_getstr(infile, i + 1));
-}

format/format.c

@@ -0,0 +1,130 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   format.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/15 13:35:50 by cchauvet          #+#    #+#             */
+/*   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;
+	size_t	i;
+
+	out = ft_strdup(str);
+	if (out == NULL)
+		return (NULL);
+	i = 1;
+	while (out[i] != '\0')
+	{
+		while (ft_is_in_quote(out, i - 1))
+			i++;
+		if (out[i - 1] == '\0' || out[i] == '\0')
+			break ;
+		if (ft_is_in("><|", out[i - 1]))
+		{
+			while (out[i] == out[i - 1])
+				i++;
+			if (ft_replace(&out, i))
+				return (NULL);
+		}
+		if (out[i] != '\0')
+			i++;
+	}
+	return (out);
+}
+
+static char	*ft_spacer_before(const char *str)
+{
+	char	*out;
+	ssize_t	i;
+
+	out = ft_strdup(str);
+	if (out == NULL)
+		return (NULL);
+	i = -1;
+	while (out[++i] != '\0')
+	{
+		while (ft_is_in_quote(out, i + 1))
+			i++;
+		if (out[i] == '\0')
+			break ;
+		if (ft_is_in("><|", out[i + 1]))
+		{
+			while (out[i] == ' ')
+				i++;
+			while (out[i] == out[i + 1])
+				i++;
+			if (ft_replace(&out, i + 1))
+				return (NULL);
+		}
+	}
+	return (out);
+}
+
+static void	ft_space_simplifier(char *str)
+{
+	size_t	i;
+	size_t	y;
+
+	i = 0;
+	while (str[i] != '\0')
+	{
+		if (ft_is_in_quote(str, i))
+			i++;
+		if (str[i] != '\0')
+			break ;
+		y = 0;
+		while (str[y + i] == ' ')
+			y++;
+		if (y > 1)
+		{
+			ft_strshift(str + i, -y + 1);
+			y--;
+		}
+		i++;
+	}
+}
+
+char	*ft_formater(t_data *data, const char *str)
+{
+	char	*out;
+	char	*temp;
+
+	if (ft_str_is_empty(str))
+		return (ft_strdup(" "));
+	temp = ft_spacer_after(str);
+	if (temp == NULL)
+		return (NULL);
+	out = ft_spacer_before(temp);
+	free(temp);
+	if (out == NULL)
+		return (NULL);
+	ft_space_simplifier(out);
+	if (out[ft_strlen(out) - 1] == ' ')
+		out[ft_strlen(out) - 1] = '\0';
+	temp = ft_env_filler(data, out);
+	free(out);
+	return (temp);
+}

format/format.h

@@ -0,0 +1,19 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   format.h                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:44:56 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/28 15:44:57 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FORMAT_H
+# define FORMAT_H
+# include "../data/data.h"
+
+char	*ft_formater(t_data *data, const char *str);
+
+#endif

format/format_private.h

@@ -0,0 +1,18 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   format_private.h                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/28 15:44:59 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/28 15:45:00 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef FORMAT_PRIVATE_H
+# define FORMAT_PRIVATE_H
+# include "../libftx/libftx.h"
+# include "../utils/utils.h"
+
+#endif

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/01/06 19:33:51 by cchauvet         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "minishell.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_index;
-	size_t	start;
-
-	tab_index = 0;
-	let_index = 0;
-	start = 0;
-	if (tab == NULL || s == NULL)
-		return (NULL);
-	while (tab_index < len)
-	{
-		while ((s[let_index] == c || ft_is_in_quote(s, let_index)) && s[let_index] != 0)
-			let_index++;
-		start = let_index;
-		while ((s[let_index] != c || ft_is_in_quote(s, let_index)) && s[let_index] != 0)
-			let_index++;
-		tab[tab_index] = ft_substr(s, start, let_index - 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);
-}

heredoc.c

@@ -1,25 +0,0 @@
-#include "minishell.h"
-#include <readline/history.h>
-
-int	ft_heredoc(char *stop)
-{
-	int		fds[2];
-	char	*line;
-
-	pipe(fds);
-	line = readline("> ");
-	while (line != NULL)
-	{
-		if (ft_strcmp(line, stop) == 0)
-		{
-			free(line);
-			break ;
-		}
-		ft_putstr_fd(line, fds[1]);
-		add_history(line);
-		free(line);
-		line = readline("> ");
-	}
-	close(fds[1]);
-	return (fds[0]);
-}

infile.c

@@ -1,89 +0,0 @@
-#include "minishell.h"
-
-static int	ft_get_infile(char *line)
-{
-	size_t	i;
-	int		fd;
-	char	*path;
-
-	fd = 0;
-	i = 0;
-	while (line[i] != '\0')
-	{
-		if (line[i] == '<' && ft_is_in_quote(line, i) == 0)
-		{
-			i++;
-			if (fd != 0)
-				close(fd);
-			if (line[i] == '<')
-			{
-				i++;
-				path = ft_get_file_path(line + i);
-				if (path == NULL)
-					return (-1);
-				fd = ft_heredoc(path);
-			}
-			else
-			{
-				path = ft_get_file_path(line + i);
-				if (path == NULL)
-					return (-1);
-				if (ft_file_is_readable(path) == 0)
-				{					
-					free(path);
-					return (-1);
-				}
-				fd = open(path, O_RDONLY);
-			}
-			free(path);
-		}
-		i++;
-	}
-	return (fd);
-}
-
-static int	ft_remove_infile(char *line)
-{
-	size_t	i;
-	int		separator;
-
-	i = 0;
-	while (line[i] != '\0')
-	{
-		if (line[i] == '<' && ft_is_in_quote(line, i) == 0)
-		{
-			while (line[i] == '<')
-				line[i++] = ' ';
-			while (line[i] == ' ')
-				i++;
-			separator = ft_is_in_quote(line, i);
-			if (separator == 0)
-				separator = ' ';
-			else if (separator == 1)
-				separator = '\'';
-			else
-				separator = '\"';
-			while (line[i] != separator && line[i] != '\0')
-				line[i++] = ' ';
-			if (line[i] != '\0'
-				&& (separator == '\'' || separator == '\"'))
-				line[i++] = ' ';
-		}
-		i++;
-	}
-	return (0);
-}
-
-int	ft_infile(char *line)
-{
-	int	fd;
-
-	fd = ft_get_infile(line);
-	if (ft_remove_infile(line))
-	{
-		if (fd > 0)
-			close(fd);
-		return (-1);
-	}
-	return (fd);
-}

libftx/extra/ft_swap.c

@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_swap.c                                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/03/27 13:43:25 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/03/27 13:43:26 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "extra.h"
 
 void	ft_swap(void *a, void *b)

libftx/gnl/Makefile

@@ -36,4 +36,4 @@ fclean: clean
 
 re: fclean all
 
-.PHONY: all bonus clean fclean re
+.PHONY: all clean fclean re

libftx/libft/ft_putchar_fd.c

@@ -6,13 +6,13 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/29 22:23:35 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/01/05 18:54:54 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/17 16:23:01 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 
-void	ft_putchar_fd(int fd, char c)
+void	ft_putchar_fd(char c, int fd)
 {
 	write(fd, &c, 1);
 }

libftx/libft/ft_putendl_fd.c

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/29 22:26:36 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/09/29 22:43:19 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/17 16:15:07 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */