Merge branch 'main' into indev_adjoly

.gitignore

@@ -7,3 +7,4 @@ compile_commands.json
 .cache
 libft/**/*.o
 libft/**/*.a
+src/main.c

src/env/env_cmd.c

@@ -5,109 +5,13 @@
 /*                                                    +:+ +:+         +:+     */
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/05/06 19:09:50 by mmoussou          #+#    #+#             */
+/*   Created: 2024/05/22 14:50:01 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/05/09 15:54:22 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/05/22 14:50:03 by mmoussou         ###   ########.fr       */
-/*   Updated: 2024/05/07 13:58:48 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-char	**env_get(t_env *env)
-{
-	char	**exec_env;
-	int		i;
-
-	exec_env = malloc(sizeof(char *) * (ft_envsize(env) + 1));
-	if (!exec_env)
-		return (exec_env);
-	exec_env[ft_envsize(env)] = NULL;
-	i = 0;
-	while (env)
-	{
-		exec_env[i] = malloc(ft_strlen(env->name)
-				+ ft_strlen(env->content) + 2);
-		if (!exec_env[i])
-		{
-			ft_free("a", exec_env);
-			return (NULL);
-		}
-		ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1);
-		exec_env[i][ft_strlen(env->name)] = '=';
-		ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1,
-			env->content, ft_strlen(env->content) + 1);
-		env = env->next;
-		i++;
-	}
-	return (exec_env);
-}
-
-int	env_create_first_el(char *env_line, t_env *env)
-{
-	char	*name;
-	char	*content;
-
-	content = ft_strdup(ft_strchr(env_line, '=') + 1);
-	if (!content)
-		return (-1);
-	ft_strchr(env_line, '=')[0] = 0;
-	name = ft_strdup(env_line);
-	if (!name)
-		return (-1);
-	env->name = name;
-	env->content = content;
-	env->next = NULL;
-	return (0);
-}
-
-t_env	*env_create_el(char *env_line)
-{
-	t_env	*new;
-	char	*name;
-	char	*content;
-
-	content = ft_strdup(ft_strchr(env_line, '=') + 1);
-	if (!content)
-		return (NULL);
-	ft_strchr(env_line, '=')[0] = 0;
-	name = ft_strdup(env_line);
-	if (!name)
-		return (NULL);
-	new = ft_envnew(name, content);
-	return (new);
-}
-
-int	env_init(char **env_d, t_env *env)
-{
-	t_env	*new;
-	int		i;
-	char	bool_first_el;
-
-	i = 0;
-	bool_first_el = true;
-	while (env_d[i])
-	{
-		if (bool_first_el)
-			i = env_create_first_el(env_d[i], env);
-		if (bool_first_el && i < 0)
-			return (1);
-		if (bool_first_el)
-			bool_first_el = false;
-		else
-		{
-			new = env_create_el(env_d[i]);
-			if (!new)
-			{
-				ft_envclear(&env, free);
-				return (1);
-			}
-			ft_envadd_back(&env, new);
-		}
-		i++;
-	}
-	return (0);
-}
-
 int	env_append(char *name, char *content, t_env *env)
 {
 	char	*new_content;
@@ -117,6 +21,8 @@ int	env_append(char *name, char *content, t_env *env)
 	if (!env)
 		return (-1);
 	new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content));
+	if (!new_content)
+		return (-1);
 	ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1);
 	ft_strlcpy(new_content + ft_strlen(env->content),
 		content, ft_strlen(content) + 1);

src/env/env_setters.c

@@ -0,0 +1,112 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   env_setters.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/05/22 14:42:52 by mmoussou          #+#    #+#             */
+/*   Updated: 2024/05/22 14:49:35 by mmoussou         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+int	env_create_first_el(char *env_line, t_env *env)
+{
+	char	*name;
+	char	*content;
+
+	content = ft_strdup(ft_strchr(env_line, '=') + 1);
+	if (!content)
+		return (-1);
+	ft_strchr(env_line, '=')[0] = 0;
+	name = ft_strdup(env_line);
+	if (!name)
+	{
+		free(content);
+		return (-1);
+	}
+	env->name = name;
+	env->content = content;
+	env->next = NULL;
+	return (0);
+}
+
+t_env	*env_create_el(char *env_line)
+{
+	t_env	*new;
+	char	*name;
+	char	*content;
+
+	content = ft_strdup(ft_strchr(env_line, '=') + 1);
+	if (!content)
+		return (NULL);
+	ft_strchr(env_line, '=')[0] = 0;
+	name = ft_strdup(env_line);
+	if (!name)
+	{
+		free(content);
+		return (NULL);
+	}
+	new = ft_envnew(name, content);
+	return (new);
+}
+
+int	env_init(char **env_d, t_env *env)
+{
+	t_env	*new;
+	int		i;
+	char	bool_first_el;
+
+	i = -1;
+	bool_first_el = true;
+	while (env_d[++i])
+	{
+		if (bool_first_el)
+			i = env_create_first_el(env_d[i], env);
+		if (bool_first_el && i < 0)
+			return (1);
+		else
+		{
+			new = env_create_el(env_d[i]);
+			if (!new)
+			{
+				ft_envclear(&env, free);
+				return (1);
+			}
+			ft_envadd_back(&env, new);
+		}
+		bool_first_el = false;
+	}
+	return (0);
+}
+
+char	**env_get(t_env *env)
+{
+	char	**exec_env;
+	int		i;
+
+	exec_env = malloc(sizeof(char *) * (ft_envsize(env) + 1));
+	if (!exec_env)
+		return (exec_env);
+	exec_env[ft_envsize(env)] = NULL;
+	i = 0;
+	while (env)
+	{
+		exec_env[i] = malloc(ft_strlen(env->name)
+				+ ft_strlen(env->content) + 2);
+		if (!exec_env[i])
+		{
+			ft_free("a", exec_env);
+			return (NULL);
+		}
+		ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1);
+		exec_env[i][ft_strlen(env->name)] = '=';
+		ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1,
+			env->content, ft_strlen(env->content) + 1);
+		env = env->next;
+		i++;
+	}
+	return (exec_env);
+}

src/exec/heredoc.c

@@ -6,47 +6,101 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/20 09:19:39 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/05/21 00:34:48 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/05/23 07:18:01 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
+/*
+	# mode
+		0: ouvre un nouveau fichier
+		<fd>: close ce fd
+		-1: pour signifier qu'il faut decrémenter la static
+ */
+int	fd_manager(int mode)
+{
+	static int	index = 0;
+	char		*index_itoa;
+	char		*path;
+	int			fd;
+
+	if (mode > 0)
+		close(mode);
+	if (mode)
+	{
+		index--;
+		return (0);
+	}
+	path = ft_calloc(sizeof(char), 24 + 3);
+	if (!path)
+		return (-1);
+	index_itoa = ft_itoa(index);
+	if (!index_itoa)
+		free(path);
+	if (!index_itoa)
+		return (-1);
+	index++;
+	strcat(path, "/tmp/.minishell-heredoc-");
+	strcat(path, index_itoa);
+	fd = open(path, O_RDONLY | O_WRONLY | O_TRUNC | O_CREAT, 0644);
+	return (fd);
+}
+
+static int	get_input(char *delimiter, int fd)
+{
+	char	*line;
+	int		status;
+
+	printf("%s | ", delimiter);
+	line = readline("heredoc> ");
+	while (ft_strcmp(line, delimiter))
+	{
+		status = write(fd, line, ft_strlen(line));
+		if (status == -1)
+			fd_manager(fd);
+		if (status == -1)
+			return (-1);
+		status = write(fd, "\n", 1);
+		if (status == -1)
+			fd_manager(fd);
+		if (status == -1)
+			return (-1);
+		free(line);
+		line = readline("heredoc> ");
+	}
+	free(line);
+	status = write(fd, "\0", 1);
+	if (status == -1)
+		fd_manager(fd);
+	if (status == -1)
+		return (-1);
+	return (0);
+}
+
 int	ft_heredoc(char *delimiter)
 {
 	int		fork_pid;
-	int		tmp_fd;
+	int		fd;
-	int		status;
-	char	*line;
 
-	tmp_fd = open("/tmp/.minishell-heredoc", O_RDONLY | O_WRONLY | O_TRUNC | O_CREAT, 0644);
+	fd = fd_manager(0);
-	if (tmp_fd == -1)
+	if (fd == -1)
+	{
+		fd_manager(-1);
 		return (-1);
+	}
 	fork_pid = fork();
 	if (fork_pid == -1)
 	{
-		close(tmp_fd);
+		fd_manager(fd);
 		return (-1);
 	}
 	if (!fork_pid)
 	{
-		line = readline("heredoc> ");
+		get_input(delimiter, fd);
-		while (ft_strcmp(line, delimiter))
+		exit(0);
-		{
-			status = write(tmp_fd, line, ft_strlen(line));
-			status = write(tmp_fd, "\n", 1);
-			free(line);
-			line = readline("heredoc> ");
-		}
-		free(line);
-		status = write(tmp_fd, "\0", 1);
-		if (status == -1)
-		{
-			close(tmp_fd);
-			return (-1);
-		}
 	}
 	else
 		waitpid(fork_pid, NULL, 0);
-	return (tmp_fd);
+	return (fd);
 }

src/main.c

@@ -3,7 +3,7 @@
 /*                                                        :::      ::::::::   */
 /*   main.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
 /*   Updated: 2024/05/24 15:01:05 by adjoly           ###   ########.fr       */
@@ -45,6 +45,7 @@ void	print_pipe(t_list *pipe)
 
 int	main(int ac, char **av, char **env)
 {
+	//ft_heredoc("EOF");
 	char	*test;
 	char	*prompt;
 	char	**lll;
@@ -70,6 +71,7 @@ int	main(int ac, char **av, char **env)
 		//free(token);
 		free(test);
 		ft_lstclear(&piped, &free);
+		ft_free("a", &lll);
 	}
 	ft_free("a", &lll);
 	return (0);