Sync OpenBSD patchset 382:

Collect status from dead jobs and don't invoke the callback until both
all input (the socket is closed) and status is available.
This commit is contained in:
Tiago Cunha
2009-10-12 00:21:08 +00:00
parent b26ea8462e
commit 1b03bc2404
3 changed files with 38 additions and 9 deletions

7
job.c
View File

@ -1,4 +1,4 @@
/* $Id: job.c,v 1.3 2009-10-12 00:12:32 tcunha Exp $ */
/* $Id: job.c,v 1.4 2009-10-12 00:21:08 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -104,6 +104,8 @@ job_add(struct jobs *jobs, struct client *c, const char *cmd,
job->freefn = freefn;
job->data = data;
job->flags = JOB_DONE;
RB_INSERT(jobs, jobs, job);
SLIST_INSERT_HEAD(&all_jobs, job, lentry);
@ -132,8 +134,9 @@ job_run(struct job *job)
{
int nullfd, out[2], mode;
if (job->fd != -1)
if (!(job->flags & JOB_DONE))
return (0);
job->flags &= ~JOB_DONE;
if (pipe(out) != 0)
return (-1);