jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pipeend and pipestart bits in process attribute, env problems solved

Browse source
This commit is contained in:
Jack Halford 2016-12-22 11:44:44 +01:00
parent 6144e4eab5
commit c9a39637da
9 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
42sh/includes/exec.h
View file

@ -16,6 +16,18 @@
# define PIPE_READ 0
# define PIPE_WRITE 1
# define PROCESS_COMPLETED (1 << 0)
# define PROCESS_STOPPED (1 << 1)
# define PROCESS_BUILTIN (1 << 2)
# define PROCESS_BINARY (1 << 3)
# define PROCESS_SCRIPT (1 << 4)
# define PROCESS_UNKNOWN (1 << 5)
# define PROCESS_PIPESTART (1 << 6)
# define PROCESS_PIPEEND (1 << 7)
# define IS_PIPESTART(p) (p & (PROCESS_PIPESTART))
# define IS_PIPEEND(p) (p & (PROCESS_PIPEEND))
# include "libft.h"
# include "types.h"
# include "job_control.h"

8
42sh/includes/job_control.h
View file

@ -19,19 +19,11 @@
# include "libft.h"
# include "types.h"
# define PROCESS_COMPLETED (1 << 0)
# define PROCESS_STOPPED (1 << 1)
# define PROCESS_BUILTIN (1 << 2)
# define PROCESS_BINARY (1 << 3)
# define PROCESS_SCRIPT (1 << 4)
# define PROCESS_UNKNOWN (1 << 5)
# define JOB_NOTIFIED (1 << 0)
# define JOB_BG (1 << 1)
# define JOB_IS_BG(j) (j & JOB_BG)
# define JOB_IS_FG(j) !(j & JOB_BG)
struct s_job
{
int id;

2
42sh/libft

@ -1 +1 @@
Subproject commit e7cece5732986cdcd159b40f1d927137e2d6c9f3
Subproject commit a26a4be4adbf4d6d4887af95a7307356d52ce85d

2
42sh/src/builtin/builtin_setenv.c
View file

@ -37,7 +37,7 @@ int builtin_setenv(const char *path, char *const av[], char *const envp[])
{
if (ft_strcmp((*env)[i], av[0]) == '=')
{
ft_strdel(*env);
ft_strdel(&(*env)[i]);
(*env)[i] = str;
return (0);
}

2
42sh/src/exec/exec_command.c
View file

@ -34,7 +34,7 @@ int exec_command(t_btree **ast)
DG("gonna launch_process now");
launch_process(p);
job_addprocess(p);
if (p->fdout == STDOUT)
if (IS_PIPEEND(p->fdout == STDOUT))
{
if (JOB_IS_FG(job->attributes))
put_job_in_foreground(job, 0);

31
42sh/src/exec/exec_pipe.c
View file

@ -16,21 +16,34 @@ int exec_pipe(t_btree **ast)
{
int fds[2];
t_data *data;
t_process *p;
data = data_singleton();
p = &data_singleton()->exec.process;
pipe(fds);
DG("pipe %i->%i", fds[PIPE_WRITE], fds[PIPE_READ]);
data->exec.process.fdout = fds[PIPE_WRITE];
p->fdout = fds[PIPE_WRITE];
if (!IS_PIPEEND(p->attributes))
{
p->attributes |= PROCESS_PIPESTART;
p->attributes &= ~PROCESS_PIPEEND;
}
ft_exec(&(*ast)->left);
if (data->exec.process.fdout != STDOUT)
close(data->exec.process.fdout);
data->exec.process.fdout = STDOUT;
data->exec.process.fdin = fds[PIPE_READ];
if (p->fdout != STDOUT)
close(p->fdout);
p->fdout = STDOUT;
p->fdin = fds[PIPE_READ];
p->attributes ~= ~PROCESS_PIPESTART;
p->attributes |= PROCESS_PIPEEND;
ft_exec(&(*ast)->right);
close(fds[PIPE_WRITE]);
close(fds[PIPE_READ]);
data->exec.process.fdin = STDIN;
data->exec.process.fdout = STDOUT;
/* close(fds[PIPE_WRITE]); */
/* close(fds[PIPE_READ]); */
p->fdin = STDIN;
p->fdout = STDOUT;
p->attributes &= ~PROCESS_PIPEEND;
btree_delone(ast, &ast_free);
return (0);
}

2
42sh/src/exec/process_setexec.c
View file

@ -14,8 +14,6 @@
int process_setexec(t_process *p)
{
DG("going to setexec:\nenv at %p\nav[0]=%s", data_singleton()->env, p->argv[0]);
DG("going to setexec:\nPATH=%s\nav[0]=%s", ft_getenv(data_singleton()->env, "PATH"), p->argv[0]);
if ((p->execf = is_builtin(p)))
{
DG("process is a builtin");

2
42sh/src/job-control/do_job_notification.c
View file

@ -31,7 +31,7 @@ int do_job_notification(void)
{
ret = 1;
job_notify_change(j->id, 0);
/* job_remove(j->id); */
job_remove(j->id);
}
else if (job_is_stopped(j) && !(j->attributes & JOB_NOTIFIED))
{

4
42sh/src/job-control/job_addprocess.c
View file

@ -19,7 +19,7 @@ int job_addprocess(t_process *p)
jobc = &data_singleton()->jobc;
job = &data_singleton()->exec.job;
if (p->fdin == STDIN)
if (IS_PIPESTART(p->attributes))
{
job_update_id();
job->id = jobc->current_id;
@ -28,7 +28,7 @@ int job_addprocess(t_process *p)
}
job = jobc->first_job->content;
ft_lstadd(&job->first_process, ft_lstnew(p, sizeof(*p)));
if (JOB_IS_BG(job->attributes) && p->fdout == STDOUT)
if (JOB_IS_BG(job->attributes) && IS_PIPEEND(p->attributes))
job_notify_new(job);
DG("added process to first_job : %i", p->pid);
return(0);