work

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_getstr.c
+UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_getstr.c utils/ft_printn.c
 SRCS = ${UTILS_SRC} main.c file.c infile.c outfile.c heredoc.c syntatics.c ft_split_quoted.c env.c execution.c
 
 OBJS = ${SRCS:.c=.o}

builtin/env.c

@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env.c                                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/14 14:56:02 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/14 14:58:40 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "../minishell.h"
+
+int	main(char **env)
+{
+	t_list	**head;
+	t_list	*current;
+
+	while (current != NULL)
+	{
+		ft_putendl_fd(1, current->content);
+		current = current->next;
+	}
+	return (0);
+}

builtin/export.c

@@ -0,0 +1,40 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   export.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/14 14:27:08 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/14 14:52:50 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "../minishell.h"
+
+int	main(char **env)
+{
+	t_list	**env_lst;
+	t_list	*current;
+	char	*key;
+	char	*value;
+
+	env_lst = init_env(env);
+	current = *env_lst;
+	while (current != NULL)
+	{
+		value = ft_strchr(current->content, '=') + 1;
+		key = ft_strndup(current->content,
+				ft_strlen(current->content) - ft_strlen(value));
+		if (key == NULL)
+		{
+			ft_lstclear(env_lst, env_del);
+			return (1);
+		}
+		ft_printf("declare -x %s=\"%s\"\n", key, value);
+		free(key);
+		current = current->next;
+	}
+	ft_lstclear(env_lst, env_del);
+	return (0);
+}

env.c

@@ -6,57 +6,17 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/14 07:32:43 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/14 15:21:28 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libftx/libftx.h"
 #include "minishell.h"
+#include "utils/utils.h"
 
-int	get_index(char *s, char c)
+void	env_del(void *content)
 {
-	int	i;
+	(void) content;
-
-	i = -1;
-	while (s[++i])
-		if (s[i] == c)
-			return (i);
-	return (-1);
-}
-
-void	print_export(t_list **head, int fd)
-{
-	t_list	*current;
-	char	*ctn;
-	int		v;
-
-	current = *head;
-	while (current != NULL)
-	{
-		ctn = current->content;
-		if (*(ft_strchr(ctn, '=') - 1) != '_')
-		{
-			v = get_index(ctn, '=');
-			write(fd, "declare -x ", 11);
-			write(fd, ctn, v + 1);
-			write(fd, "\"", 1);
-			ft_putstr_fd(ctn + v + 1, fd);
-			write(fd, "\"\n", 2);
-		}
-		current = current->next;
-	}
-}
-
-void	print_env(t_list **head, int fd)
-{
-	t_list	*current;
-
-	current = *head;
-	while (current != NULL)
-	{
-		ft_putstr_fd(current->content, fd);
-		write(fd, "\n", 1);
-		current = current->next;
-	}
 }
 
 int	strcmp_alphabet(char *s1, char *s2)
@@ -139,22 +99,6 @@ char	*get_value_by_index(int index, t_list **head)
 	return (NULL);
 }
 
-int	is_start(char *big, char *little)
-{
-	int	i;
-
-	i = 0;
-	while (big[i])
-	{
-		if (little[i] != big[i])
-			return (0);
-		i++;
-		if (!little[i])
-			return (1);
-	}
-	return (0);
-}
-
 char	*get_value_by_key(char *key, t_list **head)
 {
 	t_list	*current;
@@ -162,13 +106,39 @@ char	*get_value_by_key(char *key, t_list **head)
 	current = *head;
 	while (current != NULL)
 	{
-		if (is_start(current->content, key))
+		if (ft_strncmp(current->content, key, ft_strlen(key)))
 			return (ft_strchr(current->content, '=') + 1);
 		current = current->next;
 	}
 	return (NULL);
 }
 
+int		set_value_by_key(t_list **env, char *key, char *value)
+{
+	t_list	*current;
+	char	*temp;
+
+	current = *env;
+	while (current != NULL)
+	{
+		if (!ft_strncmp(key, current->content, ft_strlen(current->content)))
+		{
+			temp = current->content;
+			current->content = ft_strreplace(temp, value,
+					ft_strnchr(temp, '=') + 1,
+					ft_strlen(temp) - (ft_strnchr(temp, '=') - 1));
+			free(temp);
+			if (current->content == NULL)
+			{
+				ft_eprintf("minishell: malloc failed");
+				return (1);
+			}
+		}
+		current = current->next;
+	}
+	return (0);
+}
+
 t_list	**init_env(char **env)
 {
 	t_list	**head;
@@ -183,12 +153,3 @@ t_list	**init_env(char **env)
 		add_sort(head, env[i]);
 	return (head);
 }
-
-/*int	main(int argc, char *argv[], char **env)
-{
-	(void)argc;
-	(void)argv;
-	ft_putstr_fd(get_value_index(10, init_env(env)), 1);
-	//print_env(init_env(env), 1);
-	return (0);
-}*/

execution.c

@@ -8,10 +8,11 @@ static char	*ft_get_variable(char **env, char *variable)
 	size_t	i;
 
 	i = 0;
-	while (env[i] == NULL)
+	while (env[i] != NULL)
 	{
-		if (ft_strncmp(variable, env[1], ft_strlen(variable)))
+		if (ft_strncmp(variable, env[i], ft_strlen(variable)) == 0)
-			return (ft_strchr(env[1], '=') + 1);
+			return (ft_strchr(env[i], '=') + 1);
+		i++;
 	}
 	return (NULL);
 }
