105 lines
3.3 KiB
Diff
105 lines
3.3 KiB
Diff
|
diff --git a/Src/jobs.c b/Src/jobs.c
|
||
|
|
index 707374297..76c762ee5 100644
|
||
|
|
--- a/Src/jobs.c
|
||
|
|
+++ b/Src/jobs.c
|
||
|
|
@@ -544,16 +544,14 @@ update_job(Job jn)
|
||
|
|
|
||
|
|
if (isset(MONITOR)) {
|
||
|
|
pid_t pgrp = gettygrp(); /* get process group of tty */
|
||
|
|
+ int deadpgrp = (mypgrp != pgrp && inforeground && pgrp > 1 &&
|
||
|
|
+ kill(-pgrp, 0) == -1 && errno == ESRCH);
|
||
|
|
|
||
|
|
/* is this job in the foreground of an interactive shell? */
|
||
|
|
if (mypgrp != pgrp && inforeground &&
|
||
|
|
- (jn->gleader == pgrp ||
|
||
|
|
- (pgrp > 1 &&
|
||
|
|
- (kill(-pgrp, 0) == -1 && errno == ESRCH)))) {
|
||
|
|
+ ((jn->gleader == pgrp && signalled) || deadpgrp)) {
|
||
|
|
if (list_pipe) {
|
||
|
|
- if (somestopped || (pgrp > 1 &&
|
||
|
|
- kill(-pgrp, 0) == -1 &&
|
||
|
|
- errno == ESRCH)) {
|
||
|
|
+ if (somestopped || deadpgrp) {
|
||
|
|
attachtty(mypgrp);
|
||
|
|
/* check window size and adjust if necessary */
|
||
|
|
adjustwinsize(0);
|
||
|
|
@@ -566,6 +564,12 @@ update_job(Job jn)
|
||
|
|
* when the job is finally deleted.
|
||
|
|
*/
|
||
|
|
jn->stat |= STAT_ATTACH;
|
||
|
|
+ /*
|
||
|
|
+ * If we're in shell jobs on the right side of a pipeline
|
||
|
|
+ * we should treat it like a job in the current shell.
|
||
|
|
+ */
|
||
|
|
+ if (inforeground == 2)
|
||
|
|
+ inforeground = 1;
|
||
|
|
}
|
||
|
|
/* If we have `foo|while true; (( x++ )); done', and hit
|
||
|
|
* ^C, we have to stop the loop, too. */
|
||
|
|
@@ -1488,10 +1492,7 @@ addproc(pid_t pid, char *text, int aux, struct timeval *bgtime,
|
||
|
|
* set it for that, too.
|
||
|
|
*/
|
||
|
|
if (gleader != -1) {
|
||
|
|
- if (jobtab[thisjob].stat & STAT_CURSH)
|
||
|
|
- jobtab[thisjob].gleader = gleader;
|
||
|
|
- else
|
||
|
|
- jobtab[thisjob].gleader = pid;
|
||
|
|
+ jobtab[thisjob].gleader = gleader;
|
||
|
|
if (list_pipe_job_used != -1)
|
||
|
|
jobtab[list_pipe_job_used].gleader = gleader;
|
||
|
|
/*
|
||
|
|
@@ -1500,7 +1501,7 @@ addproc(pid_t pid, char *text, int aux, struct timeval *bgtime,
|
||
|
|
*/
|
||
|
|
last_attached_pgrp = gleader;
|
||
|
|
} else if (!jobtab[thisjob].gleader)
|
||
|
|
- jobtab[thisjob].gleader = pid;
|
||
|
|
+ jobtab[thisjob].gleader = pid;
|
||
|
|
/* attach this process to end of process list of current job */
|
||
|
|
pnlist = &jobtab[thisjob].procs;
|
||
|
|
}
|
||
|
|
@@ -2506,6 +2507,7 @@ bin_fg(char *name, char **argv, Options ops, int func)
|
||
|
|
jobtab[job].stat &= ~STAT_CURSH;
|
||
|
|
}
|
||
|
|
if ((stopped = (jobtab[job].stat & STAT_STOPPED))) {
|
||
|
|
+ /* WIFCONTINUED will makerunning() again at killjb() */
|
||
|
|
makerunning(jobtab + job);
|
||
|
|
if (func == BIN_BG) {
|
||
|
|
/* Set $! to indicate this was backgrounded */
|
||
|
|
|
||
|
|
diff --git a/Src/exec.c b/Src/exec.c
|
||
|
|
index 2422dae91..d4e681887 100644
|
||
|
|
--- a/Src/exec.c
|
||
|
|
+++ b/Src/exec.c
|
||
|
|
@@ -1899,8 +1899,12 @@ execpline(Estate state, wordcode slcode, int how, int last1)
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- else if (subsh && jn->stat & STAT_STOPPED)
|
||
|
|
- thisjob = newjob;
|
||
|
|
+ else if (subsh && jn->stat & STAT_STOPPED) {
|
||
|
|
+ if (thisjob == newjob)
|
||
|
|
+ makerunning(jn);
|
||
|
|
+ else
|
||
|
|
+ thisjob = newjob;
|
||
|
|
+ }
|
||
|
|
else
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
diff --git a/Src/jobs.c b/Src/jobs.c
|
||
|
|
index 76c762ee5..4863962b9 100644
|
||
|
|
--- a/Src/jobs.c
|
||
|
|
+++ b/Src/jobs.c
|
||
|
|
@@ -564,12 +564,6 @@ update_job(Job jn)
|
||
|
|
* when the job is finally deleted.
|
||
|
|
*/
|
||
|
|
jn->stat |= STAT_ATTACH;
|
||
|
|
- /*
|
||
|
|
- * If we're in shell jobs on the right side of a pipeline
|
||
|
|
- * we should treat it like a job in the current shell.
|
||
|
|
- */
|
||
|
|
- if (inforeground == 2)
|
||
|
|
- inforeground = 1;
|
||
|
|
}
|
||
|
|
/* If we have `foo|while true; (( x++ )); done', and hit
|
||
|
|
* ^C, we have to stop the loop, too. */
|