starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: starnakin:8af6b426422ad255b56c549374db8892c6690190
Branches Tags
starnakin:master
starnakin:camille
..
compare: starnakin:1e00fee53c592ea2ef5acb6f5f8abc674cfbe626
Branches Tags
starnakin:master
starnakin:camille

No commits in common. "8af6b426422ad255b56c549374db8892c6690190" and "1e00fee53c592ea2ef5acb6f5f8abc674cfbe626" have entirely different histories.
8af6b42642 ... 1e00fee53c

2 changed files with 16 additions and 11 deletions
Show Stats Expand all files Collapse all files

4
format/format.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/15 13:35:50 by cchauvet #+# #+# */
/* Updated: 2023/03/31 15:22:21 by alouis-j ### ########.fr */
/* Updated: 2023/03/30 16:01:56 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
@ -40,7 +40,7 @@ static char *ft_spacer_after(const char *str)
{
while (ft_is_in_quote(out, i - 1))
i++;
if (out[i - 1] == '\0' || out[i] == '\0')
if (out[i] == '\0')
break ;
if (ft_is_in("><|", out[i - 1]))
{

23
redirection/heredoc.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/17 15:36:26 by cchauvet #+# #+# */
/* Updated: 2023/03/31 15:19:42 by alouis-j ### ########.fr */
/* Updated: 2023/03/29 16:37:05 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
@ -31,13 +31,8 @@ static int ft_format_and_write(t_data *data, const char *str, int fd)
return (0);
}
static int ft_heredoc2(t_data *data, char *stop, int fds[2])
static int ft_heredoc2(t_data *data, char *stop, char *line, int fds[2])
{
char *line;
ft_printf("> ");
line = get_next_line(*ft_get_heredoc());
if (line == NULL)
return (1);
line[ft_strlen(line) - 1] = '\0';
if (ft_strcmp(line, stop) == 0)
{
@ -51,20 +46,30 @@ static int ft_heredoc2(t_data *data, char *stop, int fds[2])
return (1);
}
free(line);
ft_printf("> ");
line = get_next_line(*ft_get_heredoc());
if (line == NULL && *ft_get_heredoc() == -1)
{
ft_closer(fds);
return (1);
}
return (0);
}
int ft_heredoc(t_data *data, char *stop)
{
char *line;
int fds[2];
int return_code;
if (pipe(fds) == -1)
return (-1);
*ft_get_heredoc() = dup(0);
while (true)
ft_printf("> ");
line = get_next_line(*ft_get_heredoc());
while (line != NULL)
{
return_code = ft_heredoc2(data, stop, fds);
return_code = ft_heredoc2(data, stop, line, fds);
if (return_code == 2)
break ;
else if (return_code)