From 4a2f8d92e7c3ced677c0a4257c3e017bdf6c00d6 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 13 Oct 2005 17:49:59 +0000 Subject: 21872: job accounting in subshells was screwy --- Src/jobs.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Src/jobs.c') diff --git a/Src/jobs.c b/Src/jobs.c index 9d7d2aace..96250e84f 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -1213,9 +1213,14 @@ clearjobtab(int monitor) int sz = oldmaxjob * sizeof(struct job); oldjobtab = (struct job *)zalloc(sz); memcpy(oldjobtab, jobtab, sz); + + /* Don't report any job we're part of */ + if (thisjob != -1 && thisjob < oldmaxjob) + memset(oldjobtab+thisjob, 0, sizeof(struct job)); } - memset(jobtab, 0, sizeof(jobtab)); /* zero out table */ + memset(jobtab, 0, jobtabsize * sizeof(struct job)); /* zero out table */ + maxjob = 0; } static int initnewjob(int i) @@ -1241,9 +1246,11 @@ initjob(void) { int i; - for (i = 1; i < jobtabsize; i++) + for (i = 1; i <= maxjob; i++) if (!jobtab[i].stat) return initnewjob(i); + if (maxjob + 1 < jobtabsize) + return initnewjob(maxjob+1); if (expandjobtab()) return initnewjob(i); -- cgit 1.4.1