Compare commits
	
		
			11 Commits
		
	
	
		
			96da8e54c3
			...
			camille
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| daaa9dea51 | |||
| fa37938073 | |||
| 7bec120312 | |||
| 6090784c02 | |||
| d4cead2b0f | |||
| 61cd1209ff | |||
| 6ecb66a60e | |||
| 642af26133 | |||
| 38e1b9834f | |||
| e31fff5137 | |||
| 8b771d6615 | 
							
								
								
									
										
											BIN
										
									
								
								.env_fill.c.swp
									
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								.env_fill.c.swp
									
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										3
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								Makefile
									
									
									
									
									
								
							@ -28,7 +28,8 @@ fclean: clean
 | 
				
			|||||||
	make -C libftx fclean
 | 
						make -C libftx fclean
 | 
				
			||||||
	rm -f ${NAME}
 | 
						rm -f ${NAME}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
re: fclean all
 | 
					re: fclean
 | 
				
			||||||
 | 
						make all
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: all clean fclean re
 | 
					.PHONY: all clean fclean re
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										10
									
								
								cmds.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								cmds.c
									
									
									
									
									
								
							@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/02/15 14:17:26 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2023/02/15 14:17:26 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/16 18:20:10 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 15:20:29 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -101,17 +101,11 @@ static int	ft_cmds_fill(t_list **cmds, t_list **env, const char *line)
 | 
				
			|||||||
	return (0);
 | 
						return (0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
t_list	**ft_parse_cmds(char *line, t_list **env)
 | 
					t_list	**ft_parse_cmds(char *line, t_list **env, int infile, int outfile)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int		infile;
 | 
					 | 
				
			||||||
	int		outfile;
 | 
					 | 
				
			||||||
	t_list	**cmds;
 | 
						t_list	**cmds;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cmds = malloc(sizeof(t_list *));
 | 
						cmds = malloc(sizeof(t_list *));
 | 
				
			||||||
	outfile = ft_outfile(line);
 | 
					 | 
				
			||||||
	infile = ft_infile(line);
 | 
					 | 
				
			||||||
	if (infile == -2 || outfile == -2)
 | 
					 | 
				
			||||||
		return (NULL);
 | 
					 | 
				
			||||||
	if (ft_cmds_prep(cmds, line, infile, outfile) == 1)
 | 
						if (ft_cmds_prep(cmds, line, infile, outfile) == 1)
 | 
				
			||||||
		return (NULL);
 | 
							return (NULL);
 | 
				
			||||||
	if (ft_cmds_fill(cmds, env, line) == 1)
 | 
						if (ft_cmds_fill(cmds, env, line) == 1)
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										31
									
								
								env.c
									
									
									
									
									
								
							
							
						
						
									
										31
									
								
								env.c
									
									
									
									
									
								
							@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 | 
					/*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
 | 
					/*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/16 16:24:21 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 13:05:29 by erey-bet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -206,6 +206,7 @@ int	set_value_by_key(char *key, char *value, t_list **head)
 | 
				
			|||||||
int	create_value_by_key(char *key, char *value, t_list **head)
 | 
					int	create_value_by_key(char *key, char *value, t_list **head)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	t_env	*content;
 | 
						t_env	*content;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (set_value_by_key(key, value, head) == 0)
 | 
						if (set_value_by_key(key, value, head) == 0)
 | 
				
			||||||
		return (0);
 | 
							return (0);
 | 
				
			||||||
	content = ft_calloc(1, sizeof(t_env));
 | 
						content = ft_calloc(1, sizeof(t_env));
 | 
				
			||||||
@ -217,6 +218,25 @@ int	create_value_by_key(char *key, char *value, t_list **head)
 | 
				
			|||||||
	return (0);
 | 
						return (0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					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);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
t_list	**init_env(char **env)
 | 
					t_list	**init_env(char **env)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	t_list	**head;
 | 
						t_list	**head;
 | 
				
			||||||
@ -241,3 +261,12 @@ t_list	**init_env(char **env)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	return (head);
 | 
						return (head);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*int	main(int argc, char *argv[], char **env)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						t_list	**new;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						new = init_env(env);
 | 
				
			||||||
 | 
						ft_printf("%S", env_to_strs(new));
 | 
				
			||||||
 | 
						return (0);
 | 
				
			||||||
 | 
					}*/
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/02/16 16:29:08 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2023/02/16 16:29:08 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/16 17:49:03 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 13:41:51 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -61,7 +61,6 @@ char	*ft_env_filler(t_list **env, const char *str)
 | 
				
			|||||||
			if (value == NULL)
 | 
								if (value == NULL)
 | 
				
			||||||
				return (NULL);
 | 
									return (NULL);
 | 
				
			||||||
			temp = ft_strreplace(out, value, i, y);
 | 
								temp = ft_strreplace(out, value, i, y);
 | 
				
			||||||
			i = i + ft_strlen(value) - 1;
 | 
					 | 
				
			||||||
			free(out);
 | 
								free(out);
 | 
				
			||||||
			if (temp == NULL)
 | 
								if (temp == NULL)
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
@ -70,6 +69,7 @@ char	*ft_env_filler(t_list **env, const char *str)
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
			out = temp;
 | 
								out = temp;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							if (out[i] != '\0')
 | 
				
			||||||
			i++;
 | 
								i++;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return (out);
 | 
						return (out);
 | 
				
			||||||
 | 
				
			|||||||
@ -70,10 +70,9 @@ static int	ft_excutor(t_cmd *cmd, t_list **env)
 | 
				
			|||||||
		return (1);
 | 
							return (1);
 | 
				
			||||||
	if (pid == 0)
 | 
						if (pid == 0)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		//TODO DO THIS
 | 
							tab = env_to_strs(env);
 | 
				
			||||||
		/* tab = t_env2tab(env); */
 | 
							if (tab == NULL)
 | 
				
			||||||
		/* if (tab == NULL) */
 | 
								return (1);
 | 
				
			||||||
		/* 	return (1); */
 | 
					 | 
				
			||||||
		tab = NULL;
 | 
							tab = NULL;
 | 
				
			||||||
		dup2(cmd->fd_out, 1);
 | 
							dup2(cmd->fd_out, 1);
 | 
				
			||||||
		dup2(cmd->fd_in, 0);
 | 
							dup2(cmd->fd_in, 0);
 | 
				
			||||||
@ -107,7 +106,9 @@ int	ft_cmds_executor(t_list **cmds, t_list **env)
 | 
				
			|||||||
		content->executable = ft_get_executable_path(content->executable, env);
 | 
							content->executable = ft_get_executable_path(content->executable, env);
 | 
				
			||||||
		if (content->executable != NULL)
 | 
							if (content->executable != NULL)
 | 
				
			||||||
			ft_excutor(content, env);
 | 
								ft_excutor(content, env);
 | 
				
			||||||
 | 
							if (content->fd_in != 0)
 | 
				
			||||||
			close(content->fd_in);
 | 
								close(content->fd_in);
 | 
				
			||||||
 | 
							if (content->fd_out != 1 && content->fd_out != 2)
 | 
				
			||||||
			close(content->fd_out);
 | 
								close(content->fd_out);
 | 
				
			||||||
		current = current->next;
 | 
							current = current->next;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										17
									
								
								heredoc.c
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								heredoc.c
									
									
									
									
									
								
							@ -1,5 +1,17 @@
 | 
				
			|||||||
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					/*                                                                            */
 | 
				
			||||||
 | 
					/*                                                        :::      ::::::::   */
 | 
				
			||||||
 | 
					/*   heredoc.c                                          :+:      :+:    :+:   */
 | 
				
			||||||
 | 
					/*                                                    +:+ +:+         +:+     */
 | 
				
			||||||
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
 | 
					/*   Created: 2023/02/17 15:36:26 by cchauvet          #+#    #+#             */
 | 
				
			||||||
 | 
					/*   Updated: 2023/02/17 16:21:02 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
 | 
					/*                                                                            */
 | 
				
			||||||
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "libftx/libftx.h"
 | 
				
			||||||
#include "minishell.h"
 | 
					#include "minishell.h"
 | 
				
			||||||
#include <readline/history.h>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
int	ft_heredoc(char *stop)
 | 
					int	ft_heredoc(char *stop)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -15,8 +27,7 @@ int	ft_heredoc(char *stop)
 | 
				
			|||||||
			free(line);
 | 
								free(line);
 | 
				
			||||||
			break ;
 | 
								break ;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		ft_putstr_fd(line, fds[1]);
 | 
							ft_putendl_fd(line, fds[1]);
 | 
				
			||||||
		add_history(line);
 | 
					 | 
				
			||||||
		free(line);
 | 
							free(line);
 | 
				
			||||||
		line = readline("> ");
 | 
							line = readline("> ");
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										3
									
								
								infile.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								infile.c
									
									
									
									
									
								
							@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/02/15 17:52:10 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2023/02/15 17:52:10 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/16 17:52:29 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 13:19:09 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -33,6 +33,7 @@ static int	ft_infile_is_valid(const char *line)
 | 
				
			|||||||
	if (tab[i][0] == '<')
 | 
						if (tab[i][0] == '<')
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		ft_eprintf("minishell: %s: must be followed by an infile\n", tab[i]);
 | 
							ft_eprintf("minishell: %s: must be followed by an infile\n", tab[i]);
 | 
				
			||||||
 | 
							ft_freer_tab_ultimate(1, tab);
 | 
				
			||||||
		return (0);
 | 
							return (0);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	ft_freer_tab_ultimate(1, tab);
 | 
						ft_freer_tab_ultimate(1, tab);
 | 
				
			||||||
 | 
				
			|||||||
@ -6,13 +6,13 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/29 22:23:35 by cchauvet          #+#    #+#             */
 | 
					/*   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"
 | 
					#include "libft.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void	ft_putchar_fd(int fd, char c)
 | 
					void	ft_putchar_fd(char c, int fd)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	write(fd, &c, 1);
 | 
						write(fd, &c, 1);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/29 22:26:36 by cchauvet          #+#    #+#             */
 | 
					/*   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       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/01/06 19:34:13 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:22:44 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -47,7 +47,7 @@ char	**ft_split(char const *s, char c);
 | 
				
			|||||||
char	*ft_itoa(int n);
 | 
					char	*ft_itoa(int n);
 | 
				
			||||||
char	*ft_strmapi(char const *s, char (*f)(unsigned int, char));
 | 
					char	*ft_strmapi(char const *s, char (*f)(unsigned int, char));
 | 
				
			||||||
void	ft_striteri(char *s, void (*f)(unsigned int, char*));
 | 
					void	ft_striteri(char *s, void (*f)(unsigned int, char*));
 | 
				
			||||||
void	ft_putchar_fd(int fd, char c);
 | 
					void	ft_putchar_fd(char c, int fd);
 | 
				
			||||||
void	ft_putstr_fd(char *s, int fd);
 | 
					void	ft_putstr_fd(char *s, int fd);
 | 
				
			||||||
void	ft_putendl_fd(char *s, int fd);
 | 
					void	ft_putendl_fd(char *s, int fd);
 | 
				
			||||||
void	ft_putnbr_fd(int n, int fd);
 | 
					void	ft_putnbr_fd(int n, int fd);
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/03 12:42:13 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:24:42 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -69,10 +69,10 @@ char	**ft_split(char const *s, char c);
 | 
				
			|||||||
char	*ft_itoa(int n);
 | 
					char	*ft_itoa(int n);
 | 
				
			||||||
char	*ft_strmapi(char const *s, char (*f)(unsigned int, char));
 | 
					char	*ft_strmapi(char const *s, char (*f)(unsigned int, char));
 | 
				
			||||||
void	ft_striteri(char *s, void (*f)(unsigned int, char*));
 | 
					void	ft_striteri(char *s, void (*f)(unsigned int, char*));
 | 
				
			||||||
void	ft_putchar_fd(int fd, char c);
 | 
					void	ft_putchar_fd(char c, int fd);
 | 
				
			||||||
void	ft_putstr_fd(char *s, int fd);
 | 
					void	ft_putstr_fd(char *s, int fd);
 | 
				
			||||||
void	ft_putendl_fd(int fd, char *s);
 | 
					void	ft_putendl_fd(char *s, int fd);
 | 
				
			||||||
void	ft_putnbr_fd(int fd, int n);
 | 
					void	ft_putnbr_fd(int n, int fd);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct s_list
 | 
					typedef struct s_list
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/10/23 18:08:31 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/10/23 18:08:31 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/03 12:52:38 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:29:56 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -23,13 +23,13 @@ int	ft_dprintarg(int fd, int arg, va_list args)
 | 
				
			|||||||
	if (arg == 'u')
 | 
						if (arg == 'u')
 | 
				
			||||||
		return (ft_dprintul(fd, va_arg(args, unsigned int)));
 | 
							return (ft_dprintul(fd, va_arg(args, unsigned int)));
 | 
				
			||||||
	if (arg == 'c')
 | 
						if (arg == 'c')
 | 
				
			||||||
		return (ft_putchar_fd(fd, va_arg(args, int)));
 | 
							return (ft_putchar_fd_p(fd, va_arg(args, int)));
 | 
				
			||||||
	if (arg == 'S')
 | 
						if (arg == 'S')
 | 
				
			||||||
		return (ft_dprintstrtab(fd, va_arg(args, char **)));
 | 
							return (ft_dprintstrtab(fd, va_arg(args, char **)));
 | 
				
			||||||
	if (arg == 's')
 | 
						if (arg == 's')
 | 
				
			||||||
		return (ft_putstr_fd_p(fd, va_arg(args, char *)));
 | 
							return (ft_putstr_fd_p(fd, va_arg(args, char *)));
 | 
				
			||||||
	if (arg == '%')
 | 
						if (arg == '%')
 | 
				
			||||||
		return (ft_putchar_fd(fd, '%'));
 | 
							return (ft_putchar_fd_p(fd, '%'));
 | 
				
			||||||
	if (arg == 'p')
 | 
						if (arg == 'p')
 | 
				
			||||||
		return (ft_dprintptr(fd, va_arg(args, void *)));
 | 
							return (ft_dprintptr(fd, va_arg(args, void *)));
 | 
				
			||||||
	return (0);
 | 
						return (0);
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/10/10 03:26:21 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/10/10 03:26:21 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2022/10/21 15:54:31 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:30:25 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -23,7 +23,7 @@ int	ft_dprintl_base(int fd, long long int n, char *base)
 | 
				
			|||||||
	if (n < 0)
 | 
						if (n < 0)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		nb = -n;
 | 
							nb = -n;
 | 
				
			||||||
		i += ft_putchar_fd(fd, '-');
 | 
							i += ft_putchar_fd_p(fd, '-');
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		nb = n;
 | 
							nb = n;
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/01/05 17:26:55 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2023/01/05 17:26:55 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/03 12:54:44 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:30:44 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -22,7 +22,7 @@ int	ft_dprintstrtab(int fd, char **tab)
 | 
				
			|||||||
	while (tab[index] != NULL)
 | 
						while (tab[index] != NULL)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		i += ft_putstr_fd_p(fd, tab[index]) + 1;
 | 
							i += ft_putstr_fd_p(fd, tab[index]) + 1;
 | 
				
			||||||
		ft_putchar_fd(fd, '\n');
 | 
							ft_putchar_fd_p(fd, '\n');
 | 
				
			||||||
		index++;
 | 
							index++;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return (i);
 | 
						return (i);
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/29 13:49:45 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/09/29 13:49:45 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2022/10/23 14:23:44 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:31:15 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -73,9 +73,9 @@ int	ft_dprintul_base(int fd, unsigned long long n, char *base)
 | 
				
			|||||||
	if (n > base_size - 1)
 | 
						if (n > base_size - 1)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		ft_dprintul_base(fd, n / base_size, base);
 | 
							ft_dprintul_base(fd, n / base_size, base);
 | 
				
			||||||
		ft_putchar_fd(fd, base[n % base_size]);
 | 
							ft_putchar_fd_p(fd, base[n % base_size]);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		ft_putchar_fd(fd, base[n]);
 | 
							ft_putchar_fd_p(fd, base[n]);
 | 
				
			||||||
	return (str_size - 1);
 | 
						return (str_size - 1);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/09/26 14:47:54 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/03 12:51:07 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:29:18 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -36,7 +36,7 @@ int		ft_eprintf(const char *format, ...);
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int		ft_vdprintf(int fd, const char *format, va_list va);
 | 
					int		ft_vdprintf(int fd, const char *format, va_list va);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int		ft_putchar_fd(int fd, char c);
 | 
					int		ft_putchar_fd_p(int fd, char c);
 | 
				
			||||||
int		ft_putstr_fd_p(int fd, char *str);
 | 
					int		ft_putstr_fd_p(int fd, char *str);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
@ -6,13 +6,13 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/29 22:23:35 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/09/29 22:23:35 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2022/10/12 15:21:42 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:28:59 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "ft_printf.h"
 | 
					#include "ft_printf.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int	ft_putchar_fd(int fd, char c)
 | 
					int	ft_putchar_fd_p(int fd, char c)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	write(fd, &c, 1);
 | 
						write(fd, &c, 1);
 | 
				
			||||||
	return (1);
 | 
						return (1);
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/09/29 22:25:08 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/09/29 22:25:08 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/03 12:49:18 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:28:25 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -20,6 +20,6 @@ int	ft_putstr_fd_p(int fd, char *str)
 | 
				
			|||||||
		str = "(null)";
 | 
							str = "(null)";
 | 
				
			||||||
	i = 0;
 | 
						i = 0;
 | 
				
			||||||
	while (str[i] != '\0')
 | 
						while (str[i] != '\0')
 | 
				
			||||||
		ft_putchar_fd(fd, str[i++]);
 | 
							ft_putchar_fd_p(fd, str[i++]);
 | 
				
			||||||
	return (i);
 | 
						return (i);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2022/10/12 14:34:28 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2022/10/12 14:34:28 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2022/12/11 19:23:34 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:31:29 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -19,7 +19,7 @@ static int	ft_dprintseg(int fd, const char *str)
 | 
				
			|||||||
	i = 0;
 | 
						i = 0;
 | 
				
			||||||
	while (str[i] != '\0' && ft_skipflag(str + i) == 0)
 | 
						while (str[i] != '\0' && ft_skipflag(str + i) == 0)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		ft_putchar_fd(fd, str[i]);
 | 
							ft_putchar_fd_p(fd, str[i]);
 | 
				
			||||||
		i++;
 | 
							i++;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return (i);
 | 
						return (i);
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										135
									
								
								main.c
									
									
									
									
									
								
							
							
						
						
									
										135
									
								
								main.c
									
									
									
									
									
								
							@ -6,44 +6,145 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/16 18:19:49 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 16:06:02 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "libftx/libftx.h"
 | 
				
			||||||
#include "minishell.h"
 | 
					#include "minishell.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static char	*ft_get_user_input(t_list **env)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						char	*line;
 | 
				
			||||||
 | 
						char	*prompt;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						prompt = ft_strmerger(2, get_value_by_key("PWD", env), "$ ");
 | 
				
			||||||
 | 
						if (prompt == NULL)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							ft_eprintf("minishell: malloc failed\n");
 | 
				
			||||||
 | 
							return (NULL);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						line = readline(prompt);
 | 
				
			||||||
 | 
						add_history(line);
 | 
				
			||||||
 | 
						free(prompt);
 | 
				
			||||||
 | 
						return (line);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static int	ft_minishell(t_list **env, char *line)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						t_list	**cmds;
 | 
				
			||||||
 | 
						char	*line_clean;
 | 
				
			||||||
 | 
						int		infile;
 | 
				
			||||||
 | 
						int		outfile;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						line_clean = ft_normalizer(line);
 | 
				
			||||||
 | 
						if (line_clean == NULL)
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						if (ft_syntatic_verif(line_clean))
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							free(line_clean);
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						outfile = ft_outfile(line_clean);
 | 
				
			||||||
 | 
						if (outfile == -2)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							free(line_clean);
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						infile = ft_infile(line_clean);
 | 
				
			||||||
 | 
						if (infile == -2)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							close(outfile);
 | 
				
			||||||
 | 
							free(line_clean);
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						cmds = ft_parse_cmds(line_clean, env, infile, outfile);
 | 
				
			||||||
 | 
						if (cmds == NULL)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							close(outfile);
 | 
				
			||||||
 | 
							close(infile);
 | 
				
			||||||
 | 
							ft_lstclear(cmds, ft_cmddel);
 | 
				
			||||||
 | 
							free(cmds);
 | 
				
			||||||
 | 
							free(line_clean);
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						if (ft_cmds_executor(cmds, env) == 1)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							close(outfile);
 | 
				
			||||||
 | 
							close(infile);
 | 
				
			||||||
 | 
							ft_lstclear(cmds, ft_cmddel);
 | 
				
			||||||
 | 
							free(cmds);
 | 
				
			||||||
 | 
							free(line_clean);
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return (0);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if DEBUG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int	main(int ac, char **av, char **env)
 | 
					int	main(int ac, char **av, char **env)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	t_list	**cmds;
 | 
					 | 
				
			||||||
	char	*line;
 | 
					 | 
				
			||||||
	t_data	data;
 | 
						t_data	data;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (ac == 1)
 | 
						if (ac == 1)
 | 
				
			||||||
		return (1);
 | 
							return (1);
 | 
				
			||||||
	line = ft_normalizer(av[1]);
 | 
					 | 
				
			||||||
	if (line == NULL)
 | 
					 | 
				
			||||||
		return (1);
 | 
					 | 
				
			||||||
	if (ft_syntatic_verif(line) == 1)
 | 
					 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		free(line);
 | 
					 | 
				
			||||||
		return (1);
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	data.env = init_env(env);
 | 
						data.env = init_env(env);
 | 
				
			||||||
	if (data.env == NULL)
 | 
						if (data.env == NULL)
 | 
				
			||||||
		return (1);
 | 
							return (1);
 | 
				
			||||||
	cmds = ft_parse_cmds(line, data.env);
 | 
							free(data.env);
 | 
				
			||||||
	if (cmds == NULL)
 | 
					 | 
				
			||||||
		return (1);
 | 
							return (1);
 | 
				
			||||||
	if (ft_cmds_executor(cmds, data.env) == 1)
 | 
						}
 | 
				
			||||||
 | 
						if (ft_minishell(data.env, av[1]) == 1)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		ft_lstclear(data.env, env_del);
 | 
							ft_lstclear(data.env, env_del);
 | 
				
			||||||
		ft_lstclear(cmds, ft_cmddel);
 | 
							free(data.env);
 | 
				
			||||||
		return (1);
 | 
							return (1);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	ft_lstclear(data.env, env_del);
 | 
						ft_lstclear(data.env, env_del);
 | 
				
			||||||
	ft_lstclear(cmds, ft_cmddel);
 | 
					 | 
				
			||||||
	free(cmds);
 | 
					 | 
				
			||||||
	free(data.env);
 | 
						free(data.env);
 | 
				
			||||||
	free(line);
 | 
						free(line);
 | 
				
			||||||
	return (0);
 | 
						return (0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int	main(int ac, char **av, char **env)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						t_data	data;
 | 
				
			||||||
 | 
						char	*line;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						data.env = init_env(env);
 | 
				
			||||||
 | 
						if (data.env == NULL)
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						line = ft_get_user_input(data.env);
 | 
				
			||||||
 | 
						if (line == NULL)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							ft_lstclear(data.env, env_del);
 | 
				
			||||||
 | 
							free(data.env);
 | 
				
			||||||
 | 
							return (1);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						while (line != NULL)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							if (ft_minishell(data.env, line) == 1)
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								ft_lstclear(data.env, env_del);
 | 
				
			||||||
 | 
								free(data.env);
 | 
				
			||||||
 | 
								free(line);
 | 
				
			||||||
 | 
								return (1);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							free(line);
 | 
				
			||||||
 | 
							line = ft_get_user_input(data.env);
 | 
				
			||||||
 | 
							if (line == NULL)
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								ft_lstclear(data.env, env_del);
 | 
				
			||||||
 | 
								free(data.env);
 | 
				
			||||||
 | 
								return (1);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						ft_lstclear(data.env, env_del);
 | 
				
			||||||
 | 
						free(data.env);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/16 18:19:34 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 14:29:56 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -21,7 +21,7 @@
 | 
				
			|||||||
# include <stdio.h>
 | 
					# include <stdio.h>
 | 
				
			||||||
# include <readline/readline.h>
 | 
					# include <readline/readline.h>
 | 
				
			||||||
# include <readline/history.h>
 | 
					# include <readline/history.h>
 | 
				
			||||||
 | 
					# define DEBUG 0
 | 
				
			||||||
t_list		**init_env(char **env);
 | 
					t_list		**init_env(char **env);
 | 
				
			||||||
int			set_value_by_key(char *key, char *value, t_list **env);
 | 
					int			set_value_by_key(char *key, char *value, t_list **env);
 | 
				
			||||||
char		*get_value_by_key(char *key, t_list **head);
 | 
					char		*get_value_by_key(char *key, t_list **head);
 | 
				
			||||||
@ -38,10 +38,11 @@ int			ft_cmds_executor(t_list **cmds, t_list **env);
 | 
				
			|||||||
char		**ft_split_quoted(const char *s, char c);
 | 
					char		**ft_split_quoted(const char *s, char c);
 | 
				
			||||||
void		ft_cmddel(void *content);
 | 
					void		ft_cmddel(void *content);
 | 
				
			||||||
void		env_del(void *content);
 | 
					void		env_del(void *content);
 | 
				
			||||||
t_list		**ft_parse_cmds(char *line, t_list **env);
 | 
					t_list		**ft_parse_cmds(char *line, t_list **env, int infile, int outfile);
 | 
				
			||||||
int			ft_cmd_filler(t_list *current, char **args, t_list **env);
 | 
					int			ft_cmd_filler(t_list *current, char **args, t_list **env);
 | 
				
			||||||
char		*ft_normalizer(char *str);
 | 
					char		*ft_normalizer(char *str);
 | 
				
			||||||
char		*ft_env_filler(t_list **env, const char *str);
 | 
					char		*ft_env_filler(t_list **env, const char *str);
 | 
				
			||||||
 | 
					char		**env_to_strs(t_list **head);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct s_cmd
 | 
					typedef struct s_cmd
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
					/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 | 
				
			||||||
/*                                                +#+#+#+#+#+   +#+           */
 | 
					/*                                                +#+#+#+#+#+   +#+           */
 | 
				
			||||||
/*   Created: 2023/02/15 18:01:07 by cchauvet          #+#    #+#             */
 | 
					/*   Created: 2023/02/15 18:01:07 by cchauvet          #+#    #+#             */
 | 
				
			||||||
/*   Updated: 2023/02/16 17:53:28 by cchauvet         ###   ########.fr       */
 | 
					/*   Updated: 2023/02/17 13:19:46 by cchauvet         ###   ########.fr       */
 | 
				
			||||||
/*                                                                            */
 | 
					/*                                                                            */
 | 
				
			||||||
/* ************************************************************************** */
 | 
					/* ************************************************************************** */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -32,6 +32,7 @@ static int	ft_outfile_is_valid(const char *line)
 | 
				
			|||||||
	if (tab[i][0] == '>')
 | 
						if (tab[i][0] == '>')
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		ft_eprintf("minishell: %s: must be followed by an infile\n", tab[i]);
 | 
							ft_eprintf("minishell: %s: must be followed by an infile\n", tab[i]);
 | 
				
			||||||
 | 
							ft_freer_tab_ultimate(1, tab);
 | 
				
			||||||
		return (0);
 | 
							return (0);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	ft_freer_tab_ultimate(1, tab);
 | 
						ft_freer_tab_ultimate(1, tab);
 | 
				
			||||||
 | 
				
			|||||||
@ -71,6 +71,7 @@ static int	ft_special_char_dub(const char *str)
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
			i = i + y;
 | 
								i = i + y;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							else
 | 
				
			||||||
			i++;
 | 
								i++;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return (0);
 | 
						return (0);
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user