fait en sorte que le code sois moins degeu stp

input

@@ -0,0 +1 @@
+test test

output

@@ -0,0 +1 @@
+2

pipex.c

@@ -29,19 +29,23 @@ int	get_next(char *cmd, char c)
 	return (i);
 }
 
-char	*get_flags(char *cmd)
+char	**get_flags(char *cmd)
 {
-	int		i;
-	int		y;
-	char	*new_str;
+	size_t		i;
+	int			y;
+	char		*new_str;
+	char		**flags;
 
-	i = get_next(cmd, '-') + 1;
+	i = get_next(cmd, ' ') + 1;
 	new_str = ft_calloc(ft_strlen(cmd) - i + 1, 1);
 	y = 0;
 	while (cmd[i])
 		new_str[y++] = cmd[i++];
 	new_str[y] = '\0';
-	return (new_str);
+	flags = ft_split(new_str, ' ');
+	i = 0;
+	free(new_str);
+	return (flags);
 }
 
 char	*get_command(char *cmd)
@@ -57,6 +61,28 @@ char	*get_command(char *cmd)
 	return (new_str);
 }
 
+char **add_cmd(char **flg, char *cmd)
+{
+	char	*tmp;
+	int		i;
+	int		check;
+
+	tmp = NULL;
+	i = 0;
+	check = 0;
+	while (check == 0)
+	{
+		if (flg[i] == NULL)
+			check = 1;
+		if (tmp != NULL)
+			flg[i] = tmp;
+		tmp = flg[i];
+		i++;
+	}
+	flg[0] = cmd;
+	return (flg);
+}
+
 int	parsing(char *argv[], t_data *data)
 {
 	int	fd1;
@@ -65,7 +91,7 @@ int	parsing(char *argv[], t_data *data)
 	fd2 = open(argv[4], O_WRONLY | O_TRUNC | O_CREAT);
 	if (fd2 < 0)
 		return (-1);
-	fd1 = open(argv[1], O_RDONLY | O_TRUNC | O_CREAT);
+	fd1 = open(argv[1], O_RDONLY);
 	if (fd1 < 0)
 	{
 		close(fd2);
@@ -74,10 +100,12 @@ int	parsing(char *argv[], t_data *data)
 	data->cmd1 = get_command(argv[2]);
 	data->cmd2 = get_command(argv[3]);
 	data->flg1 = get_flags(argv[2]);
+	data->flg1 = add_cmd(data->flg1, data->cmd1);
 	data->flg2 = get_flags(argv[3]);
+	data->flg2 = add_cmd(data->flg2, data->cmd2);
 	data->fl1 = argv[1];
 	data->fl2 = argv[4];
-	data->ct_fl1 = read_file(fd1);
+	//data->ct_fl1 = read_file(fd1);
 	data->fd1 = fd1;
 	data->fd2 = fd2;
 	return (0);
@@ -87,33 +115,35 @@ char	*find_command(char **env, char *cmd)
 {
 	char	*path;
 	char	*s;
-	int	fd;
 	int	i;
 	int	y;
 
 	while (*env != NULL)
 	{
-		if (ft_strnstr(*env, "PATH=/", ft_strlen(*env)))
+		if (ft_strnstr(*env, "PATH=/", ft_strlen(*env))
+			&& ft_strchr(*env, ':') > 0)
 			break;
 		env++;
 	}
-	i = 4;
-	y = 4;
-	s = malloc(ft_strlen(*env) + 1);
-	while (*env[i])
+	i = 5;
+	y = 0;
+	s = ft_calloc(ft_strlen(*env) + 1, 1);
+	while ((*env)[i])
 	{
-		if (*env[i] != ':')
-			s[y++] = *env[i];
+		if ((*env)[i] != ':')
+			s[y++] = (*env)[i];
 		else
 		{
+			s = ft_strjoin(s, "/");
 			path = ft_strjoin(s, cmd);
-			fd = open(path, O_RDONLY);
-			free(path);
-			if (fd != -1)
+			if (access(path, X_OK) == 0)
 			{
 				free(s);
 				return (path);
 			}
+			free(s);
+			free(path);
+			s = ft_calloc(ft_strlen(*env) + 1, 1);
 			y = 0;
 		}
 		i++;		
@@ -127,7 +157,7 @@ void	first_cmd(int fd[2], t_data data)
 	dup2(fd[1], 1);
 	close(fd[0]);
 	close(fd[1]);
-	execve(data.cmd1, &data.flg1, NULL);
+	execve(data.cmd1, data.flg1, data.env);
 }
 
 void	second_cmd(int fd[2], t_data data)
@@ -136,7 +166,7 @@ void	second_cmd(int fd[2], t_data data)
 	dup2(data.fd2, 1);
 	close(fd[0]);
 	close(fd[1]);
-	execve(data.cmd2, &data.flg2, NULL);
+	execve(data.cmd2, data.flg2, data.env);
 }
 
 int	pipex(t_data data)
@@ -160,14 +190,14 @@ int	pipex(t_data data)
 	return (0);
 }
 
-#include <stdio.h>
-
 int	main(int argc, char *argv[], char **env)
 {
 	t_data	data;
 
 	//(void)argc;
 	//(void)argv;
+	//char **test = ft_split(argv[2], ' ');
+	//execve(find_command(env, argv[1]), test, env);
 	if (argc < 5)
 		return (1);
 	if (parsing(argv, &data))
@@ -178,9 +208,9 @@ int	main(int argc, char *argv[], char **env)
 	data.cmd2 = find_command(env, data.cmd2);
 	if (data.cmd2 == NULL)
 		return (4);
+	data.env = env;
 	if (pipex(data))
 		return (5);
-	free(data.fl1);
 	close(data.fd1);
 	close(data.fd2);
 	return (0);

pipex.h

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/01/11 15:33:34 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/01/12 17:34:59 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/01/16 18:52:06 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,14 +23,15 @@
 typedef struct s_data
 {
 	char	*cmd1;
-	char	*flg1;
+	char	**flg1;
 	char	*cmd2;
-	char	*flg2;
+	char	**flg2;
 	char	*fl1;
 	char	*fl2;
 	char	*ct_fl1;
 	int	fd1;
 	int	fd2;
+	char	**env;
 }	t_data;
 
 #endif