tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on here_doc

Browse Source
This commit is contained in:
mdev9
2024-03-24 19:28:02 +01:00
parent a58366f827
commit b25a87953b
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
srcs/here_doc.c
View File

@ -5,8 +5,8 @@
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/26 20:20:31 by marde-vr #+# #+# */ /* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */
/* Updated: 2024/03/23 19:23:09 by marde-vr ### ########.fr */ /* Updated: 2024/03/24 18:41:32 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -58,27 +58,22 @@ int contains_newline(char *str)
void get_here_doc_input(t_msh *msh, char *eof) void get_here_doc_input(t_msh *msh, char *eof)
{ {
char *line; char *line;
int new_line;
line = NULL; line = NULL;
new_line = 1;
ft_printf_fd(1, "> ");
while (1) while (1)
{ {
free(line); free(line);
line = get_next_line(0); line = readline("> ");
if (!line && new_line) if (!line)
{ {
ft_printf_fd(2, "\nminishell: warning: here-document delimited by"); ft_printf_fd(2, "\nminishell: warning: here-document delimited by");
ft_printf_fd(2, " end-of-file, wanted %s", eof); ft_printf_fd(2, " end-of-file, wanted %s", eof);
break ; break ;
} }
if (line && new_line && !ft_strncmp(line, eof, ft_strlen(eof))) if (line && !ft_strncmp(line, eof, ft_strlen(eof)))
break ; break ;
new_line = contains_newline(line);
if (new_line)
ft_printf_fd(1, "> ");
write(msh->in_fd, line, ft_strlen(line)); write(msh->in_fd, line, ft_strlen(line));
write(msh->in_fd, "\n", 1);
} }
free(eof); free(eof);
free(line); free(line);
@ -96,24 +91,15 @@ void handle_here_doc(t_msh *msh, char *eof)
perror("open"); perror("open");
ft_exit(msh, 1); ft_exit(msh, 1);
} }
eof = ft_strjoin_free(eof, "\n", 1);
if (!eof)
ft_exit(msh, 1);
/*
get_here_doc_input(msh, eof);
close(msh->in_fd);
msh->in_fd = open(here_doc_file, O_RDWR, 0644);
if (msh->in_fd == -1)
{
perror("open");
ft_exit(msh, 1);
}
}*/
pid = fork(); pid = fork();
if (pid == 0) if (pid == 0)
{
get_here_doc_input(msh, eof); get_here_doc_input(msh, eof);
close(msh->in_fd);
}
else else
{ {
wait(0);
close(msh->in_fd); close(msh->in_fd);
msh->in_fd = open(here_doc_file, O_RDWR, 0644); msh->in_fd = open(here_doc_file, O_RDWR, 0644);
if (msh->in_fd == -1) if (msh->in_fd == -1)