diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/jobs.c | 30 |
2 files changed, 31 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d8fdb7bf0..7895a7f9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-06-26 Sven Wischnowsky <wischnow@zsh.org> + + * 15087: Src/jobs.c: make warning message for disowning stopped + jobs more verbose (saying how to make the job running again) + 2001-06-25 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> * zsh-users/3942: source installed as Etc/FAQ.yo: latest FAQ. diff --git a/Src/jobs.c b/Src/jobs.c index 82e4926ff..50002d28f 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -1392,14 +1392,36 @@ bin_fg(char *name, char **argv, char *ops, int func) printjob(job + jobtab, lng, 2); break; case BIN_DISOWN: - if (jobtab[job].stat & STAT_STOPPED) + if (jobtab[job].stat & STAT_STOPPED) { + char buf[20], *pids = ""; + + if (jobtab[job].stat & STAT_SUPERJOB) { + Process pn; + + for (pn = jobtab[jobtab[job].other].procs; pn; pn = pn->next) { + sprintf(buf, " -%d", pn->pid); + pids = dyncat(pids, buf); + } + for (pn = jobtab[job].procs; pn->next; pn = pn->next) { + sprintf(buf, " %d", pn->pid); + pids = dyncat(pids, buf); + } + if (!jobtab[jobtab[job].other].procs && pn) { + sprintf(buf, " %d", pn->pid); + pids = dyncat(pids, buf); + } + } else { + sprintf(buf, " -%d", jobtab[job].gleader); + pids = buf; + } zwarnnam(name, #ifdef USE_SUSPENDED - "warning: job is suspended", + "warning: job is suspended, use `kill -CONT%s' to resume", #else - "warning: job is stopped", + "warning: job is stopped, use `kill -CONT%s' to resume", #endif - NULL, 0); + pids, 0); + } deletejob(jobtab + job); break; } |