@@ -19,11 +20,13 @@ static char	*ft_get_variable(char **env, char *variable)
 static char	*ft_get_executable_path(char *executable_name, char **env)
 {
 	char	*path;
+	char	*temp;
 	char	**tab;
 	size_t	i;
 
+	path = NULL;
 	if (executable_name[0] == '.' || executable_name[0] == '/')
-		path = executable_name;
+		path = ft_strdup(executable_name);
 	else
 	{
 		tab = ft_split(ft_get_variable(env, "PATH"), ':');
@@ -32,14 +35,25 @@ static char	*ft_get_executable_path(char *executable_name, char **env)
 		i = 0;
 		while (tab[i] != NULL)
 		{
-			if (access(tab[i], X_OK) == 0)
+			temp = ft_strmerger(3, tab[i], "/", executable_name);
+			if (temp == NULL)
 			{
-				path = ft_strmerger(3, tab[i], "/", executable_name);
+				ft_freer_tab_ultimate(1, tab);
 				free(executable_name);
+				ft_eprintf("minishell: malloc failed\n");
+			}
+			if (access(temp, X_OK) == 0)
+			{
+				path = temp;
 				break ;
 			}
+			free(temp);
 			i++;
 		}
+		if (path == NULL)
+		{
+			ft_eprintf("%s: command not found\n", executable_name);
+		}
 		ft_freer_tab_ultimate(1, tab);
 	}
 	return (path);
@@ -48,7 +62,6 @@ static char	*ft_get_executable_path(char *executable_name, char **env)
 static int	ft_excutor(t_cmd *cmd, char **env)
 {
 	int		pid;
-	char	*executable;
 	int		return_value;
 
 	pid = fork();
@@ -58,7 +71,7 @@ static int	ft_excutor(t_cmd *cmd, char **env)
 	{
 		dup2(cmd->fd_out, 1);
 		dup2(cmd->fd_in, 0);
-		execve(executable, cmd->args, env);
+		execve(cmd->executable, cmd->args, env);
 	}
 	else
 		waitpid(pid, &return_value, 0);
@@ -72,16 +85,24 @@ int	ft_cmds_executor(t_list **cmds, char **env)
 	int		fds[2];
 
 	current = *cmds;
-	while (current->next != NULL)
+	while (current != NULL)
 	{
-		if (pipe(fds) == -1)
+		content = current->content;
+		if (current->next != NULL)
 		{
-			ft_eprintf("minishell: pipe failed");
+			if (pipe(fds) == -1)
-			return (1);
+			{
+				ft_eprintf("minishell: pipe failed\n");
+				return (1);
+			}
+			content->fd_out = fds[1];
+			((t_cmd *) current->next->content)->fd_in = fds[0];
 		}
-		content->fd_out = fds[1];
+		content->executable = ft_get_executable_path(content->executable, env);
-		((t_cmd *) current->next)->fd_in = fds[0];
+		if (content->executable != NULL)
-		ft_excutor(content, env);
+			ft_excutor(content, env);
+		close(content->fd_in);
+		close(content->fd_out);
 		current = current->next;
 	}
 	return (0);

main.c

@@ -6,10 +6,10 @@ void	ft_lstdel(void *ptr)
 	t_cmd	*content;
 
 	content = (t_cmd *) ptr;
-	if (content->executable != NULL)
-		free(content->executable);
 	if (content->args != NULL)
 		ft_freer_tab_ultimate(1, content->args);
+	if (content->executable != NULL)
+		free(content->executable);
 	free(content);
 }
 
@@ -132,6 +132,7 @@ int	ft_cmd_filler(t_list *element, char **args)
 		i++;
 	}
 	content->args = args;
+	//pas free:10
 	content->executable = args[0];
 	return (0);
 }
@@ -179,7 +180,6 @@ t_list	**ft_parse_cmds(char *line)
 		return (NULL);
 	if (ft_cmds_fill(cmds, line) == 1)
 		return (NULL);
-	ft_printf("%s\n", line);
 	return (cmds);
 }
 
@@ -204,5 +204,7 @@ int	main(int ac, char **av, char **env)
 	}
 	ft_lstclear(data.env, env_del);
 	ft_lstclear(cmds, ft_lstdel);
+	free(cmds);
+	free(data.env);
 	return (0);
 }

minishell.h

@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   minishell.h                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/14 14:54:25 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #ifndef MINISHELL_H
 # define MINISHELL_H
 # include "libftx/libftx.h"
@@ -24,6 +36,7 @@ int			ft_heredoc(char *stop);
 size_t		ft_seglen_quoted(const char *str, char c);
 int			ft_cmds_executor(t_list **cmds, char **env);
 char		**ft_split_quoted(const char *s, char c);
+void		env_del(void *content);
 
 typedef struct s_cmd
 {

syntatics.c

@@ -46,6 +46,8 @@ static int	ft_pipe_is_alone(const char *str)
 			return (0);
 		i--;
 	}
+	if (i == 0)
+		return (0);
 	ft_eprintf("minishell: Pipe must be followed by a command or redirection\n");
 	return (1);
 }