circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 09:28:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-06-17 18:01:07 +01:00
commit a584e11d6b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
job.c
View File

@ -99,6 +99,8 @@ job_run(const char *cmd, struct session *s, int cwd,
close(out[1]); close(out[1]);
job = xmalloc(sizeof *job); job = xmalloc(sizeof *job);
job->state = JOB_RUNNING;
job->cmd = xstrdup(cmd); job->cmd = xstrdup(cmd);
job->pid = pid; job->pid = pid;
job->status = 0; job->status = 0;
@ -166,14 +168,13 @@ job_callback(unused struct bufferevent *bufev, unused short events, void *data)
log_debug("job error %p: %s, pid %ld", job, job->cmd, (long) job->pid); log_debug("job error %p: %s, pid %ld", job, job->cmd, (long) job->pid);
if (job->pid == -1) { if (job->state == JOB_DEAD) {
if (job->callbackfn != NULL) if (job->callbackfn != NULL)
job->callbackfn(job); job->callbackfn(job);
job_free(job); job_free(job);
} else { } else {
bufferevent_disable(job->event, EV_READ); bufferevent_disable(job->event, EV_READ);
close(job->fd); job->state = JOB_CLOSED;
job->fd = -1;
} }
} }
@ -185,10 +186,12 @@ job_died(struct job *job, int status)
job->status = status; job->status = status;
if (job->fd == -1) { if (job->state == JOB_CLOSED) {
if (job->callbackfn != NULL) if (job->callbackfn != NULL)
job->callbackfn(job); job->callbackfn(job);
job_free(job); job_free(job);
} else } else {
job->pid = -1; job->pid = -1;
job->state = JOB_DEAD;
}
} }

6
tmux.h
View File

@ -718,6 +718,12 @@ struct options {
/* Scheduled job. */ /* Scheduled job. */
struct job { struct job {
enum {
JOB_RUNNING,
JOB_DEAD,
JOB_CLOSED
} state;
char *cmd; char *cmd;
pid_t pid; pid_t pid;
int status; int status;