mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

zsh-workers/9345

Browse source
This commit is contained in:
Tanaka Akira 2000-01-18 12:29:11 +00:00
parent 2c4e618e96
commit d473a667b6
3 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Src/exec.c
View file

@ -949,9 +949,10 @@ execpline(Estate state, wordcode slcode, int how, int last1)
/* If the super-job contains only the sub-shell, the
sub-shell is the group leader. */
if (!jn->procs->next || lpforked == 2)
if (!jn->procs->next || lpforked == 2) {
jn->gleader = list_pipe_pid;
jn->stat |= STAT_SUBLEADER;
}
for (pn = jobtab[jn->other].procs; pn; pn = pn->next)
if (WIFSTOPPED(pn->status))
break;
@ -971,14 +972,17 @@ execpline(Estate state, wordcode slcode, int how, int last1)
lastwj = -1;
}
errbrk_saved = 0;
for (; !nowait;) {
if (list_pipe_child) {
jn->stat |= STAT_NOPRINT;
makerunning(jn);
}
if (!(jn->stat & STAT_LOCKED))
if (!(jn->stat & STAT_LOCKED)) {
child_unblock();
child_block();
waitjobs();
}
if (list_pipe_child &&
jn->stat & STAT_DONE &&
lastval2 & 0200)
@ -1042,6 +1046,10 @@ execpline(Estate state, wordcode slcode, int how, int last1)
list_pipe = 0;
list_pipe_child = 1;
opts[INTERACTIVE] = 0;
if (errbrk_saved) {
errflag = prev_errflag;
breaks = prev_breaks;
}
break;
}
}

19
Src/jobs.c
View file

@ -64,7 +64,13 @@ struct tms shtms;
/**/
int ttyfrozen;
/* Previous values of errflag and breaks if the signal handler had to
* change them. And a flag saying if it did that. */
/**/
int prev_errflag, prev_breaks, errbrk_saved;
static struct timeval dtimeval, now;
/* Diff two timevals for elapsed-time computations */
@ -311,6 +317,11 @@ update_job(Job jn)
/* If we have `foo|while true; (( x++ )); done', and hit
* ^C, we have to stop the loop, too. */
if ((val & 0200) && inforeground == 1) {
if (!errbrk_saved) {
errbrk_saved = 1;
prev_breaks = breaks;
prev_errflag = errflag;
}
breaks = loops;
errflag = 1;
inerrflush();
@ -322,6 +333,11 @@ update_job(Job jn)
}
}
} else if (list_pipe && (val & 0200) && inforeground == 1) {
if (!errbrk_saved) {
errbrk_saved = 1;
prev_breaks = breaks;
prev_errflag = errflag;
}
breaks = loops;
errflag = 1;
inerrflush();
@ -1296,6 +1312,7 @@ bin_fg(char *name, char **argv, char *ops, int func)
thisjob = job;
if ((jobtab[job].stat & STAT_SUPERJOB) &&
((!jobtab[job].procs->next ||
(jobtab[job].stat & STAT_SUBLEADER) ||
killpg(jobtab[job].gleader, 0) == -1)) &&
jobtab[jobtab[job].other].gleader)
attachtty(jobtab[jobtab[job].other].gleader);

1
Src/zsh.h
View file

@ -636,6 +636,7 @@ struct job {
#define STAT_NOSTTY (1<<11) /* the tty settings are not inherited */
/* from this job when it exits. */
#define STAT_ATTACH (1<<12) /* delay reattaching shell to tty */
#define STAT_SUBLEADER (1<<13) /* is super-job, but leader is sub-shell */
#define SP_RUNNING -1 /* fake status for jobs currently running */