Etienne/pipex
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Correction g plu le temp

Browse source
This commit is contained in:
Etienne Rey-bethbeder 2023-03-28 22:02:18 +02:00
parent 0f4140fb0c
commit a2160605be
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bonus/pipex_heredoc_bonus.c
View file

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/14 11:22:13 by erey-bet #+# #+# */ /* Created: 2023/02/14 11:22:13 by erey-bet #+# #+# */
/* Updated: 2023/03/26 21:53:29 by erey-bet ### ########.fr */ /* Updated: 2023/03/28 18:07:02 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -34,9 +34,9 @@ int parsing_here_doc(int argc, char *argv[], t_data *data)
{ {
data->cmds[i] = get_command(argv[3 + i]); data->cmds[i] = get_command(argv[3 + i]);
data->flgs[i] = ft_split(argv[3 + i], ' '); data->flgs[i] = ft_split(argv[3 + i], ' ');
if (!data->cmds[i] || !data->flgs[i])
return (free_all(data));
} }
if (!data->cmds[argc - 4] || !data->flgs[argc - 4])
return (free_all(data));
return (0); return (0);
} }

9
bonus/pipex_parsing_bonus.c
View file

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/01/19 17:03:01 by erey-bet #+# #+# */ /* Created: 2023/01/19 17:03:01 by erey-bet #+# #+# */
/* Updated: 2023/03/23 17:14:59 by erey-bet ### ########.fr */ /* Updated: 2023/03/28 21:13:13 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -34,16 +34,17 @@ int parsing(int argc, char *argv[], char **env, t_data *data)
{ {
data->cmds[i] = get_command(argv[2 + i]); data->cmds[i] = get_command(argv[2 + i]);
data->flgs[i] = ft_split(argv[2 + i], ' '); data->flgs[i] = ft_split(argv[2 + i], ' ');
if (!data->cmds[i] || !data->flgs[i])
return (free_all(data));
} }
if (!data->cmds[argc - 4] || !data->flgs[argc - 4])
return (free_all(data));
data->env = env; data->env = env;
return (0); return (0);
} }
char *test_acces(char **s, char **cmd, char **path, int *y) char *test_acces(char **s, char **cmd, char **path, int *y)
{ {
*s = ft_strjoin_free(*s, "/", 1); if ((*cmd)[0] != '.' && (*cmd)[1] != '/')
*s = ft_strjoin_free(*s, "/", 1);
if (*s == NULL) if (*s == NULL)
return (NULL); return (NULL);
*path = ft_strjoin_free(*s, *cmd, 1); *path = ft_strjoin_free(*s, *cmd, 1);