summaryrefslogtreecommitdiffstats
path: root/job.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-11-01 23:20:37 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-11-01 23:20:37 +0000
commit2f813ef75d7d1cfb32d78923ae6963be7266de55 (patch)
treefed2d2ac2f0b98903eea186a19f2444a8ee99452 /job.c
parent32299e401039e9c88e430516e9d85d59d551b859 (diff)
Add a flag for jobs that shouldn't be freed after they've died and use it for
status jobs, then only kill those jobs when status-left, status-right or set-titles-string is changed. Fixes problems with changing options from inside #().
Diffstat (limited to 'job.c')
-rw-r--r--job.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/job.c b/job.c
index 93ff0644..a638e3d8 100644
--- a/job.c
+++ b/job.c
@@ -73,7 +73,7 @@ job_get(struct jobs *jobs, const char *cmd)
/* Add a job. */
struct job *
-job_add(struct jobs *jobs, struct client *c, const char *cmd,
+job_add(struct jobs *jobs, int flags, struct client *c, const char *cmd,
void (*callbackfn)(struct job *), void (*freefn)(void *), void *data)
{
struct job *job;
@@ -81,6 +81,7 @@ job_add(struct jobs *jobs, struct client *c, const char *cmd,
job = xmalloc(sizeof *job);
job->cmd = xstrdup(cmd);
job->pid = -1;
+ job->status = 0;
job->client = c;
@@ -91,15 +92,24 @@ job_add(struct jobs *jobs, struct client *c, const char *cmd,
job->freefn = freefn;
job->data = data;
- job->flags = JOB_DONE;
+ job->flags = flags|JOB_DONE;
if (jobs != NULL)
RB_INSERT(jobs, jobs, job);
SLIST_INSERT_HEAD(&all_jobs, job, lentry);
-
+
return (job);
}
+/* Remove job from tree and free. */
+void
+job_remove(struct jobs *jobs, struct job *job)
+{
+ if (jobs != NULL)
+ RB_REMOVE(jobs, jobs, job);
+ job_free(job);
+}
+
/* Kill and free an individual job. */
void
job_free(struct job *job)