raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: it is now possible to write heredocs by hand :D

Browse source
This commit is contained in:
Maieul BOYER 2024-09-16 17:14:10 +02:00
parent e0bf10f117
commit f15d420fc5
No known key found for this signature in database
1 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

41
exec/src/run_ast/_spawn_cmd.c
View file

@ -6,15 +6,50 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/14 12:30:09 by maiboyer #+# #+# */ /* Created: 2024/09/14 12:30:09 by maiboyer #+# #+# */
/* Updated: 2024/09/15 20:17:13 by maiboyer ### ########.fr */ /* Updated: 2024/09/16 17:11:56 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "app/env.h" #include "app/env.h"
#include "exec/_run_ast.h" #include "exec/_run_ast.h"
#include "me/fs/fs.h"
#include "me/str/str.h" #include "me/str/str.h"
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include "line/line.h"
t_error _get_heredoc_input(t_fd *write_end, t_str delim)
{
struct s_line_state lstate;
t_str line;
if (write_end == NULL || delim == NULL)
return (ERROR);
while (true) {
if (line_edit_start(&lstate, get_stdin(), get_stdout(), "> "))
return (ERROR);
while (!line_edit_feed(&lstate, &line))
{
if (errno == EAGAIN)
{
errno = 0;
lstate.pos = 0;
string_clear(&lstate.buf);
write_fd(lstate.output_fd, (void *)"^C\n", 3, NULL);
line_refresh_line(&lstate);
return (ERROR);
}
}
line_edit_stop(&lstate);
if (line == NULL || str_compare(delim, line))
break ;
put_string_fd(write_end, line);
put_string_fd(write_end, "\n");
str_free(line);
}
return (NO_ERROR);
}
t_error _spawn_cmd_and_run(t_vec_str args, t_vec_ast redirection, t_error _spawn_cmd_and_run(t_vec_str args, t_vec_ast redirection,
t_state *state, t_cmd_pipe cmd_pipe, t_command_result *out) t_state *state, t_cmd_pipe cmd_pipe, t_command_result *out)
@ -111,8 +146,8 @@ t_error _spawn_cmd_and_run(t_vec_str args, t_vec_ast redirection,
info.stdout.tag = R_INHERITED; info.stdout.tag = R_INHERITED;
if (create_pipe(&heredoc_pipe)) if (create_pipe(&heredoc_pipe))
return (ERROR); return (ERROR);
//put_string_fd(heredoc_pipe.write, if (_get_heredoc_input(heredoc_pipe.write, red->data.heredoc_redirection.delimiter))
// red->data.heredoc_redirection.content); return (ERROR);
close_fd(heredoc_pipe.write); close_fd(heredoc_pipe.write);
info.stdin = fd(heredoc_pipe.read); info.stdin = fd(heredoc_pipe.read);
} }