mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-04 10:41:11 +02:00
43446: More entersubsh() / addproc() wiring.
Fix additional races by passing back use of list_pipe_job from subshell.
This commit is contained in:
Peter Stephenson
parent
03a51a6f09
commit
7c5241edf3
4 changed files with 45 additions and 19 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2018-09-12 Peter Stephenson <p.stephenson@samsung.com>
|
||||
|
||||
* 43446: Src/exec.c, Src/jobs.c, Src/zsh.h: enhance 43409 to
|
||||
pass back list_pipe_job as well, fixing additional races.
|
||||
|
||||
2018-09-10 Jörg Thalheim <joerg@thalheim.io>
|
||||
|
||||
* GitHub #28: Src/builtin.c: Add missing math.h include for
|
||||
|
|
|
|||
37
Src/exec.c
37
Src/exec.c
|
|
@ -1002,7 +1002,7 @@ enum {
|
|||
|
||||
/**/
|
||||
static void
|
||||
entersubsh(int flags, int *gleaderp)
|
||||
entersubsh(int flags, struct entersubsh_ret *retp)
|
||||
{
|
||||
int i, sig, monitor, job_control_ok;
|
||||
|
||||
|
|
@ -1036,8 +1036,10 @@ entersubsh(int flags, int *gleaderp)
|
|||
if (!(flags & ESUB_ASYNC))
|
||||
attachtty(jobtab[thisjob].gleader);
|
||||
}
|
||||
if (gleaderp)
|
||||
*gleaderp = jobtab[list_pipe_job].gleader;
|
||||
if (retp) {
|
||||
retp->gleader = jobtab[list_pipe_job].gleader;
|
||||
retp->list_pipe_job = list_pipe_job;
|
||||
}
|
||||
}
|
||||
else if (!jobtab[thisjob].gleader ||
|
||||
setpgrp(0L, jobtab[thisjob].gleader) == -1) {
|
||||
|
|
@ -1058,8 +1060,11 @@ entersubsh(int flags, int *gleaderp)
|
|||
setpgrp(0L, jobtab[thisjob].gleader);
|
||||
if (!(flags & ESUB_ASYNC))
|
||||
attachtty(jobtab[thisjob].gleader);
|
||||
if (gleaderp)
|
||||
*gleaderp = jobtab[thisjob].gleader;
|
||||
if (retp) {
|
||||
retp->gleader = jobtab[thisjob].gleader;
|
||||
if (list_pipe_job != thisjob)
|
||||
retp->list_pipe_job = list_pipe_job;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!(flags & ESUB_FAKE))
|
||||
|
|
@ -1692,7 +1697,7 @@ execpline(Estate state, wordcode slcode, int how, int last1)
|
|||
curjob = newjob;
|
||||
DPUTS(!list_pipe_pid, "invalid list_pipe_pid");
|
||||
addproc(list_pipe_pid, list_pipe_text, 0,
|
||||
&list_pipe_start, -1);
|
||||
&list_pipe_start, -1, -1);
|
||||
|
||||
/* If the super-job contains only the sub-shell, the
|
||||
sub-shell is the group leader. */
|
||||
|
|
@ -2185,7 +2190,7 @@ closemn(struct multio **mfds, int fd, int type)
|
|||
}
|
||||
mn->ct = 1;
|
||||
mn->fds[0] = fd;
|
||||
addproc(pid, NULL, 1, &bgtime, -1);
|
||||
addproc(pid, NULL, 1, &bgtime, -1, -1);
|
||||
child_unblock();
|
||||
return;
|
||||
}
|
||||
|
|
@ -2686,10 +2691,12 @@ execcmd_fork(Estate state, int how, int type, Wordcode varspc,
|
|||
{
|
||||
pid_t pid;
|
||||
int synch[2], flags;
|
||||
int gleader = -1;
|
||||
struct entersubsh_ret esret;
|
||||
struct timeval bgtime;
|
||||
|
||||
child_block();
|
||||
esret.gleader = -1;
|
||||
esret.list_pipe_job = -1;
|
||||
|
||||
if (pipe(synch) < 0) {
|
||||
zerr("pipe failed: %e", errno);
|
||||
|
|
@ -2703,7 +2710,7 @@ execcmd_fork(Estate state, int how, int type, Wordcode varspc,
|
|||
}
|
||||
if (pid) {
|
||||
close(synch[1]);
|
||||
read_loop(synch[0], (char *)&gleader, sizeof(gleader));
|
||||
read_loop(synch[0], (char *)&esret, sizeof(esret));
|
||||
close(synch[0]);
|
||||
if (how & Z_ASYNC) {
|
||||
lastpid = (zlong) pid;
|
||||
|
|
@ -2721,7 +2728,7 @@ execcmd_fork(Estate state, int how, int type, Wordcode varspc,
|
|||
3 : WC_ASSIGN_NUM(ac) + 2);
|
||||
}
|
||||
}
|
||||
addproc(pid, text, 0, &bgtime, gleader);
|
||||
addproc(pid, text, 0, &bgtime, esret.gleader, esret.list_pipe_job);
|
||||
if (oautocont >= 0)
|
||||
opts[AUTOCONTINUE] = oautocont;
|
||||
pipecleanfilelist(jobtab[thisjob].filelist, 1);
|
||||
|
|
@ -2736,8 +2743,8 @@ execcmd_fork(Estate state, int how, int type, Wordcode varspc,
|
|||
if (type == WC_SUBSH && !(how & Z_ASYNC))
|
||||
flags |= ESUB_JOB_CONTROL;
|
||||
*filelistp = jobtab[thisjob].filelist;
|
||||
entersubsh(flags, &gleader);
|
||||
write(synch[1], &gleader, sizeof(gleader));
|
||||
entersubsh(flags, &esret);
|
||||
write(synch[1], &esret, sizeof(esret));
|
||||
close(synch[1]);
|
||||
zclose(close_if_forked);
|
||||
|
||||
|
|
@ -4876,7 +4883,7 @@ getproc(char *cmd, char **eptr)
|
|||
if (pid == -1)
|
||||
return NULL;
|
||||
if (!out)
|
||||
addproc(pid, NULL, 1, &bgtime, -1);
|
||||
addproc(pid, NULL, 1, &bgtime, -1, -1);
|
||||
procsubstpid = pid;
|
||||
return pnam;
|
||||
}
|
||||
|
|
@ -4913,7 +4920,7 @@ getproc(char *cmd, char **eptr)
|
|||
addfilelist(NULL, fd);
|
||||
if (!out)
|
||||
{
|
||||
addproc(pid, NULL, 1, &bgtime, -1);
|
||||
addproc(pid, NULL, 1, &bgtime, -1, -1);
|
||||
}
|
||||
procsubstpid = pid;
|
||||
return pnam;
|
||||
|
|
@ -4965,7 +4972,7 @@ getpipe(char *cmd, int nullexec)
|
|||
return -1;
|
||||
}
|
||||
if (!nullexec)
|
||||
addproc(pid, NULL, 1, &bgtime, -1);
|
||||
addproc(pid, NULL, 1, &bgtime, -1, -1);
|
||||
procsubstpid = pid;
|
||||
return pipes[!out];
|
||||
}
|
||||
|
|
|
|||
14
Src/jobs.c
14
Src/jobs.c
|
|
@ -1375,7 +1375,8 @@ deletejob(Job jn, int disowning)
|
|||
|
||||
/**/
|
||||
void
|
||||
addproc(pid_t pid, char *text, int aux, struct timeval *bgtime, int gleader)
|
||||
addproc(pid_t pid, char *text, int aux, struct timeval *bgtime,
|
||||
int gleader, int list_pipe_job_used)
|
||||
{
|
||||
Process pn, *pnlist;
|
||||
|
||||
|
|
@ -1397,10 +1398,15 @@ addproc(pid_t pid, char *text, int aux, struct timeval *bgtime, int gleader)
|
|||
* the job, then it's the group leader.
|
||||
*
|
||||
* Exception: if the forked subshell reported its own group
|
||||
* leader, set that.
|
||||
* leader, set that. If it reported the use of list_pipe_job,
|
||||
* set it for that, too.
|
||||
*/
|
||||
if (!jobtab[thisjob].gleader)
|
||||
jobtab[thisjob].gleader = (gleader != -1) ? gleader : pid;
|
||||
if (gleader != -1) {
|
||||
jobtab[thisjob].gleader = gleader;
|
||||
if (list_pipe_job_used != -1)
|
||||
jobtab[list_pipe_job_used].gleader = gleader;
|
||||
} else if (!jobtab[thisjob].gleader)
|
||||
jobtab[thisjob].gleader = pid;
|
||||
/* attach this process to end of process list of current job */
|
||||
pnlist = &jobtab[thisjob].procs;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -505,6 +505,14 @@ enum {
|
|||
ZCONTEXT_PARSE = (1<<2)
|
||||
};
|
||||
|
||||
/* Report from entersubsh() to pass subshell info to addproc */
|
||||
struct entersubsh_ret {
|
||||
/* Process group leader chosen by subshell, else -1 */
|
||||
int gleader;
|
||||
/* list_pipe_job setting used by subshell, else -1 */
|
||||
int list_pipe_job;
|
||||
};
|
||||
|
||||
/**************************/
|
||||
/* Abstract types for zsh */
|
||||
/**************************/
|
||||
|
|
|
|||
Loading…
Reference in a new issue