circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 475:

Browse Source 
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 #().
This commit is contained in:
Tiago Cunha
2009-11-02 21:38:27 +00:00
parent 47f69075a0
commit 053e40572c
8 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
job.c
View File

@ -1,4 +1,4 @@
/* $Id: job.c,v 1.8 2009-10-23 17:27:40 tcunha Exp $ */
/* $Id: job.c,v 1.9 2009-11-02 21:38:26 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -72,7 +72,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;
@ -80,6 +80,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;
@ -90,15 +91,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)