diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Doc/Zsh/params.yo | 3 | ||||
| -rw-r--r-- | Src/jobs.c | 16 |
3 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2006-10-30 Peter Stephenson <pws@csr.com> + + * 22913: Doc/Zsh/params.yo, Src/jobs.c: set $! after a "bg", too. + 2006-10-27 Peter Stephenson <pws@csr.com> * unposted: Completion/Unix/Command/_perforce: completion diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo index bbe3354ce..8959130fd 100644 --- a/Doc/Zsh/params.yo +++ b/Doc/Zsh/params.yo @@ -477,7 +477,8 @@ The following parameters are automatically set by the shell: startitem() vindex(!) item(tt(!) <S>)( -The process ID of the last background command invoked. +The process ID of the last command started in the background with tt(&), +or put into the background with the tt(bg) builtin. ) vindex(#) item(tt(#) <S>)( diff --git a/Src/jobs.c b/Src/jobs.c index 509b9e843..5b42a45b0 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -1789,9 +1789,21 @@ bin_fg(char *name, char **argv, Options ops, int func) case BIN_WAIT: if (func == BIN_BG) jobtab[job].stat |= STAT_NOSTTY; - if ((stopped = (jobtab[job].stat & STAT_STOPPED))) + if ((stopped = (jobtab[job].stat & STAT_STOPPED))) { makerunning(jobtab + job); - else if (func == BIN_BG) { + if (func == BIN_BG) { + /* Set $! to indicate this was backgrounded */ + Process pn = jobtab[job].procs; + for (;;) { + Process next = pn->next; + if (!next) { + lastpid = (zlong) pn->pid; + break; + } + pn = next; + } + } + } else if (func == BIN_BG) { /* Silly to bg a job already running. */ zwarnnam(name, "job already in background"); thisjob = ocj; |